diff --git a/dbcon/execplan/treenode.h b/dbcon/execplan/treenode.h
index 2eb431aa2..ca1196b27 100644
--- a/dbcon/execplan/treenode.h
+++ b/dbcon/execplan/treenode.h
@@ -29,11 +29,6 @@
 #include <cmath>
 #include <boost/shared_ptr.hpp>
 
-#ifdef _MSC_VER
-#include <boost/regex.hpp>
-#else
-#include <regex.h>
-#endif
 #include <stdlib.h>
 #include <unistd.h>
 
diff --git a/primitives/linux-port/dictionary.cpp b/primitives/linux-port/dictionary.cpp
index b1405589f..003fd3816 100644
--- a/primitives/linux-port/dictionary.cpp
+++ b/primitives/linux-port/dictionary.cpp
@@ -31,6 +31,7 @@ using namespace std;
 #include "messageobj.h"
 #include "exceptclasses.h"
 #include "utils_utf8.h"
+#include "dataconvert.h"
 #include <sstream>
 
 using namespace funcexp;
diff --git a/primitives/linux-port/primitiveprocessor.h b/primitives/linux-port/primitiveprocessor.h
index a02f88b29..366e90daf 100644
--- a/primitives/linux-port/primitiveprocessor.h
+++ b/primitives/linux-port/primitiveprocessor.h
@@ -33,9 +33,9 @@
 #include <unordered_set>
 #endif
 
-//#ifdef __linux__
-//#define POSIX_REGEX
-//#endif
+#ifdef __linux__
+#define POSIX_REGEX
+#endif
 
 #ifdef POSIX_REGEX
 #include <regex.h>
diff --git a/utils/dataconvert/dataconvert.h b/utils/dataconvert/dataconvert.h
index b3654bc9b..c2d27b1b8 100644
--- a/utils/dataconvert/dataconvert.h
+++ b/utils/dataconvert/dataconvert.h
@@ -36,7 +36,16 @@
 #else
 #include <netinet/in.h>
 #endif
+
+#ifdef __linux__
+#define POSIX_REGEX
+#endif
+
+#ifdef POSIX_REGEX
+#include <regex.h>
+#else
 #include <boost/regex.hpp>
+#endif
 
 #include "calpontsystemcatalog.h"
 #include "columnresult.h"