diff --git a/src/openalpr/binarize_wolf.h b/src/openalpr/binarize_wolf.h
index 92f02f0..73c0491 100644
--- a/src/openalpr/binarize_wolf.h
+++ b/src/openalpr/binarize_wolf.h
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <iostream>
 #include "opencv2/opencv.hpp"
-#include "opencv2/highgui/highgui.hpp"
 
 using namespace std;
 using namespace cv;
diff --git a/src/openalpr/characteranalysis.cpp b/src/openalpr/characteranalysis.cpp
index 60106ab..08da0a5 100644
--- a/src/openalpr/characteranalysis.cpp
+++ b/src/openalpr/characteranalysis.cpp
@@ -18,7 +18,6 @@
 */
 
 #include "characteranalysis.h"
-#include <math.h>
 
 CharacterAnalysis::CharacterAnalysis(Mat img, Config* config)
 {
diff --git a/src/openalpr/characteranalysis.h b/src/openalpr/characteranalysis.h
index 5a0343d..d60145a 100644
--- a/src/openalpr/characteranalysis.h
+++ b/src/openalpr/characteranalysis.h
@@ -22,7 +22,6 @@
 #ifndef CHARACTERANALYSIS_H
 #define CHARACTERANALYSIS_H
 
-#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "constants.h"
 #include "utility.h"
diff --git a/src/openalpr/characterregion.h b/src/openalpr/characterregion.h
index 450108d..2b71227 100644
--- a/src/openalpr/characterregion.h
+++ b/src/openalpr/characterregion.h
@@ -22,7 +22,6 @@
 #ifndef CHARACTERREGION_H
 #define CHARACTERREGION_H
 
-#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "constants.h"
 #include "utility.h"
diff --git a/src/openalpr/charactersegmenter.h b/src/openalpr/charactersegmenter.h
index 693469d..c4c7703 100644
--- a/src/openalpr/charactersegmenter.h
+++ b/src/openalpr/charactersegmenter.h
@@ -22,7 +22,6 @@
 #ifndef CHARACTERSEGMENTER_H
 #define CHARACTERSEGMENTER_H
 
-#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "constants.h"
 #include "binarize_wolf.h"
diff --git a/src/openalpr/colorfilter.h b/src/openalpr/colorfilter.h
index 2f4a19a..9e553ac 100644
--- a/src/openalpr/colorfilter.h
+++ b/src/openalpr/colorfilter.h
@@ -22,7 +22,6 @@
 #define COLORFILTER_H
 
 #include <iomanip>
-#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 
 #include "constants.h"
diff --git a/src/openalpr/config.h b/src/openalpr/config.h
index 34a5229..1858b91 100644
--- a/src/openalpr/config.h
+++ b/src/openalpr/config.h
@@ -25,7 +25,7 @@
 #include "simpleini/simpleini.h"
 #include "support/filesystem.h"
 
-#include "linux_dev.h"
+#include "constants.h"
 
 #include <stdio.h>
 #include <iostream>
diff --git a/src/openalpr/constants.h b/src/openalpr/constants.h
index b014f7b..a3f3f3d 100644
--- a/src/openalpr/constants.h
+++ b/src/openalpr/constants.h
@@ -17,5 +17,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "linux_dev.h"
+#define CONFIG_FILE 		"/openalpr.conf"
+#define KEYPOINTS_DIR		"/keypoints"
+#define CASCADE_DIR		"/region/"
+#define POSTPROCESS_DIR		"/postprocess"
 
+#ifndef DEFAULT_RUNTIME_DIR
+  #define DEFAULT_RUNTIME_DIR 	"/default_runtime_data_dir/"
+#endif
+
+#define ENV_VARIABLE_RUNTIME_DIR "OPENALPR_RUNTIME_DIR"
\ No newline at end of file
diff --git a/src/openalpr/featurematcher.h b/src/openalpr/featurematcher.h
index 733d75a..b1a737a 100644
--- a/src/openalpr/featurematcher.h
+++ b/src/openalpr/featurematcher.h
@@ -23,7 +23,6 @@
 #ifndef FEATUREMATCHER_H
 #define FEATUREMATCHER_H
 
-#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/calib3d/calib3d.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/features2d/features2d.hpp"
diff --git a/src/openalpr/licenseplatecandidate.h b/src/openalpr/licenseplatecandidate.h
index a34a799..25e002f 100644
--- a/src/openalpr/licenseplatecandidate.h
+++ b/src/openalpr/licenseplatecandidate.h
@@ -24,11 +24,9 @@
 #include <iostream>
 #include <stdio.h>
 #include <vector>
-//#include <apr-1.0/apr_poll.h>
 
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/core/core.hpp"
-#include "opencv2/highgui/highgui.hpp"
 
 #include "utility.h"
 #include "constants.h"
diff --git a/src/openalpr/linux_dev.h b/src/openalpr/linux_dev.h
deleted file mode 100644
index 84689c8..0000000
--- a/src/openalpr/linux_dev.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2013 New Designs Unlimited, LLC
- * Opensource Automated License Plate Recognition [http://www.openalpr.com]
- * 
- * This file is part of OpenAlpr.
- * 
- * OpenAlpr is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License 
- * version 3 as published by the Free Software Foundation 
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#define CONFIG_FILE 		"/openalpr.conf"
-#define KEYPOINTS_DIR		"/keypoints"
-#define CASCADE_DIR		"/region/"
-#define POSTPROCESS_DIR		"/postprocess"
-
-#ifndef DEFAULT_RUNTIME_DIR
-  #define DEFAULT_RUNTIME_DIR 	"/default_runtime_data_dir/"
-#endif
-
-#define ENV_VARIABLE_RUNTIME_DIR "OPENALPR_RUNTIME_DIR"
-
-
diff --git a/src/openalpr/ocr.h b/src/openalpr/ocr.h
index 7bf6d0f..b0a7c35 100644
--- a/src/openalpr/ocr.h
+++ b/src/openalpr/ocr.h
@@ -31,7 +31,6 @@
 #include "config.h"
 
 #include "constants.h"
-#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 
 #include "baseapi.h"
diff --git a/src/openalpr/platecorners.h b/src/openalpr/platecorners.h
index 6c2aecc..e10bb32 100644
--- a/src/openalpr/platecorners.h
+++ b/src/openalpr/platecorners.h
@@ -21,7 +21,6 @@
 #ifndef PLATECORNERS_H
 #define PLATECORNERS_H
 
-#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "characterregion.h"
 #include "platelines.h"
diff --git a/src/openalpr/platelines.h b/src/openalpr/platelines.h
index 59e05f7..70170e1 100644
--- a/src/openalpr/platelines.h
+++ b/src/openalpr/platelines.h
@@ -26,7 +26,6 @@
 #include "opencv2/imgproc/imgproc.hpp"
 #include "utility.h"
 #include "binarize_wolf.h"
-//#include "lswms.h"
 #include "config.h"
 
 using namespace cv;
diff --git a/src/openalpr/regiondetector.h b/src/openalpr/regiondetector.h
index a02a54a..561934c 100644
--- a/src/openalpr/regiondetector.h
+++ b/src/openalpr/regiondetector.h
@@ -30,7 +30,6 @@
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/core/core.hpp"
 #include "opencv2/ml/ml.hpp"
-#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/ocl/ocl.hpp"
 
 #include "utility.h"
diff --git a/src/openalpr/stateidentifier.h b/src/openalpr/stateidentifier.h
index 3161541..362fbb7 100644
--- a/src/openalpr/stateidentifier.h
+++ b/src/openalpr/stateidentifier.h
@@ -22,7 +22,6 @@
 #ifndef STATEIDENTIFIER_H
 #define STATEIDENTIFIER_H
 
-#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "constants.h"
 #include "featurematcher.h"