From f29f9094828a4b13b69c0423760103c783aefec5 Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Thu, 25 Apr 2019 06:27:28 -0500
Subject: [PATCH 01/33] Add -DSERVER_BUILD_DIR configure parameter to
 interrogate the server build cache and derive variables and settings

---
 CMakeLists.txt | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 662d43d2a..42a50a221 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,21 @@ IF(NOT CMAKE_BUILD_TYPE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 
+if(SERVER_BUILD_DIR)
+    if (NOT IS_ABSOLUTE ${SERVER_BUILD_DIR})
+      set(SERVER_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${SERVER_BUILD_DIR})
+    endif()
+    if(NOT EXISTS ${SERVER_BUILD_DIR}/CMakeCache.txt)
+        message(FATAL_ERROR "SERVER_BUILD_DIR parameter supplied but CMakeCache.txt not found in ${SERVER_BUILD_DIR}")
+    endif()
+    load_cache("${SERVER_BUILD_DIR}" READ_WITH_PREFIX SERVER_ MySQL_SOURCE_DIR MySQL_BINARY_DIR CMAKE_BUILD_TYPE CMAKE_INSTALL_PREFIX)
+
+    set(SERVER_BUILD_INCLUDE_DIR "${SERVER_MySQL_BINARY_DIR}/include" CACHE PATH "Location of server build include folder" FORCE)
+    set(SERVER_SOURCE_ROOT_DIR "${SERVER_MySQL_SOURCE_DIR}" CACHE PATH "Location of the server source folder" FORCE)
+    set(CMAKE_INSTALL_PREFIX "${SERVER_CMAKE_INSTALL_PREFIX}" CACHE PATH "Installation prefix" FORCE)
+    set(CMAKE_BUILD_TYPE ${SERVER_CMAKE_BUILD_TYPE} CACHE STRING "Build configuration type" FORCE)
+endif()
+
 INCLUDE(ExternalProject)
 
 SET(CMAKE_CXX_STANDARD 11)

From 55acbf8c5c3c97d27eb43ac402a01e3cb82b990c Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Thu, 25 Apr 2019 22:15:51 -0500
Subject: [PATCH 02/33] permit execution of scripts when source is located on a
 non-executable file system

---
 utils/loggingcpp/CMakeLists.txt    | 2 +-
 utils/loggingcpp/genMsgAndErrId.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/utils/loggingcpp/CMakeLists.txt b/utils/loggingcpp/CMakeLists.txt
index d27b11e3c..c8fbbf2c3 100644
--- a/utils/loggingcpp/CMakeLists.txt
+++ b/utils/loggingcpp/CMakeLists.txt
@@ -15,7 +15,7 @@ set(loggingcpp_LIB_SRCS
 
 ADD_CUSTOM_COMMAND(
     OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/messageids.h ${CMAKE_CURRENT_SOURCE_DIR}/errorids.h
-    COMMAND ./genMsgAndErrId.sh
+    COMMAND /bin/sh genMsgAndErrId.sh
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     DEPENDS genMsgId.pl genErrId.pl
     )
diff --git a/utils/loggingcpp/genMsgAndErrId.sh b/utils/loggingcpp/genMsgAndErrId.sh
index 64e113ac8..9182e78d6 100755
--- a/utils/loggingcpp/genMsgAndErrId.sh
+++ b/utils/loggingcpp/genMsgAndErrId.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-./genMsgId.pl > messageids-temp.h
+perl ./genMsgId.pl > messageids-temp.h
 diff -abBq messageids-temp.h messageids.h >/dev/null 2>&1; if [ $? -ne 0 ]; then mv -f messageids-temp.h messageids.h; else touch -a messageids.h; fi;
 rm -f messageids-temp.h
-./genErrId.pl > errorids-temp.h
+perl ./genErrId.pl > errorids-temp.h
 diff -abBq errorids-temp.h errorids.h >/dev/null 2>&1; if [ $? -ne 0 ]; then mv -f errorids-temp.h errorids.h; else touch -a errorids.h; fi;
 rm -f errorids-temp.h

From 8b715fed44237df14e615e792fd9799c03131f33 Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Thu, 25 Apr 2019 22:41:26 -0500
Subject: [PATCH 03/33] permit script execution when sources reside on
 non-executable file system

---
 dbcon/ddlpackage/CMakeLists.txt | 18 ++++++++----------
 dbcon/dmlpackage/CMakeLists.txt | 17 ++++++++---------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/dbcon/ddlpackage/CMakeLists.txt b/dbcon/ddlpackage/CMakeLists.txt
index 3b3e231da..4f4fb995f 100644
--- a/dbcon/ddlpackage/CMakeLists.txt
+++ b/dbcon/ddlpackage/CMakeLists.txt
@@ -1,21 +1,20 @@
 INCLUDE_DIRECTORIES( ${ENGINE_COMMON_INCLUDES} )
 
+#TODO: put generated files in the binary directory
 ADD_CUSTOM_COMMAND(
     OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/ddl-gram.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ddl-scan.cpp
-    COMMAND ./ddl-gram.sh ${BISON_EXECUTABLE}
-    COMMAND ./ddl-scan.sh ${LEX_EXECUTABLE}
+    COMMAND /bin/sh ./ddl-gram.sh ${BISON_EXECUTABLE}
+    COMMAND /bin/sh ./ddl-scan.sh ${LEX_EXECUTABLE}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     DEPENDS ddl.y ddl.l
 )
 
-ADD_CUSTOM_TARGET(ddl-lexer DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ddl-scan.cpp)
-ADD_CUSTOM_TARGET(ddl-parser DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ddl-gram.cpp)
 # Parser puts extra info to stderr.
 MY_CHECK_AND_SET_COMPILER_FLAG("-DYYDEBUG=1" DEBUG)
 
 ########### next target ###############
 
-SET(ddlpackage_LIB_SRCS
+ADD_LIBRARY(ddlpackage SHARED
     serialize.cpp
     ddl-scan.cpp
     ddl-gram.cpp
@@ -32,11 +31,10 @@ SET(ddlpackage_LIB_SRCS
     sqlparser.cpp
     markpartition.cpp
     restorepartition.cpp
-    droppartition.cpp)
-
-ADD_LIBRARY(ddlpackage SHARED ${ddlpackage_LIB_SRCS})
-
-ADD_DEPENDENCIES(ddlpackage ddl-lexer ddl-parser)
+    droppartition.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/ddl-gram.cpp 
+    ${CMAKE_CURRENT_SOURCE_DIR}/ddl-scan.cpp
+    )
 
 SET_TARGET_PROPERTIES(ddlpackage PROPERTIES VERSION 1.0.0 SOVERSION 1)
 
diff --git a/dbcon/dmlpackage/CMakeLists.txt b/dbcon/dmlpackage/CMakeLists.txt
index 618d97c97..945215249 100644
--- a/dbcon/dmlpackage/CMakeLists.txt
+++ b/dbcon/dmlpackage/CMakeLists.txt
@@ -1,20 +1,19 @@
 
 INCLUDE_DIRECTORIES( ${ENGINE_COMMON_INCLUDES} )
 
+#TODO: put generated files in binary folder
 ADD_CUSTOM_COMMAND(
     OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/dml-gram.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dml-scan.cpp
-    COMMAND ./dml-gram.sh ${BISON_EXECUTABLE}
-    COMMAND ./dml-scan.sh ${LEX_EXECUTABLE}
+    COMMAND /bin/sh ./dml-gram.sh ${BISON_EXECUTABLE}
+    COMMAND /bin/sh ./dml-scan.sh ${LEX_EXECUTABLE}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     DEPENDS dml.y dml.l
 )
 
-ADD_CUSTOM_TARGET(dml-lexer DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dml-scan.cpp)
-ADD_CUSTOM_TARGET(dml-parser DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dml-gram.cpp)
 
 ########### next target ###############
 
-SET(dmlpackage_LIB_SRCS
+ADD_LIBRARY(dmlpackage SHARED
     dml-scan.cpp
     dml-gram.cpp
     calpontdmlfactory.cpp
@@ -31,11 +30,11 @@ SET(dmlpackage_LIB_SRCS
     vendordmlstatement.cpp
     commanddmlpackage.cpp
     dmlpkg.cpp
-    dmlparser.cpp)
+    dmlparser.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/dml-gram.cpp 
+	${CMAKE_CURRENT_SOURCE_DIR}/dml-scan.cpp
+	)
 
-ADD_LIBRARY(dmlpackage SHARED ${dmlpackage_LIB_SRCS})
-
-ADD_DEPENDENCIES(dmlpackage dml-lexer dml-parser)
 
 SET_TARGET_PROPERTIES(dmlpackage PROPERTIES VERSION 1.0.0 SOVERSION 1)
 

From 40194c2f3c3f11e35dc24ddb3717c192e42f3a9a Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Thu, 25 Apr 2019 22:58:17 -0500
Subject: [PATCH 04/33] remove unnecessary build target

---
 utils/loggingcpp/CMakeLists.txt | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/utils/loggingcpp/CMakeLists.txt b/utils/loggingcpp/CMakeLists.txt
index c8fbbf2c3..be2a058f9 100644
--- a/utils/loggingcpp/CMakeLists.txt
+++ b/utils/loggingcpp/CMakeLists.txt
@@ -3,16 +3,7 @@ include_directories( ${ENGINE_COMMON_INCLUDES} )
 
 
 ########### next target ###############
-
-set(loggingcpp_LIB_SRCS
-    message.cpp
-    messagelog.cpp
-    logger.cpp
-    errorcodes.cpp
-    sqllogger.cpp
-    stopwatch.cpp
-    idberrorinfo.cpp)
-
+#TODO: put generated files in binary dir
 ADD_CUSTOM_COMMAND(
     OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/messageids.h ${CMAKE_CURRENT_SOURCE_DIR}/errorids.h
     COMMAND /bin/sh genMsgAndErrId.sh
@@ -20,11 +11,20 @@ ADD_CUSTOM_COMMAND(
     DEPENDS genMsgId.pl genErrId.pl
     )
     
-ADD_CUSTOM_TARGET(genMsgAndErrId DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/messageids.h ${CMAKE_CURRENT_SOURCE_DIR}/errorids.h)
     
-add_library(loggingcpp SHARED ${loggingcpp_LIB_SRCS})
+add_library(loggingcpp SHARED
+    message.cpp
+    messagelog.cpp
+    logger.cpp
+    errorcodes.cpp
+    sqllogger.cpp
+    stopwatch.cpp
+    idberrorinfo.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/messageids.h
+	${CMAKE_CURRENT_SOURCE_DIR}/errorids.h
+	)
+
 
-add_dependencies(loggingcpp genMsgAndErrId)
 
 set_target_properties(loggingcpp PROPERTIES VERSION 1.0.0 SOVERSION 1)
 

From e65f80f49336bc6ff484bb5d2d4861ce61235df8 Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Thu, 25 Apr 2019 23:35:03 -0500
Subject: [PATCH 05/33] delete visual c++ project files. cmake can generate
 these if needed

---
 dbcon/ddlpackage/libddlpackage.vcxproj        | 236 ---------
 .../ddlpackage/libddlpackage.vcxproj.filters  |  81 ---
 .../ddlpackageproc/libddlpackageproc.vcxproj  | 355 -------------
 .../libddlpackageproc.vcxproj.filters         |  71 ---
 dbcon/dmlpackage/libdmlpackage.vcxproj        | 240 ---------
 .../dmlpackage/libdmlpackage.vcxproj.filters  | 111 ----
 .../dmlpackageproc/libdmlpackageproc.vcxproj  | 361 -------------
 .../libdmlpackageproc.vcxproj.filters         |  71 ---
 dbcon/execplan/libexecplan.vcxproj            | 290 -----------
 dbcon/execplan/libexecplan.vcxproj.filters    | 249 ---------
 dbcon/joblist/libjoblist.vcxproj              | 474 ------------------
 dbcon/joblist/libjoblist.vcxproj.filters      | 374 --------------
 dbcon/mysql/libcalmysql.vcxproj               | 401 ---------------
 dbcon/mysql/libcalmysql.vcxproj.filters       | 116 -----
 ddlproc/DDLProc.vcxproj                       | 351 -------------
 ddlproc/DDLProc.vcxproj.filters               |  41 --
 dmlproc/DMLProc.vcxproj                       | 370 --------------
 dmlproc/DMLProc.vcxproj.filters               |  53 --
 exemgr/ExeMgr.vcxproj                         | 357 -------------
 exemgr/ExeMgr.vcxproj.filters                 |  44 --
 exemgr/exemgr.vpj                             |  35 +-
 oam/oamcpp/liboamcpp.vcxproj                  | 246 ---------
 oam/oamcpp/liboamcpp.vcxproj.filters          |  48 --
 primitives/primproc/PrimProc.vcxproj          | 447 -----------------
 primitives/primproc/PrimProc.vcxproj.filters  | 182 -------
 tools/clearShm/clearShm.vcxproj               | 256 ----------
 tools/clearShm/clearShm.vcxproj.filters       |  22 -
 tools/cleartablelock/cleartablelock.vcxproj   | 316 ------------
 .../cleartablelock.vcxproj.filters            |  30 --
 tools/cplogger/cplogger.vcxproj               | 257 ----------
 tools/cplogger/cplogger.vcxproj.filters       |  22 -
 tools/dbbuilder/dbbuilder.vcxproj             | 320 ------------
 tools/dbbuilder/dbbuilder.vcxproj.filters     |  33 --
 tools/dbloadxml/colxml.vcxproj                | 337 -------------
 tools/dbloadxml/colxml.vcxproj.filters        |  38 --
 tools/ddlcleanup/ddlcleanup.vcxproj           | 324 ------------
 tools/ddlcleanup/ddlcleanup.vcxproj.filters   |  22 -
 tools/editem/editem.vcxproj                   | 312 ------------
 tools/editem/editem.vcxproj.filters           |  22 -
 tools/getConfig/getConfig.vcxproj             | 251 ----------
 tools/getConfig/getConfig.vcxproj.filters     |  22 -
 tools/setConfig/setConfig.vcxproj             | 314 ------------
 tools/setConfig/setConfig.vcxproj.filters     |  22 -
 tools/viewtablelock/viewtablelock.vcxproj     | 312 ------------
 .../viewtablelock.vcxproj.filters             |  22 -
 utils/batchloader/libbatchloader.vcxproj      | 209 --------
 .../libbatchloader.vcxproj.filters            |  27 -
 utils/cacheutils/libcacheutils.vcxproj        | 216 --------
 .../cacheutils/libcacheutils.vcxproj.filters  |  27 -
 utils/common/libcommon.vcxproj                | 232 ---------
 utils/common/libcommon.vcxproj.filters        |  69 ---
 utils/compress/libcompress-ent.vcxproj        | 245 ---------
 .../compress/libcompress-ent.vcxproj.filters  |  60 ---
 utils/configcpp/libconfigcpp.vcxproj          | 303 -----------
 utils/configcpp/libconfigcpp.vcxproj.filters  |  59 ---
 utils/dataconvert/libdataconvert.vcxproj      | 220 --------
 .../libdataconvert.vcxproj.filters            |  27 -
 utils/ddlcleanup/libddlcleanup.vcxproj        | 222 --------
 .../ddlcleanup/libddlcleanup.vcxproj.filters  |  27 -
 utils/funcexp/libfuncexp.vcxproj              | 332 ------------
 utils/funcexp/libfuncexp.vcxproj.filters      | 369 --------------
 utils/idbdatafile/idbdatafile.vcxproj         | 242 ---------
 utils/idbdatafile/idbdatafile.vcxproj.filters |  81 ---
 utils/joiner/libjoiner.vcxproj                | 222 --------
 utils/joiner/libjoiner.vcxproj.filters        |  39 --
 utils/loggingcpp/libloggingcpp.vcxproj        | 222 --------
 .../loggingcpp/libloggingcpp.vcxproj.filters  |  75 ---
 utils/messageqcpp/libmessageqcpp.vcxproj      | 230 ---------
 .../libmessageqcpp.vcxproj.filters            |  69 ---
 utils/multicast/libmulticast.vcxproj          | 210 --------
 utils/multicast/libmulticast.vcxproj.filters  |  27 -
 utils/querystats/libquerystats.vcxproj        | 219 --------
 .../querystats/libquerystats.vcxproj.filters  |  27 -
 utils/querytele/libquerytele.vcxproj          | 234 ---------
 utils/querytele/libquerytele.vcxproj.filters  |  63 ---
 utils/rowgroup/librowgroup.vcxproj            | 226 ---------
 utils/rowgroup/librowgroup.vcxproj.filters    |  33 --
 utils/rwlock/librwlock.vcxproj                | 221 --------
 utils/rwlock/librwlock.vcxproj.filters        |  33 --
 utils/startup/libidbboot.vcxproj              | 189 -------
 utils/startup/libidbboot.vcxproj.filters      |  27 -
 utils/threadpool/libthreadpool.vcxproj        | 222 --------
 .../threadpool/libthreadpool.vcxproj.filters  |  39 --
 utils/thrift/libthrift.vcxproj                | 296 -----------
 utils/thrift/libthrift.vcxproj.filters        | 292 -----------
 utils/udfsdk/libudf_mysql.vcxproj             | 261 ----------
 utils/udfsdk/libudf_mysql.vcxproj.filters     |  32 --
 utils/udfsdk/libudfsdk.vcxproj                | 285 -----------
 utils/udfsdk/libudfsdk.vcxproj.filters        |  35 --
 .../windowfunction/libwindowfunction.vcxproj  | 246 ---------
 .../libwindowfunction.vcxproj.filters         | 129 -----
 utils/winport/bootstrap.vcxproj               | 266 ----------
 utils/winport/bootstrap.vcxproj.filters       |  42 --
 utils/winport/libwinport.vcxproj              | 236 ---------
 utils/winport/libwinport.vcxproj.filters      |  78 ---
 utils/winport/winfinidb.vcxproj               | 269 ----------
 utils/winport/winfinidb.vcxproj.filters       |  32 --
 versioning/BRM/controllernode.vcxproj         | 335 -------------
 versioning/BRM/controllernode.vcxproj.filters |  38 --
 versioning/BRM/dbrmctl.vcxproj                | 297 -----------
 versioning/BRM/dbrmctl.vcxproj.filters        |  27 -
 versioning/BRM/libbrm.vcxproj                 | 292 -----------
 versioning/BRM/libbrm.vcxproj.filters         | 162 ------
 versioning/BRM/load_brm.vcxproj               | 306 -----------
 versioning/BRM/load_brm.vcxproj.filters       |  22 -
 versioning/BRM/reset_locks.vcxproj            | 310 ------------
 versioning/BRM/reset_locks.vcxproj.filters    |  22 -
 versioning/BRM/save_brm.vcxproj               | 310 ------------
 versioning/BRM/save_brm.vcxproj.filters       |  22 -
 versioning/BRM/workernode.vcxproj             | 336 -------------
 versioning/BRM/workernode.vcxproj.filters     |  32 --
 writeengine/bulk/cpimport.vcxproj             | 375 --------------
 writeengine/bulk/cpimport.vcxproj.filters     | 146 ------
 writeengine/client/libweclient.vcxproj        | 216 --------
 .../client/libweclient.vcxproj.filters        |  39 --
 writeengine/libwriteengine.vcxproj            | 392 ---------------
 writeengine/libwriteengine.vcxproj.filters    | 206 --------
 writeengine/server/WriteEngineServer.vcxproj  | 392 ---------------
 .../server/WriteEngineServer.vcxproj.filters  | 119 -----
 writeengine/splitter/splitter.vcxproj         | 341 -------------
 writeengine/splitter/splitter.vcxproj.filters |  80 ---
 121 files changed, 17 insertions(+), 21751 deletions(-)
 delete mode 100644 dbcon/ddlpackage/libddlpackage.vcxproj
 delete mode 100644 dbcon/ddlpackage/libddlpackage.vcxproj.filters
 delete mode 100644 dbcon/ddlpackageproc/libddlpackageproc.vcxproj
 delete mode 100644 dbcon/ddlpackageproc/libddlpackageproc.vcxproj.filters
 delete mode 100644 dbcon/dmlpackage/libdmlpackage.vcxproj
 delete mode 100644 dbcon/dmlpackage/libdmlpackage.vcxproj.filters
 delete mode 100644 dbcon/dmlpackageproc/libdmlpackageproc.vcxproj
 delete mode 100644 dbcon/dmlpackageproc/libdmlpackageproc.vcxproj.filters
 delete mode 100644 dbcon/execplan/libexecplan.vcxproj
 delete mode 100644 dbcon/execplan/libexecplan.vcxproj.filters
 delete mode 100644 dbcon/joblist/libjoblist.vcxproj
 delete mode 100644 dbcon/joblist/libjoblist.vcxproj.filters
 delete mode 100644 dbcon/mysql/libcalmysql.vcxproj
 delete mode 100644 dbcon/mysql/libcalmysql.vcxproj.filters
 delete mode 100644 ddlproc/DDLProc.vcxproj
 delete mode 100644 ddlproc/DDLProc.vcxproj.filters
 delete mode 100644 dmlproc/DMLProc.vcxproj
 delete mode 100644 dmlproc/DMLProc.vcxproj.filters
 delete mode 100644 exemgr/ExeMgr.vcxproj
 delete mode 100644 exemgr/ExeMgr.vcxproj.filters
 delete mode 100644 oam/oamcpp/liboamcpp.vcxproj
 delete mode 100644 oam/oamcpp/liboamcpp.vcxproj.filters
 delete mode 100644 primitives/primproc/PrimProc.vcxproj
 delete mode 100644 primitives/primproc/PrimProc.vcxproj.filters
 delete mode 100644 tools/clearShm/clearShm.vcxproj
 delete mode 100644 tools/clearShm/clearShm.vcxproj.filters
 delete mode 100644 tools/cleartablelock/cleartablelock.vcxproj
 delete mode 100644 tools/cleartablelock/cleartablelock.vcxproj.filters
 delete mode 100644 tools/cplogger/cplogger.vcxproj
 delete mode 100644 tools/cplogger/cplogger.vcxproj.filters
 delete mode 100644 tools/dbbuilder/dbbuilder.vcxproj
 delete mode 100644 tools/dbbuilder/dbbuilder.vcxproj.filters
 delete mode 100644 tools/dbloadxml/colxml.vcxproj
 delete mode 100644 tools/dbloadxml/colxml.vcxproj.filters
 delete mode 100644 tools/ddlcleanup/ddlcleanup.vcxproj
 delete mode 100644 tools/ddlcleanup/ddlcleanup.vcxproj.filters
 delete mode 100644 tools/editem/editem.vcxproj
 delete mode 100644 tools/editem/editem.vcxproj.filters
 delete mode 100644 tools/getConfig/getConfig.vcxproj
 delete mode 100644 tools/getConfig/getConfig.vcxproj.filters
 delete mode 100644 tools/setConfig/setConfig.vcxproj
 delete mode 100644 tools/setConfig/setConfig.vcxproj.filters
 delete mode 100644 tools/viewtablelock/viewtablelock.vcxproj
 delete mode 100644 tools/viewtablelock/viewtablelock.vcxproj.filters
 delete mode 100644 utils/batchloader/libbatchloader.vcxproj
 delete mode 100644 utils/batchloader/libbatchloader.vcxproj.filters
 delete mode 100644 utils/cacheutils/libcacheutils.vcxproj
 delete mode 100644 utils/cacheutils/libcacheutils.vcxproj.filters
 delete mode 100644 utils/common/libcommon.vcxproj
 delete mode 100644 utils/common/libcommon.vcxproj.filters
 delete mode 100644 utils/compress/libcompress-ent.vcxproj
 delete mode 100644 utils/compress/libcompress-ent.vcxproj.filters
 delete mode 100644 utils/configcpp/libconfigcpp.vcxproj
 delete mode 100644 utils/configcpp/libconfigcpp.vcxproj.filters
 delete mode 100644 utils/dataconvert/libdataconvert.vcxproj
 delete mode 100644 utils/dataconvert/libdataconvert.vcxproj.filters
 delete mode 100644 utils/ddlcleanup/libddlcleanup.vcxproj
 delete mode 100644 utils/ddlcleanup/libddlcleanup.vcxproj.filters
 delete mode 100644 utils/funcexp/libfuncexp.vcxproj
 delete mode 100644 utils/funcexp/libfuncexp.vcxproj.filters
 delete mode 100644 utils/idbdatafile/idbdatafile.vcxproj
 delete mode 100644 utils/idbdatafile/idbdatafile.vcxproj.filters
 delete mode 100644 utils/joiner/libjoiner.vcxproj
 delete mode 100644 utils/joiner/libjoiner.vcxproj.filters
 delete mode 100644 utils/loggingcpp/libloggingcpp.vcxproj
 delete mode 100644 utils/loggingcpp/libloggingcpp.vcxproj.filters
 delete mode 100644 utils/messageqcpp/libmessageqcpp.vcxproj
 delete mode 100644 utils/messageqcpp/libmessageqcpp.vcxproj.filters
 delete mode 100644 utils/multicast/libmulticast.vcxproj
 delete mode 100644 utils/multicast/libmulticast.vcxproj.filters
 delete mode 100644 utils/querystats/libquerystats.vcxproj
 delete mode 100644 utils/querystats/libquerystats.vcxproj.filters
 delete mode 100644 utils/querytele/libquerytele.vcxproj
 delete mode 100644 utils/querytele/libquerytele.vcxproj.filters
 delete mode 100644 utils/rowgroup/librowgroup.vcxproj
 delete mode 100644 utils/rowgroup/librowgroup.vcxproj.filters
 delete mode 100644 utils/rwlock/librwlock.vcxproj
 delete mode 100644 utils/rwlock/librwlock.vcxproj.filters
 delete mode 100644 utils/startup/libidbboot.vcxproj
 delete mode 100644 utils/startup/libidbboot.vcxproj.filters
 delete mode 100644 utils/threadpool/libthreadpool.vcxproj
 delete mode 100644 utils/threadpool/libthreadpool.vcxproj.filters
 delete mode 100644 utils/thrift/libthrift.vcxproj
 delete mode 100644 utils/thrift/libthrift.vcxproj.filters
 delete mode 100644 utils/udfsdk/libudf_mysql.vcxproj
 delete mode 100644 utils/udfsdk/libudf_mysql.vcxproj.filters
 delete mode 100644 utils/udfsdk/libudfsdk.vcxproj
 delete mode 100644 utils/udfsdk/libudfsdk.vcxproj.filters
 delete mode 100644 utils/windowfunction/libwindowfunction.vcxproj
 delete mode 100644 utils/windowfunction/libwindowfunction.vcxproj.filters
 delete mode 100644 utils/winport/bootstrap.vcxproj
 delete mode 100644 utils/winport/bootstrap.vcxproj.filters
 delete mode 100644 utils/winport/libwinport.vcxproj
 delete mode 100644 utils/winport/libwinport.vcxproj.filters
 delete mode 100644 utils/winport/winfinidb.vcxproj
 delete mode 100644 utils/winport/winfinidb.vcxproj.filters
 delete mode 100644 versioning/BRM/controllernode.vcxproj
 delete mode 100644 versioning/BRM/controllernode.vcxproj.filters
 delete mode 100644 versioning/BRM/dbrmctl.vcxproj
 delete mode 100644 versioning/BRM/dbrmctl.vcxproj.filters
 delete mode 100644 versioning/BRM/libbrm.vcxproj
 delete mode 100644 versioning/BRM/libbrm.vcxproj.filters
 delete mode 100644 versioning/BRM/load_brm.vcxproj
 delete mode 100644 versioning/BRM/load_brm.vcxproj.filters
 delete mode 100644 versioning/BRM/reset_locks.vcxproj
 delete mode 100644 versioning/BRM/reset_locks.vcxproj.filters
 delete mode 100644 versioning/BRM/save_brm.vcxproj
 delete mode 100644 versioning/BRM/save_brm.vcxproj.filters
 delete mode 100644 versioning/BRM/workernode.vcxproj
 delete mode 100644 versioning/BRM/workernode.vcxproj.filters
 delete mode 100644 writeengine/bulk/cpimport.vcxproj
 delete mode 100644 writeengine/bulk/cpimport.vcxproj.filters
 delete mode 100644 writeengine/client/libweclient.vcxproj
 delete mode 100644 writeengine/client/libweclient.vcxproj.filters
 delete mode 100644 writeengine/libwriteengine.vcxproj
 delete mode 100644 writeengine/libwriteengine.vcxproj.filters
 delete mode 100644 writeengine/server/WriteEngineServer.vcxproj
 delete mode 100644 writeengine/server/WriteEngineServer.vcxproj.filters
 delete mode 100644 writeengine/splitter/splitter.vcxproj
 delete mode 100644 writeengine/splitter/splitter.vcxproj.filters

diff --git a/dbcon/ddlpackage/libddlpackage.vcxproj b/dbcon/ddlpackage/libddlpackage.vcxproj
deleted file mode 100644
index f9f6e00ab..000000000
--- a/dbcon/ddlpackage/libddlpackage.vcxproj
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{033C6CBA-D984-483F-ADC8-825BE20A699D}</ProjectGuid>
-    <RootNamespace>libddlpackage</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <CustomBuildStep>
-      <Message>Compiling DDL scanner files ...</Message>
-      <Command />
-    </CustomBuildStep>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <CustomBuildStep>
-      <Message>Compiling DDL scanner files ...</Message>
-      <Command />
-    </CustomBuildStep>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="altertable.cpp" />
-    <ClCompile Include="columndef.cpp" />
-    <ClCompile Include="createindex.cpp" />
-    <ClCompile Include="createtable.cpp" />
-    <ClCompile Include="ddl-gram-win.cpp" />
-    <ClCompile Include="ddl-scan-win.cpp" />
-    <ClCompile Include="ddlpkg.cpp" />
-    <ClCompile Include="dropindex.cpp" />
-    <ClCompile Include="droppartition.cpp" />
-    <ClCompile Include="droptable.cpp" />
-    <ClCompile Include="markpartition.cpp" />
-    <ClCompile Include="restorepartition.cpp" />
-    <ClCompile Include="serialize.cpp" />
-    <ClCompile Include="sqlparser.cpp" />
-    <ClCompile Include="sqlstatement.cpp" />
-    <ClCompile Include="sqlstatementlist.cpp" />
-    <ClCompile Include="tabledef.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ddl-gram-win.h" />
-    <ClInclude Include="ddlpkg.h" />
-    <ClInclude Include="sqlparser.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/dbcon/ddlpackage/libddlpackage.vcxproj.filters b/dbcon/ddlpackage/libddlpackage.vcxproj.filters
deleted file mode 100644
index fc56e2286..000000000
--- a/dbcon/ddlpackage/libddlpackage.vcxproj.filters
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="altertable.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="columndef.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="createindex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="createtable.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ddl-gram-win.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ddl-scan-win.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ddlpkg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dropindex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="droppartition.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="droptable.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="markpartition.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="restorepartition.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="serialize.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sqlparser.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sqlstatement.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sqlstatementlist.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="tabledef.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ddl-gram-win.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ddlpkg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="sqlparser.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/dbcon/ddlpackageproc/libddlpackageproc.vcxproj b/dbcon/ddlpackageproc/libddlpackageproc.vcxproj
deleted file mode 100644
index 462d2b992..000000000
--- a/dbcon/ddlpackageproc/libddlpackageproc.vcxproj
+++ /dev/null
@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{19142D9E-7660-445C-B85D-98E722DFFEA5}</ProjectGuid>
-    <RootNamespace>libddlpackageproc</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DDLPKGPROC_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DDLPKGPROC_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DDLPKGPROC_DLLEXPORT;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DDLPKGPROC_DLLEXPORT;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB DDL API" $(SolutionDir)..\..x64\Release\libddlpackageproc.dll</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DDLPKGPROC_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DDLPKGPROC_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB DDL API" $(SolutionDir)..\..\x64\EnterpriseRelease\libddlpackageproc.dll</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="altertableprocessor.cpp" />
-    <ClCompile Include="createtableprocessor.cpp" />
-    <ClCompile Include="ddlpackageprocessor.cpp" />
-    <ClCompile Include="droppartitionprocessor.cpp" />
-    <ClCompile Include="droptableprocessor.cpp" />
-    <ClCompile Include="markpartitionprocessor.cpp" />
-    <ClCompile Include="restorepartitionprocessor.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="altertableprocessor.h" />
-    <ClInclude Include="createtableprocessor.h" />
-    <ClInclude Include="ddlpackageprocessor.h" />
-    <ClInclude Include="droppartitionprocessor.h" />
-    <ClInclude Include="droptableprocessor.h" />
-    <ClInclude Include="markpartitionprocessor.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="restorepartitionprocessor.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="libddlpackageproc.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\versioning\BRM\libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\writeengine\client\libweclient.vcxproj">
-      <Project>{4bc37219-e09d-4133-98c4-cf0386657df6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\writeengine\libwriteengine.vcxproj">
-      <Project>{414a47eb-55e3-4251-99b0-95d86fe5580d}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\ddlpackage\libddlpackage.vcxproj">
-      <Project>{033c6cba-d984-483f-adc8-825be20a699d}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/dbcon/ddlpackageproc/libddlpackageproc.vcxproj.filters b/dbcon/ddlpackageproc/libddlpackageproc.vcxproj.filters
deleted file mode 100644
index 8603534f4..000000000
--- a/dbcon/ddlpackageproc/libddlpackageproc.vcxproj.filters
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="altertableprocessor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="createtableprocessor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ddlpackageprocessor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="droppartitionprocessor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="droptableprocessor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="markpartitionprocessor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="restorepartitionprocessor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="altertableprocessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="createtableprocessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ddlpackageprocessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="droppartitionprocessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="droptableprocessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="markpartitionprocessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="restorepartitionprocessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="libddlpackageproc.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/dbcon/dmlpackage/libdmlpackage.vcxproj b/dbcon/dmlpackage/libdmlpackage.vcxproj
deleted file mode 100644
index ba5282f8a..000000000
--- a/dbcon/dmlpackage/libdmlpackage.vcxproj
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B9045BCA-0955-4C5E-BCA4-5EE516838119}</ProjectGuid>
-    <RootNamespace>libdmlpackage</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="calpontdmlfactory.cpp" />
-    <ClCompile Include="calpontdmlpackage.cpp" />
-    <ClCompile Include="commanddmlpackage.cpp" />
-    <ClCompile Include="deletedmlpackage.cpp" />
-    <ClCompile Include="dml-gram-win.cpp" />
-    <ClCompile Include="dml-scan-win.cpp" />
-    <ClCompile Include="dmlcolumn.cpp" />
-    <ClCompile Include="dmlobject.cpp" />
-    <ClCompile Include="dmlparser.cpp" />
-    <ClCompile Include="dmlpkg.cpp" />
-    <ClCompile Include="dmltable.cpp" />
-    <ClCompile Include="insertdmlpackage.cpp" />
-    <ClCompile Include="row.cpp" />
-    <ClCompile Include="updatedmlpackage.cpp" />
-    <ClCompile Include="vendordmlstatement.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="calpontdmlfactory.h" />
-    <ClInclude Include="calpontdmlpackage.h" />
-    <ClInclude Include="commanddmlpackage.h" />
-    <ClInclude Include="deletedmlpackage.h" />
-    <ClInclude Include="dml-gram-win.h" />
-    <ClInclude Include="dmlcolumn.h" />
-    <ClInclude Include="dmlobject.h" />
-    <ClInclude Include="dmlpackage.h" />
-    <ClInclude Include="dmlparser.h" />
-    <ClInclude Include="dmlpkg.h" />
-    <ClInclude Include="dmltable.h" />
-    <ClInclude Include="insertdmlpackage.h" />
-    <ClInclude Include="row.h" />
-    <ClInclude Include="updatedmlpackage.h" />
-    <ClInclude Include="vendordmlstatement.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/dbcon/dmlpackage/libdmlpackage.vcxproj.filters b/dbcon/dmlpackage/libdmlpackage.vcxproj.filters
deleted file mode 100644
index 2da0e80b0..000000000
--- a/dbcon/dmlpackage/libdmlpackage.vcxproj.filters
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="calpontdmlfactory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="calpontdmlpackage.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="commanddmlpackage.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="deletedmlpackage.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dml-gram-win.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dml-scan-win.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dmlcolumn.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dmlobject.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dmlparser.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dmlpkg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dmltable.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="insertdmlpackage.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="row.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="updatedmlpackage.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vendordmlstatement.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="calpontdmlfactory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="calpontdmlpackage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="commanddmlpackage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="deletedmlpackage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dml-gram-win.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dmlcolumn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dmlobject.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dmlpackage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dmlparser.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dmlpkg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dmltable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="insertdmlpackage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="row.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="updatedmlpackage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vendordmlstatement.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/dbcon/dmlpackageproc/libdmlpackageproc.vcxproj b/dbcon/dmlpackageproc/libdmlpackageproc.vcxproj
deleted file mode 100644
index 8b73de2ac..000000000
--- a/dbcon/dmlpackageproc/libdmlpackageproc.vcxproj
+++ /dev/null
@@ -1,361 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C78DD512-FCA0-4B8A-A531-376E33C9FBB7}</ProjectGuid>
-    <RootNamespace>libdmlpackageproc</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DMLPKGPROC_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Debug;$(SolutionDir)../../mysql\libmysql\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DMLPKGPROC_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\Debug;$(SolutionDir)../../mysql\libmysql\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DMLPKGPROC_DLLEXPORT;SKIP_IDB_COMPRESSION;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DMLPKGPROC_DLLEXPORT;SKIP_IDB_COMPRESSION;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB DML API" $(SolutionDir)..\..x64\Release\libdmlpackageproc.dll</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DMLPKGPROC_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DMLPKGPROC_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB DML API" $(SolutionDir)..\..\x64\EnterpriseRelease\libdmlpackageproc.dll</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="autoincrementdata.cpp" />
-    <ClCompile Include="commandpackageprocessor.cpp" />
-    <ClCompile Include="deletepackageprocessor.cpp" />
-    <ClCompile Include="dmlpackageprocessor.cpp" />
-    <ClCompile Include="insertpackageprocessor.cpp" />
-    <ClCompile Include="tablelockdata.cpp" />
-    <ClCompile Include="updatepackageprocessor.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="autoincrementdata.h" />
-    <ClInclude Include="commandpackageprocessor.h" />
-    <ClInclude Include="deletepackageprocessor.h" />
-    <ClInclude Include="dmlpackageprocessor.h" />
-    <ClInclude Include="insertpackageprocessor.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="tablelockdata.h" />
-    <ClInclude Include="updatepackageprocessor.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="libdmlpackageproc.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\mysqlcl_idb\libmysqlcl_idb.vcxproj">
-      <Project>{0bbaeacb-3336-4406-acfb-255669a3b9cf}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querystats\libquerystats.vcxproj">
-      <Project>{3238cd73-8ffd-44a7-aa5f-815beef8f402}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\versioning\BRM\libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\writeengine\client\libweclient.vcxproj">
-      <Project>{4bc37219-e09d-4133-98c4-cf0386657df6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\writeengine\libwriteengine.vcxproj">
-      <Project>{414a47eb-55e3-4251-99b0-95d86fe5580d}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\dmlpackage\libdmlpackage.vcxproj">
-      <Project>{b9045bca-0955-4c5e-bca4-5ee516838119}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/dbcon/dmlpackageproc/libdmlpackageproc.vcxproj.filters b/dbcon/dmlpackageproc/libdmlpackageproc.vcxproj.filters
deleted file mode 100644
index fd2b49979..000000000
--- a/dbcon/dmlpackageproc/libdmlpackageproc.vcxproj.filters
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="autoincrementdata.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="commandpackageprocessor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="deletepackageprocessor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dmlpackageprocessor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="insertpackageprocessor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="tablelockdata.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="updatepackageprocessor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="autoincrementdata.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="commandpackageprocessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="deletepackageprocessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dmlpackageprocessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="insertpackageprocessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="tablelockdata.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="updatepackageprocessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="libdmlpackageproc.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/dbcon/execplan/libexecplan.vcxproj b/dbcon/execplan/libexecplan.vcxproj
deleted file mode 100644
index 04b4cfa1a..000000000
--- a/dbcon/execplan/libexecplan.vcxproj
+++ /dev/null
@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{FFCCE773-27FA-4F4D-9E28-2208BE6348DA}</ProjectGuid>
-    <RootNamespace>libexecplan</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="aggregatecolumn.cpp" />
-    <ClCompile Include="arithmeticcolumn.cpp" />
-    <ClCompile Include="arithmeticoperator.cpp" />
-    <ClCompile Include="calpontexecutionplan.cpp" />
-    <ClCompile Include="calpontselectexecutionplan.cpp" />
-    <ClCompile Include="calpontsystemcatalog.cpp" />
-    <ClCompile Include="clientrotator.cpp" />
-    <ClCompile Include="constantcolumn.cpp" />
-    <ClCompile Include="constantfilter.cpp" />
-    <ClCompile Include="existsfilter.cpp" />
-    <ClCompile Include="expressionparser.cpp" />
-    <ClCompile Include="filter.cpp" />
-    <ClCompile Include="functioncolumn.cpp" />
-    <ClCompile Include="groupconcatcolumn.cpp" />
-    <ClCompile Include="intervalcolumn.cpp" />
-    <ClCompile Include="logicoperator.cpp" />
-    <ClCompile Include="objectidmanager.cpp" />
-    <ClCompile Include="objectreader.cpp" />
-    <ClCompile Include="operator.cpp" />
-    <ClCompile Include="outerjoinonfilter.cpp" />
-    <ClCompile Include="predicateoperator.cpp" />
-    <ClCompile Include="pseudocolumn.cpp" />
-    <ClCompile Include="returnedcolumn.cpp" />
-    <ClCompile Include="rowcolumn.cpp" />
-    <ClCompile Include="selectfilter.cpp" />
-    <ClCompile Include="sessionmanager.cpp" />
-    <ClCompile Include="simplecolumn.cpp" />
-    <ClCompile Include="simplefilter.cpp" />
-    <ClCompile Include="simplescalarfilter.cpp" />
-    <ClCompile Include="treenode.cpp" />
-    <ClCompile Include="treenodeimpl.cpp" />
-    <ClCompile Include="windowfunctioncolumn.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="aggregatecolumn.h" />
-    <ClInclude Include="arithmeticcolumn.h" />
-    <ClInclude Include="arithmeticoperator.h" />
-    <ClInclude Include="blocksize.h" />
-    <ClInclude Include="calpontexecutionplan.h" />
-    <ClInclude Include="calpontexecutionplanfactory.h" />
-    <ClInclude Include="calpontselectexecutionplan.h" />
-    <ClInclude Include="calpontsystemcatalog.h" />
-    <ClInclude Include="clientrotator.h" />
-    <ClInclude Include="constantcolumn.h" />
-    <ClInclude Include="constantfilter.h" />
-    <ClInclude Include="existsfilter.h" />
-    <ClInclude Include="exp_templates.h" />
-    <ClInclude Include="expressionparser.h" />
-    <ClInclude Include="filter.h" />
-    <ClInclude Include="functioncolumn.h" />
-    <ClInclude Include="groupconcatcolumn.h" />
-    <ClInclude Include="intervalcolumn.h" />
-    <ClInclude Include="logicoperator.h" />
-    <ClInclude Include="mysqlexecutionplan.h" />
-    <ClInclude Include="njlcolumnresult.h" />
-    <ClInclude Include="objectidmanager.h" />
-    <ClInclude Include="objectreader.h" />
-    <ClInclude Include="operator.h" />
-    <ClInclude Include="oracleexecutionplan.h" />
-    <ClInclude Include="outerjoinonfilter.h" />
-    <ClInclude Include="parsetree.h" />
-    <ClInclude Include="predicateoperator.h" />
-    <ClInclude Include="pseudocolumn.h" />
-    <ClInclude Include="range.h" />
-    <ClInclude Include="returnedcolumn.h" />
-    <ClInclude Include="rowcolumn.h" />
-    <ClInclude Include="selectfilter.h" />
-    <ClInclude Include="sessionmanager.h" />
-    <ClInclude Include="simplecolumn.h" />
-    <ClInclude Include="simplecolumn_decimal.h" />
-    <ClInclude Include="simplecolumn_int.h" />
-    <ClInclude Include="simplecolumn_uint.h" />
-    <ClInclude Include="simplefilter.h" />
-    <ClInclude Include="simplescalarfilter.h" />
-    <ClInclude Include="treenode.h" />
-    <ClInclude Include="treenodeimpl.h" />
-    <ClInclude Include="vendorexecutionplan.h" />
-    <ClInclude Include="windowfunctioncolumn.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/dbcon/execplan/libexecplan.vcxproj.filters b/dbcon/execplan/libexecplan.vcxproj.filters
deleted file mode 100644
index 402513038..000000000
--- a/dbcon/execplan/libexecplan.vcxproj.filters
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="aggregatecolumn.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="arithmeticcolumn.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="arithmeticoperator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="calpontexecutionplan.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="calpontselectexecutionplan.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="calpontsystemcatalog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="clientrotator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="constantcolumn.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="constantfilter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="existsfilter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="expressionparser.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="functioncolumn.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="groupconcatcolumn.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="intervalcolumn.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="logicoperator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="objectidmanager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="objectreader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="operator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="outerjoinonfilter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="predicateoperator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="returnedcolumn.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="rowcolumn.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="selectfilter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sessionmanager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="simplecolumn.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="simplefilter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="simplescalarfilter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="treenode.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="treenodeimpl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="windowfunctioncolumn.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pseudocolumn.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="aggregatecolumn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="arithmeticcolumn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="arithmeticoperator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="blocksize.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="calpontexecutionplan.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="calpontexecutionplanfactory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="calpontselectexecutionplan.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="calpontsystemcatalog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="clientrotator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="constantcolumn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="constantfilter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="existsfilter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="exp_templates.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="expressionparser.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="functioncolumn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="groupconcatcolumn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="intervalcolumn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="logicoperator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="mysqlexecutionplan.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="njlcolumnresult.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="objectidmanager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="objectreader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="operator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="oracleexecutionplan.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="outerjoinonfilter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="parsetree.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="predicateoperator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="range.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="returnedcolumn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="rowcolumn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="selectfilter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="sessionmanager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="simplecolumn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="simplecolumn_decimal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="simplecolumn_int.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="simplefilter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="simplescalarfilter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="treenode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="treenodeimpl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vendorexecutionplan.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="windowfunctioncolumn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="simplecolumn_uint.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="pseudocolumn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/dbcon/joblist/libjoblist.vcxproj b/dbcon/joblist/libjoblist.vcxproj
deleted file mode 100644
index 0749dc035..000000000
--- a/dbcon/joblist/libjoblist.vcxproj
+++ /dev/null
@@ -1,474 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{CBA13EF7-ECA1-42F4-8CE2-9E18E24DCDE2}</ProjectGuid>
-    <RootNamespace>libjoblist</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <EmbedManifest>true</EmbedManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <EmbedManifest>true</EmbedManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <EmbedManifest>true</EmbedManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>JOBLIST_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;$(SolutionDir)..\..\x64\Debug;$(SolutionDir)../../mysql\libmysql\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>JOBLIST_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;$(SolutionDir)../../mysql\libmysql\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <Manifest>
-      <VerboseOutput>false</VerboseOutput>
-    </Manifest>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>JOBLIST_DLLEXPORT;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>JOBLIST_DLLEXPORT;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <Manifest>
-      <VerboseOutput>false</VerboseOutput>
-    </Manifest>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Job List API" $(SolutionDir)..\..x64\Release\libjoblist.dll</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>JOBLIST_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;$(SolutionDir)..\build\x64\EnterpriseRelease;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>JOBLIST_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <Manifest>
-      <VerboseOutput>false</VerboseOutput>
-    </Manifest>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Job List API" $(SolutionDir)..\..\x64\EnterpriseRelease\libjoblist.dll</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="anydatalist.cpp" />
-    <ClCompile Include="batchprimitiveprocessor-jl.cpp" />
-    <ClCompile Include="columncommand-jl.cpp" />
-    <ClCompile Include="command-jl.cpp" />
-    <ClCompile Include="crossenginestep.cpp" />
-    <ClCompile Include="dictstep-jl.cpp" />
-    <ClCompile Include="diskjoinstep.cpp" />
-    <ClCompile Include="distributedenginecomm.cpp" />
-    <ClCompile Include="elementtype.cpp" />
-    <ClCompile Include="expressionstep.cpp" />
-    <ClCompile Include="filtercommand-jl.cpp" />
-    <ClCompile Include="filterstep.cpp" />
-    <ClCompile Include="groupconcat.cpp" />
-    <ClCompile Include="jl_logger.cpp" />
-    <ClCompile Include="jlf_common.cpp" />
-    <ClCompile Include="jlf_execplantojoblist.cpp" />
-    <ClCompile Include="jlf_graphics.cpp" />
-    <ClCompile Include="jlf_subquery.cpp" />
-    <ClCompile Include="jlf_tuplejoblist.cpp" />
-    <ClCompile Include="joblist.cpp" />
-    <ClCompile Include="joblistfactory.cpp" />
-    <ClCompile Include="jobstep.cpp" />
-    <ClCompile Include="lbidlist.cpp" />
-    <ClCompile Include="limitedorderby.cpp" />
-    <ClCompile Include="passthrucommand-jl.cpp" />
-    <ClCompile Include="passthrustep.cpp" />
-    <ClCompile Include="pcolscan.cpp" />
-    <ClCompile Include="pcolstep.cpp" />
-    <ClCompile Include="pdictionary.cpp" />
-    <ClCompile Include="pdictionaryscan.cpp" />
-    <ClCompile Include="primitivemsg.cpp" />
-    <ClCompile Include="pseudocc-jl.cpp" />
-    <ClCompile Include="resourcedistributor.cpp" />
-    <ClCompile Include="resourcemanager.cpp" />
-    <ClCompile Include="rowestimator.cpp" />
-    <ClCompile Include="rtscommand-jl.cpp" />
-    <ClCompile Include="subquerystep.cpp" />
-    <ClCompile Include="subquerytransformer.cpp" />
-    <ClCompile Include="tablecolumn.cpp" />
-    <ClCompile Include="timestamp.cpp" />
-    <ClCompile Include="tuple-bps.cpp" />
-    <ClCompile Include="tupleaggregatestep.cpp" />
-    <ClCompile Include="tupleannexstep.cpp" />
-    <ClCompile Include="tupleconstantstep.cpp" />
-    <ClCompile Include="tuplehashjoin.cpp" />
-    <ClCompile Include="tuplehavingstep.cpp" />
-    <ClCompile Include="tupleunion.cpp" />
-    <ClCompile Include="unique32generator.cpp" />
-    <ClCompile Include="virtualtable.cpp" />
-    <ClCompile Include="windowfunctionstep.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="batchprimitiveprocessor-jl.h" />
-    <ClInclude Include="bpp-jl.h" />
-    <ClInclude Include="columncommand-jl.h" />
-    <ClInclude Include="command-jl.h" />
-    <ClInclude Include="constantdatalist.h" />
-    <ClInclude Include="crossenginestep.h" />
-    <ClInclude Include="datalist.h" />
-    <ClInclude Include="datalistimpl.h" />
-    <ClInclude Include="deliverywsdl.h" />
-    <ClInclude Include="dictstep-jl.h" />
-    <ClInclude Include="diskjoinstep.h" />
-    <ClInclude Include="distributedenginecomm.h" />
-    <ClInclude Include="elementcompression.h" />
-    <ClInclude Include="elementtype.h" />
-    <ClInclude Include="expressionstep.h" />
-    <ClInclude Include="fifo.h" />
-    <ClInclude Include="filtercommand-jl.h" />
-    <ClInclude Include="filteroperation.h" />
-    <ClInclude Include="groupconcat.h" />
-    <ClInclude Include="hashjoin.h" />
-    <ClInclude Include="jl_logger.h" />
-    <ClInclude Include="jlf_common.h" />
-    <ClInclude Include="jlf_execplantojoblist.h" />
-    <ClInclude Include="jlf_graphics.h" />
-    <ClInclude Include="jlf_subquery.h" />
-    <ClInclude Include="jlf_tuplejoblist.h" />
-    <ClInclude Include="joblist.h" />
-    <ClInclude Include="joblistfactory.h" />
-    <ClInclude Include="joblisttypes.h" />
-    <ClInclude Include="jobstep.h" />
-    <ClInclude Include="largedatalist.h" />
-    <ClInclude Include="largehashjoin.h" />
-    <ClInclude Include="lbidlist.h" />
-    <ClInclude Include="limitedorderby.h" />
-    <ClInclude Include="passthrucommand-jl.h" />
-    <ClInclude Include="pidxlist.h" />
-    <ClInclude Include="pidxwalk.h" />
-    <ClInclude Include="primitivemsg.h" />
-    <ClInclude Include="primitivestep.h" />
-    <ClInclude Include="profiling.h" />
-    <ClInclude Include="pseudocc-jl.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="resourcedistributor.h" />
-    <ClInclude Include="resourcemanager.h" />
-    <ClInclude Include="rowestimator.h" />
-    <ClInclude Include="rtscommand-jl.h" />
-    <ClInclude Include="subquerystep.h" />
-    <ClInclude Include="subquerytransformer.h" />
-    <ClInclude Include="swsdl.h" />
-    <ClInclude Include="tableband.h" />
-    <ClInclude Include="tablecolumn.h" />
-    <ClInclude Include="threadsafequeue.h" />
-    <ClInclude Include="timeset.h" />
-    <ClInclude Include="timestamp.h" />
-    <ClInclude Include="tupleaggregatestep.h" />
-    <ClInclude Include="tupleannexstep.h" />
-    <ClInclude Include="tupleconstantstep.h" />
-    <ClInclude Include="tuplehashjoin.h" />
-    <ClInclude Include="tuplehavingstep.h" />
-    <ClInclude Include="tupleunion.h" />
-    <ClInclude Include="tuplewsdl.h" />
-    <ClInclude Include="unique32generator.h" />
-    <ClInclude Include="virtualtable.h" />
-    <ClInclude Include="windowstep.h" />
-    <ClInclude Include="wsdl.h" />
-    <ClInclude Include="zdl.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="libjoblist.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\joiner\libjoiner.vcxproj">
-      <Project>{fc0ba86e-2cc2-4ce8-ac62-16b662fe5b29}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\mysqlcl_idb\libmysqlcl_idb.vcxproj">
-      <Project>{0bbaeacb-3336-4406-acfb-255669a3b9cf}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querystats\libquerystats.vcxproj">
-      <Project>{3238cd73-8ffd-44a7-aa5f-815beef8f402}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\windowfunction\libwindowfunction.vcxproj">
-      <Project>{0dd34627-b046-4415-80cf-d0fba4e069cb}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\versioning\BRM\libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/dbcon/joblist/libjoblist.vcxproj.filters b/dbcon/joblist/libjoblist.vcxproj.filters
deleted file mode 100644
index c82123efb..000000000
--- a/dbcon/joblist/libjoblist.vcxproj.filters
+++ /dev/null
@@ -1,374 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="anydatalist.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="batchprimitiveprocessor-jl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="columncommand-jl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="command-jl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="crossenginestep.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dictstep-jl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="distributedenginecomm.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="elementtype.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="expressionstep.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filtercommand-jl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filterstep.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="groupconcat.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jl_logger.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jlf_common.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jlf_execplantojoblist.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jlf_graphics.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jlf_subquery.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jlf_tuplejoblist.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="joblist.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="joblistfactory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="jobstep.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="lbidlist.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="limitedorderby.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="passthrucommand-jl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="passthrustep.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pcolscan.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pcolstep.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pdictionary.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pdictionaryscan.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="primitivemsg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="resourcedistributor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="resourcemanager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="rowestimator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="rtscommand-jl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="subquerystep.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="subquerytransformer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="tablecolumn.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="timestamp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="tuple-bps.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="tupleaggregatestep.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="tupleannexstep.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="tupleconstantstep.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="tuplehashjoin.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="tuplehavingstep.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="tupleunion.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="unique32generator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="virtualtable.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="windowfunctionstep.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pseudocc-jl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="diskjoinstep.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="batchprimitiveprocessor-jl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="bpp-jl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="columncommand-jl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="command-jl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="constantdatalist.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="crossenginestep.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="datalist.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="datalistimpl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="deliverywsdl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dictstep-jl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="distributedenginecomm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="elementcompression.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="elementtype.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="expressionstep.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="fifo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filtercommand-jl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filteroperation.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="groupconcat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="hashjoin.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jl_logger.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jlf_common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jlf_execplantojoblist.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jlf_graphics.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jlf_subquery.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jlf_tuplejoblist.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="joblist.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="joblistfactory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="joblisttypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="jobstep.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="largedatalist.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="largehashjoin.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="lbidlist.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="limitedorderby.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="passthrucommand-jl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="pidxlist.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="pidxwalk.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="primitivemsg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="profiling.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resourcedistributor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resourcemanager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="rowestimator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="rtscommand-jl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="subquerystep.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="subquerytransformer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="swsdl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="tableband.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="tablecolumn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="threadsafequeue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="timeset.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="timestamp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="tupleaggregatestep.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="tupleannexstep.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="tupleconstantstep.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="tuplehashjoin.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="tuplehavingstep.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="tupleunion.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="tuplewsdl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="unique32generator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="virtualtable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="windowstep.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="wsdl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="zdl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="primitivestep.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="pseudocc-jl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="diskjoinstep.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="libjoblist.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/dbcon/mysql/libcalmysql.vcxproj b/dbcon/mysql/libcalmysql.vcxproj
deleted file mode 100644
index ae0a69b9c..000000000
--- a/dbcon/mysql/libcalmysql.vcxproj
+++ /dev/null
@@ -1,401 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{0049D0FD-6479-442C-B53A-F4C7FF7AD34F}</ProjectGuid>
-    <RootNamespace>libcalmysql</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-    <TargetExt>.dll</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)../../mysql\sql;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>mysqld.lib;ws2_32.lib;iphlpapi.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\InfiniDB\Debug;$(SolutionDir)../../mysql\libmysql\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)../../mysql\sql;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalDependencies>mysqld.lib;ws2_32.lib;iphlpapi.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;$(SolutionDir)../../mysql\sql\Debug;$(SolutionDir)../../mysql\libmysql\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <HeapReserveSize>2000000</HeapReserveSize>
-      <HeapCommitSize>10000</HeapCommitSize>
-      <StackReserveSize>2000000</StackReserveSize>
-      <StackCommitSize>10000</StackCommitSize>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)../../mysql\sql;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_IDB_COMPRESSION;SKIP_VIEW;SKIP_INSERT_SELECT;SKIP_AUTOI;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>mysqld.lib;ws2_32.lib;iphlpapi.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;$(SolutionDir)../../mysql\sql\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)../../mysql\sql;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_IDB_COMPRESSION;SKIP_VIEW;SKIP_INSERT_SELECT;SKIP_AUTOI;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalDependencies>mysqld.lib;ws2_32.lib;iphlpapi.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;$(SolutionDir)../../mysql\sql\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <HeapReserveSize>2000000</HeapReserveSize>
-      <HeapCommitSize>10000</HeapCommitSize>
-      <StackReserveSize>2000000</StackReserveSize>
-      <StackCommitSize>10000</StackCommitSize>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB MySQL COnnector API" $(SolutionDir)..\..x64\Release\libcalmysql.dll</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)../../mysql\sql;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>mysqld.lib;ws2_32.lib;iphlpapi.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;$(SolutionDir)../../mysql\sql\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)../../mysql\sql;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalDependencies>mysqld.lib;ws2_32.lib;iphlpapi.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;$(SolutionDir)../../mysql\sql\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <HeapReserveSize>2000000</HeapReserveSize>
-      <HeapCommitSize>10000</HeapCommitSize>
-      <StackReserveSize>2000000</StackReserveSize>
-      <StackCommitSize>10000</StackCommitSize>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB MySQL COnnector API" $(SolutionDir)..\..\x64\EnterpriseRelease\libcalmysql.dll</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="ha_calpont.cpp" />
-    <ClCompile Include="ha_calpont_ddl.cpp" />
-    <ClCompile Include="ha_calpont_dml.cpp" />
-    <ClCompile Include="ha_calpont_execplan.cpp" />
-    <ClCompile Include="ha_calpont_impl.cpp" />
-    <ClCompile Include="ha_calpont_partition.cpp" />
-    <ClCompile Include="ha_exists_sub.cpp" />
-    <ClCompile Include="ha_from_sub.cpp" />
-    <ClCompile Include="ha_in_sub.cpp" />
-    <ClCompile Include="ha_pseudocolumn.cpp" />
-    <ClCompile Include="ha_scalar_sub.cpp" />
-    <ClCompile Include="ha_select_sub.cpp" />
-    <ClCompile Include="ha_view.cpp" />
-    <ClCompile Include="ha_window_function.cpp" />
-    <ClCompile Include="sm.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\utils\loggingcpp\errorids.h" />
-    <ClInclude Include="ha_calpont.h" />
-    <ClInclude Include="ha_calpont_impl.h" />
-    <ClInclude Include="ha_calpont_impl_if.h" />
-    <ClInclude Include="ha_subquery.h" />
-    <ClInclude Include="ha_view.h" />
-    <ClInclude Include="idb_mysql.h" />
-    <ClInclude Include="item.h" />
-    <ClInclude Include="item_sum.h" />
-    <ClInclude Include="lex.h" />
-    <ClInclude Include="mysql_priv.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="sm.h" />
-    <ClInclude Include="sp_head.h" />
-    <ClInclude Include="sql_class.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="libcalmysql.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\mysqlcl_idb\libmysqlcl_idb.vcxproj">
-      <Project>{0bbaeacb-3336-4406-acfb-255669a3b9cf}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querystats\libquerystats.vcxproj">
-      <Project>{3238cd73-8ffd-44a7-aa5f-815beef8f402}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\versioning\BRM\libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\ddlpackage\libddlpackage.vcxproj">
-      <Project>{033c6cba-d984-483f-adc8-825be20a699d}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\dmlpackage\libdmlpackage.vcxproj">
-      <Project>{b9045bca-0955-4c5e-bca4-5ee516838119}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/dbcon/mysql/libcalmysql.vcxproj.filters b/dbcon/mysql/libcalmysql.vcxproj.filters
deleted file mode 100644
index faadb073a..000000000
--- a/dbcon/mysql/libcalmysql.vcxproj.filters
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ha_calpont.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ha_calpont_ddl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ha_calpont_dml.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ha_calpont_execplan.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ha_calpont_impl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ha_calpont_partition.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ha_exists_sub.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ha_from_sub.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ha_in_sub.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ha_scalar_sub.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ha_select_sub.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ha_view.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ha_window_function.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ha_pseudocolumn.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ha_calpont.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ha_calpont_impl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ha_calpont_impl_if.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ha_subquery.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ha_view.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="idb_mysql.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="item.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="item_sum.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="lex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="mysql_priv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="sm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="sp_head.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="sql_class.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\utils\loggingcpp\errorids.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="libcalmysql.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/ddlproc/DDLProc.vcxproj b/ddlproc/DDLProc.vcxproj
deleted file mode 100644
index 395a05ffa..000000000
--- a/ddlproc/DDLProc.vcxproj
+++ /dev/null
@@ -1,351 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{EE6E6244-93A6-4014-A947-EFCB779B87B6}</ProjectGuid>
-    <RootNamespace>DDLProc</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB DDL Processor" $(SolutionDir)..\..x64\Release\DDLProc.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB DDL Processor" $(SolutionDir)..\..\x64\EnterpriseRelease\DDLProc.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="ddlproc.cpp" />
-    <ClCompile Include="ddlprocessor.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ddlproc.h" />
-    <ClInclude Include="ddlprocessor.h" />
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="DDLProc.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\dbcon\ddlpackageproc\libddlpackageproc.vcxproj">
-      <Project>{19142d9e-7660-445c-b85d-98e722dffea5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\dbcon\ddlpackage\libddlpackage.vcxproj">
-      <Project>{033c6cba-d984-483f-adc8-825be20a699d}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\threadpool\libthreadpool.vcxproj">
-      <Project>{2be469d2-d854-4480-bfe0-34de89c557b2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\versioning\BRM\libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\writeengine\client\libweclient.vcxproj">
-      <Project>{4bc37219-e09d-4133-98c4-cf0386657df6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\writeengine\libwriteengine.vcxproj">
-      <Project>{414a47eb-55e3-4251-99b0-95d86fe5580d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/ddlproc/DDLProc.vcxproj.filters b/ddlproc/DDLProc.vcxproj.filters
deleted file mode 100644
index af17084df..000000000
--- a/ddlproc/DDLProc.vcxproj.filters
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ddlproc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ddlprocessor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ddlproc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ddlprocessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="DDLProc.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/dmlproc/DMLProc.vcxproj b/dmlproc/DMLProc.vcxproj
deleted file mode 100644
index c190f3fb7..000000000
--- a/dmlproc/DMLProc.vcxproj
+++ /dev/null
@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{10EFDC01-9720-45A3-9290-7C394B459CB0}</ProjectGuid>
-    <RootNamespace>DMLProc</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dmlib;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\InfiniDB\Debug;$(SolutionDir)../../mysql\libmysql\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dmlib;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;$(SolutionDir)../../mysql\libmysql\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dmlib;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNING;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dmlib;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNING;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB DML Processor" $(SolutionDir)..\..x64\Release\DMLProc.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dmlib;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNING;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dmlib;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNING;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB DML Processor" $(SolutionDir)..\..\x64\EnterpriseRelease\DMLProc.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="batchinsertprocessor.cpp" />
-    <ClCompile Include="dmlproc.cpp" />
-    <ClCompile Include="dmlprocessor.cpp" />
-    <ClCompile Include="dmlresultbuffer.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="batchinsertprocessor.h" />
-    <ClInclude Include="dmlproc.h" />
-    <ClInclude Include="dmlprocessor.h" />
-    <ClInclude Include="dmlresultbuffer.h" />
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="DMLProc.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\dbcon\ddlpackageproc\libddlpackageproc.vcxproj">
-      <Project>{19142d9e-7660-445c-b85d-98e722dffea5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\dbcon\dmlpackageproc\libdmlpackageproc.vcxproj">
-      <Project>{c78dd512-fca0-4b8a-a531-376e33c9fbb7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\dbcon\dmlpackage\libdmlpackage.vcxproj">
-      <Project>{b9045bca-0955-4c5e-bca4-5ee516838119}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\batchloader\libbatchloader.vcxproj">
-      <Project>{35d6295b-4a83-4e6e-bab0-70adf19ae822}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\ddlcleanup\libddlcleanup.vcxproj">
-      <Project>{e95fecb8-1b06-41ff-8e1d-40b7e6841765}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\mysqlcl_idb\libmysqlcl_idb.vcxproj">
-      <Project>{0bbaeacb-3336-4406-acfb-255669a3b9cf}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\querystats\libquerystats.vcxproj">
-      <Project>{3238cd73-8ffd-44a7-aa5f-815beef8f402}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\threadpool\libthreadpool.vcxproj">
-      <Project>{2be469d2-d854-4480-bfe0-34de89c557b2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\versioning\BRM\libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\writeengine\client\libweclient.vcxproj">
-      <Project>{4bc37219-e09d-4133-98c4-cf0386657df6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\writeengine\libwriteengine.vcxproj">
-      <Project>{414a47eb-55e3-4251-99b0-95d86fe5580d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/dmlproc/DMLProc.vcxproj.filters b/dmlproc/DMLProc.vcxproj.filters
deleted file mode 100644
index 8bc8f87e2..000000000
--- a/dmlproc/DMLProc.vcxproj.filters
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="batchinsertprocessor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dmlproc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dmlprocessor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dmlresultbuffer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="batchinsertprocessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dmlproc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dmlprocessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dmlresultbuffer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="DMLProc.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/exemgr/ExeMgr.vcxproj b/exemgr/ExeMgr.vcxproj
deleted file mode 100644
index ac92cf5a1..000000000
--- a/exemgr/ExeMgr.vcxproj
+++ /dev/null
@@ -1,357 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1CE8E777-042F-48E2-B146-2B411E14F765}</ProjectGuid>
-    <RootNamespace>ExeMgr</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\InfiniDB\Debug;$(SolutionDir)../../mysql\libmysql\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAsManaged>
-      </CompileAsManaged>
-      <MultiProcessorCompilation>
-      </MultiProcessorCompilation>
-      <StringPooling>
-      </StringPooling>
-      <EnableParallelCodeGeneration>
-      </EnableParallelCodeGeneration>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;$(SolutionDir)../../mysql\libmysql\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Execution Manager" \InfiniDB\Release\ExeMgr.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Execution Manager" $(SolutionDir)..\..x64\Release\ExeMgr.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Execution Manager" \InfiniDB\Release\ExeMgr.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;$(SolutionDir)../../mysql\libmysql\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Execution Manager" $(SolutionDir)..\..\x64\EnterpriseRelease\ExeMgr.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="activestatementcounter.cpp" />
-    <ClCompile Include="femsghandler.cpp" />
-    <ClCompile Include="main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="activestatementcounter.h" />
-    <ClInclude Include="femsghandler.h" />
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ExeMgr.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\mysqlcl_idb\libmysqlcl_idb.vcxproj">
-      <Project>{0bbaeacb-3336-4406-acfb-255669a3b9cf}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\querystats\libquerystats.vcxproj">
-      <Project>{3238cd73-8ffd-44a7-aa5f-815beef8f402}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\versioning\BRM\libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/exemgr/ExeMgr.vcxproj.filters b/exemgr/ExeMgr.vcxproj.filters
deleted file mode 100644
index f9ec4090b..000000000
--- a/exemgr/ExeMgr.vcxproj.filters
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="activestatementcounter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="femsghandler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="activestatementcounter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="femsghandler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ExeMgr.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/exemgr/exemgr.vpj b/exemgr/exemgr.vpj
index 25cac951e..c1bb5181c 100644
--- a/exemgr/exemgr.vpj
+++ b/exemgr/exemgr.vpj
@@ -41,9 +41,8 @@
                 CaptureOutputWith="ProcessBuffer"
                 Deletable="0"
                 SaveOption="SaveWorkspaceFiles"
-                RunFromDir="%rw"
-                ClearProcessBuffer="1">
-                <Exec CmdLine="make -fMakefile"/>
+                RunFromDir="%rw">
+                <Exec CmdLine="make"/>
             </Target>
             <Target
                 Name="Rebuild"
@@ -51,9 +50,8 @@
                 CaptureOutputWith="ProcessBuffer"
                 Deletable="0"
                 SaveOption="SaveWorkspaceFiles"
-                RunFromDir="%rw"
-                ClearProcessBuffer="1">
-                <Exec CmdLine="make -fMakefile clean; make -fMakefile"/>
+                RunFromDir="%rw">
+                <Exec CmdLine=""/>
             </Target>
             <Target
                 Name="Debug"
@@ -62,7 +60,7 @@
                 CaptureOutputWith="ProcessBuffer"
                 Deletable="0"
                 SaveOption="SaveNone"
-                RunFromDir="%rw"
+                RunFromDir="%wp"
                 ClearProcessBuffer="1">
                 <Exec CmdLine='vsdebugio -prog "%o"'/>
             </Target>
@@ -70,11 +68,11 @@
                 Name="Execute"
                 MenuCaption="E&amp;xecute"
                 Dialog="_gnuc_options_form Run/Debug"
+                BuildFirst="1"
                 CaptureOutputWith="ProcessBuffer"
                 Deletable="0"
                 SaveOption="SaveWorkspaceFiles"
-                RunFromDir="%rw"
-                ClearProcessBuffer="1">
+                RunFromDir="%rw">
                 <Exec CmdLine='"%o"'/>
             </Target>
             <Target
@@ -136,9 +134,8 @@
                 CaptureOutputWith="ProcessBuffer"
                 Deletable="0"
                 SaveOption="SaveWorkspaceFiles"
-                RunFromDir="%rw"
-                ClearProcessBuffer="1">
-                <Exec CmdLine="make -fMakefile"/>
+                RunFromDir="%rw">
+                <Exec CmdLine="make"/>
             </Target>
             <Target
                 Name="Rebuild"
@@ -146,9 +143,8 @@
                 CaptureOutputWith="ProcessBuffer"
                 Deletable="0"
                 SaveOption="SaveWorkspaceFiles"
-                RunFromDir="%rw"
-                ClearProcessBuffer="1">
-                <Exec CmdLine="make -fMakefile clean; make -fMakefile"/>
+                RunFromDir="%rw">
+                <Exec CmdLine=""/>
             </Target>
             <Target
                 Name="Debug"
@@ -157,7 +153,7 @@
                 CaptureOutputWith="ProcessBuffer"
                 Deletable="0"
                 SaveOption="SaveNone"
-                RunFromDir="%rw"
+                RunFromDir="%wp"
                 ClearProcessBuffer="1">
                 <Exec CmdLine='vsdebugio -prog "%o"'/>
             </Target>
@@ -165,11 +161,11 @@
                 Name="Execute"
                 MenuCaption="E&amp;xecute"
                 Dialog="_gnuc_options_form Run/Debug"
+                BuildFirst="1"
                 CaptureOutputWith="ProcessBuffer"
                 Deletable="0"
                 SaveOption="SaveWorkspaceFiles"
-                RunFromDir="%rw"
-                ClearProcessBuffer="1">
+                RunFromDir="%rw">
                 <Exec CmdLine='"%o"'/>
             </Target>
             <Target
@@ -200,14 +196,17 @@
             Name="Source Files"
             Filters="*.c;*.C;*.cc;*.cpp;*.cp;*.cxx;*.c++;*.prg;*.pas;*.dpr;*.asm;*.s;*.bas;*.java;*.cs;*.sc;*.e;*.cob;*.html;*.rc;*.tcl;*.py;*.pl;*.d">
             <F N="activestatementcounter.cpp"/>
+            <F N="ExeMgr.cpp"/>
             <F N="femsghandler.cpp"/>
             <F N="main.cpp"/>
+            <F N="procstat.cpp"/>
         </Folder>
         <Folder
             Name="Header Files"
             Filters="*.h;*.H;*.hh;*.hpp;*.hxx;*.inc;*.sh;*.cpy;*.if">
             <F N="activestatementcounter.h"/>
             <F N="femsghandler.h"/>
+            <F N="procstat.h"/>
         </Folder>
         <Folder
             Name="Resource Files"
diff --git a/oam/oamcpp/liboamcpp.vcxproj b/oam/oamcpp/liboamcpp.vcxproj
deleted file mode 100644
index 632df33ea..000000000
--- a/oam/oamcpp/liboamcpp.vcxproj
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8F7C9B67-639C-468F-8C5A-EB5F2E944E64}</ProjectGuid>
-    <RootNamespace>liboamcpp</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <PostBuildEvent>
-      <Command />
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <PostBuildEvent>
-      <Command />
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <PostBuildEvent>
-      <Command />
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <PostBuildEvent>
-      <Command />
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <PostBuildEvent>
-      <Command />
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <PostBuildEvent>
-      <Command />
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\snmpd\snmpmanager\alarm.cpp" />
-    <ClCompile Include="liboamcpp.cpp" />
-    <ClCompile Include="oamcache.cpp" />
-    <ClCompile Include="..\..\snmpd\snmpmanager\snmpmanager.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\snmpd\snmpmanager\alarm.h" />
-    <ClInclude Include="liboamcpp.h" />
-    <ClInclude Include="oamcache.h" />
-    <ClInclude Include="..\..\snmpd\snmpmanager\snmpglobal.h" />
-    <ClInclude Include="..\..\snmpd\snmpmanager\snmpmanager.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/oam/oamcpp/liboamcpp.vcxproj.filters b/oam/oamcpp/liboamcpp.vcxproj.filters
deleted file mode 100644
index b061535b6..000000000
--- a/oam/oamcpp/liboamcpp.vcxproj.filters
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\snmpd\snmpmanager\alarm.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="liboamcpp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="oamcache.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\snmpd\snmpmanager\snmpmanager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\snmpd\snmpmanager\alarm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="liboamcpp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="oamcache.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\snmpd\snmpmanager\snmpglobal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\snmpd\snmpmanager\snmpmanager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/primitives/primproc/PrimProc.vcxproj b/primitives/primproc/PrimProc.vcxproj
deleted file mode 100644
index 2032f6a0d..000000000
--- a/primitives/primproc/PrimProc.vcxproj
+++ /dev/null
@@ -1,447 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C3CE5C6C-A4E2-4B6F-80C3-94E0609C654E}</ProjectGuid>
-    <RootNamespace>PrimProc</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>del \InfiniDB\primproc\rowaggregation.h \InfiniDB\primproc\rowgroup.h &gt;nul 2&gt;&amp;1</Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\primitives\primproc;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\primitives\blockcache;$(SolutionDir)..\primitives\linux-port;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>rm -f \InfiniDB\primproc\rowaggregation.h \InfiniDB\primproc\rowgroup.h &gt;nul 2&gt;&amp;1</Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\primitives\primproc;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\primitives\blockcache;$(SolutionDir)..\primitives\linux-port;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <HeapReserveSize>2097152</HeapReserveSize>
-      <HeapCommitSize>0</HeapCommitSize>
-      <StackReserveSize>2097152</StackReserveSize>
-      <StackCommitSize>0</StackCommitSize>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>del \InfiniDB\primproc\rowaggregation.h \InfiniDB\primproc\rowgroup.h &gt;nul 2&gt;&amp;1</Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\primitives\primproc;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\primitives\blockcache;$(SolutionDir)..\primitives\linux-port;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Primitive Processor" \InfiniDB\Release\PrimProc.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>del \InfiniDB\primproc\rowaggregation.h \InfiniDB\primproc\rowgroup.h &gt;nul 2&gt;&amp;1</Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\primitives\primproc;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\primitives\blockcache;$(SolutionDir)..\primitives\linux-port;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <HeapReserveSize>2097152</HeapReserveSize>
-      <StackReserveSize>2097152</StackReserveSize>
-      <StackCommitSize>1100</StackCommitSize>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Primitive Processor" $(SolutionDir)..\..x64\Release\PrimProc.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <PreBuildEvent>
-      <Command>del \InfiniDB\primproc\rowaggregation.h \InfiniDB\primproc\rowgroup.h &gt;nul 2&gt;&amp;1</Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\primitives\primproc;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\primitives\blockcache;$(SolutionDir)..\primitives\linux-port;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Primitive Processor" \InfiniDB\Release\PrimProc.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <PreBuildEvent>
-      <Command>rm -f \InfiniDB\primproc\rowaggregation.h \InfiniDB\primproc\rowgroup.h &gt;nul 2&gt;&amp;1</Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\primitives\primproc;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\primitives\blockcache;$(SolutionDir)..\primitives\linux-port;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <HeapReserveSize>2097152</HeapReserveSize>
-      <StackReserveSize>2097152</StackReserveSize>
-      <StackCommitSize>1100</StackCommitSize>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Primitive Processor" $(SolutionDir)..\..\x64\EnterpriseRelease\PrimProc.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="batchprimitiveprocessor.cpp" />
-    <ClCompile Include="..\blockcache\blockcacheclient.cpp" />
-    <ClCompile Include="..\blockcache\blockrequestprocessor.cpp" />
-    <ClCompile Include="bppseeder.cpp" />
-    <ClCompile Include="bppsendthread.cpp" />
-    <ClCompile Include="..\linux-port\column.cpp" />
-    <ClCompile Include="columncommand.cpp" />
-    <ClCompile Include="command.cpp" />
-    <ClCompile Include="..\linux-port\dictionary.cpp" />
-    <ClCompile Include="dictstep.cpp" />
-    <ClCompile Include="..\blockcache\fileblockrequestqueue.cpp" />
-    <ClCompile Include="..\blockcache\filebuffer.cpp" />
-    <ClCompile Include="..\blockcache\filebuffermgr.cpp" />
-    <ClCompile Include="..\blockcache\filerequest.cpp" />
-    <ClCompile Include="filtercommand.cpp" />
-    <ClCompile Include="..\blockcache\fsutils.cpp" />
-    <ClCompile Include="..\blockcache\iomanager.cpp" />
-    <ClCompile Include="logger.cpp" />
-    <ClCompile Include="passthrucommand.cpp" />
-    <ClCompile Include="..\linux-port\primitiveprocessor.cpp" />
-    <ClCompile Include="primitiveserver.cpp" />
-    <ClCompile Include="primproc.cpp" />
-    <ClCompile Include="pseudocc.cpp" />
-    <ClCompile Include="rtscommand.cpp" />
-    <ClCompile Include="..\blockcache\stats.cpp" />
-    <ClCompile Include="umsocketselector.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="batchprimitiveprocessor.h" />
-    <ClInclude Include="..\blockcache\blockcacheclient.h" />
-    <ClInclude Include="..\blockcache\blockrequestprocessor.h" />
-    <ClInclude Include="bpp.h" />
-    <ClInclude Include="bppseeder.h" />
-    <ClInclude Include="bppsendthread.h" />
-    <ClInclude Include="columncommand.h" />
-    <ClInclude Include="command.h" />
-    <ClInclude Include="dictstep.h" />
-    <ClInclude Include="..\blockcache\fileblockrequestqueue.h" />
-    <ClInclude Include="..\blockcache\filebuffer.h" />
-    <ClInclude Include="..\blockcache\filebuffermgr.h" />
-    <ClInclude Include="..\blockcache\filerequest.h" />
-    <ClInclude Include="filtercommand.h" />
-    <ClInclude Include="..\blockcache\fsutils.h" />
-    <ClInclude Include="..\blockcache\iomanager.h" />
-    <ClInclude Include="passthrucommand.h" />
-    <ClInclude Include="pp_logger.h" />
-    <ClInclude Include="..\linux-port\primitiveprocessor.h" />
-    <ClInclude Include="primitiveserver.h" />
-    <ClInclude Include="primproc.h" />
-    <ClInclude Include="pseudocc.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="rtscommand.h" />
-    <ClInclude Include="..\blockcache\stats.h" />
-    <ClInclude Include="umsocketselector.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="PrimProc.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\joiner\libjoiner.vcxproj">
-      <Project>{fc0ba86e-2cc2-4ce8-ac62-16b662fe5b29}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\threadpool\libthreadpool.vcxproj">
-      <Project>{2be469d2-d854-4480-bfe0-34de89c557b2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\versioning\BRM\libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\writeengine\libwriteengine.vcxproj">
-      <Project>{414a47eb-55e3-4251-99b0-95d86fe5580d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/primitives/primproc/PrimProc.vcxproj.filters b/primitives/primproc/PrimProc.vcxproj.filters
deleted file mode 100644
index 3ce886e27..000000000
--- a/primitives/primproc/PrimProc.vcxproj.filters
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="batchprimitiveprocessor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\blockcache\blockcacheclient.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\blockcache\blockrequestprocessor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bppseeder.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bppsendthread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\linux-port\column.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="columncommand.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="command.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\linux-port\dictionary.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dictstep.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\blockcache\fileblockrequestqueue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\blockcache\filebuffer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\blockcache\filebuffermgr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\blockcache\filerequest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="filtercommand.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\blockcache\fsutils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\blockcache\iomanager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="logger.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="passthrucommand.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\linux-port\primitiveprocessor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="primitiveserver.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="primproc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="rtscommand.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\blockcache\stats.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="umsocketselector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pseudocc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="batchprimitiveprocessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\blockcache\blockcacheclient.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\blockcache\blockrequestprocessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="bpp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="bppseeder.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="bppsendthread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="columncommand.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="command.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dictstep.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\blockcache\fileblockrequestqueue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\blockcache\filebuffer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\blockcache\filebuffermgr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\blockcache\filerequest.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="filtercommand.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\blockcache\fsutils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\blockcache\iomanager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="passthrucommand.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="pp_logger.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\linux-port\primitiveprocessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="primitiveserver.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="primproc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="rtscommand.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\blockcache\stats.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="umsocketselector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="pseudocc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="PrimProc.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/clearShm/clearShm.vcxproj b/tools/clearShm/clearShm.vcxproj
deleted file mode 100644
index c1c0a3d5d..000000000
--- a/tools/clearShm/clearShm.vcxproj
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E369D45E-2933-4E72-AA1D-CA2A8E59BA5F}</ProjectGuid>
-    <RootNamespace>clearShm</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>COMMUNITY_KEYRANGE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\versioning\BRM\libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/clearShm/clearShm.vcxproj.filters b/tools/clearShm/clearShm.vcxproj.filters
deleted file mode 100644
index a5aaa3f23..000000000
--- a/tools/clearShm/clearShm.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/cleartablelock/cleartablelock.vcxproj b/tools/cleartablelock/cleartablelock.vcxproj
deleted file mode 100644
index bb8764141..000000000
--- a/tools/cleartablelock/cleartablelock.vcxproj
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F1BFEF1B-41F8-437C-AA09-1F22D2F9ED13}</ProjectGuid>
-    <RootNamespace>cleartablelock</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\compress;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="cleartablelock.cpp" />
-    <ClCompile Include="cleartablelockthread.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="cleartablelockthread.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\versioning\BRM\libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/cleartablelock/cleartablelock.vcxproj.filters b/tools/cleartablelock/cleartablelock.vcxproj.filters
deleted file mode 100644
index 8d49470e1..000000000
--- a/tools/cleartablelock/cleartablelock.vcxproj.filters
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="cleartablelock.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="cleartablelockthread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="cleartablelockthread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/cplogger/cplogger.vcxproj b/tools/cplogger/cplogger.vcxproj
deleted file mode 100644
index 460fbf46e..000000000
--- a/tools/cplogger/cplogger.vcxproj
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6B8C806F-46F7-412F-9FB1-78DFA505597E}</ProjectGuid>
-    <RootNamespace>cplogger</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/cplogger/cplogger.vcxproj.filters b/tools/cplogger/cplogger.vcxproj.filters
deleted file mode 100644
index a5aaa3f23..000000000
--- a/tools/cplogger/cplogger.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/dbbuilder/dbbuilder.vcxproj b/tools/dbbuilder/dbbuilder.vcxproj
deleted file mode 100644
index cdd73fa05..000000000
--- a/tools/dbbuilder/dbbuilder.vcxproj
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F767A00A-1063-4C0A-B8E3-A27E3F332724}</ProjectGuid>
-    <RootNamespace>dbbuilder</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="dbbuilder.cpp" />
-    <ClCompile Include="systemcatalog.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="dbbuilder.h" />
-    <ClInclude Include="systemcatalog.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\versioning\BRM\libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\writeengine\libwriteengine.vcxproj">
-      <Project>{414a47eb-55e3-4251-99b0-95d86fe5580d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/dbbuilder/dbbuilder.vcxproj.filters b/tools/dbbuilder/dbbuilder.vcxproj.filters
deleted file mode 100644
index 1e38b2a5b..000000000
--- a/tools/dbbuilder/dbbuilder.vcxproj.filters
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="dbbuilder.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="systemcatalog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="dbbuilder.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="systemcatalog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/dbloadxml/colxml.vcxproj b/tools/dbloadxml/colxml.vcxproj
deleted file mode 100644
index 751703e1d..000000000
--- a/tools/dbloadxml/colxml.vcxproj
+++ /dev/null
@@ -1,337 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{635981B1-9353-4102-935B-177432EDC072}</ProjectGuid>
-    <RootNamespace>colxml</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Bulk Load Utility" $(SolutionDir)..\..x64\Release\colxml.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Bulk Load Utility" $(SolutionDir)..\..\x64\EnterpriseRelease\colxml.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="colxml.cpp" />
-    <ClCompile Include="inputmgr.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="inputmgr.h" />
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="colxml.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\versioning\BRM\libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\writeengine\libwriteengine.vcxproj">
-      <Project>{414a47eb-55e3-4251-99b0-95d86fe5580d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/dbloadxml/colxml.vcxproj.filters b/tools/dbloadxml/colxml.vcxproj.filters
deleted file mode 100644
index f2070de6b..000000000
--- a/tools/dbloadxml/colxml.vcxproj.filters
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="colxml.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="inputmgr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="inputmgr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="colxml.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/ddlcleanup/ddlcleanup.vcxproj b/tools/ddlcleanup/ddlcleanup.vcxproj
deleted file mode 100644
index 8a8c17206..000000000
--- a/tools/ddlcleanup/ddlcleanup.vcxproj
+++ /dev/null
@@ -1,324 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{71C00ACF-619C-407D-8A69-995CD27F7809}</ProjectGuid>
-    <RootNamespace>ddlcleanup</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\ddlcleanup;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="ddlcleanup.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dbcon\ddlpackageproc\libddlpackageproc.vcxproj">
-      <Project>{19142d9e-7660-445c-b85d-98e722dffea5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\ddlcleanup\libddlcleanup.vcxproj">
-      <Project>{e95fecb8-1b06-41ff-8e1d-40b7e6841765}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\versioning\BRM\libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\writeengine\client\libweclient.vcxproj">
-      <Project>{4bc37219-e09d-4133-98c4-cf0386657df6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\writeengine\libwriteengine.vcxproj">
-      <Project>{414a47eb-55e3-4251-99b0-95d86fe5580d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/ddlcleanup/ddlcleanup.vcxproj.filters b/tools/ddlcleanup/ddlcleanup.vcxproj.filters
deleted file mode 100644
index 8c6cfc795..000000000
--- a/tools/ddlcleanup/ddlcleanup.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ddlcleanup.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/editem/editem.vcxproj b/tools/editem/editem.vcxproj
deleted file mode 100644
index 9784c61c5..000000000
--- a/tools/editem/editem.vcxproj
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E9417C0B-D839-46E2-A2A8-439E6087E873}</ProjectGuid>
-    <RootNamespace>editem</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="editem.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\versioning\BRM\libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/editem/editem.vcxproj.filters b/tools/editem/editem.vcxproj.filters
deleted file mode 100644
index 4520f5354..000000000
--- a/tools/editem/editem.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="editem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/getConfig/getConfig.vcxproj b/tools/getConfig/getConfig.vcxproj
deleted file mode 100644
index f13200076..000000000
--- a/tools/getConfig/getConfig.vcxproj
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1F7BEFE7-87AC-4FB1-97E3-3472A578F0A3}</ProjectGuid>
-    <RootNamespace>getConfig</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/getConfig/getConfig.vcxproj.filters b/tools/getConfig/getConfig.vcxproj.filters
deleted file mode 100644
index a5aaa3f23..000000000
--- a/tools/getConfig/getConfig.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/setConfig/setConfig.vcxproj b/tools/setConfig/setConfig.vcxproj
deleted file mode 100644
index cc1aa5a3e..000000000
--- a/tools/setConfig/setConfig.vcxproj
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{13E96B71-0854-4EA5-A7ED-0950AE10C858}</ProjectGuid>
-    <RootNamespace>setConfig</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <DisableSpecificWarnings>4996;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\versioning\BRM\libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/setConfig/setConfig.vcxproj.filters b/tools/setConfig/setConfig.vcxproj.filters
deleted file mode 100644
index a5aaa3f23..000000000
--- a/tools/setConfig/setConfig.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/viewtablelock/viewtablelock.vcxproj b/tools/viewtablelock/viewtablelock.vcxproj
deleted file mode 100644
index 22fcf3bf0..000000000
--- a/tools/viewtablelock/viewtablelock.vcxproj
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DC26E3DB-B3E6-469E-869D-3FA5FC026C20}</ProjectGuid>
-    <RootNamespace>viewtablelock</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="viewtablelock.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\versioning\BRM\libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/viewtablelock/viewtablelock.vcxproj.filters b/tools/viewtablelock/viewtablelock.vcxproj.filters
deleted file mode 100644
index 5516c1d2e..000000000
--- a/tools/viewtablelock/viewtablelock.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="viewtablelock.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/batchloader/libbatchloader.vcxproj b/utils/batchloader/libbatchloader.vcxproj
deleted file mode 100644
index 7c7d03f57..000000000
--- a/utils/batchloader/libbatchloader.vcxproj
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{35D6295B-4A83-4E6E-BAB0-70ADF19AE822}</ProjectGuid>
-    <RootNamespace>libbatchloader</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="batchloader.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="batchloader.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/batchloader/libbatchloader.vcxproj.filters b/utils/batchloader/libbatchloader.vcxproj.filters
deleted file mode 100644
index 0118ab452..000000000
--- a/utils/batchloader/libbatchloader.vcxproj.filters
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="batchloader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="batchloader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/cacheutils/libcacheutils.vcxproj b/utils/cacheutils/libcacheutils.vcxproj
deleted file mode 100644
index 8dc049bf2..000000000
--- a/utils/cacheutils/libcacheutils.vcxproj
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B44BE805-2019-4FCB-B213-45F1D7A73CCD}</ProjectGuid>
-    <RootNamespace>libcacheutils</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-    <TargetExt>*.lib</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <TargetExt>.lib</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-    <TargetExt>*.lib</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <TargetExt>*.lib</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-    <TargetExt>*.lib</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <TargetExt>.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="cacheutils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="cacheutils.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/cacheutils/libcacheutils.vcxproj.filters b/utils/cacheutils/libcacheutils.vcxproj.filters
deleted file mode 100644
index dc5f4bc5a..000000000
--- a/utils/cacheutils/libcacheutils.vcxproj.filters
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="cacheutils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="cacheutils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/common/libcommon.vcxproj b/utils/common/libcommon.vcxproj
deleted file mode 100644
index 446a0b2cd..000000000
--- a/utils/common/libcommon.vcxproj
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{004899A2-3CAB-4796-B030-34A20AC285C9}</ProjectGuid>
-    <RootNamespace>libcommon</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="cgroupconfigurator.cpp" />
-    <ClCompile Include="fixedallocator.cpp" />
-    <ClCompile Include="MonitorProcMem.cpp" />
-    <ClCompile Include="nullvaluemanip.cpp" />
-    <ClCompile Include="poolallocator.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="atomicops.h" />
-    <ClInclude Include="branchpred.h" />
-    <ClInclude Include="cgroupconfigurator.h" />
-    <ClInclude Include="fixedallocator.h" />
-    <ClInclude Include="hasher.h" />
-    <ClInclude Include="MonitorProcMem.h" />
-    <ClInclude Include="nullvaluemanip.h" />
-    <ClInclude Include="poolallocator.h" />
-    <ClInclude Include="simpleallocator.h" />
-    <ClInclude Include="stlpoolallocator.h" />
-    <ClInclude Include="syncstream.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/common/libcommon.vcxproj.filters b/utils/common/libcommon.vcxproj.filters
deleted file mode 100644
index f015a777f..000000000
--- a/utils/common/libcommon.vcxproj.filters
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="cgroupconfigurator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="fixedallocator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MonitorProcMem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="poolallocator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="nullvaluemanip.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="atomicops.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="branchpred.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="cgroupconfigurator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="fixedallocator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="hasher.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MonitorProcMem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="poolallocator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="simpleallocator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="stlpoolallocator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="syncstream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="nullvaluemanip.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/compress/libcompress-ent.vcxproj b/utils/compress/libcompress-ent.vcxproj
deleted file mode 100644
index 80ba62a8e..000000000
--- a/utils/compress/libcompress-ent.vcxproj
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{0B72A604-0755-4E2C-B74B-C93564847114}</ProjectGuid>
-    <RootNamespace>libcompressent</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-    <TargetName>libcompress</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>libcompress</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-    <TargetName>libcompress</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>libcompress</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-    <TargetName>libcompress</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>libcompress</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)libcompress.lib</OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)libcompress.lib</OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)libcompress.lib</OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)libcompress.lib</OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)libcompress.lib</OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\startup;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)libcompress.lib</OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="idbcompress.cpp" />
-    <ClCompile Include="snappy-sinksource.cpp" />
-    <ClCompile Include="snappy-stubs-internal.cpp" />
-    <ClCompile Include="snappy.cpp" />
-    <ClCompile Include="version1.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="idbcompress.h" />
-    <ClInclude Include="snappy-config-win.h" />
-    <ClInclude Include="snappy-internal.h" />
-    <ClInclude Include="snappy-sinksource.h" />
-    <ClInclude Include="snappy-stubs-internal.h" />
-    <ClInclude Include="snappy-stubs-public.h" />
-    <ClInclude Include="snappy.h" />
-    <ClInclude Include="version1.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/compress/libcompress-ent.vcxproj.filters b/utils/compress/libcompress-ent.vcxproj.filters
deleted file mode 100644
index 1d57e955e..000000000
--- a/utils/compress/libcompress-ent.vcxproj.filters
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="idbcompress.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="snappy-sinksource.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="snappy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="version1.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="snappy-stubs-internal.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="idbcompress.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="snappy-config-win.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="snappy-internal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="snappy-sinksource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="snappy-stubs-internal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="snappy-stubs-public.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="snappy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="version1.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/configcpp/libconfigcpp.vcxproj b/utils/configcpp/libconfigcpp.vcxproj
deleted file mode 100644
index 4f7510e5f..000000000
--- a/utils/configcpp/libconfigcpp.vcxproj
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C543C9A1-B4E0-4BAD-9FC2-2AFEEA952FC5}</ProjectGuid>
-    <RootNamespace>libconfigcpp</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <PreprocessorDefinitions>LIBCONFIG_DLLEXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libxml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\startup;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <PreprocessorDefinitions>LIBCONFIG_DLLEXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>libxml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <PreprocessorDefinitions>LIBCONFIG_DLLEXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libxml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <PreprocessorDefinitions>LIBCONFIG_DLLEXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>libxml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Config API" $(SolutionDir)..\..x64\Release\libconfigcpp.dll</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <PreprocessorDefinitions>LIBCONFIG_DLLEXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libxml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\startup;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PreprocessorDefinitions>LIBCONFIG_DLLEXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalDependencies>libxml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <TargetMachine>MachineX64</TargetMachine>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Config API" $(SolutionDir)..\..\x64\EnterpriseRelease\libconfigcpp.dll</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="configcpp.cpp" />
-    <ClCompile Include="configstream.cpp" />
-    <ClCompile Include="writeonce.cpp" />
-    <ClCompile Include="xmlparser.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="config.h" />
-    <ClInclude Include="configcpp.h" />
-    <ClInclude Include="configstream.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="..\..\columnstoreversion.h" />
-    <ClInclude Include="writeonce.h" />
-    <ClInclude Include="xmlparser.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="libconfigcpp.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/utils/configcpp/libconfigcpp.vcxproj.filters b/utils/configcpp/libconfigcpp.vcxproj.filters
deleted file mode 100644
index 706be8841..000000000
--- a/utils/configcpp/libconfigcpp.vcxproj.filters
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="configcpp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="configstream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="writeonce.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="xmlparser.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="configcpp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="configstream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\columnstoreversion.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="writeonce.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="xmlparser.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="libconfigcpp.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
diff --git a/utils/dataconvert/libdataconvert.vcxproj b/utils/dataconvert/libdataconvert.vcxproj
deleted file mode 100644
index de38d3f00..000000000
--- a/utils/dataconvert/libdataconvert.vcxproj
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{AB342A0E-604E-4BBC-B43E-08DF3FA37F9B}</ProjectGuid>
-    <RootNamespace>libdataconvert</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="dataconvert.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="dataconvert.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/dataconvert/libdataconvert.vcxproj.filters b/utils/dataconvert/libdataconvert.vcxproj.filters
deleted file mode 100644
index 228742d56..000000000
--- a/utils/dataconvert/libdataconvert.vcxproj.filters
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="dataconvert.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="dataconvert.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/ddlcleanup/libddlcleanup.vcxproj b/utils/ddlcleanup/libddlcleanup.vcxproj
deleted file mode 100644
index e9bc0f4cd..000000000
--- a/utils/ddlcleanup/libddlcleanup.vcxproj
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E95FECB8-1B06-41FF-8E1D-40B7E6841765}</ProjectGuid>
-    <RootNamespace>libddlcleanup</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions> _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions> _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions> _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions> _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="ddlcleanuputil.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ddlcleanuputil.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/ddlcleanup/libddlcleanup.vcxproj.filters b/utils/ddlcleanup/libddlcleanup.vcxproj.filters
deleted file mode 100644
index 51565ab47..000000000
--- a/utils/ddlcleanup/libddlcleanup.vcxproj.filters
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ddlcleanuputil.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ddlcleanuputil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/funcexp/libfuncexp.vcxproj b/utils/funcexp/libfuncexp.vcxproj
deleted file mode 100644
index c74577006..000000000
--- a/utils/funcexp/libfuncexp.vcxproj
+++ /dev/null
@@ -1,332 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9AE60D66-99F6-4CCB-902D-3814A12AE0A9}</ProjectGuid>
-    <RootNamespace>libfuncexp</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\udfsdk;$(SolutionDir)..\utils\common;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\udfsdk;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS; SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\udfsdk;$(SolutionDir)..\utils\common;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_UDF;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\udfsdk;$(SolutionDir)..\utils\common;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_UDF;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\udfsdk;$(SolutionDir)..\utils\common;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\udfsdk;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS; SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="func_abs.cpp" />
-    <ClCompile Include="func_add_time.cpp" />
-    <ClCompile Include="func_ascii.cpp" />
-    <ClCompile Include="func_between.cpp" />
-    <ClCompile Include="func_bitwise.cpp" />
-    <ClCompile Include="func_case.cpp" />
-    <ClCompile Include="func_cast.cpp" />
-    <ClCompile Include="func_ceil.cpp" />
-    <ClCompile Include="func_char.cpp" />
-    <ClCompile Include="func_char_length.cpp" />
-    <ClCompile Include="func_coalesce.cpp" />
-    <ClCompile Include="func_concat.cpp" />
-    <ClCompile Include="func_concat_ws.cpp" />
-    <ClCompile Include="func_conv.cpp" />
-    <ClCompile Include="func_crc32.cpp" />
-    <ClCompile Include="func_date.cpp" />
-    <ClCompile Include="func_date_add.cpp" />
-    <ClCompile Include="func_date_format.cpp" />
-    <ClCompile Include="func_day.cpp" />
-    <ClCompile Include="func_dayname.cpp" />
-    <ClCompile Include="func_dayofweek.cpp" />
-    <ClCompile Include="func_dayofyear.cpp" />
-    <ClCompile Include="func_div.cpp" />
-    <ClCompile Include="func_elt.cpp" />
-    <ClCompile Include="func_exp.cpp" />
-    <ClCompile Include="func_extract.cpp" />
-    <ClCompile Include="func_find_in_set.cpp" />
-    <ClCompile Include="func_floor.cpp" />
-    <ClCompile Include="func_from_days.cpp" />
-    <ClCompile Include="func_from_unixtime.cpp" />
-    <ClCompile Include="func_get_format.cpp" />
-    <ClCompile Include="func_greatest.cpp" />
-    <ClCompile Include="func_hex.cpp" />
-    <ClCompile Include="func_hour.cpp" />
-    <ClCompile Include="func_idbpartition.cpp" />
-    <ClCompile Include="func_if.cpp" />
-    <ClCompile Include="func_ifnull.cpp" />
-    <ClCompile Include="func_in.cpp" />
-    <ClCompile Include="func_inet_aton.cpp" />
-    <ClCompile Include="func_inet_ntoa.cpp" />
-    <ClCompile Include="func_insert.cpp" />
-    <ClCompile Include="func_instr.cpp" />
-    <ClCompile Include="func_isnull.cpp" />
-    <ClCompile Include="func_last_day.cpp" />
-    <ClCompile Include="func_lcase.cpp" />
-    <ClCompile Include="func_least.cpp" />
-    <ClCompile Include="func_left.cpp" />
-    <ClCompile Include="func_length.cpp" />
-    <ClCompile Include="func_lpad.cpp" />
-    <ClCompile Include="func_ltrim.cpp" />
-    <ClCompile Include="func_makedate.cpp" />
-    <ClCompile Include="func_maketime.cpp" />
-    <ClCompile Include="func_math.cpp" />
-    <ClCompile Include="func_md5.cpp" />
-    <ClCompile Include="func_microsecond.cpp" />
-    <ClCompile Include="func_minute.cpp" />
-    <ClCompile Include="func_mod.cpp" />
-    <ClCompile Include="func_month.cpp" />
-    <ClCompile Include="func_monthname.cpp" />
-    <ClCompile Include="func_nullif.cpp" />
-    <ClCompile Include="func_period_add.cpp" />
-    <ClCompile Include="func_period_diff.cpp" />
-    <ClCompile Include="func_pow.cpp" />
-    <ClCompile Include="func_quarter.cpp" />
-    <ClCompile Include="func_rand.cpp" />
-    <ClCompile Include="func_regexp.cpp" />
-    <ClCompile Include="func_repeat.cpp" />
-    <ClCompile Include="func_replace.cpp" />
-    <ClCompile Include="func_reverse.cpp" />
-    <ClCompile Include="func_right.cpp" />
-    <ClCompile Include="func_round.cpp" />
-    <ClCompile Include="func_rpad.cpp" />
-    <ClCompile Include="func_rtrim.cpp" />
-    <ClCompile Include="func_sec_to_time.cpp" />
-    <ClCompile Include="func_second.cpp" />
-    <ClCompile Include="func_sha.cpp" />
-    <ClCompile Include="func_sign.cpp" />
-    <ClCompile Include="func_str_to_date.cpp" />
-    <ClCompile Include="func_strcmp.cpp" />
-    <ClCompile Include="func_substr.cpp" />
-    <ClCompile Include="func_substring_index.cpp" />
-    <ClCompile Include="func_sysdate.cpp" />
-    <ClCompile Include="func_time.cpp" />
-    <ClCompile Include="func_time_format.cpp" />
-    <ClCompile Include="func_time_to_sec.cpp" />
-    <ClCompile Include="func_timediff.cpp" />
-    <ClCompile Include="func_timestampdiff.cpp" />
-    <ClCompile Include="func_to_days.cpp" />
-    <ClCompile Include="func_trim.cpp" />
-    <ClCompile Include="func_truncate.cpp" />
-    <ClCompile Include="func_ucase.cpp" />
-    <ClCompile Include="func_unhex.cpp" />
-    <ClCompile Include="func_unix_timestamp.cpp" />
-    <ClCompile Include="func_week.cpp" />
-    <ClCompile Include="func_weekday.cpp" />
-    <ClCompile Include="func_year.cpp" />
-    <ClCompile Include="func_yearweek.cpp" />
-    <ClCompile Include="funcexp.cpp" />
-    <ClCompile Include="funcexpwrapper.cpp" />
-    <ClCompile Include="functor.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="utf8\checked.h" />
-    <ClInclude Include="utf8\core.h" />
-    <ClInclude Include="funcexp.h" />
-    <ClInclude Include="funcexpwrapper.h" />
-    <ClInclude Include="funchelpers.h" />
-    <ClInclude Include="functor.h" />
-    <ClInclude Include="functor_all.h" />
-    <ClInclude Include="functor_bool.h" />
-    <ClInclude Include="functor_dtm.h" />
-    <ClInclude Include="functor_export.h" />
-    <ClInclude Include="functor_int.h" />
-    <ClInclude Include="functor_real.h" />
-    <ClInclude Include="functor_str.h" />
-    <ClInclude Include="sha.h" />
-    <ClInclude Include="utf8\unchecked.h" />
-    <ClInclude Include="utf8.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/funcexp/libfuncexp.vcxproj.filters b/utils/funcexp/libfuncexp.vcxproj.filters
deleted file mode 100644
index 695ff897d..000000000
--- a/utils/funcexp/libfuncexp.vcxproj.filters
+++ /dev/null
@@ -1,369 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="func_abs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_add_time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_ascii.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_between.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_bitwise.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_case.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_cast.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_ceil.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_char.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_char_length.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_coalesce.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_concat.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_concat_ws.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_conv.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_crc32.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_date.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_date_add.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_date_format.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_day.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_dayname.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_dayofweek.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_dayofyear.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_div.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_elt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_exp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_extract.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_find_in_set.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_floor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_from_days.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_from_unixtime.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_get_format.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_greatest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_hex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_hour.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_if.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_ifnull.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_in.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_inet_aton.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_inet_ntoa.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_insert.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_instr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_isnull.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_last_day.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_lcase.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_least.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_left.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_length.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_lpad.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_ltrim.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_makedate.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_maketime.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_math.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_md5.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_microsecond.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_minute.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_mod.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_month.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_monthname.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_nullif.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_period_add.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_period_diff.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_pow.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_quarter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_rand.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_regexp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_repeat.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_replace.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_reverse.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_right.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_round.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_rpad.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_rtrim.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_sec_to_time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_second.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_sha.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_sign.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_str_to_date.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_strcmp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_substr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_substring_index.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_sysdate.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_time_format.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_time_to_sec.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_timediff.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_timestampdiff.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_to_days.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_trim.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_truncate.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_ucase.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_unhex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_unix_timestamp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_week.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_weekday.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_year.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_yearweek.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="funcexp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="funcexpwrapper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="functor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="func_idbpartition.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="utf8\checked.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="utf8\core.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="funcexp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="funcexpwrapper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="funchelpers.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="functor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="functor_all.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="functor_bool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="functor_dtm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="functor_export.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="functor_int.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="functor_real.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="functor_str.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="sha.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="utf8\unchecked.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="utf8.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/idbdatafile/idbdatafile.vcxproj b/utils/idbdatafile/idbdatafile.vcxproj
deleted file mode 100644
index dfebdaa6d..000000000
--- a/utils/idbdatafile/idbdatafile.vcxproj
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>libidbdatafile</ProjectName>
-    <ProjectGuid>{4C8231D7-7A87-4650-AA9C-D7650C1D03EE}</ProjectGuid>
-    <RootNamespace>libidbdatafile</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4996;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions> _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions> _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions> _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions> _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4996;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="BufferedFile.cpp" />
-    <ClCompile Include="IDBDataFile.cpp" />
-    <ClCompile Include="IDBFactory.cpp" />
-    <ClCompile Include="IDBFileSystem.cpp" />
-    <ClCompile Include="IDBLogger.cpp" />
-    <ClCompile Include="IDBPolicy.cpp" />
-    <ClCompile Include="PosixFileSystem.cpp" />
-    <ClCompile Include="UnbufferedFile.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="BufferedFile.h" />
-    <ClInclude Include="BufferedFileFactory.h" />
-    <ClInclude Include="FileFactoryBase.h" />
-    <ClInclude Include="IDBDataFile.h" />
-    <ClInclude Include="IDBFactory.h" />
-    <ClInclude Include="IDBFileSystem.h" />
-    <ClInclude Include="IDBLogger.h" />
-    <ClInclude Include="IDBPolicy.h" />
-    <ClInclude Include="PosixFileSystem.h" />
-    <ClInclude Include="UnbufferedFile.h" />
-    <ClInclude Include="UnbufferedFileFactory.h" />
-    <ClInclude Include="utility.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/idbdatafile/idbdatafile.vcxproj.filters b/utils/idbdatafile/idbdatafile.vcxproj.filters
deleted file mode 100644
index 3c9145d66..000000000
--- a/utils/idbdatafile/idbdatafile.vcxproj.filters
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="BufferedFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="IDBDataFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="IDBFactory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="IDBFileSystem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="IDBLogger.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="IDBPolicy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PosixFileSystem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UnbufferedFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="BufferedFile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="BufferedFileFactory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileFactoryBase.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="IDBDataFile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="IDBFactory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="IDBFileSystem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="IDBLogger.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="IDBPolicy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PosixFileSystem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="UnbufferedFile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="UnbufferedFileFactory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="utility.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/joiner/libjoiner.vcxproj b/utils/joiner/libjoiner.vcxproj
deleted file mode 100644
index 23b559fdd..000000000
--- a/utils/joiner/libjoiner.vcxproj
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{FC0BA86E-2CC2-4CE8-AC62-16B662FE5B29}</ProjectGuid>
-    <RootNamespace>libjoiner</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\..\libiconv-1.14\libiconv\include</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\idbcompress.h</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\..\libiconv-1.14\libiconv\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="joiner.cpp" />
-    <ClCompile Include="joinpartition.cpp" />
-    <ClCompile Include="tuplejoiner.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="joiner.h" />
-    <ClInclude Include="joinpartition.h" />
-    <ClInclude Include="tuplejoiner.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/joiner/libjoiner.vcxproj.filters b/utils/joiner/libjoiner.vcxproj.filters
deleted file mode 100644
index 004feea36..000000000
--- a/utils/joiner/libjoiner.vcxproj.filters
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="joiner.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="tuplejoiner.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="joinpartition.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="joiner.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="tuplejoiner.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="joinpartition.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/loggingcpp/libloggingcpp.vcxproj b/utils/loggingcpp/libloggingcpp.vcxproj
deleted file mode 100644
index 64ac83b8c..000000000
--- a/utils/loggingcpp/libloggingcpp.vcxproj
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{07230DF5-10E9-469E-8075-C0978C0460AD}</ProjectGuid>
-    <RootNamespace>libloggingcpp</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\startup;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\startup;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\startup;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="errorcodes.cpp" />
-    <ClCompile Include="idberrorinfo.cpp" />
-    <ClCompile Include="logger.cpp" />
-    <ClCompile Include="message.cpp" />
-    <ClCompile Include="messagelog.cpp" />
-    <ClCompile Include="sqllogger.cpp" />
-    <ClCompile Include="stopwatch.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="errorcodes.h" />
-    <ClInclude Include="errorids.h" />
-    <ClInclude Include="exceptclasses.h" />
-    <ClInclude Include="idberrorinfo.h" />
-    <ClInclude Include="logger.h" />
-    <ClInclude Include="loggingid.h" />
-    <ClInclude Include="messageids.h" />
-    <ClInclude Include="messagelog.h" />
-    <ClInclude Include="messageobj.h" />
-    <ClInclude Include="sqllogger.h" />
-    <ClInclude Include="stopwatch.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/loggingcpp/libloggingcpp.vcxproj.filters b/utils/loggingcpp/libloggingcpp.vcxproj.filters
deleted file mode 100644
index 93cc32811..000000000
--- a/utils/loggingcpp/libloggingcpp.vcxproj.filters
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="errorcodes.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="idberrorinfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="logger.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="message.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="messagelog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sqllogger.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="stopwatch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="errorcodes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="errorids.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="exceptclasses.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="idberrorinfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="logger.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="loggingid.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="messageids.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="messagelog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="messageobj.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="sqllogger.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="stopwatch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/messageqcpp/libmessageqcpp.vcxproj b/utils/messageqcpp/libmessageqcpp.vcxproj
deleted file mode 100644
index 4f943705c..000000000
--- a/utils/messageqcpp/libmessageqcpp.vcxproj
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{226D1F60-1E33-401B-A333-D583AF69B86E}</ProjectGuid>
-    <RootNamespace>libmessageqcpp</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_IDB_COMPRESSION;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_IDB_COMPRESSION;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\compress;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="bytestream.cpp" />
-    <ClCompile Include="compressed_iss.cpp" />
-    <ClCompile Include="inetstreamsocket.cpp" />
-    <ClCompile Include="iosocket.cpp" />
-    <ClCompile Include="messagequeue.cpp" />
-    <ClCompile Include="socketparms.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="bytestream.h" />
-    <ClInclude Include="compressed_iss.h" />
-    <ClInclude Include="inetstreamsocket.h" />
-    <ClInclude Include="iosocket.h" />
-    <ClInclude Include="messagequeue.h" />
-    <ClInclude Include="serializeable.h" />
-    <ClInclude Include="serversocket.h" />
-    <ClInclude Include="socket.h" />
-    <ClInclude Include="socketclosed.h" />
-    <ClInclude Include="socketparms.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/messageqcpp/libmessageqcpp.vcxproj.filters b/utils/messageqcpp/libmessageqcpp.vcxproj.filters
deleted file mode 100644
index 3d50ef073..000000000
--- a/utils/messageqcpp/libmessageqcpp.vcxproj.filters
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="bytestream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="compressed_iss.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="inetstreamsocket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="iosocket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="messagequeue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="socketparms.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="bytestream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="compressed_iss.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="inetstreamsocket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="iosocket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="messagequeue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="serializeable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="serversocket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="socket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="socketclosed.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="socketparms.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/multicast/libmulticast.vcxproj b/utils/multicast/libmulticast.vcxproj
deleted file mode 100644
index dcc832df4..000000000
--- a/utils/multicast/libmulticast.vcxproj
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5418FA03-807C-4CCE-AA7F-DBCCD96AC5D9}</ProjectGuid>
-    <RootNamespace>libmulticast</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="multicast.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="multicast.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/multicast/libmulticast.vcxproj.filters b/utils/multicast/libmulticast.vcxproj.filters
deleted file mode 100644
index d23ea5b98..000000000
--- a/utils/multicast/libmulticast.vcxproj.filters
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="multicast.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="multicast.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/querystats/libquerystats.vcxproj b/utils/querystats/libquerystats.vcxproj
deleted file mode 100644
index 51bf0d3e1..000000000
--- a/utils/querystats/libquerystats.vcxproj
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{3238CD73-8FFD-44A7-AA5F-815BEEF8F402}</ProjectGuid>
-    <RootNamespace>libquerystats</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244; 4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244; 4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244; 4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\mysqlcl_idb;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244; 4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="querystats.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="querystats.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/querystats/libquerystats.vcxproj.filters b/utils/querystats/libquerystats.vcxproj.filters
deleted file mode 100644
index 473e8bb70..000000000
--- a/utils/querystats/libquerystats.vcxproj.filters
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="querystats.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="querystats.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/querytele/libquerytele.vcxproj b/utils/querytele/libquerytele.vcxproj
deleted file mode 100644
index e7f75adf4..000000000
--- a/utils/querytele/libquerytele.vcxproj
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{599E3C29-63BA-4F25-AEAE-BF413AD93312}</ProjectGuid>
-    <RootNamespace>libquerytele</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\thrift;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\thrift;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\thrift;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\thrift;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\thrift;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\thrift;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\thrift\libthrift.vcxproj">
-      <Project>{e9a8354a-5317-479f-8a7b-c4596666d0be}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="querytele.h" />
-    <ClInclude Include="queryteleclient.h" />
-    <ClInclude Include="queryteleprotoimpl.h" />
-    <ClInclude Include="queryteleserverparms.h" />
-    <ClInclude Include="QueryTeleService.h" />
-    <ClInclude Include="querytele_constants.h" />
-    <ClInclude Include="querytele_types.h" />
-    <ClInclude Include="telestats.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="querytele.cpp" />
-    <ClCompile Include="queryteleclient.cpp" />
-    <ClCompile Include="queryteleprotoimpl.cpp" />
-    <ClCompile Include="QueryTeleService.cpp" />
-    <ClCompile Include="querytele_constants.cpp" />
-    <ClCompile Include="querytele_types.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/querytele/libquerytele.vcxproj.filters b/utils/querytele/libquerytele.vcxproj.filters
deleted file mode 100644
index 744ae2d29..000000000
--- a/utils/querytele/libquerytele.vcxproj.filters
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="querytele.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="querytele_constants.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="querytele_types.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="queryteleclient.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="queryteleprotoimpl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="QueryTeleService.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="querytele.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="querytele_constants.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="querytele_types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="queryteleclient.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="queryteleprotoimpl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="queryteleserverparms.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="QueryTeleService.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="telestats.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{6c661aba-d9d9-4af3-b5f9-5459b5f5745d}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{f1ed41f2-249c-4c38-b58c-5ce31a066e68}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{3a5a1c5b-b4a4-485b-ae71-57a11f10a759}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/rowgroup/librowgroup.vcxproj b/utils/rowgroup/librowgroup.vcxproj
deleted file mode 100644
index 24541749b..000000000
--- a/utils/rowgroup/librowgroup.vcxproj
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{054CFC82-A54E-4EA5-8CE7-1281D2ED9ECE}</ProjectGuid>
-    <RootNamespace>librowgroup</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\common;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\common;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\common;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\common;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\common;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\common;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\windowfunction;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="rowaggregation.cpp" />
-    <ClCompile Include="rowgroup.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="rowaggregation.h" />
-    <ClInclude Include="rowgroup.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/rowgroup/librowgroup.vcxproj.filters b/utils/rowgroup/librowgroup.vcxproj.filters
deleted file mode 100644
index 593fe90a6..000000000
--- a/utils/rowgroup/librowgroup.vcxproj.filters
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="rowaggregation.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="rowgroup.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="rowaggregation.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="rowgroup.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/rwlock/librwlock.vcxproj b/utils/rwlock/librwlock.vcxproj
deleted file mode 100644
index d57d98117..000000000
--- a/utils/rwlock/librwlock.vcxproj
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5362725E-BB90-44A3-9D13-3DE9B5041AD2}</ProjectGuid>
-    <RootNamespace>librwlock</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-    <LibraryPath>$(SolutionDir)..\..\boost_1_54_0;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="rwlock.cpp" />
-    <ClCompile Include="rwlock_local.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="rwlock.h" />
-    <ClInclude Include="rwlock_local.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/rwlock/librwlock.vcxproj.filters b/utils/rwlock/librwlock.vcxproj.filters
deleted file mode 100644
index dc491b677..000000000
--- a/utils/rwlock/librwlock.vcxproj.filters
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="rwlock.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="rwlock_local.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="rwlock.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="rwlock_local.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/startup/libidbboot.vcxproj b/utils/startup/libidbboot.vcxproj
deleted file mode 100644
index 245ed638b..000000000
--- a/utils/startup/libidbboot.vcxproj
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B62B74B4-4621-4CF2-AC06-FB84D9CCA66F}</ProjectGuid>
-    <RootNamespace>libidbboot</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Lib>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="installdir.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="installdir.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/startup/libidbboot.vcxproj.filters b/utils/startup/libidbboot.vcxproj.filters
deleted file mode 100644
index 7f3e0c94b..000000000
--- a/utils/startup/libidbboot.vcxproj.filters
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="installdir.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="installdir.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/threadpool/libthreadpool.vcxproj b/utils/threadpool/libthreadpool.vcxproj
deleted file mode 100644
index 1a846afd9..000000000
--- a/utils/threadpool/libthreadpool.vcxproj
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2BE469D2-D854-4480-BFE0-34DE89C557B2}</ProjectGuid>
-    <RootNamespace>libthreadpool</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="prioritythreadpool.cpp" />
-    <ClCompile Include="threadpool.cpp" />
-    <ClCompile Include="weightedthreadpool.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="prioritythreadpool.h" />
-    <ClInclude Include="threadpool.h" />
-    <ClInclude Include="weightedthreadpool.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/threadpool/libthreadpool.vcxproj.filters b/utils/threadpool/libthreadpool.vcxproj.filters
deleted file mode 100644
index 968d4262f..000000000
--- a/utils/threadpool/libthreadpool.vcxproj.filters
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="prioritythreadpool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="threadpool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="weightedthreadpool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="prioritythreadpool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="threadpool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="weightedthreadpool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/thrift/libthrift.vcxproj b/utils/thrift/libthrift.vcxproj
deleted file mode 100644
index 0bc83f993..000000000
--- a/utils/thrift/libthrift.vcxproj
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E9A8354A-5317-479F-8A7B-C4596666D0BE}</ProjectGuid>
-    <RootNamespace>libthrift</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\thrift;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\thrift;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>C:\InfiniDB\boost_1_54_0;C:\InfiniDB\genii\utils\thrift;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\thrift;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\thrift;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\thrift;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="thrift\async\TAsyncBufferProcessor.h" />
-    <ClInclude Include="thrift\async\TAsyncChannel.h" />
-    <ClInclude Include="thrift\async\TAsyncDispatchProcessor.h" />
-    <ClInclude Include="thrift\async\TAsyncProcessor.h" />
-    <ClInclude Include="thrift\async\TAsyncProtocolProcessor.h" />
-    <ClInclude Include="thrift\async\TEvhttpClientChannel.h" />
-    <ClInclude Include="thrift\async\TEvhttpServer.h" />
-    <ClInclude Include="thrift\concurrency\BoostThreadFactory.h" />
-    <ClInclude Include="thrift\concurrency\Exception.h" />
-    <ClInclude Include="thrift\concurrency\FunctionRunner.h" />
-    <ClInclude Include="thrift\concurrency\Monitor.h" />
-    <ClInclude Include="thrift\concurrency\Mutex.h" />
-    <ClInclude Include="thrift\concurrency\PlatformThreadFactory.h" />
-    <ClInclude Include="thrift\concurrency\PosixThreadFactory.h" />
-    <ClInclude Include="thrift\concurrency\StdThreadFactory.h" />
-    <ClInclude Include="thrift\concurrency\Thread.h" />
-    <ClInclude Include="thrift\concurrency\ThreadManager.h" />
-    <ClInclude Include="thrift\concurrency\TimerManager.h" />
-    <ClInclude Include="thrift\concurrency\Util.h" />
-    <ClInclude Include="thrift\cxxfunctional.h" />
-    <ClInclude Include="thrift\processor\PeekProcessor.h" />
-    <ClInclude Include="thrift\processor\StatsProcessor.h" />
-    <ClInclude Include="thrift\processor\TMultiplexedProcessor.h" />
-    <ClInclude Include="thrift\protocol\TBase64Utils.h" />
-    <ClInclude Include="thrift\protocol\TBinaryProtocol.h" />
-    <ClInclude Include="thrift\protocol\TCompactProtocol.h" />
-    <ClInclude Include="thrift\protocol\TDebugProtocol.h" />
-    <ClInclude Include="thrift\protocol\TDenseProtocol.h" />
-    <ClInclude Include="thrift\protocol\TJSONProtocol.h" />
-    <ClInclude Include="thrift\protocol\TMultiplexedProtocol.h" />
-    <ClInclude Include="thrift\protocol\TProtocol.h" />
-    <ClInclude Include="thrift\protocol\TProtocolDecorator.h" />
-    <ClInclude Include="thrift\protocol\TProtocolException.h" />
-    <ClInclude Include="thrift\protocol\TProtocolTap.h" />
-    <ClInclude Include="thrift\protocol\TVirtualProtocol.h" />
-    <ClInclude Include="thrift\qt\TQIODeviceTransport.h" />
-    <ClInclude Include="thrift\qt\TQTcpServer.h" />
-    <ClInclude Include="thrift\server\TNonblockingServer.h" />
-    <ClInclude Include="thrift\server\TServer.h" />
-    <ClInclude Include="thrift\server\TSimpleServer.h" />
-    <ClInclude Include="thrift\server\TThreadedServer.h" />
-    <ClInclude Include="thrift\server\TThreadPoolServer.h" />
-    <ClInclude Include="thrift\TApplicationException.h" />
-    <ClInclude Include="thrift\TDispatchProcessor.h" />
-    <ClInclude Include="thrift\thrift-config.h" />
-    <ClInclude Include="thrift\Thrift.h" />
-    <ClInclude Include="thrift\TLogging.h" />
-    <ClInclude Include="thrift\TProcessor.h" />
-    <ClInclude Include="thrift\transport\PlatformSocket.h" />
-    <ClInclude Include="thrift\transport\TBufferTransports.h" />
-    <ClInclude Include="thrift\transport\TFDTransport.h" />
-    <ClInclude Include="thrift\transport\TFileTransport.h" />
-    <ClInclude Include="thrift\transport\THttpClient.h" />
-    <ClInclude Include="thrift\transport\THttpServer.h" />
-    <ClInclude Include="thrift\transport\THttpTransport.h" />
-    <ClInclude Include="thrift\transport\TPipe.h" />
-    <ClInclude Include="thrift\transport\TPipeServer.h" />
-    <ClInclude Include="thrift\transport\TServerSocket.h" />
-    <ClInclude Include="thrift\transport\TServerTransport.h" />
-    <ClInclude Include="thrift\transport\TShortReadTransport.h" />
-    <ClInclude Include="thrift\transport\TSimpleFileTransport.h" />
-    <ClInclude Include="thrift\transport\TSocket.h" />
-    <ClInclude Include="thrift\transport\TSocketPool.h" />
-    <ClInclude Include="thrift\transport\TSSLServerSocket.h" />
-    <ClInclude Include="thrift\transport\TSSLSocket.h" />
-    <ClInclude Include="thrift\transport\TTransport.h" />
-    <ClInclude Include="thrift\transport\TTransportException.h" />
-    <ClInclude Include="thrift\transport\TTransportUtils.h" />
-    <ClInclude Include="thrift\transport\TVirtualTransport.h" />
-    <ClInclude Include="thrift\transport\TZlibTransport.h" />
-    <ClInclude Include="thrift\TReflectionLocal.h" />
-    <ClInclude Include="thrift\windows\config.h" />
-    <ClInclude Include="thrift\windows\force_inc.h" />
-    <ClInclude Include="thrift\windows\GetTimeOfDay.h" />
-    <ClInclude Include="thrift\windows\Operators.h" />
-    <ClInclude Include="thrift\windows\SocketPair.h" />
-    <ClInclude Include="thrift\windows\StdAfx.h" />
-    <ClInclude Include="thrift\windows\TargetVersion.h" />
-    <ClInclude Include="thrift\windows\TWinsockSingleton.h" />
-    <ClInclude Include="thrift\windows\WinFcntl.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="thrift\server\TSimpleServer.cpp" />
-    <ClCompile Include="thrift\TApplicationException.cpp" />
-    <ClCompile Include="thrift\Thrift.cpp" />
-    <ClCompile Include="thrift\transport\TBufferTransports.cpp" />
-    <ClCompile Include="thrift\transport\TServerSocket.cpp" />
-    <ClCompile Include="thrift\transport\TSocket.cpp" />
-    <ClCompile Include="thrift\windows\GetTimeOfDay.cpp" />
-    <ClCompile Include="thrift\windows\TWinsockSingleton.cpp" />
-    <ClCompile Include="thrift\windows\WinFcntl.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="thrift\protocol\TBinaryProtocol.tcc" />
-    <None Include="thrift\protocol\TCompactProtocol.tcc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/thrift/libthrift.vcxproj.filters b/utils/thrift/libthrift.vcxproj.filters
deleted file mode 100644
index cda302d8e..000000000
--- a/utils/thrift/libthrift.vcxproj.filters
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="thrift\cxxfunctional.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\TApplicationException.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\TDispatchProcessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\Thrift.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\thrift-config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\TLogging.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\TProcessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\TReflectionLocal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\async\TAsyncBufferProcessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\async\TAsyncChannel.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\async\TAsyncDispatchProcessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\async\TAsyncProcessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\async\TAsyncProtocolProcessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\async\TEvhttpClientChannel.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\async\TEvhttpServer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\concurrency\BoostThreadFactory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\concurrency\Exception.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\concurrency\FunctionRunner.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\concurrency\Monitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\concurrency\Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\concurrency\PlatformThreadFactory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\concurrency\PosixThreadFactory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\concurrency\StdThreadFactory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\concurrency\Thread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\concurrency\ThreadManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\concurrency\TimerManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\concurrency\Util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\processor\PeekProcessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\processor\StatsProcessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\processor\TMultiplexedProcessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\protocol\TBase64Utils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\protocol\TBinaryProtocol.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\protocol\TCompactProtocol.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\protocol\TDebugProtocol.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\protocol\TDenseProtocol.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\protocol\TJSONProtocol.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\protocol\TMultiplexedProtocol.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\protocol\TProtocol.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\protocol\TProtocolDecorator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\protocol\TProtocolException.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\protocol\TProtocolTap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\protocol\TVirtualProtocol.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\qt\TQIODeviceTransport.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\qt\TQTcpServer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\server\TNonblockingServer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\server\TServer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\server\TSimpleServer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\server\TThreadedServer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\server\TThreadPoolServer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\PlatformSocket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\TBufferTransports.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\TFDTransport.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\TFileTransport.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\THttpClient.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\THttpServer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\THttpTransport.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\TPipe.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\TPipeServer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\TServerSocket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\TServerTransport.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\TShortReadTransport.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\TSimpleFileTransport.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\TSocket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\TSocketPool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\TSSLServerSocket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\TSSLSocket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\TTransport.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\TTransportException.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\TTransportUtils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\TVirtualTransport.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\transport\TZlibTransport.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\windows\force_inc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\windows\GetTimeOfDay.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\windows\Operators.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\windows\SocketPair.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\windows\StdAfx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\windows\TargetVersion.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\windows\TWinsockSingleton.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\windows\WinFcntl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="thrift\windows\config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="thrift\TApplicationException.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="thrift\Thrift.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="thrift\server\TSimpleServer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="thrift\transport\TBufferTransports.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="thrift\transport\TServerSocket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="thrift\transport\TSocket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="thrift\windows\TWinsockSingleton.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="thrift\windows\WinFcntl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="thrift\windows\GetTimeOfDay.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="thrift\protocol\TBinaryProtocol.tcc" />
-    <None Include="thrift\protocol\TCompactProtocol.tcc" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/udfsdk/libudf_mysql.vcxproj b/utils/udfsdk/libudf_mysql.vcxproj
deleted file mode 100644
index 6cada9333..000000000
--- a/utils/udfsdk/libudf_mysql.vcxproj
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{51ACB58A-6581-482E-BEBE-B85D0BB5A1ED}</ProjectGuid>
-    <RootNamespace>libudf_mysql</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command />
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)libudf_mysql.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <PreBuildEvent>
-      <Command />
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)libudf_mysql.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB UDF MYSQL" $(SolutionDir)..\..\x64\EnterpriseRelease\libudf_mysql.dll</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="udfmysql.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="libudf_mysql.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/udfsdk/libudf_mysql.vcxproj.filters b/utils/udfsdk/libudf_mysql.vcxproj.filters
deleted file mode 100644
index e02ca2a70..000000000
--- a/utils/udfsdk/libudf_mysql.vcxproj.filters
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="udfmysql.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="libudf_mysql.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/udfsdk/libudfsdk.vcxproj b/utils/udfsdk/libudfsdk.vcxproj
deleted file mode 100644
index 6cc6f9de5..000000000
--- a/utils/udfsdk/libudfsdk.vcxproj
+++ /dev/null
@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{021A7045-6334-478F-9A4C-79F8200B504A}</ProjectGuid>
-    <RootNamespace>libudfsdkent</RootNamespace>
-    <ProjectName>libudfsdk</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <PreprocessorDefinitions>UDFSDK_DLLEXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <PreprocessorDefinitions>UDFSDK_DLLEXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)libudfsdk.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <PreprocessorDefinitions>UDFSDK_DLLEXPORT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4244;4800;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <PreprocessorDefinitions>UDFSDK_DLLEXPORT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4244;4800;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>UDFSDK_DLLEXPORT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4800;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\mysql;$(SolutionDir)../../mysql\include;$(SolutionDir)../../mysql\sql;$(SolutionDir)../../mysql\extra\yassl\include;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>UDFSDK_DLLEXPORT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4800;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)libudfsdk.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB UDF SDK" $(SolutionDir)..\..\x64\EnterpriseRelease\libudfsdk.dll</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="udfinfinidb.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="udfsdk.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="libudfsdk.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/udfsdk/libudfsdk.vcxproj.filters b/utils/udfsdk/libudfsdk.vcxproj.filters
deleted file mode 100644
index 22239115d..000000000
--- a/utils/udfsdk/libudfsdk.vcxproj.filters
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="udfinfinidb.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="udfsdk.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="libudfsdk.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/windowfunction/libwindowfunction.vcxproj b/utils/windowfunction/libwindowfunction.vcxproj
deleted file mode 100644
index 0d6112dc1..000000000
--- a/utils/windowfunction/libwindowfunction.vcxproj
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{0DD34627-B046-4415-80CF-D0FBA4E069CB}</ProjectGuid>
-    <RootNamespace>libwindowfunction</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="framebound.cpp" />
-    <ClCompile Include="frameboundrange.cpp" />
-    <ClCompile Include="frameboundrow.cpp" />
-    <ClCompile Include="idborderby.cpp" />
-    <ClCompile Include="wf_count.cpp" />
-    <ClCompile Include="wf_lead_lag.cpp" />
-    <ClCompile Include="wf_min_max.cpp" />
-    <ClCompile Include="wf_nth_value.cpp" />
-    <ClCompile Include="wf_ntile.cpp" />
-    <ClCompile Include="wf_percentile.cpp" />
-    <ClCompile Include="wf_ranking.cpp" />
-    <ClCompile Include="wf_row_number.cpp" />
-    <ClCompile Include="wf_stats.cpp" />
-    <ClCompile Include="wf_sum_avg.cpp" />
-    <ClCompile Include="windowframe.cpp" />
-    <ClCompile Include="windowfunction.cpp" />
-    <ClCompile Include="windowfunctiontype.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="framebound.h" />
-    <ClInclude Include="frameboundrange.h" />
-    <ClInclude Include="frameboundrow.h" />
-    <ClInclude Include="idborderby.h" />
-    <ClInclude Include="wf_avg.h" />
-    <ClInclude Include="wf_count.h" />
-    <ClInclude Include="wf_leadlag.h" />
-    <ClInclude Include="wf_max.h" />
-    <ClInclude Include="wf_min.h" />
-    <ClInclude Include="wf_nth_value.h" />
-    <ClInclude Include="wf_ntile.h" />
-    <ClInclude Include="wf_percentile.h" />
-    <ClInclude Include="wf_ranking.h" />
-    <ClInclude Include="wf_row_number.h" />
-    <ClInclude Include="wf_stats.h" />
-    <ClInclude Include="wf_sum.h" />
-    <ClInclude Include="windowframe.h" />
-    <ClInclude Include="windowfunction.h" />
-    <ClInclude Include="windowfunctiontype.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/utils/windowfunction/libwindowfunction.vcxproj.filters b/utils/windowfunction/libwindowfunction.vcxproj.filters
deleted file mode 100644
index a2032f556..000000000
--- a/utils/windowfunction/libwindowfunction.vcxproj.filters
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="framebound.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="frameboundrange.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="frameboundrow.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="idborderby.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="wf_count.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="wf_lead_lag.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="wf_min_max.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="wf_nth_value.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="wf_ntile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="wf_percentile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="wf_ranking.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="wf_row_number.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="wf_stats.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="wf_sum_avg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="windowframe.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="windowfunction.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="windowfunctiontype.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="framebound.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="frameboundrange.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="frameboundrow.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="idborderby.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="wf_avg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="wf_count.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="wf_leadlag.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="wf_max.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="wf_min.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="wf_nth_value.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="wf_ntile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="wf_percentile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="wf_ranking.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="wf_row_number.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="wf_stats.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="wf_sum.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="windowframe.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="windowfunction.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="windowfunctiontype.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/winport/bootstrap.vcxproj b/utils/winport/bootstrap.vcxproj
deleted file mode 100644
index dbb7149b1..000000000
--- a/utils/winport/bootstrap.vcxproj
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{BCC9E913-1C3D-492B-B245-8F43B4F30C1C}</ProjectGuid>
-    <RootNamespace>bootstrap</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <ExecutablePath>$(ExecutablePath)</ExecutablePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_MYSQL_SETUP4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_MYSQL_SETUP4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\common;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="bootstrap.cpp" />
-    <ClCompile Include="fixup.cpp" />
-    <ClCompile Include="grepit.cpp" />
-    <ClCompile Include="sedit.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="fixup.h" />
-    <ClInclude Include="grepit.h" />
-    <ClInclude Include="sedit.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/winport/bootstrap.vcxproj.filters b/utils/winport/bootstrap.vcxproj.filters
deleted file mode 100644
index fdd972a2b..000000000
--- a/utils/winport/bootstrap.vcxproj.filters
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="bootstrap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="fixup.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="grepit.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sedit.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="fixup.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="grepit.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="sedit.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/winport/libwinport.vcxproj b/utils/winport/libwinport.vcxproj
deleted file mode 100644
index 4c03b0152..000000000
--- a/utils/winport/libwinport.vcxproj
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4F0851D3-B782-4F12-B748-73EFA2DA586B}</ProjectGuid>
-    <RootNamespace>libwinport</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <PostBuildEvent>
-      <Command>cd $(SolutionDir)
-$(SolutionDir)BuildCalpontVersion.bat</Command>
-      <Message>BuildCalpontVersion.bat</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="crc.c" />
-    <ClCompile Include="glob.c" />
-    <ClCompile Include="idb_getopt.cpp" />
-    <ClCompile Include="idbregistry.cpp" />
-    <ClCompile Include="poll.c" />
-    <ClCompile Include="strtoll.c" />
-    <ClCompile Include="sysinfo.cpp" />
-    <ClCompile Include="winport.cpp" />
-    <ClCompile Include="WinSyslog.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="glob.h" />
-    <ClInclude Include="idb_getopt.h" />
-    <ClInclude Include="idbregistry.h" />
-    <ClInclude Include="inttypes.h" />
-    <ClInclude Include="poll.h" />
-    <ClInclude Include="sysinfo.h" />
-    <ClInclude Include="syslog.h" />
-    <ClInclude Include="sys\time.h" />
-    <ClInclude Include="unistd.h" />
-    <ClInclude Include="WinSyslog.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/winport/libwinport.vcxproj.filters b/utils/winport/libwinport.vcxproj.filters
deleted file mode 100644
index 8489c9d65..000000000
--- a/utils/winport/libwinport.vcxproj.filters
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="crc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="glob.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="idb_getopt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="idbregistry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="poll.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="strtoll.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sysinfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="winport.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WinSyslog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="glob.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="idb_getopt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="idbregistry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="poll.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="sysinfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="syslog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="sys\time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="WinSyslog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="unistd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="inttypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/winport/winfinidb.vcxproj b/utils/winport/winfinidb.vcxproj
deleted file mode 100644
index 0b1d42010..000000000
--- a/utils/winport/winfinidb.vcxproj
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DCB5C215-2F35-4439-B94E-C818E0921385}</ProjectGuid>
-    <RootNamespace>winfinidb</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\x64\Debug;$(SolutionDir)..\..\boost_1_54_0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Windows Service Manager" $(SolutionDir)..\..x64\Release\winfinidb.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\x64\EnterpriseRelease;$(SolutionDir)..\..\boost_1_54_0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Windows Service Manager" $(SolutionDir)..\..\x64\EnterpriseRelease\winfinidb.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="winfinidb.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="winfinidb.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/utils/winport/winfinidb.vcxproj.filters b/utils/winport/winfinidb.vcxproj.filters
deleted file mode 100644
index 09f1effb2..000000000
--- a/utils/winport/winfinidb.vcxproj.filters
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="winfinidb.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="winfinidb.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/versioning/BRM/controllernode.vcxproj b/versioning/BRM/controllernode.vcxproj
deleted file mode 100644
index 421aab030..000000000
--- a/versioning/BRM/controllernode.vcxproj
+++ /dev/null
@@ -1,335 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A9298547-2C38-4116-9063-D09F72A85F43}</ProjectGuid>
-    <RootNamespace>controllernode</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB DBRM Controller Node" $(SolutionDir)..\..x64\Release\controllernode.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB DBRM Controller Node" $(SolutionDir)..\..\x64\EnterpriseRelease\controllernode.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="masterdbrmnode.cpp" />
-    <ClCompile Include="masternode.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="masterdbrmnode.h" />
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="controllernode.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/versioning/BRM/controllernode.vcxproj.filters b/versioning/BRM/controllernode.vcxproj.filters
deleted file mode 100644
index 7dc926818..000000000
--- a/versioning/BRM/controllernode.vcxproj.filters
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="masterdbrmnode.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="masternode.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="masterdbrmnode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="controllernode.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/versioning/BRM/dbrmctl.vcxproj b/versioning/BRM/dbrmctl.vcxproj
deleted file mode 100644
index 6f0b43a85..000000000
--- a/versioning/BRM/dbrmctl.vcxproj
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E4A08BD5-5F31-499B-A61D-68E4924D9F60}</ProjectGuid>
-    <RootNamespace>dbrmctl</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <ClCompile>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/NODEFAULTLIB:LIBCMT.lib %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <TargetMachine>MachineX64</TargetMachine>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="dbrmctl.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="brm.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/versioning/BRM/dbrmctl.vcxproj.filters b/versioning/BRM/dbrmctl.vcxproj.filters
deleted file mode 100644
index 9094864ac..000000000
--- a/versioning/BRM/dbrmctl.vcxproj.filters
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="dbrmctl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="brm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/versioning/BRM/libbrm.vcxproj b/versioning/BRM/libbrm.vcxproj
deleted file mode 100644
index 3fa3107a0..000000000
--- a/versioning/BRM/libbrm.vcxproj
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A13E870A-7A9E-4027-8E17-204398225361}</ProjectGuid>
-    <RootNamespace>libbrm</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\idbdatafile;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP; COMMUNITY_KEYRANGE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <PostBuildEvent>
-      <Command />
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP; COMMUNITY_KEYRANGE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <PostBuildEvent>
-      <Command />
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;COMMUNITY_KEYRANGE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <PostBuildEvent>
-      <Command />
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;COMMUNITY_KEYRANGE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <PostBuildEvent>
-      <Command />
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <PostBuildEvent>
-      <Command />
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\common;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <PostBuildEvent>
-      <Command />
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="autoincrementmanager.cpp" />
-    <ClCompile Include="blockresolutionmanager.cpp" />
-    <ClCompile Include="brmshmimpl.cpp" />
-    <ClCompile Include="brmtypes.cpp" />
-    <ClCompile Include="copylocks.cpp" />
-    <ClCompile Include="dbrm.cpp" />
-    <ClCompile Include="extentmap.cpp" />
-    <ClCompile Include="lbidresourcegraph.cpp" />
-    <ClCompile Include="logicalpartition.cpp" />
-    <ClCompile Include="mastersegmenttable.cpp" />
-    <ClCompile Include="oidserver.cpp" />
-    <ClCompile Include="resourcenode.cpp" />
-    <ClCompile Include="rgnode.cpp" />
-    <ClCompile Include="rwlockmonitor.cpp" />
-    <ClCompile Include="sessionmanagerserver.cpp" />
-    <ClCompile Include="shmkeys.cpp" />
-    <ClCompile Include="slavecomm.cpp" />
-    <ClCompile Include="slavedbrmnode.cpp" />
-    <ClCompile Include="tablelockserver.cpp" />
-    <ClCompile Include="transactionnode.cpp" />
-    <ClCompile Include="undoable.cpp" />
-    <ClCompile Include="vbbm.cpp" />
-    <ClCompile Include="vss.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="autoincrementmanager.h" />
-    <ClInclude Include="blockresolutionmanager.h" />
-    <ClInclude Include="brm.h" />
-    <ClInclude Include="brmshmimpl.h" />
-    <ClInclude Include="brmtypes.h" />
-    <ClInclude Include="copylocks.h" />
-    <ClInclude Include="dbrm.h" />
-    <ClInclude Include="extentmap.h" />
-    <ClInclude Include="lbidresourcegraph.h" />
-    <ClInclude Include="logicalpartition.h" />
-    <ClInclude Include="mastersegmenttable.h" />
-    <ClInclude Include="oidserver.h" />
-    <ClInclude Include="resourcenode.h" />
-    <ClInclude Include="rgnode.h" />
-    <ClInclude Include="rwlockmonitor.h" />
-    <ClInclude Include="sessionmanagerserver.h" />
-    <ClInclude Include="shmkeys.h" />
-    <ClInclude Include="slavecomm.h" />
-    <ClInclude Include="slavedbrmnode.h" />
-    <ClInclude Include="tablelockserver.h" />
-    <ClInclude Include="transactionnode.h" />
-    <ClInclude Include="undoable.h" />
-    <ClInclude Include="vbbm.h" />
-    <ClInclude Include="vss.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/versioning/BRM/libbrm.vcxproj.filters b/versioning/BRM/libbrm.vcxproj.filters
deleted file mode 100644
index 63248e20c..000000000
--- a/versioning/BRM/libbrm.vcxproj.filters
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="autoincrementmanager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="blockresolutionmanager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="brmshmimpl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="brmtypes.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="copylocks.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dbrm.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="extentmap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="lbidresourcegraph.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="logicalpartition.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="mastersegmenttable.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="oidserver.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="resourcenode.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="rgnode.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="rwlockmonitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sessionmanagerserver.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shmkeys.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slavecomm.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slavedbrmnode.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="tablelockserver.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="transactionnode.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="undoable.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vbbm.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vss.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="autoincrementmanager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="blockresolutionmanager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="brm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="brmshmimpl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="brmtypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="copylocks.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dbrm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="extentmap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="lbidresourcegraph.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="logicalpartition.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="mastersegmenttable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="oidserver.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resourcenode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="rgnode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="rwlockmonitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="sessionmanagerserver.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shmkeys.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slavecomm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slavedbrmnode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="tablelockserver.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="transactionnode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="undoable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vbbm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vss.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/versioning/BRM/load_brm.vcxproj b/versioning/BRM/load_brm.vcxproj
deleted file mode 100644
index 753313655..000000000
--- a/versioning/BRM/load_brm.vcxproj
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B77B5FD1-8CA3-40F6-BA61-2FE51D074119}</ProjectGuid>
-    <RootNamespace>load_brm</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="load_brm.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/versioning/BRM/load_brm.vcxproj.filters b/versioning/BRM/load_brm.vcxproj.filters
deleted file mode 100644
index 68a3a3cbc..000000000
--- a/versioning/BRM/load_brm.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="load_brm.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/versioning/BRM/reset_locks.vcxproj b/versioning/BRM/reset_locks.vcxproj
deleted file mode 100644
index 8f004720e..000000000
--- a/versioning/BRM/reset_locks.vcxproj
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DB67EB06-04F1-4615-9095-3E5F02DD7008}</ProjectGuid>
-    <RootNamespace>reset_locks</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <DisableSpecificWarnings>4996;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="reset_locks.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/versioning/BRM/reset_locks.vcxproj.filters b/versioning/BRM/reset_locks.vcxproj.filters
deleted file mode 100644
index 3b8d87c29..000000000
--- a/versioning/BRM/reset_locks.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="reset_locks.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/versioning/BRM/save_brm.vcxproj b/versioning/BRM/save_brm.vcxproj
deleted file mode 100644
index d9887b95f..000000000
--- a/versioning/BRM/save_brm.vcxproj
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D1A9BAEF-7612-403A-ACEC-CD6DF09A3F8D}</ProjectGuid>
-    <RootNamespace>save_brm</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="save_brm.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/versioning/BRM/save_brm.vcxproj.filters b/versioning/BRM/save_brm.vcxproj.filters
deleted file mode 100644
index 82b81d9c3..000000000
--- a/versioning/BRM/save_brm.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="save_brm.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/versioning/BRM/workernode.vcxproj b/versioning/BRM/workernode.vcxproj
deleted file mode 100644
index b9fc96543..000000000
--- a/versioning/BRM/workernode.vcxproj
+++ /dev/null
@@ -1,336 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{AB35CD02-BACD-4E11-8FBC-106DFD9AB1FC}</ProjectGuid>
-    <RootNamespace>workernode</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB DBRM Worker Node" $(SolutionDir)..\..x64\Release\workernode.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB DBRM Worker Node" $(SolutionDir)..\..\x64\EnterpriseRelease\workernode.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="slavenode.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="workernode.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/versioning/BRM/workernode.vcxproj.filters b/versioning/BRM/workernode.vcxproj.filters
deleted file mode 100644
index 3b4a63d28..000000000
--- a/versioning/BRM/workernode.vcxproj.filters
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="slavenode.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="workernode.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/writeengine/bulk/cpimport.vcxproj b/writeengine/bulk/cpimport.vcxproj
deleted file mode 100644
index 50e11b002..000000000
--- a/writeengine/bulk/cpimport.vcxproj
+++ /dev/null
@@ -1,375 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{36549A0A-BF9F-4642-92E7-FAA10061BD34}</ProjectGuid>
-    <RootNamespace>cpimport</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\bulk;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;libxml2.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\bulk;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;libxml2.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\bulk;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;SKIP_UDF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;libxml2.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\bulk;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;SKIP_UDF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;libxml2.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Bulk Loader" $(SolutionDir)..\..x64\Release\cpimport.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\bulk;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;libxml2.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\dmlib;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\writeengine\bulk;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;libxml2.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Bulk Loader" $(SolutionDir)..\..\x64\EnterpriseRelease\cpimport.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="cpimport.cpp" />
-    <ClCompile Include="we_brmreporter.cpp" />
-    <ClCompile Include="we_bulkload.cpp" />
-    <ClCompile Include="we_bulkloadbuffer.cpp" />
-    <ClCompile Include="we_bulkstatus.cpp" />
-    <ClCompile Include="we_colbuf.cpp" />
-    <ClCompile Include="we_colbufcompressed.cpp" />
-    <ClCompile Include="we_colbufmgr.cpp" />
-    <ClCompile Include="we_colbufmgrdctnry.cpp" />
-    <ClCompile Include="we_colbufsec.cpp" />
-    <ClCompile Include="we_colextinf.cpp" />
-    <ClCompile Include="we_colopbulk.cpp" />
-    <ClCompile Include="we_columnautoinc.cpp" />
-    <ClCompile Include="we_columninfo.cpp" />
-    <ClCompile Include="we_columninfocompressed.cpp" />
-    <ClCompile Include="we_extentstripealloc.cpp" />
-    <ClCompile Include="we_tableinfo.cpp" />
-    <ClCompile Include="we_tempxmlgendata.cpp" />
-    <ClCompile Include="we_workers.cpp" />
-    <ClCompile Include="..\xml\we_xmljob.cpp" />
-    <ClCompile Include="..\xml\we_xmlop.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="we_brmreporter.h" />
-    <ClInclude Include="we_bulkload.h" />
-    <ClInclude Include="we_bulkloadbuffer.h" />
-    <ClInclude Include="we_bulkstatus.h" />
-    <ClInclude Include="we_colbuf.h" />
-    <ClInclude Include="we_colbufcompressed.h" />
-    <ClInclude Include="we_colbufmgr.h" />
-    <ClInclude Include="we_colbufsec.h" />
-    <ClInclude Include="we_colextinf.h" />
-    <ClInclude Include="we_colopbulk.h" />
-    <ClInclude Include="we_columnautoinc.h" />
-    <ClInclude Include="we_columninfo.h" />
-    <ClInclude Include="we_columninfocompressed.h" />
-    <ClInclude Include="we_extentstripealloc.h" />
-    <ClInclude Include="we_tableinfo.h" />
-    <ClInclude Include="we_tempxmlgendata.h" />
-    <ClInclude Include="..\xml\we_xmljob.h" />
-    <ClInclude Include="..\xml\we_xmlop.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="cpimport.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\versioning\BRM\libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\client\libweclient.vcxproj">
-      <Project>{4bc37219-e09d-4133-98c4-cf0386657df6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\libwriteengine.vcxproj">
-      <Project>{414a47eb-55e3-4251-99b0-95d86fe5580d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/writeengine/bulk/cpimport.vcxproj.filters b/writeengine/bulk/cpimport.vcxproj.filters
deleted file mode 100644
index 35dcdd72b..000000000
--- a/writeengine/bulk/cpimport.vcxproj.filters
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="cpimport.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_brmreporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_bulkload.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_bulkloadbuffer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_bulkstatus.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_colbuf.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_colbufcompressed.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_colbufmgr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_colbufmgrdctnry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_colbufsec.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_colextinf.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_colopbulk.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_columnautoinc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_columninfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_columninfocompressed.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_extentstripealloc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_tableinfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_tempxmlgendata.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_workers.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\xml\we_xmljob.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\xml\we_xmlop.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_brmreporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_bulkload.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_bulkloadbuffer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_bulkstatus.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_colbuf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_colbufcompressed.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_colbufmgr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_colbufsec.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_colextinf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_colopbulk.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_columnautoinc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_columninfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_columninfocompressed.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_extentstripealloc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_tableinfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_tempxmlgendata.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\xml\we_xmljob.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\xml\we_xmlop.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="cpimport.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/writeengine/client/libweclient.vcxproj b/writeengine/client/libweclient.vcxproj
deleted file mode 100644
index e4c633b3a..000000000
--- a/writeengine/client/libweclient.vcxproj
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4BC37219-E09D-4133-98C4-CF0386657DF6}</ProjectGuid>
-    <RootNamespace>libweclient</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\dbcon\ddlpackageproc;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\compress;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="we_clients.cpp" />
-    <ClCompile Include="we_ddlcommandclient.cpp" />
-    <ClCompile Include="we_dmlcommandclient.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="we_clients.h" />
-    <ClInclude Include="we_ddlcommandclient.h" />
-    <ClInclude Include="we_dmlcommandclient.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/writeengine/client/libweclient.vcxproj.filters b/writeengine/client/libweclient.vcxproj.filters
deleted file mode 100644
index 19ca4b059..000000000
--- a/writeengine/client/libweclient.vcxproj.filters
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="we_clients.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_ddlcommandclient.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_dmlcommandclient.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="we_clients.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_ddlcommandclient.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_dmlcommandclient.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/writeengine/libwriteengine.vcxproj b/writeengine/libwriteengine.vcxproj
deleted file mode 100644
index 966b5a62c..000000000
--- a/writeengine/libwriteengine.vcxproj
+++ /dev/null
@@ -1,392 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{414A47EB-55E3-4251-99B0-95D86FE5580D}</ProjectGuid>
-    <RootNamespace>libwriteengine</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WRITEENGINE_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libxml2.lib;ws2_32.lib;iphlpapi.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WRITEENGINE_DLLEXPORT;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>libxml2.lib;ws2_32.lib;iphlpapi.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WRITEENGINE_DLLEXPORT;_CRT_SECURE_NO_WARNINGS;SKIP_IDB_COMPRESSION;SKIP_AUTOI;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libxml2.lib;ws2_32.lib;iphlpapi.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WRITEENGINE_DLLEXPORT;_CRT_SECURE_NO_WARNINGS;SKIP_IDB_COMPRESSION;SKIP_AUTOI;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>libxml2.lib;ws2_32.lib;iphlpapi.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Write Engine API" $(SolutionDir)..\..x64\Release\libwriteengine.dll</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WRITEENGINE_DLLEXPORT;_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libxml2.lib;ws2_32.lib;iphlpapi.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\dmlib;$(SolutionDir)..\writeengine\index;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\utils\compress;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\writeengine\xml;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WRITEENGINE_DLLEXPORT;_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>libxml2.lib;ws2_32.lib;iphlpapi.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Write Engine API" $(SolutionDir)..\..\x64\EnterpriseRelease\libwriteengine.dll</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="shared\we_blockop.cpp" />
-    <ClCompile Include="shared\we_brm.cpp" />
-    <ClCompile Include="shared\we_bulkrollbackfile.cpp" />
-    <ClCompile Include="shared\we_bulkrollbackfilecompressed.cpp" />
-    <ClCompile Include="shared\we_bulkrollbackfilecompressedhdfs.cpp" />
-    <ClCompile Include="shared\we_bulkrollbackmgr.cpp" />
-    <ClCompile Include="shared\we_cache.cpp" />
-    <ClCompile Include="shared\we_chunkmanager.cpp" />
-    <ClCompile Include="shared\we_confirmhdfsdbfile.cpp" />
-    <ClCompile Include="wrapper\we_colop.cpp" />
-    <ClCompile Include="wrapper\we_colopcompress.cpp" />
-    <ClCompile Include="shared\we_config.cpp" />
-    <ClCompile Include="shared\we_convertor.cpp" />
-    <ClCompile Include="shared\we_dbfileop.cpp" />
-    <ClCompile Include="shared\we_dbrootextenttracker.cpp" />
-    <ClCompile Include="dictionary\we_dctnry.cpp" />
-    <ClCompile Include="wrapper\we_dctnrycompress.cpp" />
-    <ClCompile Include="shared\we_define.cpp" />
-    <ClCompile Include="shared\we_fileop.cpp" />
-    <ClCompile Include="shared\we_log.cpp" />
-    <ClCompile Include="shared\we_rbmetawriter.cpp" />
-    <ClCompile Include="shared\we_simplesyslog.cpp" />
-    <ClCompile Include="shared\we_stats.cpp" />
-    <ClCompile Include="wrapper\we_tablemetadata.cpp" />
-    <ClCompile Include="xml\we_xmlgendata.cpp" />
-    <ClCompile Include="xml\we_xmlgenproc.cpp" />
-    <ClCompile Include="wrapper\writeengine.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="shared\we_blockop.h" />
-    <ClInclude Include="shared\we_brm.h" />
-    <ClInclude Include="shared\we_bulkrollbackfile.h" />
-    <ClInclude Include="shared\we_bulkrollbackfilecompressed.h" />
-    <ClInclude Include="shared\we_bulkrollbackfilecompressedhdfs.h" />
-    <ClInclude Include="shared\we_bulkrollbackmgr.h" />
-    <ClInclude Include="shared\we_cache.h" />
-    <ClInclude Include="shared\we_chunkmanager.h" />
-    <ClInclude Include="shared\we_confirmhdfsdbfile.h" />
-    <ClInclude Include="wrapper\we_colop.h" />
-    <ClInclude Include="wrapper\we_colopcompress.h" />
-    <ClInclude Include="shared\we_config.h" />
-    <ClInclude Include="shared\we_convertor.h" />
-    <ClInclude Include="shared\we_dbfileop.h" />
-    <ClInclude Include="shared\we_dbrootextenttracker.h" />
-    <ClInclude Include="dictionary\we_dctnry.h" />
-    <ClInclude Include="wrapper\we_dctnrycompress.h" />
-    <ClInclude Include="shared\we_define.h" />
-    <ClInclude Include="shared\we_fileop.h" />
-    <ClInclude Include="shared\we_index.h" />
-    <ClInclude Include="shared\we_log.h" />
-    <ClInclude Include="shared\we_macro.h" />
-    <ClInclude Include="shared\we_obj.h" />
-    <ClInclude Include="shared\we_rbmetawriter.h" />
-    <ClInclude Include="shared\we_simplesyslog.h" />
-    <ClInclude Include="shared\we_stats.h" />
-    <ClInclude Include="wrapper\we_tablemetadata.h" />
-    <ClInclude Include="shared\we_type.h" />
-    <ClInclude Include="shared\we_typeext.h" />
-    <ClInclude Include="xml\we_xmlgendata.h" />
-    <ClInclude Include="xml\we_xmlgenproc.h" />
-    <ClInclude Include="wrapper\writeengine.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="libwriteengine.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\versioning\BRM\libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/writeengine/libwriteengine.vcxproj.filters b/writeengine/libwriteengine.vcxproj.filters
deleted file mode 100644
index 0b5fb22d4..000000000
--- a/writeengine/libwriteengine.vcxproj.filters
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="shared\we_blockop.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shared\we_brm.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shared\we_bulkrollbackfile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shared\we_bulkrollbackfilecompressed.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shared\we_bulkrollbackfilecompressedhdfs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shared\we_bulkrollbackmgr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shared\we_cache.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shared\we_chunkmanager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="wrapper\we_colop.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="wrapper\we_colopcompress.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shared\we_config.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shared\we_convertor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shared\we_dbfileop.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shared\we_dbrootextenttracker.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dictionary\we_dctnry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="wrapper\we_dctnrycompress.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shared\we_define.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shared\we_fileop.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shared\we_log.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shared\we_rbmetawriter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shared\we_simplesyslog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shared\we_stats.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="wrapper\we_tablemetadata.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="xml\we_xmlgendata.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="xml\we_xmlgenproc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="wrapper\writeengine.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="shared\we_confirmhdfsdbfile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_blockop.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_brm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_bulkrollbackfile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_bulkrollbackfilecompressed.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_bulkrollbackfilecompressedhdfs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_bulkrollbackmgr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_cache.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_chunkmanager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="wrapper\we_colop.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="wrapper\we_colopcompress.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_convertor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_dbfileop.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_dbrootextenttracker.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dictionary\we_dctnry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="wrapper\we_dctnrycompress.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_define.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_fileop.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_index.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_log.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_macro.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_obj.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_rbmetawriter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_simplesyslog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_stats.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="wrapper\we_tablemetadata.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_type.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_typeext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="xml\we_xmlgendata.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="xml\we_xmlgenproc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="wrapper\writeengine.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="shared\we_confirmhdfsdbfile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="libwriteengine.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/writeengine/server/WriteEngineServer.vcxproj b/writeengine/server/WriteEngineServer.vcxproj
deleted file mode 100644
index 14e72abef..000000000
--- a/writeengine/server/WriteEngineServer.vcxproj
+++ /dev/null
@@ -1,392 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{85C9D0FD-0C04-47DB-9AF3-B71BE89A3034}</ProjectGuid>
-    <RootNamespace>WriteEngineServer</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\compress;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\writeengine\redistribute;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <StackReserveSize>8388608</StackReserveSize>
-      <StackCommitSize>8192</StackCommitSize>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command />
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\compress;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\writeengine\redistribute;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <StackReserveSize>8388608</StackReserveSize>
-      <StackCommitSize>8192</StackCommitSize>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command />
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\compress;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\writeengine\redistribute;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;SKIP_UDF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4996;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <StackReserveSize>8388608</StackReserveSize>
-      <StackCommitSize>8192</StackCommitSize>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command />
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\compress;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\writeengine\redistribute;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_IDB_COMPRESSION;SKIP_UDF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4996;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <StackReserveSize>8388608</StackReserveSize>
-      <StackCommitSize>8192</StackCommitSize>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Write Engine Server" $(SolutionDir)..\..x64\Release\WriteEngineServer.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\compress;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\writeengine\redistribute;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4996;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <StackReserveSize>8388608</StackReserveSize>
-      <StackCommitSize>8192</StackCommitSize>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command />
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\utils\threadpool;$(SolutionDir)..\writeengine\wrapper;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\dbcon\dmlpackage;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\writeengine\dictionary;$(SolutionDir)..\dbcon\ddlpackage;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\compress;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\utils\rowgroup;$(SolutionDir)..\utils\joiner;$(SolutionDir)..\utils\funcexp;$(SolutionDir)..\dbcon\dmlpackageproc;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\querystats;$(SolutionDir)..\writeengine\redistribute;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\utils\cacheutils;$(SolutionDir)..\utils\querytele;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4996;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <StackReserveSize>8388608</StackReserveSize>
-      <StackCommitSize>8192</StackCommitSize>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Write Engine Server" $(SolutionDir)..\..\x64\EnterpriseRelease\WriteEngineServer.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="we_brmrprtparser.cpp" />
-    <ClCompile Include="we_cleartablelockcmd.cpp" />
-    <ClCompile Include="we_cpifeederthread.cpp" />
-    <ClCompile Include="we_dataloader.cpp" />
-    <ClCompile Include="we_ddlcommandproc.cpp" />
-    <ClCompile Include="we_dmlcommandproc.cpp" />
-    <ClCompile Include="we_getfilesizes.cpp" />
-    <ClCompile Include="we_observer.cpp" />
-    <ClCompile Include="we_readthread.cpp" />
-    <ClCompile Include="..\redistribute\we_redistribute.cpp" />
-    <ClCompile Include="..\redistribute\we_redistributecontrol.cpp" />
-    <ClCompile Include="..\redistribute\we_redistributecontrolthread.cpp" />
-    <ClCompile Include="..\redistribute\we_redistributeworkerthread.cpp" />
-    <ClCompile Include="we_server.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="we_brmrprtparser.h" />
-    <ClInclude Include="we_cleartablelockcmd.h" />
-    <ClInclude Include="we_cpifeederthread.h" />
-    <ClInclude Include="we_dataloader.h" />
-    <ClInclude Include="we_ddlcommandproc.h" />
-    <ClInclude Include="we_ddlcommon.h" />
-    <ClInclude Include="we_dmlcommandproc.h" />
-    <ClInclude Include="we_getfilesizes.h" />
-    <ClInclude Include="we_message_handlers.h" />
-    <ClInclude Include="we_messages.h" />
-    <ClInclude Include="we_observer.h" />
-    <ClInclude Include="we_readthread.h" />
-    <ClInclude Include="..\redistribute\we_redistribute.h" />
-    <ClInclude Include="..\redistribute\we_redistributecontrol.h" />
-    <ClInclude Include="..\redistribute\we_redistributecontrolthread.h" />
-    <ClInclude Include="..\redistribute\we_redistributedef.h" />
-    <ClInclude Include="..\redistribute\we_redistributeworkerthread.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="WriteEngineServer.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dbcon\ddlpackage\libddlpackage.vcxproj">
-      <Project>{033c6cba-d984-483f-adc8-825be20a699d}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\dbcon\dmlpackage\libdmlpackage.vcxproj">
-      <Project>{b9045bca-0955-4c5e-bca4-5ee516838119}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\threadpool\libthreadpool.vcxproj">
-      <Project>{2be469d2-d854-4480-bfe0-34de89c557b2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\versioning\BRM\libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\libwriteengine.vcxproj">
-      <Project>{414a47eb-55e3-4251-99b0-95d86fe5580d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/writeengine/server/WriteEngineServer.vcxproj.filters b/writeengine/server/WriteEngineServer.vcxproj.filters
deleted file mode 100644
index d42d6b2f9..000000000
--- a/writeengine/server/WriteEngineServer.vcxproj.filters
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="we_brmrprtparser.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_cleartablelockcmd.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_cpifeederthread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_dataloader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_ddlcommandproc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_dmlcommandproc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_getfilesizes.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_observer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_readthread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\redistribute\we_redistribute.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\redistribute\we_redistributecontrol.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\redistribute\we_redistributecontrolthread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\redistribute\we_redistributeworkerthread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_server.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="we_brmrprtparser.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_cleartablelockcmd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_cpifeederthread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_dataloader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_ddlcommandproc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_ddlcommon.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_dmlcommandproc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_getfilesizes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_message_handlers.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_messages.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_observer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_readthread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\redistribute\we_redistribute.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\redistribute\we_redistributecontrol.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\redistribute\we_redistributecontrolthread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\redistribute\we_redistributedef.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\redistribute\we_redistributeworkerthread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="WriteEngineServer.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/writeengine/splitter/splitter.vcxproj b/writeengine/splitter/splitter.vcxproj
deleted file mode 100644
index 8396753f2..000000000
--- a/writeengine/splitter/splitter.vcxproj
+++ /dev/null
@@ -1,341 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|Win32">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="EnterpriseRelease|x64">
-      <Configuration>EnterpriseRelease</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B160A65B-D07D-4CCD-A0FD-6A0800E9F595}</ProjectGuid>
-    <RootNamespace>splitter</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <OutDir>$(SolutionDir)..\..\$(PlatformName)\$(ConfigurationName)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libxml2.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>libxml2.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Debug;$(SolutionDir)..\..\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions> _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_UDF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4996;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libxml2.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions> _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;SKIP_UDF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4996;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>libxml2.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;C:$(SolutionDir)..\..x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Load File Splitter" $(SolutionDir)..\..x64\Release\splitter.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions> _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4244;4996;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\utils\winport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libxml2.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0\lib32;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include\lib32;C:\InfiniDB\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EnterpriseRelease|x64'">
-    <ClCompile>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\include;$(SolutionDir)..\utils\winport;$(SolutionDir)..\versioning\BRM;$(SolutionDir)..\writeengine\server;$(SolutionDir)..\utils\loggingcpp;$(SolutionDir)..\oam\oamcpp;$(SolutionDir)..\snmpd\snmpmanager;$(SolutionDir)..\dbcon\execplan;$(SolutionDir)..\utils\messageqcpp;$(SolutionDir)..\writeengine\shared;$(SolutionDir)..\utils\configcpp;$(SolutionDir)..\utils\rwlock;$(SolutionDir)..\dbcon\joblist;$(SolutionDir)..\utils\dataconvert;$(SolutionDir)..\writeengine\client;$(SolutionDir)..\utils\batchloader;$(SolutionDir)..\utils\startup;$(SolutionDir)..\utils\common;$(SolutionDir)..\utils\idbdatafile;$(SolutionDir)..\..\libiconv-1.14\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions> _CRT_SECURE_NO_WARNINGS;SKIP_SNMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;4996;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>libxml2.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\..\boost_1_54_0;$(SolutionDir)..\..\libxml2-2.7.8\libxml2\win32\Release;$(SolutionDir)..\..\x64\EnterpriseRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-    </Link>
-    <PostBuildEvent>
-      <Command>$(SolutionDir)..\..\signit "InfiniDB Load File Splitter" $(SolutionDir)..\..\x64\EnterpriseRelease\splitter.exe</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="we_brmupdater.cpp" />
-    <ClCompile Include="we_cmdargs.cpp" />
-    <ClCompile Include="we_filereadthread.cpp" />
-    <ClCompile Include="we_respreadthread.cpp" />
-    <ClCompile Include="we_sdhandler.cpp" />
-    <ClCompile Include="we_splclient.cpp" />
-    <ClCompile Include="we_splitterapp.cpp" />
-    <ClCompile Include="we_tablelockgrabber.cpp" />
-    <ClCompile Include="we_xmlgetter.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="we_brmupdater.h" />
-    <ClInclude Include="we_cmdargs.h" />
-    <ClInclude Include="we_filereadthread.h" />
-    <ClInclude Include="we_respreadthread.h" />
-    <ClInclude Include="we_sdhandler.h" />
-    <ClInclude Include="we_splclient.h" />
-    <ClInclude Include="we_splitterapp.h" />
-    <ClInclude Include="we_tablelockgrabber.h" />
-    <ClInclude Include="we_xmlgetter.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="splitter.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dbcon\execplan\libexecplan.vcxproj">
-      <Project>{ffcce773-27fa-4f4d-9e28-2208be6348da}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\dbcon\joblist\libjoblist.vcxproj">
-      <Project>{cba13ef7-eca1-42f4-8ce2-9e18e24dcde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\oam\oamcpp\liboamcpp.vcxproj">
-      <Project>{8f7c9b67-639c-468f-8c5a-eb5f2e944e64}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\batchloader\libbatchloader.vcxproj">
-      <Project>{35d6295b-4a83-4e6e-bab0-70adf19ae822}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\cacheutils\libcacheutils.vcxproj">
-      <Project>{b44be805-2019-4fcb-b213-45f1d7a73ccd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\common\libcommon.vcxproj">
-      <Project>{004899a2-3cab-4796-b030-34a20ac285c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\compress\libcompress-ent.vcxproj">
-      <Project>{0b72a604-0755-4e2c-b74b-c93564847114}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\configcpp\libconfigcpp.vcxproj">
-      <Project>{c543c9a1-b4e0-4bad-9fc2-2afeea952fc5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\dataconvert\libdataconvert.vcxproj">
-      <Project>{ab342a0e-604e-4bbc-b43e-08df3fa37f9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\funcexp\libfuncexp.vcxproj">
-      <Project>{9ae60d66-99f6-4ccb-902d-3814a12ae0a9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\idbdatafile\idbdatafile.vcxproj">
-      <Project>{4c8231d7-7a87-4650-aa9c-d7650c1d03ee}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\loggingcpp\libloggingcpp.vcxproj">
-      <Project>{07230df5-10e9-469e-8075-c0978c0460ad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\messageqcpp\libmessageqcpp.vcxproj">
-      <Project>{226d1f60-1e33-401b-a333-d583af69b86e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\querytele\libquerytele.vcxproj">
-      <Project>{599e3c29-63ba-4f25-aeae-bf413ad93312}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rowgroup\librowgroup.vcxproj">
-      <Project>{054cfc82-a54e-4ea5-8ce7-1281d2ed9ece}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\rwlock\librwlock.vcxproj">
-      <Project>{5362725e-bb90-44a3-9d13-3de9b5041ad2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\startup\libidbboot.vcxproj">
-      <Project>{b62b74b4-4621-4cf2-ac06-fb84d9cca66f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\udfsdk\libudfsdk.vcxproj">
-      <Project>{021a7045-6334-478f-9a4c-79f8200b504a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\utils\winport\libwinport.vcxproj">
-      <Project>{4f0851d3-b782-4f12-b748-73efa2da586b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\versioning\BRM\libbrm.vcxproj">
-      <Project>{a13e870a-7a9e-4027-8e17-204398225361}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\libwriteengine.vcxproj">
-      <Project>{414a47eb-55e3-4251-99b0-95d86fe5580d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/writeengine/splitter/splitter.vcxproj.filters b/writeengine/splitter/splitter.vcxproj.filters
deleted file mode 100644
index 4eb34bf76..000000000
--- a/writeengine/splitter/splitter.vcxproj.filters
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="we_brmupdater.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_cmdargs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_filereadthread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_respreadthread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_sdhandler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_splclient.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_splitterapp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_tablelockgrabber.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="we_xmlgetter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="we_brmupdater.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_cmdargs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_filereadthread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_respreadthread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_sdhandler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_splclient.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_splitterapp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_tablelockgrabber.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="we_xmlgetter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="splitter.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file

From 35ab11cbb69b5bc78b374f1ce7bde82fb1b6dff1 Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Fri, 26 Apr 2019 04:46:46 -0500
Subject: [PATCH 06/33] remove std::auto_ptr

---
 utils/threadpool/threadpool.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/utils/threadpool/threadpool.h b/utils/threadpool/threadpool.h
index 84c9aff7a..16754385d 100644
--- a/utils/threadpool/threadpool.h
+++ b/utils/threadpool/threadpool.h
@@ -75,9 +75,8 @@ public:
     boost::thread* create_thread(F threadfunc)
     {
         boost::lock_guard<boost::shared_mutex> guard(m);
-        std::auto_ptr<boost::thread> new_thread(new boost::thread(threadfunc));
-        threads.push_back(new_thread.get());
-        return new_thread.release();
+        threads.push_back(new boost::thread(threadfunc));
+        return threads.back();
     }
 
     void add_thread(boost::thread* thrd)

From f6fb523d65aaaadc864a874b393ce944716f7569 Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Fri, 26 Apr 2019 08:21:47 -0500
Subject: [PATCH 07/33] Fully resolve potentially ambiguous symbols by removing
 using namespace statements from headers which have a cascading effect. This
 causes potential behavior changes when switching to c++11 since symbols can
 be exported from std and boost while both have been imported into the global
 namespace.

---
 .gitignore                                    |   1 +
 CMakeLists.txt                                |  11 +
 dbcon/execplan/predicateoperator.h            |   2 +-
 dbcon/execplan/treenode.h                     |   9 +-
 dbcon/execplan/udafcolumn.h                   |   5 +-
 dbcon/joblist/crossenginestep.cpp             |  26 +-
 dbcon/joblist/crossenginestep.h               |  18 +-
 dbcon/joblist/jlf_execplantojoblist.cpp       |   2 +-
 dbcon/joblist/jlf_execplantojoblist.h         |   4 +-
 dbcon/joblist/joblistfactory.cpp              |   3 +-
 dbcon/joblist/jobstep.cpp                     |   2 +-
 dbcon/joblist/jobstep.h                       |   4 +-
 dbcon/mysql/ha_calpont_execplan.cpp           |  11 +-
 dbcon/mysql/ha_calpont_impl.cpp               |   2 +-
 dbcon/mysql/ha_mcs_client_udfs.cpp            |  42 +-
 ddlproc/ddlprocessor.cpp                      |   2 +-
 dmlproc/dmlproc.cpp                           |   4 +-
 exemgr/CMakeLists.txt                         |   4 +-
 exemgr/main.cpp                               | 366 ++++++++----------
 oamapps/columnstoreDB/columnstoreDB.cpp       |   1 +
 .../columnstoreSupport/columnstoreSupport.cpp |   1 +
 oamapps/mcsadmin/mcsadmin.cpp                 |   1 +
 oamapps/postConfigure/getMySQLpw.cpp          |   1 +
 oamapps/postConfigure/helpers.cpp             |  26 +-
 oamapps/postConfigure/helpers.h               |   4 +-
 oamapps/postConfigure/installer.cpp           |   1 +
 oamapps/postConfigure/mycnfUpgrade.cpp        |   1 +
 oamapps/postConfigure/postConfigure.cpp       |   1 +
 oamapps/serverMonitor/serverMonitor.cpp       |   1 +
 primitives/primproc/dictstep.h                |   2 +-
 primitives/primproc/primproc.cpp              |   2 +
 primitives/primproc/umsocketselector.cpp      |   8 +-
 primitives/primproc/umsocketselector.h        |  12 +-
 procmgr/main.cpp                              |   1 +
 procmon/main.cpp                              |   1 +
 tools/clearShm/main.cpp                       |   7 +-
 tools/cleartablelock/cleartablelock.cpp       |   1 +
 tools/configMgt/autoConfigure.cpp             |   1 +
 tools/configMgt/autoInstaller.cpp             |   1 +
 tools/configMgt/svnQuery.cpp                  |   1 +
 tools/cplogger/main.cpp                       |   1 +
 tools/dbbuilder/dbbuilder.cpp                 |   1 +
 tools/dbloadxml/colxml.cpp                    |   1 +
 tools/ddlcleanup/ddlcleanup.cpp               |   1 +
 tools/editem/editem.cpp                       |   1 +
 tools/getConfig/main.cpp                      |   1 +
 tools/idbmeminfo/idbmeminfo.cpp               |   1 +
 tools/setConfig/main.cpp                      |   1 +
 tools/viewtablelock/viewtablelock.cpp         |   1 +
 utils/funcexp/func_date.cpp                   |   6 +-
 utils/funcexp/func_day.cpp                    |   6 +-
 utils/funcexp/func_dayname.cpp                |   6 +-
 utils/funcexp/func_dayofweek.cpp              |   6 +-
 utils/funcexp/func_dayofyear.cpp              |   6 +-
 utils/funcexp/func_month.cpp                  |   6 +-
 utils/funcexp/func_monthname.cpp              |   6 +-
 utils/funcexp/func_quarter.cpp                |   6 +-
 utils/funcexp/func_to_days.cpp                |   6 +-
 utils/funcexp/func_week.cpp                   |   6 +-
 utils/funcexp/func_weekday.cpp                |   6 +-
 utils/funcexp/func_year.cpp                   |   6 +-
 utils/funcexp/func_yearweek.cpp               |   6 +-
 utils/funcexp/functor.h                       |   3 +-
 utils/funcexp/functor_str.h                   |   8 +-
 utils/funcexp/utils_utf8.h                    |  15 +-
 utils/regr/corr.cpp                           |   2 +-
 utils/regr/corr.h                             |   1 -
 utils/regr/covar_pop.cpp                      |   2 +-
 utils/regr/covar_pop.h                        |   1 -
 utils/regr/covar_samp.cpp                     |   2 +-
 utils/regr/covar_samp.h                       |   1 -
 utils/regr/regr_avgx.cpp                      |   2 +-
 utils/regr/regr_avgx.h                        |   1 -
 utils/regr/regr_avgy.cpp                      |   2 +-
 utils/regr/regr_avgy.h                        |   1 -
 utils/regr/regr_count.cpp                     |   2 +-
 utils/regr/regr_count.h                       |   1 -
 utils/regr/regr_intercept.cpp                 |   2 +-
 utils/regr/regr_intercept.h                   |   1 -
 utils/regr/regr_r2.cpp                        |   2 +-
 utils/regr/regr_r2.h                          |   1 -
 utils/regr/regr_slope.cpp                     |   2 +-
 utils/regr/regr_slope.h                       |   1 -
 utils/regr/regr_sxx.cpp                       |   2 +-
 utils/regr/regr_sxx.h                         |   1 -
 utils/regr/regr_sxy.cpp                       |   2 +-
 utils/regr/regr_sxy.h                         |   1 -
 utils/regr/regr_syy.cpp                       |   2 +-
 utils/regr/regr_syy.h                         |   1 -
 utils/rowgroup/rowaggregation.cpp             |   8 +-
 utils/rowgroup/rowaggregation.h               |   4 +-
 utils/rowgroup/rowgroup.h                     |   3 +-
 utils/threadpool/prioritythreadpool.cpp       |   2 +-
 utils/udfsdk/allnull.cpp                      |   2 +-
 utils/udfsdk/allnull.h                        |   1 -
 utils/udfsdk/avg_mode.cpp                     |   2 +-
 utils/udfsdk/avg_mode.h                       |   1 -
 utils/udfsdk/avgx.cpp                         |   2 +-
 utils/udfsdk/avgx.h                           |   1 -
 utils/udfsdk/distinct_count.cpp               |   3 +-
 utils/udfsdk/distinct_count.h                 |   1 -
 utils/udfsdk/mcsv1_udaf.cpp                   |  56 +--
 utils/udfsdk/mcsv1_udaf.h                     |  42 +-
 utils/udfsdk/median.h                         |   1 -
 utils/udfsdk/ssq.cpp                          |   2 +-
 utils/udfsdk/ssq.h                            |   1 -
 utils/windowfunction/windowfunctiontype.h     |   6 +-
 versioning/BRM/dbrmctl.cpp                    |   1 +
 versioning/BRM/load_brm.cpp                   |   1 +
 versioning/BRM/masternode.cpp                 |   1 +
 versioning/BRM/reset_locks.cpp                |   2 +
 versioning/BRM/rollback.cpp                   |   1 +
 versioning/BRM/save_brm.cpp                   |   1 +
 versioning/BRM/slavenode.cpp                  |   1 +
 writeengine/bulk/we_brmreporter.cpp           |   2 +-
 writeengine/bulk/we_brmreporter.h             |   3 +-
 writeengine/bulk/we_bulkload.cpp              |   2 +-
 writeengine/bulk/we_tableinfo.cpp             |  16 +-
 writeengine/server/we_brmrprtparser.h         |   1 -
 writeengine/server/we_ddlcommon.h             |  69 ++--
 writeengine/server/we_observer.h              |   1 -
 writeengine/splitter/we_brmupdater.cpp        |  10 +-
 writeengine/splitter/we_brmupdater.h          |   2 +-
 writeengine/splitter/we_sdhandler.h           |   4 +-
 writeengine/splitter/we_splclient.cpp         |   2 +-
 writeengine/splitter/we_splclient.h           |   8 +-
 126 files changed, 492 insertions(+), 516 deletions(-)

diff --git a/.gitignore b/.gitignore
index 93be85e28..73a91cbd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,3 +108,4 @@ columnstoreversion.h
 .idea/
 .build
 /.vs
+/CMakeSettings.json
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42a50a221..be85518bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,17 @@ ENDIF()
 
 MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
 
+OPTION(USE_CCACHE "reduce compile time with ccache." FALSE)
+if(NOT USE_CCACHE)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "")
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "")
+else()
+  find_program(CCACHE_FOUND ccache)
+  if(CCACHE_FOUND)
+      set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+      set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+  endif(CCACHE_FOUND)
+endif()
 # Distinguish between community and non-community builds, with the
 # default being a community build. This does not impact the feature
 # set that will be compiled in; it's merely provided as a hint to
diff --git a/dbcon/execplan/predicateoperator.h b/dbcon/execplan/predicateoperator.h
index b83931394..51d3bc5ee 100644
--- a/dbcon/execplan/predicateoperator.h
+++ b/dbcon/execplan/predicateoperator.h
@@ -294,7 +294,7 @@ inline bool PredicateOperator::getBoolVal(rowgroup::Row& row, bool& isNull, Retu
                 // we won't want to just multiply by scale, as it may move
                 // significant digits out of scope. So we break them apart
                 // and compare each separately 
-                int64_t scale = max(lop->resultType().scale, rop->resultType().scale);
+                int64_t scale = std::max(lop->resultType().scale, rop->resultType().scale);
                 if (scale)
                 {
                     long double intpart1;
diff --git a/dbcon/execplan/treenode.h b/dbcon/execplan/treenode.h
index 106b40d37..9fea74984 100644
--- a/dbcon/execplan/treenode.h
+++ b/dbcon/execplan/treenode.h
@@ -41,9 +41,6 @@
 #include "exceptclasses.h"
 #include "dataconvert.h"
 
-// Workaround for my_global.h #define of isnan(X) causing a std::std namespace
-using namespace std;
-
 namespace messageqcpp
 {
 class ByteStream;
@@ -608,7 +605,7 @@ inline const std::string& TreeNode::getStrVal()
                 int exponent  = (int)floor(log10( fabs(fResult.floatVal)));  // This will round down the exponent
                 double base   = fResult.floatVal * pow(10, -1.0 * exponent);
 
-                if (isnan(exponent) || std::isnan(base))
+                if (std::isnan(exponent) || std::isnan(base))
                 {
                     snprintf(tmp, 312, "%f", fResult.floatVal);
                     fResult.strVal = removeTrailing0(tmp, 312);
@@ -643,7 +640,7 @@ inline const std::string& TreeNode::getStrVal()
                 int exponent  = (int)floor(log10( fabs(fResult.doubleVal)));  // This will round down the exponent
                 double base   = fResult.doubleVal * pow(10, -1.0 * exponent);
 
-                if (isnan(exponent) || std::isnan(base))
+                if (std::isnan(exponent) || std::isnan(base))
                 {
                     snprintf(tmp, 312, "%f", fResult.doubleVal);
                     fResult.strVal = removeTrailing0(tmp, 312);
@@ -677,7 +674,7 @@ inline const std::string& TreeNode::getStrVal()
                 int exponent  = (int)floorl(log10( fabsl(fResult.longDoubleVal)));  // This will round down the exponent
                 long double base   = fResult.longDoubleVal * pow(10, -1.0 * exponent);
 
-                if (isnan(exponent) || isnan(base))
+                if (std::isnan(exponent) || std::isnan(base))
                 {
                     snprintf(tmp, 312, "%Lf", fResult.longDoubleVal);
                     fResult.strVal = removeTrailing0(tmp, 312);
diff --git a/dbcon/execplan/udafcolumn.h b/dbcon/execplan/udafcolumn.h
index 4263a9445..3486740ca 100644
--- a/dbcon/execplan/udafcolumn.h
+++ b/dbcon/execplan/udafcolumn.h
@@ -30,7 +30,6 @@ namespace messageqcpp
 class ByteStream;
 }
 
-using namespace mcsv1sdk;
 /**
  * Namespace
  */
@@ -78,7 +77,7 @@ public:
     /**
      * Accessors and Mutators
      */
-    mcsv1Context& getContext()
+    mcsv1sdk::mcsv1Context& getContext()
     {
         return context;
     }
@@ -122,7 +121,7 @@ public:
     virtual bool operator!=(const UDAFColumn& t) const;
 
 private:
-    mcsv1Context context;
+    mcsv1sdk::mcsv1Context context;
 };
 
 /**
diff --git a/dbcon/joblist/crossenginestep.cpp b/dbcon/joblist/crossenginestep.cpp
index d3cef7928..e9b573713 100644
--- a/dbcon/joblist/crossenginestep.cpp
+++ b/dbcon/joblist/crossenginestep.cpp
@@ -63,9 +63,9 @@ namespace joblist
 {
 
 CrossEngineStep::CrossEngineStep(
-    const string& schema,
-    const string& table,
-    const string& alias,
+    const std::string& schema,
+    const std::string& table,
+    const std::string& alias,
     const JobInfo& jobInfo) :
     BatchPrimitive(jobInfo),
     fRowsRetrieved(0),
@@ -113,7 +113,7 @@ bool CrossEngineStep::deliverStringTableRowGroup() const
 }
 
 
-void CrossEngineStep::addFcnJoinExp(const vector<execplan::SRCP>& fe)
+void CrossEngineStep::addFcnJoinExp(const std::vector<execplan::SRCP>& fe)
 {
     fFeFcnJoin = fe;
 }
@@ -131,7 +131,7 @@ void CrossEngineStep::setFE1Input(const rowgroup::RowGroup& rg)
 }
 
 
-void CrossEngineStep::setFcnExpGroup3(const vector<execplan::SRCP>& fe)
+void CrossEngineStep::setFcnExpGroup3(const std::vector<execplan::SRCP>& fe)
 {
     fFeSelects = fe;
 }
@@ -336,7 +336,7 @@ int64_t CrossEngineStep::convertValueNum(
         case CalpontSystemCatalog::TEXT:
         case CalpontSystemCatalog::CLOB:
         {
-            string i = boost::any_cast<string>(anyVal);
+            std::string i = boost::any_cast<std::string>(anyVal);
             // bug 1932, pad nulls up to the size of v
             i.resize(sizeof(rv), 0);
             rv = *((uint64_t*) i.data());
@@ -435,7 +435,7 @@ void CrossEngineStep::execute()
         if (ret != 0)
             mysql->handleMySqlError(mysql->getError().c_str(), ret);
 
-        string query(makeQuery());
+        std::string query(makeQuery());
         fLogger->logMessage(logging::LOG_TYPE_INFO, "QUERY to foreign engine: " + query);
 
         if (traceOn())
@@ -651,7 +651,7 @@ void CrossEngineStep::setBPP(JobStep* jobStep)
     pDictionaryStep* pds = NULL;
     pDictionaryScan* pdss = NULL;
     FilterStep* fs = NULL;
-    string bop = " AND ";
+    std::string bop = " AND ";
 
     if (pcs != 0)
     {
@@ -690,12 +690,12 @@ void CrossEngineStep::setBPP(JobStep* jobStep)
     }
 }
 
-void CrossEngineStep::addFilterStr(const vector<const Filter*>& f, const string& bop)
+void CrossEngineStep::addFilterStr(const std::vector<const Filter*>& f, const std::string& bop)
 {
     if (f.size() == 0)
         return;
 
-    string filterStr;
+    std::string filterStr;
 
     for (uint64_t i = 0; i < f.size(); i++)
     {
@@ -731,7 +731,7 @@ void CrossEngineStep::setProjectBPP(JobStep* jobStep1, JobStep*)
 }
 
 
-string CrossEngineStep::makeQuery()
+std::string CrossEngineStep::makeQuery()
 {
     ostringstream oss;
     oss << fSelectClause << " FROM " << fTable;
@@ -742,7 +742,7 @@ string CrossEngineStep::makeQuery()
     if (!fWhereClause.empty())
         oss << fWhereClause;
 
-    // the string must consist of a single SQL statement without a terminating semicolon ; or \g.
+    // the std::string must consist of a single SQL statement without a terminating semicolon ; or \g.
     // oss << ";";
     return oss.str();
 }
@@ -832,7 +832,7 @@ uint32_t CrossEngineStep::nextBand(messageqcpp::ByteStream& bs)
 }
 
 
-const string CrossEngineStep::toString() const
+const std::string CrossEngineStep::toString() const
 {
     ostringstream oss;
     oss << "CrossEngineStep ses:" << fSessionId << " txn:" << fTxnId << " st:" << fStepId;
diff --git a/dbcon/joblist/crossenginestep.h b/dbcon/joblist/crossenginestep.h
index 4ebf2ac9d..2e9cc79f0 100644
--- a/dbcon/joblist/crossenginestep.h
+++ b/dbcon/joblist/crossenginestep.h
@@ -30,8 +30,6 @@
 #include "primitivestep.h"
 #include "threadnaming.h"
 
-using namespace std;
-
 // forward reference
 namespace utils
 {
@@ -60,9 +58,9 @@ public:
     /** @brief CrossEngineStep constructor
      */
     CrossEngineStep(
-        const string& schema,
-        const string& table,
-        const string& alias,
+        const std::string& schema,
+        const std::string& table,
+        const std::string& alias,
         const JobInfo& jobInfo);
 
     /** @brief CrossEngineStep destructor
@@ -124,15 +122,15 @@ public:
     {
         return fRowsReturned;
     }
-    const string& schemaName() const
+    const std::string& schemaName() const
     {
         return fSchema;
     }
-    const string& tableName() const
+    const std::string& tableName() const
     {
         return fTable;
     }
-    const string& tableAlias() const
+    const std::string& tableAlias() const
     {
         return fAlias;
     }
@@ -149,10 +147,10 @@ public:
     bool  deliverStringTableRowGroup() const;
     uint32_t nextBand(messageqcpp::ByteStream& bs);
 
-    void addFcnJoinExp(const vector<execplan::SRCP>&);
+    void addFcnJoinExp(const std::vector<execplan::SRCP>&);
     void addFcnExpGroup1(const boost::shared_ptr<execplan::ParseTree>&);
     void setFE1Input(const rowgroup::RowGroup&);
-    void setFcnExpGroup3(const vector<execplan::SRCP>&);
+    void setFcnExpGroup3(const std::vector<execplan::SRCP>&);
     void setFE23Output(const rowgroup::RowGroup&);
 
     void addFilter(JobStep* jobStep);
diff --git a/dbcon/joblist/jlf_execplantojoblist.cpp b/dbcon/joblist/jlf_execplantojoblist.cpp
index f3782c9d5..fef60082b 100644
--- a/dbcon/joblist/jlf_execplantojoblist.cpp
+++ b/dbcon/joblist/jlf_execplantojoblist.cpp
@@ -3374,7 +3374,7 @@ namespace joblist
 // conversion performed by the functions in this file.
 // @bug6131, pre-order traversing
 /* static */ void
-JLF_ExecPlanToJobList::walkTree(ParseTree* n, JobInfo& jobInfo)
+JLF_ExecPlanToJobList::walkTree(execplan::ParseTree* n, JobInfo& jobInfo)
 {
     TreeNode* tn = n->data();
     JobStepVector jsv;
diff --git a/dbcon/joblist/jlf_execplantojoblist.h b/dbcon/joblist/jlf_execplantojoblist.h
index 0232e87a3..6f9fb5daf 100644
--- a/dbcon/joblist/jlf_execplantojoblist.h
+++ b/dbcon/joblist/jlf_execplantojoblist.h
@@ -30,7 +30,7 @@
 #include "calpontexecutionplan.h"
 #include "calpontselectexecutionplan.h"
 #include "calpontsystemcatalog.h"
-using namespace execplan;
+
 
 #include "jlf_common.h"
 
@@ -50,7 +50,7 @@ public:
      * @param ParseTree (in) is CEP to be translated to a joblist
      * @param JobInfo&  (in/out) is the JobInfo reference that is loaded
      */
-    static void walkTree(ParseTree* n, JobInfo& jobInfo);
+    static void walkTree(execplan::ParseTree* n, JobInfo& jobInfo);
 
     /** @brief This function add new job steps to the job step vector in JobInfo
      *
diff --git a/dbcon/joblist/joblistfactory.cpp b/dbcon/joblist/joblistfactory.cpp
index b0c314364..788cf5cc9 100644
--- a/dbcon/joblist/joblistfactory.cpp
+++ b/dbcon/joblist/joblistfactory.cpp
@@ -88,6 +88,7 @@ using namespace logging;
 #include "rowgroup.h"
 using namespace rowgroup;
 
+#include "mcsv1_udaf.h"
 
 namespace
 {
@@ -709,7 +710,7 @@ void updateAggregateColType(AggregateColumn* ac, const SRCP& srcp, int op, JobIn
 
         if (udafc)
         {
-            mcsv1Context& udafContext = udafc->getContext();
+            mcsv1sdk::mcsv1Context& udafContext = udafc->getContext();
             ct.colDataType = udafContext.getResultType();
             ct.colWidth = udafContext.getColWidth();
             ct.scale = udafContext.getScale();
diff --git a/dbcon/joblist/jobstep.cpp b/dbcon/joblist/jobstep.cpp
index f5419558d..8e90bd2a6 100644
--- a/dbcon/joblist/jobstep.cpp
+++ b/dbcon/joblist/jobstep.cpp
@@ -57,7 +57,7 @@ namespace joblist
 {
 boost::mutex JobStep::fLogMutex; //=PTHREAD_MUTEX_INITIALIZER;
 
-ThreadPool JobStep::jobstepThreadPool(defaultJLThreadPoolSize, 0);
+threadpool::ThreadPool JobStep::jobstepThreadPool(defaultJLThreadPoolSize, 0);
 
 ostream& operator<<(ostream& os, const JobStep* rhs)
 {
diff --git a/dbcon/joblist/jobstep.h b/dbcon/joblist/jobstep.h
index 5e917b2f0..d4f5143f4 100644
--- a/dbcon/joblist/jobstep.h
+++ b/dbcon/joblist/jobstep.h
@@ -53,8 +53,6 @@
 #  endif
 #endif
 
-using namespace threadpool;
-
 namespace joblist
 {
 
@@ -423,7 +421,7 @@ public:
         fOnClauseFilter = b;
     }
 
-    static ThreadPool jobstepThreadPool;
+    static threadpool::ThreadPool jobstepThreadPool;
 protected:
 
     //@bug6088, for telemetry posting
diff --git a/dbcon/mysql/ha_calpont_execplan.cpp b/dbcon/mysql/ha_calpont_execplan.cpp
index e553254e3..d962511ef 100644
--- a/dbcon/mysql/ha_calpont_execplan.cpp
+++ b/dbcon/mysql/ha_calpont_execplan.cpp
@@ -44,6 +44,7 @@
 #include <limits>
 
 #include <string.h>
+#include "mcsv1_udaf.h"
 
 using namespace std;
 
@@ -4610,7 +4611,7 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
 
             if (udafc)
             {
-                mcsv1Context& context = udafc->getContext();
+                mcsv1sdk::mcsv1Context& context = udafc->getContext();
                 context.setName(isp->func_name());
 
                 // Set up the return type defaults for the call to init()
@@ -4620,8 +4621,8 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
                 context.setPrecision(udafc->resultType().precision);
 
                 context.setParamCount(udafc->aggParms().size());
-                ColumnDatum colType;
-                ColumnDatum colTypes[udafc->aggParms().size()];
+                mcsv1sdk::ColumnDatum colType;
+                mcsv1sdk::ColumnDatum colTypes[udafc->aggParms().size()];
 
                 // Build the column type vector.
                 // Modified for MCOL-1201 multi-argument aggregate
@@ -4649,7 +4650,7 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
                     return NULL;
                 }
 
-                if (udaf->init(&context, colTypes) == mcsv1_UDAF::ERROR)
+                if (udaf->init(&context, colTypes) == mcsv1sdk::mcsv1_UDAF::ERROR)
                 {
                     gwi.fatalParseError = true;
                     gwi.parseErrorText = udafc->getContext().getErrorMessage();
@@ -4662,7 +4663,7 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
 
                 // UDAF_OVER_REQUIRED means that this function is for Window
                 // Function only. Reject it here in aggregate land.
-                if (udafc->getContext().getRunFlag(UDAF_OVER_REQUIRED))
+                if (udafc->getContext().getRunFlag(mcsv1sdk::UDAF_OVER_REQUIRED))
                 {
                     gwi.fatalParseError = true;
                     gwi.parseErrorText =
diff --git a/dbcon/mysql/ha_calpont_impl.cpp b/dbcon/mysql/ha_calpont_impl.cpp
index 57c17c6e7..685258744 100644
--- a/dbcon/mysql/ha_calpont_impl.cpp
+++ b/dbcon/mysql/ha_calpont_impl.cpp
@@ -3277,7 +3277,7 @@ void ha_calpont_impl_start_bulk_insert(ha_rows rows, TABLE* table)
 
             if (get_local_query(thd))
             {
-                OamCache* oamcache = OamCache::makeOamCache();
+                const auto oamcache = oam::OamCache::makeOamCache();
                 int localModuleId = oamcache->getLocalPMId();
 
                 if (localModuleId == 0)
diff --git a/dbcon/mysql/ha_mcs_client_udfs.cpp b/dbcon/mysql/ha_mcs_client_udfs.cpp
index 1766bdf1c..9113ae51b 100644
--- a/dbcon/mysql/ha_mcs_client_udfs.cpp
+++ b/dbcon/mysql/ha_mcs_client_udfs.cpp
@@ -58,7 +58,7 @@ extern "C"
     const char* invalidParmSizeMessage(uint64_t size, size_t& len)
     {
         static char str[sizeof(InvalidParmSize) + 12] = {0};
-        ostringstream os;
+        std::ostringstream os;
         os << InvalidParmSize << size;
         len = os.str().length();
         strcpy(str, os.str().c_str());
@@ -86,13 +86,13 @@ extern "C"
         uint64_t value = Config::uFromText(valuestr);
 
         THD* thd = current_thd;
-        uint32_t sessionID = CalpontSystemCatalog::idb_tid2sid(thd->thread_id);
+        uint32_t sessionID = execplan::CalpontSystemCatalog::idb_tid2sid(thd->thread_id);
 
         const char* msg = SetParmsError;
         size_t mlen = Elen;
         bool includeInput = true;
 
-        string pstr(parameter);
+        std::string pstr(parameter);
         boost::algorithm::to_lower(pstr);
 
         if (get_fe_conn_info_ptr() == NULL)
@@ -107,7 +107,7 @@ extern "C"
 
             if (rm->getHjTotalUmMaxMemorySmallSide() >= value)
             {
-                ci->rmParms.push_back(RMParam(sessionID, execplan::PMSMALLSIDEMEMORY, value));
+                ci->rmParms.push_back(execplan::RMParam(sessionID, execplan::PMSMALLSIDEMEMORY, value));
 
                 msg = SetParmsPrelude;
                 mlen = Plen;
@@ -254,8 +254,8 @@ extern "C"
         long long oldTrace = ci->traceFlags;
         ci->traceFlags = (uint32_t)(*((long long*)args->args[0]));
         // keep the vtablemode bit
-        ci->traceFlags |= (oldTrace & CalpontSelectExecutionPlan::TRACE_TUPLE_OFF);
-        ci->traceFlags |= (oldTrace & CalpontSelectExecutionPlan::TRACE_TUPLE_AUTOSWITCH);
+        ci->traceFlags |= (oldTrace & execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_OFF);
+        ci->traceFlags |= (oldTrace & execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_AUTOSWITCH);
         return oldTrace;
     }
 
@@ -381,8 +381,8 @@ extern "C"
     {
         long long rtn = 0;
         Oam oam;
-        string PrimaryUMModuleName;
-        string localModule;
+        std::string PrimaryUMModuleName;
+        std::string localModule;
         oamModuleInfo_t st;
 
         try
@@ -396,7 +396,7 @@ extern "C"
             if (PrimaryUMModuleName == "unassigned")
                 rtn = 1;
         }
-        catch (runtime_error& e)
+        catch (std::runtime_error& e)
         {
             // It's difficult to return an error message from a numerical UDF
             //string msg = string("ERROR: Problem getting Primary UM Module Name. ") + e.what();
@@ -469,7 +469,7 @@ extern "C"
             set_fe_conn_info_ptr((void*)new cal_connection_info());
 
         cal_connection_info* ci = reinterpret_cast<cal_connection_info*>(get_fe_conn_info_ptr());
-        CalpontSystemCatalog::TableName tableName;
+        execplan::CalpontSystemCatalog::TableName tableName;
 
         if ( args->arg_count == 2 )
         {
@@ -484,7 +484,7 @@ extern "C"
                 tableName.schema = thd->db.str;
             else
             {
-                string msg("No schema information provided");
+              std::string msg("No schema information provided");
                 memcpy(result, msg.c_str(), msg.length());
                 *length = msg.length();
                 return result;
@@ -497,7 +497,7 @@ extern "C"
             //cout << "viewtablelock starts a new client " << ci->dmlProc << " for session " << thd->thread_id << endl;
         }
 
-        string lockinfo = ha_calpont_impl_viewtablelock(*ci, tableName);
+        std::string lockinfo = ha_calpont_impl_viewtablelock(*ci, tableName);
 
         memcpy(result, lockinfo.c_str(), lockinfo.length());
         *length = lockinfo.length();
@@ -550,7 +550,7 @@ extern "C"
         }
 
         unsigned long long uLockID = lockID;
-        string lockinfo = ha_calpont_impl_cleartablelock(*ci, uLockID);
+        std::string lockinfo = ha_calpont_impl_cleartablelock(*ci, uLockID);
 
         memcpy(result, lockinfo.c_str(), lockinfo.length());
         *length = lockinfo.length();
@@ -604,7 +604,7 @@ extern "C"
     {
         THD* thd = current_thd;
 
-        CalpontSystemCatalog::TableName tableName;
+        execplan::CalpontSystemCatalog::TableName tableName;
         uint64_t nextVal = 0;
 
         if ( args->arg_count == 2 )
@@ -624,9 +624,9 @@ extern "C"
             }
         }
 
-        boost::shared_ptr<CalpontSystemCatalog> csc =
-            CalpontSystemCatalog::makeCalpontSystemCatalog(
-                CalpontSystemCatalog::idb_tid2sid(thd->thread_id));
+        boost::shared_ptr<execplan::CalpontSystemCatalog> csc =
+            execplan::CalpontSystemCatalog::makeCalpontSystemCatalog(
+                execplan::CalpontSystemCatalog::idb_tid2sid(thd->thread_id));
         csc->identity(execplan::CalpontSystemCatalog::FE);
 
         try
@@ -635,7 +635,7 @@ extern "C"
         }
         catch (std::exception&)
         {
-            string msg("No such table found during autincrement");
+          std::string msg("No such table found during autincrement");
             setError(thd, ER_INTERNAL_ERROR, msg);
             return nextVal;
         }
@@ -649,7 +649,7 @@ extern "C"
         //@Bug 3559. Return a message for table without autoincrement column.
         if (nextVal == 0)
         {
-            string msg("Autoincrement does not exist for this table.");
+          std::string msg("Autoincrement does not exist for this table.");
             setError(thd, ER_INTERNAL_ERROR, msg);
             return nextVal;
         }
@@ -705,7 +705,7 @@ extern "C"
                             char* result, unsigned long* length,
                             char* is_null, char* error)
     {
-        const string* msgp;
+        const std::string* msgp;
         int flags = 0;
 
         if (args->arg_count > 0)
@@ -776,7 +776,7 @@ extern "C"
                               char* result, unsigned long* length,
                               char* is_null, char* error)
     {
-        string version(columnstore_version);
+      std::string version(columnstore_version);
         *length = version.size();
         memcpy(result, version.c_str(), *length);
         return result;
diff --git a/ddlproc/ddlprocessor.cpp b/ddlproc/ddlprocessor.cpp
index a10ff31af..fb283f3a7 100644
--- a/ddlproc/ddlprocessor.cpp
+++ b/ddlproc/ddlprocessor.cpp
@@ -20,7 +20,7 @@
  *
  *
  ***********************************************************************/
-
+#include <future> //cxx11test
 #include <map>
 #include <boost/scoped_ptr.hpp>
 using namespace std;
diff --git a/dmlproc/dmlproc.cpp b/dmlproc/dmlproc.cpp
index deb936422..7b1041b1e 100644
--- a/dmlproc/dmlproc.cpp
+++ b/dmlproc/dmlproc.cpp
@@ -20,7 +20,7 @@
 *
 *
 ***********************************************************************/
-
+#include <future> //cxx11test
 #include <unistd.h>
 #include <signal.h>
 #include <string>
@@ -632,7 +632,7 @@ int main(int argc, char* argv[])
     if (rm->getDMLJlThreadPoolDebug() == "Y" || rm->getDMLJlThreadPoolDebug() == "y")
     {
         JobStep::jobstepThreadPool.setDebug(true);
-        JobStep::jobstepThreadPool.invoke(ThreadPoolMonitor(&JobStep::jobstepThreadPool));
+        JobStep::jobstepThreadPool.invoke(threadpool::ThreadPoolMonitor(&JobStep::jobstepThreadPool));
     }
 
     //set ACTIVE state
diff --git a/exemgr/CMakeLists.txt b/exemgr/CMakeLists.txt
index cae1cf3ce..5f77ed886 100644
--- a/exemgr/CMakeLists.txt
+++ b/exemgr/CMakeLists.txt
@@ -8,7 +8,9 @@ set(ExeMgr_SRCS main.cpp activestatementcounter.cpp femsghandler.cpp ../utils/co
 
 add_executable(ExeMgr ${ExeMgr_SRCS})
 
-target_link_libraries(ExeMgr ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} cacheutils threadpool)
+target_link_libraries(ExeMgr ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} cacheutils threadpool stdc++fs)
+
+
 
 install(TARGETS ExeMgr DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
 
diff --git a/exemgr/main.cpp b/exemgr/main.cpp
index 259d1443e..a0cdbb0e0 100644
--- a/exemgr/main.cpp
+++ b/exemgr/main.cpp
@@ -39,82 +39,53 @@
  * on the Front-End Processor where it is returned to the DBMS
  * front-end.
  */
+
+
+
+#include <mutex>
+#include <experimental/filesystem>
 #include <iostream>
-#include <map>
-#include <string>
-#include <stdexcept>
+
+#include <cstdint>
 #include <csignal>
-#include <unistd.h>
-#include <sys/time.h>
-#ifndef _MSC_VER
+
 #include <sys/resource.h>
-#else
-#include <io.h>
-#include <direct.h>
-#endif
-//#define NDEBUG
-#include <cassert>
-#include <clocale>
-#include <ctime>
-using namespace std;
 
-#include <boost/thread.hpp>
-#include <boost/tokenizer.hpp>
-#include <boost/scoped_ptr.hpp>
-using namespace boost;
-
-#include "config.h"
-#include "configcpp.h"
-using namespace config;
-#include "messagequeue.h"
-#include "iosocket.h"
-#include "bytestream.h"
-using namespace messageqcpp;
 #include "calpontselectexecutionplan.h"
-#include "calpontsystemcatalog.h"
-#include "simplecolumn.h"
-using namespace execplan;
-#include "joblist.h"
-#include "joblistfactory.h"
+#include "activestatementcounter.h"
 #include "distributedenginecomm.h"
 #include "resourcemanager.h"
-using namespace joblist;
-#include "liboamcpp.h"
-using namespace oam;
-#include "logger.h"
-#include "sqllogger.h"
-#include "idberrorinfo.h"
-using namespace logging;
-#include "querystats.h"
-using namespace querystats;
-#include "MonitorProcMem.h"
-#include "querytele.h"
-using namespace querytele;
+#include "configcpp.h"
+#include "queryteleserverparms.h"
+#include "iosocket.h"
+#include "joblist.h"
+#include "joblistfactory.h"
 #include "oamcache.h"
-
-#include "activestatementcounter.h"
+#include "simplecolumn.h"
+#include "bytestream.h"
+#include "telestats.h"
+#include "messageobj.h"
+#include "messagelog.h"
+#include "sqllogger.h"
 #include "femsghandler.h"
-
-#include "utils_utf8.h"
-#include "boost/filesystem.hpp"
-
-#include "threadpool.h"
+#include "idberrorinfo.h"
+#include "MonitorProcMem.h"
+#include "liboamcpp.h"
 #include "crashtrace.h"
+#include "utils_utf8.h"
 
 #if defined(SKIP_OAM_INIT)
 #include "dbrm.h"
 #endif
 
 
-#include "installdir.h"
-
 namespace
 {
 
 //If any flags other than the table mode flags are set, produce output to screeen
 const uint32_t flagsWantOutput = (0xffffffff &
-                                  ~CalpontSelectExecutionPlan::TRACE_TUPLE_AUTOSWITCH &
-                                  ~CalpontSelectExecutionPlan::TRACE_TUPLE_OFF);
+                                  ~execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_AUTOSWITCH &
+                                  ~execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_OFF);
 
 int gDebug;
 
@@ -129,32 +100,32 @@ const unsigned logExeMgrExcpt          = logging::M0055;
 
 logging::Logger msgLog(16);
 
-typedef map<uint32_t, size_t> SessionMemMap_t;
+typedef std::map<uint32_t, size_t> SessionMemMap_t;
 SessionMemMap_t sessionMemMap; // track memory% usage during a query
-mutex sessionMemMapMutex;
+std::mutex sessionMemMapMutex;
 
 //...The FrontEnd may establish more than 1 connection (which results in
 //   more than 1 ExeMgr thread) per session.  These threads will share
 //   the same CalpontSystemCatalog object for that session.  Here, we
-//   define a map to track how many threads are sharing each session, so
+//   define a std::map to track how many threads are sharing each session, so
 //   that we know when we can safely delete a CalpontSystemCatalog object
 //   shared by multiple threads per session.
-typedef map<uint32_t, uint32_t> ThreadCntPerSessionMap_t;
+typedef std::map<uint32_t, uint32_t> ThreadCntPerSessionMap_t;
 ThreadCntPerSessionMap_t        threadCntPerSessionMap;
-mutex threadCntPerSessionMapMutex;
+std::mutex threadCntPerSessionMapMutex;
 
 //This var is only accessed using thread-safe inc/dec calls
 ActiveStatementCounter* statementsRunningCount;
 
-DistributedEngineComm* ec;
+joblist::DistributedEngineComm* ec;
 
-ResourceManager* rm = ResourceManager::instance(true);
+auto rm = joblist::ResourceManager::instance(true);
 
 int toInt(const string& val)
 {
     if (val.length() == 0) return -1;
 
-    return static_cast<int>(Config::fromText(val));
+    return static_cast<int>(config::Config::fromText(val));
 }
 
 const string ExeMgr("ExeMgr1");
@@ -216,7 +187,7 @@ const string prettyPrintMiniInfo(const string& in)
         lineparts.push_back(parts);
     }
 
-    ostringstream oss;
+    std::ostringstream oss;
 
     vector<vector<string> >::iterator iter1 = lineparts.begin();
     vector<vector<string> >::iterator end1 = lineparts.end();
@@ -265,13 +236,13 @@ const string timeNow()
     return buf;
 }
 
-QueryTeleServerParms gTeleServerParms;
+querytele::QueryTeleServerParms gTeleServerParms;
 
 class SessionThread
 {
 public:
 
-    SessionThread(const IOSocket& ios, DistributedEngineComm* ec, ResourceManager* rm) :
+    SessionThread(const messageqcpp::IOSocket& ios, joblist::DistributedEngineComm* ec, joblist::ResourceManager* rm) :
         fIos(ios), fEc(ec),
         fRm(rm),
         fStatsRetrieved(false),
@@ -282,15 +253,15 @@ public:
 
 private:
 
-    IOSocket fIos;
-    DistributedEngineComm* fEc;
-    ResourceManager*  fRm;
+    messageqcpp::IOSocket fIos;
+    joblist::DistributedEngineComm* fEc;
+    joblist::ResourceManager*  fRm;
     querystats::QueryStats fStats;
 
     // Variables used to store return stats
     bool       fStatsRetrieved;
 
-    QueryTeleClient fTeleClient;
+    querytele::QueryTeleClient fTeleClient;
 
     oam::OamCache* fOamCachePtr;	//this ptr is copyable...
 
@@ -314,7 +285,7 @@ private:
 
         if ( sessionId < 0x80000000 )
         {
-            mutex::scoped_lock lk(sessionMemMapMutex);
+            std::lock_guard<std::mutex> lk(sessionMemMapMutex);
             SessionMemMap_t::iterator mapIter =
                 sessionMemMap.find( sessionId );
 
@@ -333,7 +304,7 @@ private:
     {
         if ( sessionId < 0x80000000 )
         {
-            mutex::scoped_lock lk(sessionMemMapMutex);
+            std::lock_guard<std::mutex> lk(sessionMemMapMutex);
             SessionMemMap_t::iterator mapIter =
                 sessionMemMap.find( sessionId );
 
@@ -346,14 +317,14 @@ private:
 
     //...Get and log query stats to specified output stream
     const string formatQueryStats (
-        SJLP&    jl,			// joblist associated with query
+        joblist::SJLP&    jl,			// joblist associated with query
         const    string& label, // header label to print in front of log output
         bool     includeNewLine,//include line breaks in query stats string
         bool     vtableModeOn,
         bool     wantExtendedStats,
         uint64_t rowsReturned)
     {
-        ostringstream os;
+        std::ostringstream os;
 
         // Get stats if not already acquired for current query
         if ( !fStatsRetrieved )
@@ -405,7 +376,7 @@ private:
     //...Increment the number of threads using the specified sessionId
     static void incThreadCntPerSession(uint32_t sessionId)
     {
-        mutex::scoped_lock lk(threadCntPerSessionMapMutex);
+        std::lock_guard<std::mutex> lk(threadCntPerSessionMapMutex);
         ThreadCntPerSessionMap_t::iterator mapIter =
             threadCntPerSessionMap.find(sessionId);
 
@@ -425,7 +396,7 @@ private:
     //...debugging/stats purpose, such as result graph, etc.
     static void decThreadCntPerSession(uint32_t sessionId)
     {
-        mutex::scoped_lock lk(threadCntPerSessionMapMutex);
+        std::lock_guard<std::mutex> lk(threadCntPerSessionMapMutex);
         ThreadCntPerSessionMap_t::iterator mapIter =
             threadCntPerSessionMap.find(sessionId);
 
@@ -434,8 +405,8 @@ private:
             if (--mapIter->second == 0)
             {
                 threadCntPerSessionMap.erase(mapIter);
-                CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId);
-                CalpontSystemCatalog::removeCalpontSystemCatalog((sessionId ^ 0x80000000));
+                execplan::CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId);
+                execplan::CalpontSystemCatalog::removeCalpontSystemCatalog((sessionId ^ 0x80000000));
             }
         }
     }
@@ -447,7 +418,7 @@ private:
         if ( sessionId < 0x80000000 )
         {
             // cout << "Setting pct to 0 for session " << sessionId << endl;
-            mutex::scoped_lock lk(sessionMemMapMutex);
+            std::lock_guard<std::mutex> lk(sessionMemMapMutex);
             SessionMemMap_t::iterator mapIter = sessionMemMap.find( sessionId );
 
             if ( mapIter == sessionMemMap.end() )
@@ -478,7 +449,7 @@ private:
         if (up)
             roundedValue++;
 
-        ostringstream oss;
+        std::ostringstream oss;
         oss << roundedValue << units[i];
         return oss.str();
     }
@@ -494,20 +465,20 @@ private:
         return roundedValue;
     }
 
-    void setRMParms ( const CalpontSelectExecutionPlan::RMParmVec& parms )
+    void setRMParms ( const execplan::CalpontSelectExecutionPlan::RMParmVec& parms )
     {
-        for (CalpontSelectExecutionPlan::RMParmVec::const_iterator it = parms.begin();
+        for (execplan::CalpontSelectExecutionPlan::RMParmVec::const_iterator it = parms.begin();
                 it != parms.end(); ++it)
         {
             switch (it->id)
             {
-                case PMSMALLSIDEMEMORY:
+                case execplan::PMSMALLSIDEMEMORY:
                 {
                     fRm->addHJPmMaxSmallSideMap(it->sessionId, it->value);
                     break;
                 }
 
-                case UMSMALLSIDEMEMORY:
+                case execplan::UMSMALLSIDEMEMORY:
                 {
                     fRm->addHJUmMaxSmallSideMap(it->sessionId, it->value);
                     break;
@@ -519,22 +490,22 @@ private:
         }
     }
 
-    void buildSysCache(const CalpontSelectExecutionPlan& csep, boost::shared_ptr<CalpontSystemCatalog> csc)
+    void buildSysCache(const execplan::CalpontSelectExecutionPlan& csep, boost::shared_ptr<execplan::CalpontSystemCatalog> csc)
     {
-        const CalpontSelectExecutionPlan::ColumnMap& colMap = csep.columnMap();
-        CalpontSelectExecutionPlan::ColumnMap::const_iterator it;
+        const execplan::CalpontSelectExecutionPlan::ColumnMap& colMap = csep.columnMap();
+        execplan::CalpontSelectExecutionPlan::ColumnMap::const_iterator it;
         string schemaName;
 
         for (it = colMap.begin(); it != colMap.end(); ++it)
         {
-            SimpleColumn* sc = dynamic_cast<SimpleColumn*>((it->second).get());
+            const auto sc = dynamic_cast<execplan::SimpleColumn*>((it->second).get());
 
             if (sc)
             {
                 schemaName = sc->schemaName();
 
                 // only the first time a schema is got will actually query
-                // system catalog. System catalog keeps a schema name map.
+                // system catalog. System catalog keeps a schema name std::map.
                 // if a schema exists, the call getSchemaInfo returns without
                 // doing anything.
                 if (!schemaName.empty())
@@ -542,11 +513,11 @@ private:
             }
         }
 
-        CalpontSelectExecutionPlan::SelectList::const_iterator subIt;
+        execplan::CalpontSelectExecutionPlan::SelectList::const_iterator subIt;
 
         for (subIt = csep.derivedTableList().begin(); subIt != csep.derivedTableList().end(); ++ subIt)
         {
-            buildSysCache(*(dynamic_cast<CalpontSelectExecutionPlan*>(subIt->get())), csc);
+            buildSysCache(*(dynamic_cast<execplan::CalpontSelectExecutionPlan*>(subIt->get())), csc);
         }
     }
 
@@ -554,10 +525,10 @@ public:
 
     void operator()()
     {
-        ByteStream bs, inbs;
-        CalpontSelectExecutionPlan csep;
+        messageqcpp::ByteStream bs, inbs;
+        execplan::CalpontSelectExecutionPlan csep;
         csep.sessionID(0);
-        SJLP jl;
+        joblist::SJLP jl;
         bool incSessionThreadCnt = true;
 
         bool selfJoin = false;
@@ -596,7 +567,7 @@ public:
                 }
                 else if (bs.length() == 4) //possible tuple flag
                 {
-                    ByteStream::quadbyte qb;
+                    messageqcpp::ByteStream::quadbyte qb;
                     bs >> qb;
 
                     if (qb == 4) //UM wants new tuple i/f
@@ -632,14 +603,14 @@ public:
 new_plan:
                 csep.unserialize(bs);
 
-                QueryTeleStats qts;
+                querytele::QueryTeleStats qts;
 
                 if ( !csep.isInternal() &&
                         (csep.queryType() == "SELECT" || csep.queryType() == "INSERT_SELECT") )
                 {
                     qts.query_uuid = csep.uuid();
-                    qts.msg_type = QueryTeleStats::QT_START;
-                    qts.start_time = QueryTeleClient::timeNowms();
+                    qts.msg_type = querytele::QueryTeleStats::QT_START;
+                    qts.start_time = querytele::QueryTeleClient::timeNowms();
                     qts.query = csep.data();
                     qts.session_id = csep.sessionID();
                     qts.query_type = csep.queryType();
@@ -659,8 +630,8 @@ new_plan:
                 // skip system catalog queries.
                 if (!csep.isInternal())
                 {
-                    boost::shared_ptr<CalpontSystemCatalog> csc =
-                        CalpontSystemCatalog::makeCalpontSystemCatalog(csep.sessionID());
+                    boost::shared_ptr<execplan::CalpontSystemCatalog> csc =
+                      execplan::CalpontSystemCatalog::makeCalpontSystemCatalog(csep.sessionID());
                     buildSysCache(csep, csc);
                 }
 
@@ -674,9 +645,9 @@ new_plan:
                 }
 
                 bool needDbProfEndStatementMsg = false;
-                Message::Args args;
+                logging::Message::Args args;
                 string sqlText = csep.data();
-                LoggingID li(16, csep.sessionID(), csep.txnID());
+                logging::LoggingID li(16, csep.sessionID(), csep.txnID());
 
                 // Initialize stats for this query, including
                 // init sessionMemMap entry for this session to 0 memory %.
@@ -694,7 +665,7 @@ new_plan:
                     args.add((int)csep.statementID());
                     args.add((int)csep.verID().currentScn);
                     args.add(sqlText);
-                    msgLog.logMessage(LOG_TYPE_DEBUG,
+                    msgLog.logMessage(logging::LOG_TYPE_DEBUG,
                                       logDbProfStartStatement,
                                       args,
                                       li);
@@ -705,9 +676,9 @@ new_plan:
                 if (selfJoin)
                     sqlText = "";
 
-                ostringstream oss;
+                std::ostringstream oss;
                 oss << sqlText << "; |" << csep.schemaName() << "|";
-                SQLLogger sqlLog(oss.str(), li);
+                logging::SQLLogger sqlLog(oss.str(), li);
 
                 statementsRunningCount->incr(stmtCounted);
 
@@ -716,13 +687,13 @@ new_plan:
                     try // @bug2244: try/catch around fIos.write() calls responding to makeTupleList
                     {
                         string emsg("NOERROR");
-                        ByteStream emsgBs;
-                        ByteStream::quadbyte tflg = 0;
-                        jl = JobListFactory::makeJobList(&csep, fRm, true, true);
+                        messageqcpp::ByteStream emsgBs;
+                        messageqcpp::ByteStream::quadbyte tflg = 0;
+                        jl = joblist::JobListFactory::makeJobList(&csep, fRm, true, true);
                         // assign query stats
                         jl->queryStats(fStats);
 
-                        ByteStream tbs;
+                        messageqcpp::ByteStream tbs;
 
                         if ((jl->status()) == 0 && (jl->putEngineComm(fEc) == 0))
                         {
@@ -734,7 +705,7 @@ new_plan:
                             emsgBs.reset();
                             emsgBs << emsg;
                             fIos.write(emsgBs);
-                            TupleJobList* tjlp = dynamic_cast<TupleJobList*>(jl.get());
+                            auto tjlp = dynamic_cast<joblist::TupleJobList*>(jl.get());
                             assert(tjlp);
                             tbs.restart();
                             tbs << tjlp->getOutputRowGroup();
@@ -756,14 +727,14 @@ new_plan:
                     }
                     catch (std::exception& ex)
                     {
-                        ostringstream errMsg;
+                        std::ostringstream errMsg;
                         errMsg << "ExeMgr: error writing makeJoblist "
                                "response; " <<  ex.what();
                         throw runtime_error( errMsg.str() );
                     }
                     catch (...)
                     {
-                        ostringstream errMsg;
+                        std::ostringstream errMsg;
                         errMsg << "ExeMgr: unknown error writing makeJoblist "
                                "response; ";
                         throw runtime_error( errMsg.str() );
@@ -783,7 +754,7 @@ new_plan:
                 else
                 {
                     usingTuples = false;
-                    jl = JobListFactory::makeJobList(&csep, fRm, false, true);
+                    jl = joblist::JobListFactory::makeJobList(&csep, fRm, false, true);
 
                     if (jl->status() == 0)
                     {
@@ -801,9 +772,9 @@ new_plan:
 
                 jl->doQuery();
 
-                CalpontSystemCatalog::OID tableOID;
+                execplan::CalpontSystemCatalog::OID tableOID;
                 bool swallowRows = false;
-                DeliveredTableMap tm;
+                joblist::DeliveredTableMap tm;
                 uint64_t totalBytesSent = 0;
                 uint64_t totalRowCount = 0;
 
@@ -835,7 +806,7 @@ new_plan:
 
                     assert(bs.length() == 4);
 
-                    ByteStream::quadbyte qb;
+                    messageqcpp::ByteStream::quadbyte qb;
 
                     try // @bug2244: try/catch around fIos.write() calls responding to qb command
                     {
@@ -861,7 +832,7 @@ new_plan:
                         {
                             // UM just wants any table
                             assert(swallowRows);
-                            DeliveredTableMap::iterator iter = tm.begin();
+                            auto iter = tm.begin();
 
                             if (iter == tm.end())
                             {
@@ -869,7 +840,7 @@ new_plan:
                                     cout << "### For session id " << csep.sessionID() << ", returning end flag" << endl;
 
                                 bs.restart();
-                                bs << (ByteStream::byte)1;
+                                bs << (messageqcpp::ByteStream::byte)1;
                                 fIos.write(bs);
                                 continue;
                             }
@@ -885,15 +856,15 @@ new_plan:
                                               jl,
                                               "Query Stats",
                                               false,
-                                              !(csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_TUPLE_OFF),
-                                              (csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_LOG),
+                                              !(csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_OFF),
+                                              (csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_LOG),
                                               totalRowCount
                                           );
 
                             bs.restart();
                             bs << statsString;
 
-                            if ((csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_LOG) != 0)
+                            if ((csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_LOG) != 0)
                             {
                                 bs << jl->extendedInfo();
                                 bs << prettyPrintMiniInfo(jl->miniInfo());
@@ -920,12 +891,12 @@ new_plan:
                         else // (qb > 3)
                         {
                             //Return table bands for the requested tableOID
-                            tableOID = static_cast<CalpontSystemCatalog::OID>(qb);
+                            tableOID = static_cast<execplan::CalpontSystemCatalog::OID>(qb);
                         }
                     }
                     catch (std::exception& ex)
                     {
-                        ostringstream errMsg;
+                        std::ostringstream errMsg;
                         errMsg << "ExeMgr: error writing qb response "
                                "for qb cmd " << qb <<
                                "; " <<  ex.what();
@@ -933,7 +904,7 @@ new_plan:
                     }
                     catch (...)
                     {
-                        ostringstream errMsg;
+                        std::ostringstream errMsg;
                         errMsg << "ExeMgr: unknown error writing qb response "
                                "for qb cmd " << qb;
                         throw runtime_error( errMsg.str() );
@@ -957,7 +928,7 @@ new_plan:
 
                         if (jl->status())
                         {
-                            IDBErrorInfo* errInfo = IDBErrorInfo::instance();
+                            const auto errInfo = logging::IDBErrorInfo::instance();
 
                             if (jl->errMsg().length() != 0)
                                 bs << jl->errMsg();
@@ -967,7 +938,7 @@ new_plan:
 
                         try // @bug2244: try/catch around fIos.write() calls projecting rows
                         {
-                            if (csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_NO_ROWS3)
+                            if (csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_NO_ROWS3)
                             {
                                 // Skip the write to the front end until the last empty band.  Used to time queries
                                 // through without any front end waiting.
@@ -982,7 +953,7 @@ new_plan:
                         catch (std::exception& ex)
                         {
                             msgHandler.stop();
-                            ostringstream errMsg;
+                            std::ostringstream errMsg;
                             errMsg << "ExeMgr: error projecting rows "
                                    "for tableOID: " << tableOID <<
                                    "; rowCnt: " << rowCount <<
@@ -1009,7 +980,7 @@ new_plan:
                         }
                         catch (...)
                         {
-                            ostringstream errMsg;
+                            std::ostringstream errMsg;
                             msgHandler.stop();
                             errMsg << "ExeMgr: unknown error projecting rows "
                                    "for tableOID: " <<
@@ -1052,7 +1023,7 @@ new_plan:
                 if (needDbProfEndStatementMsg)
                 {
                     string ss;
-                    ostringstream prefix;
+                    std::ostringstream prefix;
                     prefix << "ses:" << csep.sessionID() << " Query Totals";
 
                     //Log stats string to standard out
@@ -1060,8 +1031,8 @@ new_plan:
                              jl,
                              prefix.str(),
                              true,
-                             !(csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_TUPLE_OFF),
-                             (csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_LOG),
+                             !(csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_OFF),
+                             (csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_LOG),
                              totalRowCount);
                     //@Bug 1306. Added timing info for real time tracking.
                     cout << ss << " at " << timeNow() << endl;
@@ -1078,7 +1049,7 @@ new_plan:
                     args.add(fStats.fMsgBytesIn);
                     args.add(fStats.fMsgBytesOut);
                     args.add(fStats.fCPBlocksSkipped);
-                    msgLog.logMessage(LOG_TYPE_DEBUG,
+                    msgLog.logMessage(logging::LOG_TYPE_DEBUG,
                                       logDbProfQueryStats,
                                       args,
                                       li);
@@ -1092,7 +1063,7 @@ new_plan:
                     jl.reset();
                     args.reset();
                     args.add((int)csep.statementID());
-                    msgLog.logMessage(LOG_TYPE_DEBUG,
+                    msgLog.logMessage(logging::LOG_TYPE_DEBUG,
                                       logDbProfEndStatement,
                                       args,
                                       li);
@@ -1113,7 +1084,7 @@ new_plan:
                     // $FIFO_SINK compiler definition in pColStep.
                     // This option consumes rows in the project steps.
                     if (csep.traceFlags() &
-                            CalpontSelectExecutionPlan::TRACE_NO_ROWS4)
+                      execplan::CalpontSelectExecutionPlan::TRACE_NO_ROWS4)
                     {
                         cout << endl;
                         cout << "**** No data returned to DM.  Rows consumed "
@@ -1122,7 +1093,7 @@ new_plan:
                         cout << endl;
                     }
                     else if (csep.traceFlags() &
-                             CalpontSelectExecutionPlan::TRACE_NO_ROWS3)
+                      execplan::CalpontSelectExecutionPlan::TRACE_NO_ROWS3)
                     {
                         cout << endl;
                         cout << "**** No data returned to DM - caltrace(8) is "
@@ -1136,7 +1107,7 @@ new_plan:
                 if ( !csep.isInternal() &&
                         (csep.queryType() == "SELECT" || csep.queryType() == "INSERT_SELECT") )
                 {
-                    qts.msg_type = QueryTeleStats::QT_SUMMARY;
+                    qts.msg_type = querytele::QueryTeleStats::QT_SUMMARY;
                     qts.max_mem_pct = fStats.fMaxMemPct;
                     qts.num_files = fStats.fNumFiles;
                     qts.phy_io = fStats.fPhyIO;
@@ -1146,7 +1117,7 @@ new_plan:
                     qts.msg_bytes_in = fStats.fMsgBytesIn;
                     qts.msg_bytes_out = fStats.fMsgBytesOut;
                     qts.rows = totalRowCount;
-                    qts.end_time = QueryTeleClient::timeNowms();
+                    qts.end_time = querytele::QueryTeleClient::timeNowms();
                     qts.session_id = csep.sessionID();
                     qts.query_type = csep.queryType();
                     qts.query = csep.data();
@@ -1169,10 +1140,10 @@ new_plan:
             decThreadCntPerSession( csep.sessionID() | 0x80000000 );
             statementsRunningCount->decr(stmtCounted);
             cerr << "### ExeMgr ses:" << csep.sessionID() << " caught: " << ex.what() << endl;
-            Message::Args args;
-            LoggingID li(16, csep.sessionID(), csep.txnID());
+            logging::Message::Args args;
+            logging::LoggingID li(16, csep.sessionID(), csep.txnID());
             args.add(ex.what());
-            msgLog.logMessage(LOG_TYPE_CRITICAL, logExeMgrExcpt, args, li);
+            msgLog.logMessage(logging::LOG_TYPE_CRITICAL, logExeMgrExcpt, args, li);
             fIos.close();
         }
         catch (...)
@@ -1180,10 +1151,10 @@ new_plan:
             decThreadCntPerSession( csep.sessionID() | 0x80000000 );
             statementsRunningCount->decr(stmtCounted);
             cerr << "### Exception caught!" << endl;
-            Message::Args args;
-            LoggingID li(16, csep.sessionID(), csep.txnID());
+            logging::Message::Args args;
+            logging::LoggingID li(16, csep.sessionID(), csep.txnID());
             args.add("ExeMgr caught unknown exception");
-            msgLog.logMessage(LOG_TYPE_CRITICAL, logExeMgrExcpt, args, li);
+            msgLog.logMessage(logging::LOG_TYPE_CRITICAL, logExeMgrExcpt, args, li);
             fIos.close();
         }
     }
@@ -1209,20 +1180,20 @@ public:
                 if (fMaxPct >= 95)
                 {
                     cerr << "Too much memory allocated!" << endl;
-                    Message::Args args;
+                    logging::Message::Args args;
                     args.add((int)pct);
                     args.add((int)fMaxPct);
-                    msgLog.logMessage(LOG_TYPE_CRITICAL, logRssTooBig, args, LoggingID(16));
+                    msgLog.logMessage(logging::LOG_TYPE_CRITICAL, logRssTooBig, args, logging::LoggingID(16));
                     exit(1);
                 }
 
                 if (statementsRunningCount->cur() == 0)
                 {
                     cerr << "Too much memory allocated!" << endl;
-                    Message::Args args;
+                    logging::Message::Args args;
                     args.add((int)pct);
                     args.add((int)fMaxPct);
-                    msgLog.logMessage(LOG_TYPE_WARNING, logRssTooBig, args, LoggingID(16));
+                    msgLog.logMessage(logging::LOG_TYPE_WARNING, logRssTooBig, args, logging::LoggingID(16));
                     exit(1);
                 }
 
@@ -1230,19 +1201,20 @@ public:
             }
 
             // Update sessionMemMap entries lower than current mem % use
-            mutex::scoped_lock lk(sessionMemMapMutex);
-
-            for ( SessionMemMap_t::iterator mapIter = sessionMemMap.begin();
-                    mapIter != sessionMemMap.end();
-                    ++mapIter )
             {
-                if ( pct > mapIter->second )
-                {
-                    mapIter->second = pct;
-                }
-            }
+                std::lock_guard<std::mutex> lk(sessionMemMapMutex);
 
-            lk.unlock();
+                for (SessionMemMap_t::iterator mapIter = sessionMemMap.begin();
+                    mapIter != sessionMemMap.end();
+                    ++mapIter)
+                {
+                    if (pct > mapIter->second)
+                    {
+                        mapIter->second = pct;
+                    }
+                }
+
+            }
 
             pause_();
         }
@@ -1270,7 +1242,7 @@ void added_a_pm(int)
     if (ec)
     {
         //set BUSY_INIT state while processing the add pm configuration change
-        Oam oam;
+        oam::Oam oam;
 
         try
         {
@@ -1296,7 +1268,7 @@ void added_a_pm(int)
 void printTotalUmMemory(int sig)
 {
     int64_t num = rm->availableMemory();
-    cout << "Total UM memory available: " << num << endl;
+    std::cout << "Total UM memory available: " << num << std::endl;
 }
 
 void setupSignalHandlers()
@@ -1325,7 +1297,7 @@ void setupSignalHandlers()
 #endif
 }
 
-void setupCwd(ResourceManager* rm)
+void setupCwd(joblist::ResourceManager* rm)
 {
     string workdir = rm->getScWorkingDir();
     (void)chdir(workdir.c_str());
@@ -1376,7 +1348,7 @@ int setupResources()
 
 void cleanTempDir()
 {
-    config::Config* config = config::Config::makeConfig();
+    const auto config = config::Config::makeConfig();
     string allowDJS = config->getConfig("HashJoin", "AllowDiskBasedJoin");
     string tmpPrefix = config->getConfig("HashJoin", "TempFilePath");
 
@@ -1393,31 +1365,31 @@ void cleanTempDir()
     /* This is quite scary as ExeMgr usually runs as root */
     try
     {
-    	boost::filesystem::remove_all(tmpPrefix);
-    	boost::filesystem::create_directories(tmpPrefix);
+        std::experimental::filesystem::remove_all(tmpPrefix);
+        std::experimental::filesystem::create_directories(tmpPrefix);
     }
-    catch (std::exception& ex)
+    catch (const std::exception& ex)
     {
-        cerr << ex.what() << endl;
-        LoggingID logid(16, 0, 0);
-        Message::Args args;
-        Message message(8);
+        std::cerr << ex.what() << endl;
+        logging::LoggingID logid(16, 0, 0);
+        logging::Message::Args args;
+        logging::Message message(8);
         args.add("Execption whilst cleaning tmpdir: ");
         args.add(ex.what());
         message.format( args );
         logging::Logger logger(logid.fSubsysID);
-        logger.logMessage(LOG_TYPE_WARNING, message, logid);
+        logger.logMessage(logging::LOG_TYPE_WARNING, message, logid);
     }
     catch (...)
     {
         cerr << "Caught unknown exception during tmpdir cleanup" << endl;
-        LoggingID logid(16, 0, 0);
-        Message::Args args;
-        Message message(8);
+        logging::LoggingID logid(16, 0, 0);
+        logging::Message::Args args;
+        logging::Message message(8);
         args.add("Unknown execption whilst cleaning tmpdir");
         message.format( args );
         logging::Logger logger(logid.fSubsysID);
-        logger.logMessage(LOG_TYPE_WARNING, message, logid);
+        logger.logMessage(logging::LOG_TYPE_WARNING, message, logid);
     }
 }
 
@@ -1455,7 +1427,7 @@ int main(int argc, char* argv[])
 
     //set BUSY_INIT state
     {
-        Oam oam;
+        oam::Oam oam;
 
         try
         {
@@ -1502,7 +1474,7 @@ int main(int argc, char* argv[])
 
     if (err < 0)
     {
-        Oam oam;
+        oam::Oam oam;
         logging::Message::Args args;
         logging::Message message;
         args.add( errMsg );
@@ -1528,23 +1500,23 @@ int main(int argc, char* argv[])
 
     cleanTempDir();
 
-    MsgMap msgMap;
-    msgMap[logDefaultMsg]           = Message(logDefaultMsg);
-    msgMap[logDbProfStartStatement] = Message(logDbProfStartStatement);
-    msgMap[logDbProfEndStatement]   = Message(logDbProfEndStatement);
-    msgMap[logStartSql]             = Message(logStartSql);
-    msgMap[logEndSql]               = Message(logEndSql);
-    msgMap[logRssTooBig]            = Message(logRssTooBig);
-    msgMap[logDbProfQueryStats]     = Message(logDbProfQueryStats);
-    msgMap[logExeMgrExcpt]          = Message(logExeMgrExcpt);
+    logging::MsgMap msgMap;
+    msgMap[logDefaultMsg]           = logging::Message(logDefaultMsg);
+    msgMap[logDbProfStartStatement] = logging::Message(logDbProfStartStatement);
+    msgMap[logDbProfEndStatement]   = logging::Message(logDbProfEndStatement);
+    msgMap[logStartSql]             = logging::Message(logStartSql);
+    msgMap[logEndSql]               = logging::Message(logEndSql);
+    msgMap[logRssTooBig]            = logging::Message(logRssTooBig);
+    msgMap[logDbProfQueryStats]     = logging::Message(logDbProfQueryStats);
+    msgMap[logExeMgrExcpt]          = logging::Message(logExeMgrExcpt);
     msgLog.msgMap(msgMap);
 
-    ec = DistributedEngineComm::instance(rm, true);
+    ec = joblist::DistributedEngineComm::instance(rm, true);
     ec->Open();
 
     bool tellUser = true;
 
-    MessageQueueServer* mqs;
+    messageqcpp::MessageQueueServer* mqs;
 
     statementsRunningCount = new ActiveStatementCounter(rm->getEmExecQueueSize());
 
@@ -1552,7 +1524,7 @@ int main(int argc, char* argv[])
     {
         try
         {
-            mqs = new MessageQueueServer(ExeMgr, rm->getConfig(), ByteStream::BlockSize, 64);
+            mqs = new messageqcpp::MessageQueueServer(ExeMgr, rm->getConfig(), messageqcpp::ByteStream::BlockSize, 64);
             break;
         }
         catch (runtime_error& re)
@@ -1581,13 +1553,13 @@ int main(int argc, char* argv[])
     // because rm has a "isExeMgr" flag that is set upon creation (rm is a singleton).
     // From  the pools perspective, it has no idea if it is ExeMgr doing the
     // creation, so it has no idea which way to set the flag. So we set the max here.
-    JobStep::jobstepThreadPool.setMaxThreads(rm->getJLThreadPoolSize());
-    JobStep::jobstepThreadPool.setName("ExeMgrJobList");
+    joblist::JobStep::jobstepThreadPool.setMaxThreads(rm->getJLThreadPoolSize());
+    joblist::JobStep::jobstepThreadPool.setName("ExeMgrJobList");
 
     if (rm->getJlThreadPoolDebug() == "Y" || rm->getJlThreadPoolDebug() == "y")
     {
-        JobStep::jobstepThreadPool.setDebug(true);
-        JobStep::jobstepThreadPool.invoke(ThreadPoolMonitor(&JobStep::jobstepThreadPool));
+      joblist::JobStep::jobstepThreadPool.setDebug(true);
+      joblist::JobStep::jobstepThreadPool.invoke(threadpool::ThreadPoolMonitor(&joblist::JobStep::jobstepThreadPool));
     }
 
     int serverThreads = rm->getEmServerThreads();
@@ -1605,7 +1577,7 @@ int main(int argc, char* argv[])
     setpriority(PRIO_PROCESS, 0, priority);
 #endif
 
-    string teleServerHost(rm->getConfig()->getConfig("QueryTele", "Host"));
+    std::string teleServerHost(rm->getConfig()->getConfig("QueryTele", "Host"));
 
     if (!teleServerHost.empty())
     {
@@ -1618,13 +1590,13 @@ int main(int argc, char* argv[])
         }
     }
 
-    cout << "Starting ExeMgr: st = " << serverThreads <<
+    std::cout << "Starting ExeMgr: st = " << serverThreads <<
          ", qs = " << rm->getEmExecQueueSize() << ", mx = " << maxPct << ", cf = " <<
          rm->getConfig()->configFile() << endl;
 
     //set ACTIVE state
     {
-        Oam oam;
+        oam::Oam oam;
 
         try
         {
@@ -1646,12 +1618,12 @@ int main(int argc, char* argv[])
     if (rm->getExeMgrThreadPoolDebug() == "Y" || rm->getExeMgrThreadPoolDebug() == "y")
     {
         exeMgrThreadPool.setDebug(true);
-        exeMgrThreadPool.invoke(ThreadPoolMonitor(&exeMgrThreadPool));
+        exeMgrThreadPool.invoke(threadpool::ThreadPoolMonitor(&exeMgrThreadPool));
     }
 
     for (;;)
     {
-        IOSocket ios;
+        messageqcpp::IOSocket ios;
         ios = mqs->accept();
         exeMgrThreadPool.invoke(SessionThread(ios, ec, rm));
     }
diff --git a/oamapps/columnstoreDB/columnstoreDB.cpp b/oamapps/columnstoreDB/columnstoreDB.cpp
index 25c06d140..58a7e375f 100644
--- a/oamapps/columnstoreDB/columnstoreDB.cpp
+++ b/oamapps/columnstoreDB/columnstoreDB.cpp
@@ -23,6 +23,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <iostream>
 #include <fstream>
diff --git a/oamapps/columnstoreSupport/columnstoreSupport.cpp b/oamapps/columnstoreSupport/columnstoreSupport.cpp
index ccf7714c4..87adb28f7 100644
--- a/oamapps/columnstoreSupport/columnstoreSupport.cpp
+++ b/oamapps/columnstoreSupport/columnstoreSupport.cpp
@@ -10,6 +10,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <iterator>
 #include <numeric>
diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp
index d07c67ffb..6b951133b 100644
--- a/oamapps/mcsadmin/mcsadmin.cpp
+++ b/oamapps/mcsadmin/mcsadmin.cpp
@@ -21,6 +21,7 @@
  * $Id: mcsadmin.cpp 3110 2013-06-20 18:09:12Z dhill $
  *
  ******************************************************************************************/
+#include <future> //cxx11test
 
 #include <clocale>
 #include <netdb.h>
diff --git a/oamapps/postConfigure/getMySQLpw.cpp b/oamapps/postConfigure/getMySQLpw.cpp
index fdc6a6759..0073175bf 100644
--- a/oamapps/postConfigure/getMySQLpw.cpp
+++ b/oamapps/postConfigure/getMySQLpw.cpp
@@ -24,6 +24,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <unistd.h>
 #include <iterator>
diff --git a/oamapps/postConfigure/helpers.cpp b/oamapps/postConfigure/helpers.cpp
index 3238f9c57..e020ff7bc 100644
--- a/oamapps/postConfigure/helpers.cpp
+++ b/oamapps/postConfigure/helpers.cpp
@@ -348,8 +348,8 @@ int sendUpgradeRequest(int IserverTypeInstall, bool pmwithum)
         std::cerr << exc.what() << std::endl;
     }
 
-    ByteStream msg;
-    ByteStream::byte requestID = RUNUPGRADE;
+    messageqcpp::ByteStream msg;
+    messageqcpp::ByteStream::byte requestID = RUNUPGRADE;
 
     msg << requestID;
 
@@ -484,8 +484,8 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pm
                         if ( (*pt).DeviceName == masterModule )
                         {
                             // set for Master MySQL DB distrubution to slaves
-                            ByteStream msg1;
-                            ByteStream::byte requestID = oam::MASTERDIST;
+                            messageqcpp::ByteStream msg1;
+                            messageqcpp::ByteStream::byte requestID = oam::MASTERDIST;
                             msg1 << requestID;
                             msg1 << password;
                             msg1 << "all";	// dist to all slave modules
@@ -499,7 +499,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pm
                             }
 
                             // set for master repl request
-                            ByteStream msg;
+                            messageqcpp::ByteStream msg;
                             requestID = oam::MASTERREP;
                             msg << requestID;
 
@@ -527,8 +527,8 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pm
                                 continue;
                             }
 
-                            ByteStream msg;
-                            ByteStream::byte requestID = oam::SLAVEREP;
+                            messageqcpp::ByteStream msg;
+                            messageqcpp::ByteStream::byte requestID = oam::SLAVEREP;
                             msg << requestID;
 
                             if ( masterLogFile == oam::UnassignedName ||
@@ -574,7 +574,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pm
 * purpose:	Sends a Msg to ProcMon
 *
 ******************************************************************************************/
-int sendMsgProcMon( std::string module, ByteStream msg, int requestID, int timeout )
+int sendMsgProcMon( std::string module, messageqcpp::ByteStream msg, int requestID, int timeout )
 {
     string msgPort = module + "_ProcessMonitor";
     int returnStatus = API_FAILURE;
@@ -602,16 +602,16 @@ int sendMsgProcMon( std::string module, ByteStream msg, int requestID, int timeo
 
     try
     {
-        MessageQueueClient mqRequest(msgPort);
+        messageqcpp::MessageQueueClient mqRequest(msgPort);
         mqRequest.write(msg);
 
         if ( timeout > 0 )
         {
             // wait for response
-            ByteStream::byte returnACK;
-            ByteStream::byte returnRequestID;
-            ByteStream::byte requestStatus;
-            ByteStream receivedMSG;
+            messageqcpp::ByteStream::byte returnACK;
+            messageqcpp::ByteStream::byte returnRequestID;
+            messageqcpp::ByteStream::byte requestStatus;
+            messageqcpp::ByteStream receivedMSG;
 
             struct timespec ts = { timeout, 0 };
 
diff --git a/oamapps/postConfigure/helpers.h b/oamapps/postConfigure/helpers.h
index 5f7b1631a..8eb23bce0 100644
--- a/oamapps/postConfigure/helpers.h
+++ b/oamapps/postConfigure/helpers.h
@@ -21,7 +21,7 @@
 
 #include "liboamcpp.h"
 
-using namespace messageqcpp;
+
 namespace installer
 {
 
@@ -37,7 +37,7 @@ typedef std::vector<ChildModule> ChildModuleList;
 extern bool waitForActive();
 extern void dbrmDirCheck();
 extern void mysqlSetup();
-extern int sendMsgProcMon( std::string module, ByteStream msg, int requestID, int timeout );
+extern int sendMsgProcMon( std::string module, messageqcpp::ByteStream msg, int requestID, int timeout );
 extern int sendUpgradeRequest(int IserverTypeInstall, bool pmwithum = false);
 extern int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pmwithum);
 extern void checkFilesPerPartion(int DBRootCount, Config* sysConfig);
diff --git a/oamapps/postConfigure/installer.cpp b/oamapps/postConfigure/installer.cpp
index 81b69e548..075870275 100644
--- a/oamapps/postConfigure/installer.cpp
+++ b/oamapps/postConfigure/installer.cpp
@@ -27,6 +27,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <iterator>
 #include <numeric>
diff --git a/oamapps/postConfigure/mycnfUpgrade.cpp b/oamapps/postConfigure/mycnfUpgrade.cpp
index 7f785153e..e42a9b64f 100644
--- a/oamapps/postConfigure/mycnfUpgrade.cpp
+++ b/oamapps/postConfigure/mycnfUpgrade.cpp
@@ -25,6 +25,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <unistd.h>
 #include <iterator>
diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp
index fdfc1482c..a115104e5 100644
--- a/oamapps/postConfigure/postConfigure.cpp
+++ b/oamapps/postConfigure/postConfigure.cpp
@@ -29,6 +29,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <unistd.h>
 #include <iterator>
diff --git a/oamapps/serverMonitor/serverMonitor.cpp b/oamapps/serverMonitor/serverMonitor.cpp
index 99d0fb04a..f9a468569 100644
--- a/oamapps/serverMonitor/serverMonitor.cpp
+++ b/oamapps/serverMonitor/serverMonitor.cpp
@@ -21,6 +21,7 @@
  *
  *   Author: David Hill
  ***************************************************************************/
+#include <future> //cxx11test
 
 #include "serverMonitor.h"
 #include "installdir.h"
diff --git a/primitives/primproc/dictstep.h b/primitives/primproc/dictstep.h
index 1652ec8f3..025658d5b 100644
--- a/primitives/primproc/dictstep.h
+++ b/primitives/primproc/dictstep.h
@@ -138,7 +138,7 @@ private:
     int64_t* values;
     boost::scoped_array<std::string>* strValues;
     int compressionType;
-    ByteStream filterString;
+    messageqcpp::ByteStream filterString;
     uint32_t filterCount;
     uint32_t bufferSize;
     uint16_t inputRidCount;
diff --git a/primitives/primproc/primproc.cpp b/primitives/primproc/primproc.cpp
index 2e88493a0..3df972ac1 100644
--- a/primitives/primproc/primproc.cpp
+++ b/primitives/primproc/primproc.cpp
@@ -21,6 +21,8 @@
  *
  *
  ***********************************************************************/
+#include <future> //cxx11test
+
 #include <unistd.h>
 #include <string>
 #include <iostream>
diff --git a/primitives/primproc/umsocketselector.cpp b/primitives/primproc/umsocketselector.cpp
index 574e23e56..5fa76f3bc 100644
--- a/primitives/primproc/umsocketselector.cpp
+++ b/primitives/primproc/umsocketselector.cpp
@@ -243,7 +243,7 @@ UmSocketSelector::addConnection(
 // ioSock (in) - socket/port connection to be deleted
 //------------------------------------------------------------------------------
 void
-UmSocketSelector::delConnection( const IOSocket& ios )
+UmSocketSelector::delConnection( const messageqcpp::IOSocket& ios )
 {
     sockaddr sa = ios.sa();
     const sockaddr_in* sinp = reinterpret_cast<const sockaddr_in*>(&sa);
@@ -271,7 +271,7 @@ UmSocketSelector::delConnection( const IOSocket& ios )
 //------------------------------------------------------------------------------
 bool
 UmSocketSelector::nextIOSocket(
-    const IOSocket& ios,
+    const messageqcpp::IOSocket& ios,
     SP_UM_IOSOCK&   outIos,
     SP_UM_MUTEX&    writeLock )
 {
@@ -405,7 +405,7 @@ UmModuleIPs::addSocketConn(
 // ioSock (in) - socket/port connection to be deleted
 //------------------------------------------------------------------------------
 void
-UmModuleIPs::delSocketConn( const IOSocket& ioSock )
+UmModuleIPs::delSocketConn( const messageqcpp::IOSocket& ioSock )
 {
     boost::mutex::scoped_lock lock( fUmModuleMutex );
 
@@ -565,7 +565,7 @@ UmIPSocketConns::addSocketConn(
 // can benefit from quick random access.
 //------------------------------------------------------------------------------
 void
-UmIPSocketConns::delSocketConn( const IOSocket& ioSock )
+UmIPSocketConns::delSocketConn( const messageqcpp::IOSocket& ioSock )
 {
     for (unsigned int i = 0; i < fIOSockets.size(); ++i)
     {
diff --git a/primitives/primproc/umsocketselector.h b/primitives/primproc/umsocketselector.h
index 0affabec8..c5be55be8 100644
--- a/primitives/primproc/umsocketselector.h
+++ b/primitives/primproc/umsocketselector.h
@@ -52,8 +52,6 @@ typedef uint32_t in_addr_t;
 
 #include "iosocket.h"
 
-using namespace messageqcpp;
-
 namespace primitiveprocessor
 {
 class UmModuleIPs;
@@ -61,7 +59,7 @@ class UmIPSocketConns;
 
 typedef boost::shared_ptr<UmModuleIPs>     SP_UM_MODIPS;
 typedef boost::shared_ptr<UmIPSocketConns> SP_UM_IPCONNS;
-typedef boost::shared_ptr<IOSocket>		   SP_UM_IOSOCK;
+typedef boost::shared_ptr<messageqcpp::IOSocket>		   SP_UM_IOSOCK;
 typedef boost::shared_ptr<boost::mutex>	   SP_UM_MUTEX;
 
 //------------------------------------------------------------------------------
@@ -116,7 +114,7 @@ public:
      *
      * @param ios (in) socket/port connection to be removed.
      */
-    void delConnection( const IOSocket& ios );
+    void delConnection( const messageqcpp::IOSocket& ios );
 
     /** @brief Get the next output IOSocket to use for the specified ios.
      *
@@ -125,7 +123,7 @@ public:
      * @param writeLock (out) mutex to use when writing to outIos.
      * @return boolean indicating if operation was successful.
      */
-    bool nextIOSocket( const IOSocket& ios, SP_UM_IOSOCK& outIos,
+    bool nextIOSocket( const messageqcpp::IOSocket& ios, SP_UM_IOSOCK& outIos,
                        SP_UM_MUTEX& writeLock );
 
     /** @brief toString method used in logging, debugging, etc.
@@ -217,7 +215,7 @@ public:
      *
      * @param ioSock (in) socket/port to delete from the connection list.
      */
-    void delSocketConn ( const IOSocket& ioSock );
+    void delSocketConn ( const messageqcpp::IOSocket& ioSock );
 
     /** @brief Get the "next" available socket/port for this UM module.
      *
@@ -311,7 +309,7 @@ public:
      *
      * @param ioSock (in) socket/port to delete from the connection list.
      */
-    void delSocketConn ( const IOSocket& ioSock );
+    void delSocketConn ( const messageqcpp::IOSocket& ioSock );
 
     /** @brief Get the "next" available socket/port for this IP address.
      *
diff --git a/procmgr/main.cpp b/procmgr/main.cpp
index c81f5fd69..54529ae0a 100644
--- a/procmgr/main.cpp
+++ b/procmgr/main.cpp
@@ -21,6 +21,7 @@
 * $Id: main.cpp 2203 2013-07-08 16:50:51Z bpaul $
 *
 *****************************************************************************************/
+#include <future> //cxx11test
 
 
 #include <clocale>
diff --git a/procmon/main.cpp b/procmon/main.cpp
index 0d2d2ab4a..37afe274c 100644
--- a/procmon/main.cpp
+++ b/procmon/main.cpp
@@ -15,6 +15,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
+#include <future> //cxx11test
 
 #include <boost/interprocess/shared_memory_object.hpp>
 #include <boost/interprocess/mapped_region.hpp>
diff --git a/tools/clearShm/main.cpp b/tools/clearShm/main.cpp
index e883bc0f6..e80a8c79d 100644
--- a/tools/clearShm/main.cpp
+++ b/tools/clearShm/main.cpp
@@ -16,6 +16,7 @@
    MA 02110-1301, USA. */
 
 // $Id: main.cpp 2101 2013-01-21 14:12:52Z rdempsey $
+#include <future> //cxx11test
 
 #include "config.h"
 
@@ -46,7 +47,7 @@ namespace
 
 bool vFlg;
 bool nFlg;
-mutex coutMutex;
+std::mutex coutMutex;
 
 void shmDoit(key_t shm_key, const string& label)
 {
@@ -61,7 +62,7 @@ void shmDoit(key_t shm_key, const string& label)
                                             bi::read_only);
             bi::offset_t memSize = 0;
             memObj.get_size(memSize);
-            mutex::scoped_lock lk(coutMutex);
+            std::lock_guard<std::mutex> lk(coutMutex);
             cout << label << ": shm_key: " << shm_key <<
                  "; key_name: " << key_name <<
                  "; size: " << memSize << endl;
@@ -102,7 +103,7 @@ void semDoit(key_t sem_key, const string& label)
                                             bi::read_only);
             bi::offset_t memSize = 0;
             memObj.get_size(memSize);
-            mutex::scoped_lock lk(coutMutex);
+            std::lock_guard<std::mutex> lk(coutMutex);
             cout << label << ": sem_key: " << sem_key <<
                  "; key_name: " << key_name <<
                  "; size: " << memSize << endl;
diff --git a/tools/cleartablelock/cleartablelock.cpp b/tools/cleartablelock/cleartablelock.cpp
index a18148343..cb22cb343 100644
--- a/tools/cleartablelock/cleartablelock.cpp
+++ b/tools/cleartablelock/cleartablelock.cpp
@@ -18,6 +18,7 @@
 /*
 * $Id: cleartablelock.cpp 2336 2013-06-25 19:11:36Z rdempsey $
 */
+#include <future> //cxx11test
 
 #include <cstdlib>
 #include <iostream>
diff --git a/tools/configMgt/autoConfigure.cpp b/tools/configMgt/autoConfigure.cpp
index 85702952a..fbd5d739a 100644
--- a/tools/configMgt/autoConfigure.cpp
+++ b/tools/configMgt/autoConfigure.cpp
@@ -28,6 +28,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <iterator>
 #include <numeric>
diff --git a/tools/configMgt/autoInstaller.cpp b/tools/configMgt/autoInstaller.cpp
index 15ac98c33..e3699449e 100644
--- a/tools/configMgt/autoInstaller.cpp
+++ b/tools/configMgt/autoInstaller.cpp
@@ -28,6 +28,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <iostream>
 #include <cstdlib>
diff --git a/tools/configMgt/svnQuery.cpp b/tools/configMgt/svnQuery.cpp
index 1aaee0117..c1de2c065 100644
--- a/tools/configMgt/svnQuery.cpp
+++ b/tools/configMgt/svnQuery.cpp
@@ -24,6 +24,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <iterator>
 #include <numeric>
diff --git a/tools/cplogger/main.cpp b/tools/cplogger/main.cpp
index 0f1b1e32e..4d45cd527 100644
--- a/tools/cplogger/main.cpp
+++ b/tools/cplogger/main.cpp
@@ -16,6 +16,7 @@
    MA 02110-1301, USA. */
 
 // $Id: main.cpp 2336 2013-06-25 19:11:36Z rdempsey $
+#include <future> //cxx11test
 #include <unistd.h>
 #include <cstdio>
 #include <iostream>
diff --git a/tools/dbbuilder/dbbuilder.cpp b/tools/dbbuilder/dbbuilder.cpp
index aec094b89..6f62eeb0a 100644
--- a/tools/dbbuilder/dbbuilder.cpp
+++ b/tools/dbbuilder/dbbuilder.cpp
@@ -19,6 +19,7 @@
 * $Id: dbbuilder.cpp 2101 2013-01-21 14:12:52Z rdempsey $
 *
 *******************************************************************************/
+#include <future> //cxx11test
 #include <stdio.h>
 #include <unistd.h>
 #include <cerrno>
diff --git a/tools/dbloadxml/colxml.cpp b/tools/dbloadxml/colxml.cpp
index 00171ffc0..4e359c599 100644
--- a/tools/dbloadxml/colxml.cpp
+++ b/tools/dbloadxml/colxml.cpp
@@ -19,6 +19,7 @@
  * $Id: colxml.cpp 2237 2013-05-05 23:42:37Z dcathey $
  *
  ******************************************************************************/
+#include <future> //cxx11test
 
 #include <clocale>
 
diff --git a/tools/ddlcleanup/ddlcleanup.cpp b/tools/ddlcleanup/ddlcleanup.cpp
index f09e50d7a..9924f91be 100644
--- a/tools/ddlcleanup/ddlcleanup.cpp
+++ b/tools/ddlcleanup/ddlcleanup.cpp
@@ -18,6 +18,7 @@
 /*
 * $Id: ddlcleanup.cpp 967 2009-10-15 13:57:29Z rdempsey $
 */
+#include <future> //cxx11test
 
 #include <iostream>
 #include <fstream>
diff --git a/tools/editem/editem.cpp b/tools/editem/editem.cpp
index 12ff29221..81c34c407 100644
--- a/tools/editem/editem.cpp
+++ b/tools/editem/editem.cpp
@@ -18,6 +18,7 @@
 /*
 * $Id: editem.cpp 2336 2013-06-25 19:11:36Z rdempsey $
 */
+#include <future> //cxx11test
 
 #include <iostream>
 #include <vector>
diff --git a/tools/getConfig/main.cpp b/tools/getConfig/main.cpp
index 87e5ed724..e895f603b 100644
--- a/tools/getConfig/main.cpp
+++ b/tools/getConfig/main.cpp
@@ -19,6 +19,7 @@
 * $Id: main.cpp 2101 2013-01-21 14:12:52Z rdempsey $
 *
 *****************************************************************************/
+#include <future> //cxx11test
 #include <iostream>
 #include <cassert>
 #include <unistd.h>
diff --git a/tools/idbmeminfo/idbmeminfo.cpp b/tools/idbmeminfo/idbmeminfo.cpp
index b0be99d35..4c84403a3 100644
--- a/tools/idbmeminfo/idbmeminfo.cpp
+++ b/tools/idbmeminfo/idbmeminfo.cpp
@@ -14,6 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
+#include <future> //cxx11test
 
 #ifdef _MSC_VER
 #define WIN32_LEAN_AND_MEAN
diff --git a/tools/setConfig/main.cpp b/tools/setConfig/main.cpp
index d74d51ed9..fb66c9bc7 100644
--- a/tools/setConfig/main.cpp
+++ b/tools/setConfig/main.cpp
@@ -19,6 +19,7 @@
 * $Id: main.cpp 210 2007-06-08 17:08:26Z rdempsey $
 *
 *****************************************************************************/
+#include <future> //cxx11test
 #include <unistd.h>
 #include <iostream>
 #include <cassert>
diff --git a/tools/viewtablelock/viewtablelock.cpp b/tools/viewtablelock/viewtablelock.cpp
index cec87cfec..6d163e3e5 100644
--- a/tools/viewtablelock/viewtablelock.cpp
+++ b/tools/viewtablelock/viewtablelock.cpp
@@ -18,6 +18,7 @@
 /*
 * $Id: viewtablelock.cpp 2101 2013-01-21 14:12:52Z rdempsey $
 */
+#include <future> //cxx11test
 
 #include <ctime>
 #include <iostream>
diff --git a/utils/funcexp/func_date.cpp b/utils/funcexp/func_date.cpp
index 7fc990ab6..719b068df 100644
--- a/utils/funcexp/func_date.cpp
+++ b/utils/funcexp/func_date.cpp
@@ -56,8 +56,8 @@ int64_t Func_date::getIntVal(rowgroup::Row& row,
 
     string value = "";
 
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (type)
     {
@@ -79,7 +79,7 @@ int64_t Func_date::getIntVal(rowgroup::Row& row,
         case CalpontSystemCatalog::TIME:
         {
             int64_t val;
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             aDateTime.hour = 0;
diff --git a/utils/funcexp/func_day.cpp b/utils/funcexp/func_day.cpp
index 7ff2bab9a..6adfc9c25 100644
--- a/utils/funcexp/func_day.cpp
+++ b/utils/funcexp/func_day.cpp
@@ -49,8 +49,8 @@ int64_t Func_day::getIntVal(rowgroup::Row& row,
 {
     int64_t val = 0;
 
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -64,7 +64,7 @@ int64_t Func_day::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_dayname.cpp b/utils/funcexp/func_dayname.cpp
index 5da6d8943..15933080e 100644
--- a/utils/funcexp/func_dayname.cpp
+++ b/utils/funcexp/func_dayname.cpp
@@ -54,8 +54,8 @@ int64_t Func_dayname::getIntVal(rowgroup::Row& row,
     int64_t val = 0;
     int32_t dayofweek = 0;
 
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -75,7 +75,7 @@ int64_t Func_dayname::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_dayofweek.cpp b/utils/funcexp/func_dayofweek.cpp
index ec84f5738..e9cb9f0e4 100644
--- a/utils/funcexp/func_dayofweek.cpp
+++ b/utils/funcexp/func_dayofweek.cpp
@@ -52,8 +52,8 @@ int64_t Func_dayofweek::getIntVal(rowgroup::Row& row,
     uint32_t day = 0;
     int64_t val = 0;
 
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -73,7 +73,7 @@ int64_t Func_dayofweek::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_dayofyear.cpp b/utils/funcexp/func_dayofyear.cpp
index ee3b9cf30..782e7e1af 100644
--- a/utils/funcexp/func_dayofyear.cpp
+++ b/utils/funcexp/func_dayofyear.cpp
@@ -52,8 +52,8 @@ int64_t Func_dayofyear::getIntVal(rowgroup::Row& row,
     uint32_t day = 0;
     int64_t val = 0;
 
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -73,7 +73,7 @@ int64_t Func_dayofyear::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_month.cpp b/utils/funcexp/func_month.cpp
index 5479270d0..e11cee296 100644
--- a/utils/funcexp/func_month.cpp
+++ b/utils/funcexp/func_month.cpp
@@ -48,8 +48,8 @@ int64_t Func_month::getIntVal(rowgroup::Row& row,
                               CalpontSystemCatalog::ColType& op_ct)
 {
     int64_t val = 0;
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -63,7 +63,7 @@ int64_t Func_month::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_monthname.cpp b/utils/funcexp/func_monthname.cpp
index 9657b1ea2..70bba26e0 100644
--- a/utils/funcexp/func_monthname.cpp
+++ b/utils/funcexp/func_monthname.cpp
@@ -79,8 +79,8 @@ int64_t Func_monthname::getIntVal(rowgroup::Row& row,
                                   CalpontSystemCatalog::ColType& op_ct)
 {
     int64_t val = 0;
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -94,7 +94,7 @@ int64_t Func_monthname::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_quarter.cpp b/utils/funcexp/func_quarter.cpp
index 78559d68d..4f476e2ff 100644
--- a/utils/funcexp/func_quarter.cpp
+++ b/utils/funcexp/func_quarter.cpp
@@ -50,8 +50,8 @@ int64_t Func_quarter::getIntVal(rowgroup::Row& row,
 {
     // try to cast to date/datetime
     int64_t val = 0, month = 0;
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -67,7 +67,7 @@ int64_t Func_quarter::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_to_days.cpp b/utils/funcexp/func_to_days.cpp
index f16642958..33f72b22d 100644
--- a/utils/funcexp/func_to_days.cpp
+++ b/utils/funcexp/func_to_days.cpp
@@ -59,8 +59,8 @@ int64_t Func_to_days::getIntVal(rowgroup::Row& row,
              month = 0,
              day = 0;
 
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (type)
     {
@@ -89,7 +89,7 @@ int64_t Func_to_days::getIntVal(rowgroup::Row& row,
         case CalpontSystemCatalog::TIME:
         {
             int64_t val;
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aDateTime.hour = 0;
             aDateTime.minute = 0;
diff --git a/utils/funcexp/func_week.cpp b/utils/funcexp/func_week.cpp
index a9e47bd4b..ec6131b26 100644
--- a/utils/funcexp/func_week.cpp
+++ b/utils/funcexp/func_week.cpp
@@ -53,8 +53,8 @@ int64_t Func_week::getIntVal(rowgroup::Row& row,
 
     int64_t val = 0;
     int16_t mode = 0;
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     if (parm.size() > 1)  // mode value
         mode = parm[1]->data()->getIntVal(row, isNull);
@@ -77,7 +77,7 @@ int64_t Func_week::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_weekday.cpp b/utils/funcexp/func_weekday.cpp
index 9666710f5..6b5c1f55d 100644
--- a/utils/funcexp/func_weekday.cpp
+++ b/utils/funcexp/func_weekday.cpp
@@ -52,8 +52,8 @@ int64_t Func_weekday::getIntVal(rowgroup::Row& row,
     uint32_t month = 0;
     uint32_t day = 0;
     int64_t val = 0;
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -73,7 +73,7 @@ int64_t Func_weekday::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_year.cpp b/utils/funcexp/func_year.cpp
index 17ff4f2d0..6e71b8a03 100644
--- a/utils/funcexp/func_year.cpp
+++ b/utils/funcexp/func_year.cpp
@@ -48,8 +48,8 @@ int64_t Func_year::getIntVal(rowgroup::Row& row,
                              CalpontSystemCatalog::ColType& op_ct)
 {
     int64_t val = 0;
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -63,7 +63,7 @@ int64_t Func_year::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_yearweek.cpp b/utils/funcexp/func_yearweek.cpp
index e567440b4..5568b763c 100644
--- a/utils/funcexp/func_yearweek.cpp
+++ b/utils/funcexp/func_yearweek.cpp
@@ -54,8 +54,8 @@ int64_t Func_yearweek::getIntVal(rowgroup::Row& row,
 
     int64_t val = 0;
     int16_t mode = 0;	// default to 2
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     if (parm.size() > 1)   // mode value
         mode = parm[1]->data()->getIntVal(row, isNull);
@@ -80,7 +80,7 @@ int64_t Func_yearweek::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/functor.h b/utils/funcexp/functor.h
index 9904c6831..890fddeae 100644
--- a/utils/funcexp/functor.h
+++ b/utils/funcexp/functor.h
@@ -36,7 +36,6 @@
 #include "calpontsystemcatalog.h"
 
 #include "dataconvert.h"
-using namespace dataconvert;
 
 namespace rowgroup
 {
@@ -178,7 +177,7 @@ protected:
     virtual std::string longDoubleToString(long double);
 
     virtual int64_t nowDatetime();
-    virtual int64_t addTime(DateTime& dt1, dataconvert::Time& dt2);
+    virtual int64_t addTime(dataconvert::DateTime& dt1, dataconvert::Time& dt2);
     virtual int64_t addTime(dataconvert::Time& dt1, dataconvert::Time& dt2);
 
     std::string fFuncName;
diff --git a/utils/funcexp/functor_str.h b/utils/funcexp/functor_str.h
index 5402cc646..fc8de1d9f 100644
--- a/utils/funcexp/functor_str.h
+++ b/utils/funcexp/functor_str.h
@@ -25,8 +25,6 @@
 
 #include "functor.h"
 
-using namespace std;
-
 namespace funcexp
 {
 
@@ -141,7 +139,7 @@ protected:
         exponent = (int)floor(log10( fabsl(floatVal)));
         base = floatVal * pow(10, -1.0 * exponent);
 
-        if (isnan(exponent) || isnan(base))
+        if (std::isnan(exponent) || std::isnan(base))
         {
             snprintf(buf, 20, "%Lf", floatVal);
             fFloatStr = execplan::removeTrailing0(buf, 20);
@@ -325,7 +323,7 @@ public:
   */
 class Func_lpad : public Func_Str
 {
-    static const string fPad;
+    static const std::string fPad;
 public:
     Func_lpad() : Func_Str("lpad") {}
     virtual ~Func_lpad() {}
@@ -343,7 +341,7 @@ public:
   */
 class Func_rpad : public Func_Str
 {
-    static const string fPad;
+    static const std::string fPad;
 public:
     Func_rpad() : Func_Str("rpad") {}
     virtual ~Func_rpad() {}
diff --git a/utils/funcexp/utils_utf8.h b/utils/funcexp/utils_utf8.h
index 6f5cb26a8..442ca6297 100644
--- a/utils/funcexp/utils_utf8.h
+++ b/utils/funcexp/utils_utf8.h
@@ -37,12 +37,9 @@
 
 #include <clocale>
 
-#include "alarmmanager.h"
-using namespace alarmmanager;
+#include "ALARMManager.h"
 
 #include "liboamcpp.h"
-using namespace oam;
-
 
 /** @file */
 
@@ -63,7 +60,7 @@ std::string idb_setlocale()
 {
     // get and set locale language
     std::string systemLang("C");
-    Oam oam;
+    oam::Oam oam;
 
     try
     {
@@ -81,9 +78,9 @@ std::string idb_setlocale()
         try
         {
             //send alarm
-            ALARMManager alarmMgr;
+            alarmmanager::ALARMManager alarmMgr;
             std::string alarmItem = "system";
-            alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, SET);
+            alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, alarmmanager::SET);
             printf("Failed to set locale : %s, Critical alarm generated\n", systemLang.c_str());
         }
         catch (...)
@@ -96,9 +93,9 @@ std::string idb_setlocale()
         try
         {
             //send alarm
-            ALARMManager alarmMgr;
+            alarmmanager::ALARMManager alarmMgr;
             std::string alarmItem = "system";
-            alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, CLEAR);
+            alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, alarmmanager::CLEAR);
         }
         catch (...)
         {
diff --git a/utils/regr/corr.cpp b/utils/regr/corr.cpp
index c1c388da9..ac69357df 100644
--- a/utils/regr/corr.cpp
+++ b/utils/regr/corr.cpp
@@ -66,7 +66,7 @@ mcsv1_UDAF::ReturnCode corr::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(corr_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/corr.h b/utils/regr/corr.h
index eba7597eb..649cea2e3 100644
--- a/utils/regr/corr.h
+++ b/utils/regr/corr.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/covar_pop.cpp b/utils/regr/covar_pop.cpp
index 876be1f30..672da9d75 100644
--- a/utils/regr/covar_pop.cpp
+++ b/utils/regr/covar_pop.cpp
@@ -64,7 +64,7 @@ mcsv1_UDAF::ReturnCode covar_pop::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(covar_pop_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/covar_pop.h b/utils/regr/covar_pop.h
index fc47d4497..c05e4966a 100644
--- a/utils/regr/covar_pop.h
+++ b/utils/regr/covar_pop.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/covar_samp.cpp b/utils/regr/covar_samp.cpp
index ccc302046..81e9fc212 100644
--- a/utils/regr/covar_samp.cpp
+++ b/utils/regr/covar_samp.cpp
@@ -64,7 +64,7 @@ mcsv1_UDAF::ReturnCode covar_samp::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(covar_samp_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/covar_samp.h b/utils/regr/covar_samp.h
index 6aba65054..05d563d8e 100644
--- a/utils/regr/covar_samp.h
+++ b/utils/regr/covar_samp.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_avgx.cpp b/utils/regr/regr_avgx.cpp
index bf010e648..f474c544c 100644
--- a/utils/regr/regr_avgx.cpp
+++ b/utils/regr/regr_avgx.cpp
@@ -72,7 +72,7 @@ mcsv1_UDAF::ReturnCode regr_avgx::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_avgx_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(colTypes[1].scale + 4);
     context->setPrecision(19);
diff --git a/utils/regr/regr_avgx.h b/utils/regr/regr_avgx.h
index 75791f769..187291176 100644
--- a/utils/regr/regr_avgx.h
+++ b/utils/regr/regr_avgx.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_avgy.cpp b/utils/regr/regr_avgy.cpp
index 7325d991f..015cc5ea7 100644
--- a/utils/regr/regr_avgy.cpp
+++ b/utils/regr/regr_avgy.cpp
@@ -72,7 +72,7 @@ mcsv1_UDAF::ReturnCode regr_avgy::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_avgy_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(colTypes[0].scale + 4);
     context->setPrecision(19);
diff --git a/utils/regr/regr_avgy.h b/utils/regr/regr_avgy.h
index c99021f9f..209f97098 100644
--- a/utils/regr/regr_avgy.h
+++ b/utils/regr/regr_avgy.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_count.cpp b/utils/regr/regr_count.cpp
index c65a1f4a6..8b5993d33 100644
--- a/utils/regr/regr_count.cpp
+++ b/utils/regr/regr_count.cpp
@@ -54,7 +54,7 @@ mcsv1_UDAF::ReturnCode regr_count::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_count_data));
-    context->setResultType(CalpontSystemCatalog::BIGINT);
+    context->setResultType(execplan::CalpontSystemCatalog::BIGINT);
     context->setColWidth(8);
     context->setRunFlag(mcsv1sdk::UDAF_IGNORE_NULLS);
     return mcsv1_UDAF::SUCCESS;
diff --git a/utils/regr/regr_count.h b/utils/regr/regr_count.h
index 4f4fc558e..bde8d1cfd 100644
--- a/utils/regr/regr_count.h
+++ b/utils/regr/regr_count.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_intercept.cpp b/utils/regr/regr_intercept.cpp
index df9310f03..9b457243c 100644
--- a/utils/regr/regr_intercept.cpp
+++ b/utils/regr/regr_intercept.cpp
@@ -65,7 +65,7 @@ mcsv1_UDAF::ReturnCode regr_intercept::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_intercept_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/regr_intercept.h b/utils/regr/regr_intercept.h
index ed82477cd..72856d250 100644
--- a/utils/regr/regr_intercept.h
+++ b/utils/regr/regr_intercept.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_r2.cpp b/utils/regr/regr_r2.cpp
index 1abd3ea2e..60bcad65c 100644
--- a/utils/regr/regr_r2.cpp
+++ b/utils/regr/regr_r2.cpp
@@ -66,7 +66,7 @@ mcsv1_UDAF::ReturnCode regr_r2::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_r2_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/regr_r2.h b/utils/regr/regr_r2.h
index d440ad5a1..7494114a6 100644
--- a/utils/regr/regr_r2.h
+++ b/utils/regr/regr_r2.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_slope.cpp b/utils/regr/regr_slope.cpp
index de9eab5c7..17e662f2c 100644
--- a/utils/regr/regr_slope.cpp
+++ b/utils/regr/regr_slope.cpp
@@ -64,7 +64,7 @@ mcsv1_UDAF::ReturnCode regr_slope::init(mcsv1Context* context,
         return mcsv1_UDAF::ERROR;
     }
     context->setUserDataSize(sizeof(regr_slope_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/regr_slope.h b/utils/regr/regr_slope.h
index 9c148d895..084b12aac 100644
--- a/utils/regr/regr_slope.h
+++ b/utils/regr/regr_slope.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_sxx.cpp b/utils/regr/regr_sxx.cpp
index 5769a227b..afa379f68 100644
--- a/utils/regr/regr_sxx.cpp
+++ b/utils/regr/regr_sxx.cpp
@@ -63,7 +63,7 @@ mcsv1_UDAF::ReturnCode regr_sxx::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_sxx_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/regr_sxx.h b/utils/regr/regr_sxx.h
index 14d82bd55..007c032f1 100644
--- a/utils/regr/regr_sxx.h
+++ b/utils/regr/regr_sxx.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_sxy.cpp b/utils/regr/regr_sxy.cpp
index 76e1373c4..daef4333e 100644
--- a/utils/regr/regr_sxy.cpp
+++ b/utils/regr/regr_sxy.cpp
@@ -64,7 +64,7 @@ mcsv1_UDAF::ReturnCode regr_sxy::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_sxy_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/regr_sxy.h b/utils/regr/regr_sxy.h
index 25aa34145..257a61663 100644
--- a/utils/regr/regr_sxy.h
+++ b/utils/regr/regr_sxy.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_syy.cpp b/utils/regr/regr_syy.cpp
index 014a28389..f8e4c5b0c 100644
--- a/utils/regr/regr_syy.cpp
+++ b/utils/regr/regr_syy.cpp
@@ -63,7 +63,7 @@ mcsv1_UDAF::ReturnCode regr_syy::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_syy_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/regr_syy.h b/utils/regr/regr_syy.h
index a837fab13..cce37e9c0 100644
--- a/utils/regr/regr_syy.h
+++ b/utils/regr/regr_syy.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/rowgroup/rowaggregation.cpp b/utils/rowgroup/rowaggregation.cpp
index 4bfbf87b6..0be02629a 100644
--- a/utils/rowgroup/rowaggregation.cpp
+++ b/utils/rowgroup/rowaggregation.cpp
@@ -1903,7 +1903,7 @@ void RowAggregation::doUDAF(const Row& rowIn, int64_t colIn, int64_t colOut,
     // The vector of parameters to be sent to the UDAF
     mcsv1sdk::ColumnDatum valsIn[paramCount];
     uint32_t dataFlags[paramCount];
-    ConstantColumn* cc;
+    execplan::ConstantColumn* cc;
     bool bIsNull = false;
     execplan::CalpontSystemCatalog::ColDataType colDataType;
 
@@ -1919,10 +1919,10 @@ void RowAggregation::doUDAF(const Row& rowIn, int64_t colIn, int64_t colOut,
 
         if (fFunctionCols[funcColsIdx]->fpConstCol)
         {
-            cc = dynamic_cast<ConstantColumn*>(fFunctionCols[funcColsIdx]->fpConstCol.get());
+            cc = dynamic_cast<execplan::ConstantColumn*>(fFunctionCols[funcColsIdx]->fpConstCol.get());
         }
 
-        if ((cc && cc->type() == ConstantColumn::NULLDATA)
+        if ((cc && cc->type() == execplan::ConstantColumn::NULLDATA)
                 ||  (!cc && isNull(&fRowGroupIn, rowIn, colIn) == true))
         {
             if (fRGContext.getRunFlag(mcsv1sdk::UDAF_IGNORE_NULLS))
@@ -3680,7 +3680,7 @@ void RowAggregationUM::doNotNullConstantAggregate(const ConstantAggData& aggData
 
             // Create a datum item for sending to UDAF
             mcsv1sdk::ColumnDatum& datum = valsIn[0];
-            datum.dataType = (CalpontSystemCatalog::ColDataType)colDataType;
+            datum.dataType = (execplan::CalpontSystemCatalog::ColDataType)colDataType;
 
             switch (colDataType)
             {
diff --git a/utils/rowgroup/rowaggregation.h b/utils/rowgroup/rowaggregation.h
index 4817ed476..23df1f6d0 100644
--- a/utils/rowgroup/rowaggregation.h
+++ b/utils/rowgroup/rowaggregation.h
@@ -207,7 +207,7 @@ struct RowAggFunctionCol
     // The first will be a RowUDAFFunctionCol. Subsequent ones will be RowAggFunctionCol
     // with fAggFunction == ROWAGG_MULTI_PARM. Order is important.
     // If this parameter is constant, that value is here.
-    SRCP fpConstCol;
+    execplan::SRCP fpConstCol;
 };
 
 
@@ -272,7 +272,7 @@ inline void RowAggFunctionCol::deserialize(messageqcpp::ByteStream& bs)
 
     if (t)
     {
-        fpConstCol.reset(new ConstantColumn);
+        fpConstCol.reset(new execplan::ConstantColumn);
         fpConstCol.get()->unserialize(bs);
     }
 }
diff --git a/utils/rowgroup/rowgroup.h b/utils/rowgroup/rowgroup.h
index 27f0b98a4..e60148010 100644
--- a/utils/rowgroup/rowgroup.h
+++ b/utils/rowgroup/rowgroup.h
@@ -59,7 +59,6 @@
 #include "../winport/winport.h"
 
 // Workaround for my_global.h #define of isnan(X) causing a std::std namespace
-using namespace std;
 
 namespace rowgroup
 {
@@ -1028,7 +1027,7 @@ inline void Row::setFloatField(float val, uint32_t colIndex)
     //N.B. There is a bug in boost::any or in gcc where, if you store a nan, you will get back a nan,
     //  but not necessarily the same bits that you put in. This only seems to be for float (double seems
     //  to work).
-    if (isnan(val))
+    if (std::isnan(val))
         setUintField<4>(joblist::FLOATNULL, colIndex);
     else
         *((float*) &data[offsets[colIndex]]) = val;
diff --git a/utils/threadpool/prioritythreadpool.cpp b/utils/threadpool/prioritythreadpool.cpp
index 92fd0ad98..e25cd7af8 100644
--- a/utils/threadpool/prioritythreadpool.cpp
+++ b/utils/threadpool/prioritythreadpool.cpp
@@ -282,7 +282,7 @@ void PriorityThreadPool::sendErrorMsg(uint32_t id, uint32_t step, primitiveproce
     ism.Status =  logging::primitiveServerErr;
     ph.UniqueID = id;
     ph.StepID = step;
-    ByteStream msg(sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader));
+    messageqcpp::ByteStream msg(sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader));
     msg.append((uint8_t*) &ism, sizeof(ism));
     msg.append((uint8_t*) &ph, sizeof(ph));
 
diff --git a/utils/udfsdk/allnull.cpp b/utils/udfsdk/allnull.cpp
index 247b9e28f..ee6669789 100644
--- a/utils/udfsdk/allnull.cpp
+++ b/utils/udfsdk/allnull.cpp
@@ -39,7 +39,7 @@ mcsv1_UDAF::ReturnCode allnull::init(mcsv1Context* context,
         return mcsv1_UDAF::ERROR;
     }
 
-    context->setResultType(CalpontSystemCatalog::TINYINT);
+    context->setResultType(execplan::CalpontSystemCatalog::TINYINT);
 
     return mcsv1_UDAF::SUCCESS;
 }
diff --git a/utils/udfsdk/allnull.h b/utils/udfsdk/allnull.h
index 6a727caf6..40e5ce709 100644
--- a/utils/udfsdk/allnull.h
+++ b/utils/udfsdk/allnull.h
@@ -57,7 +57,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/udfsdk/avg_mode.cpp b/utils/udfsdk/avg_mode.cpp
index dba0859fb..317ccce93 100644
--- a/utils/udfsdk/avg_mode.cpp
+++ b/utils/udfsdk/avg_mode.cpp
@@ -49,7 +49,7 @@ mcsv1_UDAF::ReturnCode avg_mode::init(mcsv1Context* context,
         return mcsv1_UDAF::ERROR;
     }
 
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(context->getScale() * 2);
     context->setPrecision(19);
diff --git a/utils/udfsdk/avg_mode.h b/utils/udfsdk/avg_mode.h
index fba1fcdcc..d37c3b83b 100644
--- a/utils/udfsdk/avg_mode.h
+++ b/utils/udfsdk/avg_mode.h
@@ -65,7 +65,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/udfsdk/avgx.cpp b/utils/udfsdk/avgx.cpp
index 15548db36..a7ee4eb75 100644
--- a/utils/udfsdk/avgx.cpp
+++ b/utils/udfsdk/avgx.cpp
@@ -54,7 +54,7 @@ mcsv1_UDAF::ReturnCode avgx::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(avgx_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(colTypes[0].scale + 4);
     context->setPrecision(19);
diff --git a/utils/udfsdk/avgx.h b/utils/udfsdk/avgx.h
index a830c6803..0268df021 100644
--- a/utils/udfsdk/avgx.h
+++ b/utils/udfsdk/avgx.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/udfsdk/distinct_count.cpp b/utils/udfsdk/distinct_count.cpp
index 66dcea18f..11c2ce776 100644
--- a/utils/udfsdk/distinct_count.cpp
+++ b/utils/udfsdk/distinct_count.cpp
@@ -16,6 +16,7 @@
    MA 02110-1301, USA. */
 
 #include "distinct_count.h"
+#include "calpontsystemcatalog.h"
 
 using namespace mcsv1sdk;
 
@@ -36,7 +37,7 @@ mcsv1_UDAF::ReturnCode distinct_count::init(mcsv1Context* context,
         context->setErrorMessage("avgx() with other than 1 arguments");
 		return mcsv1_UDAF::ERROR;
 	}
-	context->setResultType(CalpontSystemCatalog::BIGINT);
+	context->setResultType(execplan::CalpontSystemCatalog::BIGINT);
 	context->setColWidth(8);
 	context->setRunFlag(mcsv1sdk::UDAF_IGNORE_NULLS);
 	context->setRunFlag(mcsv1sdk::UDAF_DISTINCT);
diff --git a/utils/udfsdk/distinct_count.h b/utils/udfsdk/distinct_count.h
index 1d804eaa8..7ad43f952 100644
--- a/utils/udfsdk/distinct_count.h
+++ b/utils/udfsdk/distinct_count.h
@@ -52,7 +52,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/udfsdk/mcsv1_udaf.cpp b/utils/udfsdk/mcsv1_udaf.cpp
index 9d513ced2..4dc30a3ef 100644
--- a/utils/udfsdk/mcsv1_udaf.cpp
+++ b/utils/udfsdk/mcsv1_udaf.cpp
@@ -75,41 +75,41 @@ int32_t mcsv1Context::getColWidth()
     // JIT initialization for types that have a defined size.
     switch (fResultType)
     {
-        case CalpontSystemCatalog::BIT:
-        case CalpontSystemCatalog::TINYINT:
-        case CalpontSystemCatalog::UTINYINT:
-        case CalpontSystemCatalog::CHAR:
+        case execplan::CalpontSystemCatalog::BIT:
+        case execplan::CalpontSystemCatalog::TINYINT:
+        case execplan::CalpontSystemCatalog::UTINYINT:
+        case execplan::CalpontSystemCatalog::CHAR:
             fColWidth = 1;
             break;
 
-        case CalpontSystemCatalog::SMALLINT:
-        case CalpontSystemCatalog::USMALLINT:
+        case execplan::CalpontSystemCatalog::SMALLINT:
+        case execplan::CalpontSystemCatalog::USMALLINT:
             fColWidth = 2;
             break;
 
-        case CalpontSystemCatalog::MEDINT:
-        case CalpontSystemCatalog::INT:
-        case CalpontSystemCatalog::UMEDINT:
-        case CalpontSystemCatalog::UINT:
-        case CalpontSystemCatalog::FLOAT:
-        case CalpontSystemCatalog::UFLOAT:
-        case CalpontSystemCatalog::DATE:
+        case execplan::CalpontSystemCatalog::MEDINT:
+        case execplan::CalpontSystemCatalog::INT:
+        case execplan::CalpontSystemCatalog::UMEDINT:
+        case execplan::CalpontSystemCatalog::UINT:
+        case execplan::CalpontSystemCatalog::FLOAT:
+        case execplan::CalpontSystemCatalog::UFLOAT:
+        case execplan::CalpontSystemCatalog::DATE:
             fColWidth = 4;
             break;
 
-        case CalpontSystemCatalog::BIGINT:
-        case CalpontSystemCatalog::UBIGINT:
-        case CalpontSystemCatalog::DECIMAL:
-        case CalpontSystemCatalog::UDECIMAL:
-        case CalpontSystemCatalog::DOUBLE:
-        case CalpontSystemCatalog::UDOUBLE:
-        case CalpontSystemCatalog::DATETIME:
-        case CalpontSystemCatalog::TIME:
-        case CalpontSystemCatalog::STRINT:
+        case execplan::CalpontSystemCatalog::BIGINT:
+        case execplan::CalpontSystemCatalog::UBIGINT:
+        case execplan::CalpontSystemCatalog::DECIMAL:
+        case execplan::CalpontSystemCatalog::UDECIMAL:
+        case execplan::CalpontSystemCatalog::DOUBLE:
+        case execplan::CalpontSystemCatalog::UDOUBLE:
+        case execplan::CalpontSystemCatalog::DATETIME:
+        case execplan::CalpontSystemCatalog::TIME:
+        case execplan::CalpontSystemCatalog::STRINT:
             fColWidth = 8;
             break;
 
-        case CalpontSystemCatalog::LONGDOUBLE:
+        case execplan::CalpontSystemCatalog::LONGDOUBLE:
             fColWidth = sizeof(long double);
             break;
 
@@ -212,7 +212,7 @@ void mcsv1Context::createUserData()
 void mcsv1Context::serialize(messageqcpp::ByteStream& b) const
 {
     b.needAtLeast(sizeof(mcsv1Context));
-    b << (ObjectReader::id_t) ObjectReader::MCSV1_CONTEXT;
+    b << (execplan::ObjectReader::id_t) execplan::ObjectReader::MCSV1_CONTEXT;
     b << functionName;
     b << fRunFlags;
     // Dont send context flags, These are set for each call
@@ -232,21 +232,21 @@ void mcsv1Context::serialize(messageqcpp::ByteStream& b) const
 
 void mcsv1Context::unserialize(messageqcpp::ByteStream& b)
 {
-    ObjectReader::checkType(b, ObjectReader::MCSV1_CONTEXT);
+    execplan::ObjectReader::checkType(b, execplan::ObjectReader::MCSV1_CONTEXT);
     b >> functionName;
     b >> fRunFlags;
     b >> fUserDataSize;
     uint32_t iResultType;
     b >> iResultType;
-    fResultType = (CalpontSystemCatalog::ColDataType)iResultType;
+    fResultType = (execplan::CalpontSystemCatalog::ColDataType)iResultType;
     b >> fResultscale;
     b >> fResultPrecision;
     b >> errorMsg;
     uint32_t frame;
     b >> frame;
-    fStartFrame = (WF_FRAME)frame;
+    fStartFrame = (execplan::WF_FRAME)frame;
     b >> frame;
-    fEndFrame = (WF_FRAME)frame;
+    fEndFrame = (execplan::WF_FRAME)frame;
     b >> fStartConstant;
     b >> fEndConstant;
     b >> fParamCount;
diff --git a/utils/udfsdk/mcsv1_udaf.h b/utils/udfsdk/mcsv1_udaf.h
index d6ba04483..0fcd877c9 100644
--- a/utils/udfsdk/mcsv1_udaf.h
+++ b/utils/udfsdk/mcsv1_udaf.h
@@ -78,8 +78,6 @@
 #include "wf_frame.h"
 #include "my_decimal_limits.h"
 
-using namespace execplan;
-
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
 #else
@@ -282,7 +280,7 @@ public:
     EXPORT bool isParamConstant(int paramIdx);
 
     // For getting the result type.
-    EXPORT CalpontSystemCatalog::ColDataType getResultType() const;
+    EXPORT execplan::CalpontSystemCatalog::ColDataType getResultType() const;
 
     // For getting the decimal characteristics for the return type.
     // These will be set to the default before init().
@@ -291,7 +289,7 @@ public:
 
     // If you want to change the result type
     // valid in init()
-    EXPORT bool setResultType(CalpontSystemCatalog::ColDataType resultType);
+    EXPORT bool setResultType(execplan::CalpontSystemCatalog::ColDataType resultType);
 
     // For setting the decimal characteristics for the return value.
     // This only makes sense if the return type is decimal, but should be set
@@ -339,14 +337,14 @@ public:
     // If WF_PRECEEdING and/or WF_FOLLOWING, a start or end constant should
     // be included to say how many preceeding or following is the default
     // Set this during init()
-    EXPORT bool  setDefaultWindowFrame(WF_FRAME defaultStartFrame,
-                                       WF_FRAME defaultEndFrame,
+    EXPORT bool  setDefaultWindowFrame(execplan::WF_FRAME defaultStartFrame,
+                                      execplan::WF_FRAME defaultEndFrame,
                                        int32_t startConstant = 0, // For WF_PRECEEDING or WF_FOLLOWING
                                        int32_t endConstant = 0);  // For WF_PRECEEDING or WF_FOLLOWING
 
     // There may be times you want to know the actual frame set by the caller
-    EXPORT void  getStartFrame(WF_FRAME& startFrame, int32_t& startConstant) const;
-    EXPORT void  getEndFrame(WF_FRAME& endFrame, int32_t& endConstant) const;
+    EXPORT void  getStartFrame(execplan::WF_FRAME& startFrame, int32_t& startConstant) const;
+    EXPORT void  getEndFrame(execplan::WF_FRAME& endFrame, int32_t& endConstant) const;
 
     // Deep Equivalence
     bool operator==(const mcsv1Context& c) const;
@@ -367,15 +365,15 @@ private:
     uint64_t fContextFlags;   // Set by the framework to define this specific call.
     int32_t fUserDataSize;
     boost::shared_ptr<UserData> fUserData;
-    CalpontSystemCatalog::ColDataType fResultType;
+    execplan::CalpontSystemCatalog::ColDataType fResultType;
     int32_t  fColWidth;       // The length in bytes of the return type
     int32_t  fResultscale;    // For scale, the number of digits to the right of the decimal
     int32_t  fResultPrecision; // The max number of digits allowed in the decimal value
     std::string errorMsg;
     uint32_t* dataFlags;      // an integer array wirh one entry for each parameter
     bool*    bInterrupted;    // Gets set to true by the Framework if something happens
-    WF_FRAME fStartFrame;     // Is set to default to start, then modified by the actual frame in the call
-    WF_FRAME fEndFrame;       // Is set to default to start, then modified by the actual frame in the call
+    execplan::WF_FRAME fStartFrame;     // Is set to default to start, then modified by the actual frame in the call
+    execplan::WF_FRAME fEndFrame;       // Is set to default to start, then modified by the actual frame in the call
     int32_t  fStartConstant;  // for start frame WF_PRECEEDIMG or WF_FOLLOWING
     int32_t  fEndConstant;    // for end frame WF_PRECEEDIMG or WF_FOLLOWING
     std::string functionName;
@@ -422,12 +420,12 @@ public:
 // For char, varchar, text, varbinary and blob types, columnData will be std::string.
 struct ColumnDatum
 {
-    CalpontSystemCatalog::ColDataType dataType;   // defined in calpontsystemcatalog.h
+  execplan::CalpontSystemCatalog::ColDataType dataType;   // defined in calpontsystemcatalog.h
     static_any::any  columnData;  // Not valid in init()
     uint32_t    scale;     // If dataType is a DECIMAL type
     uint32_t    precision; // If dataType is a DECIMAL type
     std::string alias;     // Only filled in for init()
-    ColumnDatum() : dataType(CalpontSystemCatalog::UNDEFINED), scale(0), precision(-1) {};
+    ColumnDatum() : dataType(execplan::CalpontSystemCatalog::UNDEFINED), scale(0), precision(-1) {};
 };
 
 // Override mcsv1_UDAF to build your User Defined Aggregate (UDAF) and/or
@@ -636,14 +634,14 @@ inline mcsv1Context::mcsv1Context() :
     fRunFlags(UDAF_OVER_ALLOWED | UDAF_ORDER_ALLOWED | UDAF_WINDOWFRAME_ALLOWED),
     fContextFlags(0),
     fUserDataSize(0),
-    fResultType(CalpontSystemCatalog::UNDEFINED),
+    fResultType(execplan::CalpontSystemCatalog::UNDEFINED),
     fColWidth(0),
     fResultscale(0),
     fResultPrecision(18),
     dataFlags(NULL),
     bInterrupted(NULL),
-    fStartFrame(WF_UNBOUNDED_PRECEDING),
-    fEndFrame(WF_CURRENT_ROW),
+    fStartFrame(execplan::WF_UNBOUNDED_PRECEDING),
+    fEndFrame(execplan::WF_CURRENT_ROW),
     fStartConstant(0),
     fEndConstant(0),
     func(NULL),
@@ -774,12 +772,12 @@ inline bool mcsv1Context::isParamConstant(int paramIdx)
     return false;
 }
 
-inline CalpontSystemCatalog::ColDataType mcsv1Context::getResultType() const
+inline execplan::CalpontSystemCatalog::ColDataType mcsv1Context::getResultType() const
 {
     return fResultType;
 }
 
-inline bool mcsv1Context::setResultType(CalpontSystemCatalog::ColDataType resultType)
+inline bool mcsv1Context::setResultType(execplan::CalpontSystemCatalog::ColDataType resultType)
 {
     fResultType = resultType;
     return true;  // We may want to sanity check here.
@@ -878,8 +876,8 @@ inline void mcsv1Context::setUserData(UserData* userData)
     }
 }
 
-inline bool mcsv1Context::setDefaultWindowFrame(WF_FRAME defaultStartFrame,
-        WF_FRAME defaultEndFrame,
+inline bool mcsv1Context::setDefaultWindowFrame(execplan::WF_FRAME defaultStartFrame,
+        execplan::WF_FRAME defaultEndFrame,
         int32_t startConstant,
         int32_t endConstant)
 {
@@ -891,13 +889,13 @@ inline bool mcsv1Context::setDefaultWindowFrame(WF_FRAME defaultStartFrame,
     return true;
 }
 
-inline void mcsv1Context::getStartFrame(WF_FRAME& startFrame, int32_t& startConstant) const
+inline void mcsv1Context::getStartFrame(execplan::WF_FRAME& startFrame, int32_t& startConstant) const
 {
     startFrame = fStartFrame;
     startConstant = fStartConstant;
 }
 
-inline void mcsv1Context::getEndFrame(WF_FRAME& endFrame, int32_t& endConstant) const
+inline void mcsv1Context::getEndFrame(execplan::WF_FRAME& endFrame, int32_t& endConstant) const
 {
     endFrame = fEndFrame;
     endConstant = fEndConstant;
diff --git a/utils/udfsdk/median.h b/utils/udfsdk/median.h
index 48bd93c70..ead9eede4 100644
--- a/utils/udfsdk/median.h
+++ b/utils/udfsdk/median.h
@@ -65,7 +65,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/udfsdk/ssq.cpp b/utils/udfsdk/ssq.cpp
index 74b60b5f6..4886acdb1 100644
--- a/utils/udfsdk/ssq.cpp
+++ b/utils/udfsdk/ssq.cpp
@@ -59,7 +59,7 @@ mcsv1_UDAF::ReturnCode ssq::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(ssq_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(context->getScale() * 2);
     context->setPrecision(19);
diff --git a/utils/udfsdk/ssq.h b/utils/udfsdk/ssq.h
index e27ecf1fa..58d42084b 100644
--- a/utils/udfsdk/ssq.h
+++ b/utils/udfsdk/ssq.h
@@ -65,7 +65,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/windowfunction/windowfunctiontype.h b/utils/windowfunction/windowfunctiontype.h
index e0a1aa832..ecf8f694e 100644
--- a/utils/windowfunction/windowfunctiontype.h
+++ b/utils/windowfunction/windowfunctiontype.h
@@ -199,9 +199,9 @@ public:
         fStep = step;
     }
 
-    void constParms(const std::vector<SRCP>& functionParms);
+    void constParms(const std::vector<execplan::SRCP>& functionParms);
 
-    static boost::shared_ptr<WindowFunctionType> makeWindowFunction(const std::string&, int ct, WindowFunctionColumn* wc);
+    static boost::shared_ptr<WindowFunctionType> makeWindowFunction(const std::string&, int ct, execplan::WindowFunctionColumn* wc);
 
 protected:
 
@@ -255,7 +255,7 @@ protected:
     std::vector<int64_t>                        fFieldIndex;
 
     // constant function parameters -- needed for udaf with constant
-    std::vector<SRCP>                           fConstantParms;
+    std::vector<execplan::SRCP>                           fConstantParms;
 
     // row meta data
     rowgroup::RowGroup	                        fRowGroup;
diff --git a/versioning/BRM/dbrmctl.cpp b/versioning/BRM/dbrmctl.cpp
index b9bca4d7c..45bf68f36 100644
--- a/versioning/BRM/dbrmctl.cpp
+++ b/versioning/BRM/dbrmctl.cpp
@@ -19,6 +19,7 @@
  * $Id: dbrmctl.cpp 1823 2013-01-21 14:13:09Z rdempsey $
  *
  ****************************************************************************/
+#include <future> //cxx11test
 
 #include <unistd.h>
 #include <iostream>
diff --git a/versioning/BRM/load_brm.cpp b/versioning/BRM/load_brm.cpp
index 4650fc5ec..871a51122 100644
--- a/versioning/BRM/load_brm.cpp
+++ b/versioning/BRM/load_brm.cpp
@@ -19,6 +19,7 @@
  * $Id: load_brm.cpp 1905 2013-06-14 18:42:28Z rdempsey $
  *
  ****************************************************************************/
+#include <future> //cxx11test
 #include <unistd.h>
 #include <iostream>
 #include <string>
diff --git a/versioning/BRM/masternode.cpp b/versioning/BRM/masternode.cpp
index cb3eb5024..ea4832dae 100644
--- a/versioning/BRM/masternode.cpp
+++ b/versioning/BRM/masternode.cpp
@@ -23,6 +23,7 @@
 /*
  * The executable source that runs a Master DBRM Node.
  */
+#include <future> //cxx11test
 
 #include "masterdbrmnode.h"
 #include "liboamcpp.h"
diff --git a/versioning/BRM/reset_locks.cpp b/versioning/BRM/reset_locks.cpp
index 895e34600..47237aafa 100644
--- a/versioning/BRM/reset_locks.cpp
+++ b/versioning/BRM/reset_locks.cpp
@@ -17,6 +17,8 @@
 
 // $Id: reset_locks.cpp 1823 2013-01-21 14:13:09Z rdempsey $
 //
+#include <future> //cxx11test
+
 #include <unistd.h>
 #include <iostream>
 using namespace std;
diff --git a/versioning/BRM/rollback.cpp b/versioning/BRM/rollback.cpp
index 1944f2938..509635248 100644
--- a/versioning/BRM/rollback.cpp
+++ b/versioning/BRM/rollback.cpp
@@ -28,6 +28,7 @@
  * 		rollback -p   (to get the transaction(s) that need to be rolled back)
  * 		rollback -r transID  	(for each one to roll them back)
  */
+#include <future> //cxx11test
 
 #include "dbrm.h"
 
diff --git a/versioning/BRM/save_brm.cpp b/versioning/BRM/save_brm.cpp
index d53507082..6993fd8fb 100644
--- a/versioning/BRM/save_brm.cpp
+++ b/versioning/BRM/save_brm.cpp
@@ -25,6 +25,7 @@
  *
  * More detailed description
  */
+#include <future> //cxx11test
 
 #include <unistd.h>
 #include <iostream>
diff --git a/versioning/BRM/slavenode.cpp b/versioning/BRM/slavenode.cpp
index 1fd89ff7d..26701504a 100644
--- a/versioning/BRM/slavenode.cpp
+++ b/versioning/BRM/slavenode.cpp
@@ -19,6 +19,7 @@
  * $Id: slavenode.cpp 1931 2013-07-08 16:53:02Z bpaul $
  *
  ****************************************************************************/
+#include <future> //cxx11test
 
 #include <iostream>
 #include <signal.h>
diff --git a/writeengine/bulk/we_brmreporter.cpp b/writeengine/bulk/we_brmreporter.cpp
index 4c0f1511c..fd9691ef9 100644
--- a/writeengine/bulk/we_brmreporter.cpp
+++ b/writeengine/bulk/we_brmreporter.cpp
@@ -321,7 +321,7 @@ void BRMReporter::sendCPToFile( )
 void BRMReporter::reportTotals(
     uint64_t totalReadRows,
     uint64_t totalInsertedRows,
-    const std::vector<boost::tuple<CalpontSystemCatalog::ColDataType, uint64_t, uint64_t> >& satCounts)
+    const std::vector<boost::tuple<execplan::CalpontSystemCatalog::ColDataType, uint64_t, uint64_t> >& satCounts)
 {
     if (fRptFile.is_open())
     {
diff --git a/writeengine/bulk/we_brmreporter.h b/writeengine/bulk/we_brmreporter.h
index b5e43f867..e71310ff1 100644
--- a/writeengine/bulk/we_brmreporter.h
+++ b/writeengine/bulk/we_brmreporter.h
@@ -28,7 +28,6 @@
 
 #include "brmtypes.h"
 #include "calpontsystemcatalog.h"
-using namespace execplan;
 /** @file
  * class BRMReporter
  */
@@ -107,7 +106,7 @@ public:
      */
     void reportTotals(uint64_t totalReadRows,
                       uint64_t totalInsertedRows,
-                      const std::vector<boost::tuple<CalpontSystemCatalog::ColDataType,
+                      const std::vector<boost::tuple<execplan::CalpontSystemCatalog::ColDataType,
                       uint64_t, uint64_t> >& satCounts);
 
     /** @brief Generate report for job that exceeds error limit
diff --git a/writeengine/bulk/we_bulkload.cpp b/writeengine/bulk/we_bulkload.cpp
index 48cc79f07..134bb07af 100644
--- a/writeengine/bulk/we_bulkload.cpp
+++ b/writeengine/bulk/we_bulkload.cpp
@@ -473,7 +473,7 @@ int BulkLoad::preProcess( Job& job, int tableNo,
     int         rc = NO_ERROR, minWidth = 9999; // give a big number
     HWM         minHWM = 999999;  // rp 9/25/07 Bug 473
     ColStruct   curColStruct;
-    CalpontSystemCatalog::ColDataType colDataType;
+    execplan::CalpontSystemCatalog::ColDataType colDataType;
 
     // Initialize portions of TableInfo object
     tableInfo->setBufferSize(fBufferSize);
diff --git a/writeengine/bulk/we_tableinfo.cpp b/writeengine/bulk/we_tableinfo.cpp
index 2885d1462..92f8ac19f 100644
--- a/writeengine/bulk/we_tableinfo.cpp
+++ b/writeengine/bulk/we_tableinfo.cpp
@@ -957,7 +957,7 @@ void TableInfo::reportTotals(double elapsedTime)
     fLog->logMsg(oss2.str(), MSGLVL_INFO2);
 
     // @bug 3504: Loop through columns to print saturation counts
-    std::vector<boost::tuple<CalpontSystemCatalog::ColDataType, uint64_t, uint64_t> > satCounts;
+    std::vector<boost::tuple<execplan::CalpontSystemCatalog::ColDataType, uint64_t, uint64_t> > satCounts;
 
     for (unsigned i = 0; i < fColumns.size(); ++i)
     {
@@ -977,30 +977,28 @@ void TableInfo::reportTotals(double elapsedTime)
             ossSatCnt << "Column " << fTableName << '.' <<
                       fColumns[i].column.colName << "; Number of ";
 
-            if (fColumns[i].column.dataType == CalpontSystemCatalog::DATE)
+            if (fColumns[i].column.dataType == execplan::CalpontSystemCatalog::DATE)
             {
                 ossSatCnt <<
                           "invalid dates replaced with zero value : ";
             }
             else if (fColumns[i].column.dataType ==
-                     CalpontSystemCatalog::DATETIME)
+              execplan::CalpontSystemCatalog::DATETIME)
             {
                 //bug5383
                 ossSatCnt <<
                           "invalid date/times replaced with zero value : ";
             }
-            else if (fColumns[i].column.dataType == CalpontSystemCatalog::TIME)
+            else if (fColumns[i].column.dataType == execplan::CalpontSystemCatalog::TIME)
             {
                 ossSatCnt <<
                           "invalid times replaced with zero value : ";
             }
-            else if (fColumns[i].column.dataType == CalpontSystemCatalog::CHAR)
-                ossSatCnt <<
-                          "character strings truncated: ";
-            else if (fColumns[i].column.dataType ==
-                     CalpontSystemCatalog::VARCHAR)
+            else if (fColumns[i].column.dataType == execplan::CalpontSystemCatalog::CHAR)
                 ossSatCnt <<
                           "character strings truncated: ";
+            else if (fColumns[i].column.dataType == execplan::CalpontSystemCatalog::VARCHAR)
+                ossSatCnt << "character strings truncated: ";
             else
                 ossSatCnt <<
                           "rows inserted with saturated values: ";
diff --git a/writeengine/server/we_brmrprtparser.h b/writeengine/server/we_brmrprtparser.h
index e9525a744..e0d87e730 100644
--- a/writeengine/server/we_brmrprtparser.h
+++ b/writeengine/server/we_brmrprtparser.h
@@ -31,7 +31,6 @@
 
 #include <fstream>
 #include <iostream>
-using namespace std;
 
 #include "bytestream.h"
 #include "messagequeue.h"
diff --git a/writeengine/server/we_ddlcommon.h b/writeengine/server/we_ddlcommon.h
index b1e4e48f1..1df4df305 100644
--- a/writeengine/server/we_ddlcommon.h
+++ b/writeengine/server/we_ddlcommon.h
@@ -51,9 +51,6 @@
 #define EXPORT
 #endif
 
-using namespace std;
-using namespace execplan;
-
 #include <boost/algorithm/string/case_conv.hpp>
 using namespace boost::algorithm;
 
@@ -72,7 +69,7 @@ struct DDLColumn
 {
     execplan::CalpontSystemCatalog::OID oid;
     execplan::CalpontSystemCatalog::ColType colType;
-    execplan:: CalpontSystemCatalog::TableColName tableColName;
+    execplan::CalpontSystemCatalog::TableColName tableColName;
 };
 
 typedef std::vector<DDLColumn> ColumnList;
@@ -104,23 +101,23 @@ inline void  getColumnsForTable(uint32_t sessionID, std::string schema, std::str
                                 ColumnList& colList)
 {
 
-    CalpontSystemCatalog::TableName tableName;
+  execplan::CalpontSystemCatalog::TableName tableName;
     tableName.schema = schema;
     tableName.table = table;
     std::string err;
 
     try
     {
-        boost::shared_ptr<CalpontSystemCatalog> systemCatalogPtr = CalpontSystemCatalog::makeCalpontSystemCatalog(sessionID);
-        systemCatalogPtr->identity(CalpontSystemCatalog::EC);
+        boost::shared_ptr<execplan::CalpontSystemCatalog> systemCatalogPtr = execplan::CalpontSystemCatalog::makeCalpontSystemCatalog(sessionID);
+        systemCatalogPtr->identity(execplan::CalpontSystemCatalog::EC);
 
-        const CalpontSystemCatalog::RIDList ridList = systemCatalogPtr->columnRIDs(tableName);
+        const execplan::CalpontSystemCatalog::RIDList ridList = systemCatalogPtr->columnRIDs(tableName);
 
-        CalpontSystemCatalog::RIDList::const_iterator rid_iterator = ridList.begin();
+        execplan::CalpontSystemCatalog::RIDList::const_iterator rid_iterator = ridList.begin();
 
         while (rid_iterator != ridList.end())
         {
-            CalpontSystemCatalog::ROPair roPair = *rid_iterator;
+          execplan::CalpontSystemCatalog::ROPair roPair = *rid_iterator;
 
             DDLColumn column;
             column.oid = roPair.objnum;
@@ -381,112 +378,112 @@ inline int convertDataType(int dataType)
     switch (dataType)
     {
         case ddlpackage::DDL_CHAR:
-            calpontDataType = CalpontSystemCatalog::CHAR;
+            calpontDataType = execplan::CalpontSystemCatalog::CHAR;
             break;
 
         case ddlpackage::DDL_VARCHAR:
-            calpontDataType = CalpontSystemCatalog::VARCHAR;
+            calpontDataType = execplan::CalpontSystemCatalog::VARCHAR;
             break;
 
         case ddlpackage::DDL_VARBINARY:
-            calpontDataType = CalpontSystemCatalog::VARBINARY;
+            calpontDataType = execplan::CalpontSystemCatalog::VARBINARY;
             break;
 
         case ddlpackage::DDL_BIT:
-            calpontDataType = CalpontSystemCatalog::BIT;
+            calpontDataType = execplan::CalpontSystemCatalog::BIT;
             break;
 
         case ddlpackage::DDL_REAL:
         case ddlpackage::DDL_DECIMAL:
         case ddlpackage::DDL_NUMERIC:
         case ddlpackage::DDL_NUMBER:
-            calpontDataType = CalpontSystemCatalog::DECIMAL;
+            calpontDataType = execplan::CalpontSystemCatalog::DECIMAL;
             break;
 
         case ddlpackage::DDL_FLOAT:
-            calpontDataType = CalpontSystemCatalog::FLOAT;
+            calpontDataType = execplan::CalpontSystemCatalog::FLOAT;
             break;
 
         case ddlpackage::DDL_DOUBLE:
-            calpontDataType = CalpontSystemCatalog::DOUBLE;
+            calpontDataType = execplan::CalpontSystemCatalog::DOUBLE;
             break;
 
         case ddlpackage::DDL_INT:
         case ddlpackage::DDL_INTEGER:
-            calpontDataType = CalpontSystemCatalog::INT;
+            calpontDataType = execplan::CalpontSystemCatalog::INT;
             break;
 
         case ddlpackage::DDL_BIGINT:
-            calpontDataType = CalpontSystemCatalog::BIGINT;
+            calpontDataType = execplan::CalpontSystemCatalog::BIGINT;
             break;
 
         case ddlpackage::DDL_MEDINT:
-            calpontDataType = CalpontSystemCatalog::MEDINT;
+            calpontDataType = execplan::CalpontSystemCatalog::MEDINT;
             break;
 
         case ddlpackage::DDL_SMALLINT:
-            calpontDataType = CalpontSystemCatalog::SMALLINT;
+            calpontDataType = execplan::CalpontSystemCatalog::SMALLINT;
             break;
 
         case ddlpackage::DDL_TINYINT:
-            calpontDataType = CalpontSystemCatalog::TINYINT;
+            calpontDataType = execplan::CalpontSystemCatalog::TINYINT;
             break;
 
         case ddlpackage::DDL_DATE:
-            calpontDataType = CalpontSystemCatalog::DATE;
+            calpontDataType = execplan::CalpontSystemCatalog::DATE;
             break;
 
         case ddlpackage::DDL_DATETIME:
-            calpontDataType = CalpontSystemCatalog::DATETIME;
+            calpontDataType = execplan::CalpontSystemCatalog::DATETIME;
             break;
 
         case ddlpackage::DDL_TIME:
-            calpontDataType = CalpontSystemCatalog::TIME;
+            calpontDataType = execplan::CalpontSystemCatalog::TIME;
             break;
 
         case ddlpackage::DDL_CLOB:
-            calpontDataType = CalpontSystemCatalog::CLOB;
+            calpontDataType = execplan::CalpontSystemCatalog::CLOB;
             break;
 
         case ddlpackage::DDL_BLOB:
-            calpontDataType = CalpontSystemCatalog::BLOB;
+            calpontDataType = execplan::CalpontSystemCatalog::BLOB;
             break;
 
         case ddlpackage::DDL_TEXT:
-            calpontDataType = CalpontSystemCatalog::TEXT;
+            calpontDataType = execplan::CalpontSystemCatalog::TEXT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_TINYINT:
-            calpontDataType = CalpontSystemCatalog::UTINYINT;
+            calpontDataType = execplan::CalpontSystemCatalog::UTINYINT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_SMALLINT:
-            calpontDataType = CalpontSystemCatalog::USMALLINT;
+            calpontDataType = execplan::CalpontSystemCatalog::USMALLINT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_MEDINT:
-            calpontDataType = CalpontSystemCatalog::UMEDINT;
+            calpontDataType = execplan::CalpontSystemCatalog::UMEDINT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_INT:
-            calpontDataType = CalpontSystemCatalog::UINT;
+            calpontDataType = execplan::CalpontSystemCatalog::UINT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_BIGINT:
-            calpontDataType = CalpontSystemCatalog::UBIGINT;
+            calpontDataType = execplan::CalpontSystemCatalog::UBIGINT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_DECIMAL:
         case ddlpackage::DDL_UNSIGNED_NUMERIC:
-            calpontDataType = CalpontSystemCatalog::UDECIMAL;
+            calpontDataType = execplan::CalpontSystemCatalog::UDECIMAL;
             break;
 
         case ddlpackage::DDL_UNSIGNED_FLOAT:
-            calpontDataType = CalpontSystemCatalog::UFLOAT;
+            calpontDataType = execplan::CalpontSystemCatalog::UFLOAT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_DOUBLE:
-            calpontDataType = CalpontSystemCatalog::UDOUBLE;
+            calpontDataType = execplan::CalpontSystemCatalog::UDOUBLE;
             break;
 
         default:
diff --git a/writeengine/server/we_observer.h b/writeengine/server/we_observer.h
index 85401d885..ac3039318 100644
--- a/writeengine/server/we_observer.h
+++ b/writeengine/server/we_observer.h
@@ -31,7 +31,6 @@
 #define OBSERVER_H_
 
 #include <list>
-using namespace std;
 
 
 namespace WriteEngine
diff --git a/writeengine/splitter/we_brmupdater.cpp b/writeengine/splitter/we_brmupdater.cpp
index 96a3e9d11..ea728fb27 100644
--- a/writeengine/splitter/we_brmupdater.cpp
+++ b/writeengine/splitter/we_brmupdater.cpp
@@ -512,13 +512,13 @@ bool WEBrmUpdater::prepareRowsInsertedInfo(std::string Entry,
 
 bool WEBrmUpdater::prepareColumnOutOfRangeInfo(std::string Entry,
         int& ColNum,
-        CalpontSystemCatalog::ColDataType& ColType,
+        execplan::CalpontSystemCatalog::ColDataType& ColType,
         std::string& ColName,
         int& OorValues)
 {
     bool aFound = false;
-    boost::shared_ptr<CalpontSystemCatalog> systemCatalogPtr =
-        CalpontSystemCatalog::makeCalpontSystemCatalog();
+    boost::shared_ptr<execplan::CalpontSystemCatalog> systemCatalogPtr =
+      execplan::CalpontSystemCatalog::makeCalpontSystemCatalog();
 
     //DATA: 3 1
     if ((!Entry.empty()) && (Entry.at(0) == 'D'))
@@ -553,7 +553,7 @@ bool WEBrmUpdater::prepareColumnOutOfRangeInfo(std::string Entry,
 
         if (pTok)
         {
-            ColType = (CalpontSystemCatalog::ColDataType)atoi(pTok);
+            ColType = (execplan::CalpontSystemCatalog::ColDataType)atoi(pTok);
         }
         else
         {
@@ -566,7 +566,7 @@ bool WEBrmUpdater::prepareColumnOutOfRangeInfo(std::string Entry,
         if (pTok)
         {
             uint64_t columnOid = strtol(pTok, NULL, 10);
-            CalpontSystemCatalog::TableColName colname = systemCatalogPtr->colName(columnOid);
+            execplan::CalpontSystemCatalog::TableColName colname = systemCatalogPtr->colName(columnOid);
             ColName = colname.schema + "." + colname.table + "." + colname.column;
         }
         else
diff --git a/writeengine/splitter/we_brmupdater.h b/writeengine/splitter/we_brmupdater.h
index b14cf4430..c575b3bd1 100644
--- a/writeengine/splitter/we_brmupdater.h
+++ b/writeengine/splitter/we_brmupdater.h
@@ -68,7 +68,7 @@ public:
     static bool prepareRowsInsertedInfo(std::string Entry, int64_t& TotRows,
                                         int64_t& InsRows);
     static bool prepareColumnOutOfRangeInfo(std::string Entry, int& ColNum,
-                                            CalpontSystemCatalog::ColDataType& ColType,
+      execplan::CalpontSystemCatalog::ColDataType& ColType,
                                             std::string& ColName, int& OorValues);
     static bool prepareErrorFileInfo(std::string Entry, std::string& ErrFileName);
     static bool prepareBadDataFileInfo(std::string Entry, std::string& BadFileName);
diff --git a/writeengine/splitter/we_sdhandler.h b/writeengine/splitter/we_sdhandler.h
index f31f40c63..551df4d9f 100644
--- a/writeengine/splitter/we_sdhandler.h
+++ b/writeengine/splitter/we_sdhandler.h
@@ -233,7 +233,7 @@ public:
         fWeSplClients[PmId]->setRowsUploadInfo(RowsRead, RowsInserted);
     }
     void add2ColOutOfRangeInfo(int PmId, int ColNum,
-                               CalpontSystemCatalog::ColDataType ColType,
+            execplan::CalpontSystemCatalog::ColDataType ColType,
                                std::string&  ColName, int NoOfOors)
     {
         fWeSplClients[PmId]->add2ColOutOfRangeInfo(ColNum, ColType, ColName, NoOfOors);
@@ -326,7 +326,7 @@ private:
         {
             fRowsIns += Rows;
         }
-        void updateColOutOfRangeInfo(int aColNum, CalpontSystemCatalog::ColDataType aColType,
+        void updateColOutOfRangeInfo(int aColNum, execplan::CalpontSystemCatalog::ColDataType aColType,
                                      std::string aColName, int aNoOfOors)
         {
             WEColOorVec::iterator aIt = fColOorVec.begin();
diff --git a/writeengine/splitter/we_splclient.cpp b/writeengine/splitter/we_splclient.cpp
index de84abe8e..59b776888 100644
--- a/writeengine/splitter/we_splclient.cpp
+++ b/writeengine/splitter/we_splclient.cpp
@@ -453,7 +453,7 @@ void WESplClient::setRowsUploadInfo(int64_t RowsRead, int64_t RowsInserted)
 //------------------------------------------------------------------------------
 
 void WESplClient::add2ColOutOfRangeInfo(int ColNum,
-                                        CalpontSystemCatalog::ColDataType ColType,
+  execplan::CalpontSystemCatalog::ColDataType ColType,
                                         std::string&  ColName, int NoOfOors)
 {
     WEColOORInfo aColOorInfo;
diff --git a/writeengine/splitter/we_splclient.h b/writeengine/splitter/we_splclient.h
index 1d86b0610..63c54c337 100644
--- a/writeengine/splitter/we_splclient.h
+++ b/writeengine/splitter/we_splclient.h
@@ -35,7 +35,6 @@
 
 #include "we_messages.h"
 #include "calpontsystemcatalog.h"
-using namespace execplan;
 
 namespace WriteEngine
 {
@@ -47,11 +46,11 @@ class WESplClient;			//forward decleration
 class WEColOORInfo		// Column Out-Of-Range Info
 {
 public:
-    WEColOORInfo(): fColNum(0), fColType(CalpontSystemCatalog::INT), fNoOfOORs(0) {}
+    WEColOORInfo(): fColNum(0), fColType(execplan::CalpontSystemCatalog::INT), fNoOfOORs(0) {}
     ~WEColOORInfo() {}
 public:
     int fColNum;
-    CalpontSystemCatalog::ColDataType fColType;
+    execplan::CalpontSystemCatalog::ColDataType fColType;
     std::string fColName;
     int fNoOfOORs;
 };
@@ -390,8 +389,7 @@ private:
     std::string fErrInfoFile;
 
     void setRowsUploadInfo(int64_t RowsRead, int64_t RowsInserted);
-    void add2ColOutOfRangeInfo(int ColNum,
-                               CalpontSystemCatalog::ColDataType ColType,
+    void add2ColOutOfRangeInfo(int ColNum, execplan::CalpontSystemCatalog::ColDataType ColType,
                                std::string&  ColName, int NoOfOors);
     void setBadDataFile(const std::string& BadDataFile);
     void setErrInfoFile(const std::string& ErrInfoFile);

From f8b5fed978c3aa5004e89af5054fa507f46b2e55 Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Fri, 26 Apr 2019 08:21:47 -0500
Subject: [PATCH 08/33] Fully resolve potentially ambiguous symbols by removing
 using namespace statements from headers which have a cascading effect. This
 causes potential behavior changes when switching to c++11 since symbols can
 be exported from std and boost while both have been imported into the global
 namespace.

---
 .gitignore                                    |   1 +
 CMakeLists.txt                                |  11 +
 dbcon/execplan/predicateoperator.h            |   2 +-
 dbcon/execplan/treenode.h                     |   9 +-
 dbcon/execplan/udafcolumn.h                   |   5 +-
 dbcon/joblist/crossenginestep.cpp             |  26 +-
 dbcon/joblist/crossenginestep.h               |  18 +-
 dbcon/joblist/jlf_execplantojoblist.cpp       |   2 +-
 dbcon/joblist/jlf_execplantojoblist.h         |   4 +-
 dbcon/joblist/joblistfactory.cpp              |   3 +-
 dbcon/joblist/jobstep.cpp                     |   2 +-
 dbcon/joblist/jobstep.h                       |   4 +-
 dbcon/mysql/ha_calpont_execplan.cpp           |  11 +-
 dbcon/mysql/ha_calpont_impl.cpp               |   2 +-
 dbcon/mysql/ha_mcs_client_udfs.cpp            |  42 +-
 ddlproc/ddlprocessor.cpp                      |   2 +-
 dmlproc/dmlproc.cpp                           |   4 +-
 exemgr/CMakeLists.txt                         |   4 +-
 exemgr/main.cpp                               | 542 +++++++++---------
 oamapps/columnstoreDB/columnstoreDB.cpp       |   1 +
 .../columnstoreSupport/columnstoreSupport.cpp |   1 +
 oamapps/mcsadmin/mcsadmin.cpp                 |   1 +
 oamapps/postConfigure/getMySQLpw.cpp          |   1 +
 oamapps/postConfigure/helpers.cpp             |  26 +-
 oamapps/postConfigure/helpers.h               |   4 +-
 oamapps/postConfigure/installer.cpp           |   1 +
 oamapps/postConfigure/mycnfUpgrade.cpp        |   1 +
 oamapps/postConfigure/postConfigure.cpp       |   1 +
 oamapps/serverMonitor/serverMonitor.cpp       |   1 +
 primitives/primproc/dictstep.h                |   2 +-
 primitives/primproc/primproc.cpp              |   2 +
 primitives/primproc/umsocketselector.cpp      |   8 +-
 primitives/primproc/umsocketselector.h        |  12 +-
 procmgr/main.cpp                              |   1 +
 procmon/main.cpp                              |   1 +
 tools/clearShm/main.cpp                       |   7 +-
 tools/cleartablelock/cleartablelock.cpp       |   1 +
 tools/configMgt/autoConfigure.cpp             |   1 +
 tools/configMgt/autoInstaller.cpp             |   1 +
 tools/configMgt/svnQuery.cpp                  |   1 +
 tools/cplogger/main.cpp                       |   1 +
 tools/dbbuilder/dbbuilder.cpp                 |   1 +
 tools/dbloadxml/colxml.cpp                    |   1 +
 tools/ddlcleanup/ddlcleanup.cpp               |   1 +
 tools/editem/editem.cpp                       |   1 +
 tools/getConfig/main.cpp                      |   1 +
 tools/idbmeminfo/idbmeminfo.cpp               |   1 +
 tools/setConfig/main.cpp                      |   1 +
 tools/viewtablelock/viewtablelock.cpp         |   1 +
 utils/funcexp/func_date.cpp                   |   6 +-
 utils/funcexp/func_day.cpp                    |   6 +-
 utils/funcexp/func_dayname.cpp                |   6 +-
 utils/funcexp/func_dayofweek.cpp              |   6 +-
 utils/funcexp/func_dayofyear.cpp              |   6 +-
 utils/funcexp/func_month.cpp                  |   6 +-
 utils/funcexp/func_monthname.cpp              |   6 +-
 utils/funcexp/func_quarter.cpp                |   6 +-
 utils/funcexp/func_to_days.cpp                |   6 +-
 utils/funcexp/func_week.cpp                   |   6 +-
 utils/funcexp/func_weekday.cpp                |   6 +-
 utils/funcexp/func_year.cpp                   |   6 +-
 utils/funcexp/func_yearweek.cpp               |   6 +-
 utils/funcexp/functor.h                       |   3 +-
 utils/funcexp/functor_str.h                   |   8 +-
 utils/funcexp/utils_utf8.h                    |  15 +-
 utils/regr/corr.cpp                           |   2 +-
 utils/regr/corr.h                             |   1 -
 utils/regr/covar_pop.cpp                      |   2 +-
 utils/regr/covar_pop.h                        |   1 -
 utils/regr/covar_samp.cpp                     |   2 +-
 utils/regr/covar_samp.h                       |   1 -
 utils/regr/regr_avgx.cpp                      |   2 +-
 utils/regr/regr_avgx.h                        |   1 -
 utils/regr/regr_avgy.cpp                      |   2 +-
 utils/regr/regr_avgy.h                        |   1 -
 utils/regr/regr_count.cpp                     |   2 +-
 utils/regr/regr_count.h                       |   1 -
 utils/regr/regr_intercept.cpp                 |   2 +-
 utils/regr/regr_intercept.h                   |   1 -
 utils/regr/regr_r2.cpp                        |   2 +-
 utils/regr/regr_r2.h                          |   1 -
 utils/regr/regr_slope.cpp                     |   2 +-
 utils/regr/regr_slope.h                       |   1 -
 utils/regr/regr_sxx.cpp                       |   2 +-
 utils/regr/regr_sxx.h                         |   1 -
 utils/regr/regr_sxy.cpp                       |   2 +-
 utils/regr/regr_sxy.h                         |   1 -
 utils/regr/regr_syy.cpp                       |   2 +-
 utils/regr/regr_syy.h                         |   1 -
 utils/rowgroup/rowaggregation.cpp             |   8 +-
 utils/rowgroup/rowaggregation.h               |   4 +-
 utils/rowgroup/rowgroup.h                     |   3 +-
 utils/threadpool/prioritythreadpool.cpp       |   2 +-
 utils/udfsdk/allnull.cpp                      |   2 +-
 utils/udfsdk/allnull.h                        |   1 -
 utils/udfsdk/avg_mode.cpp                     |   2 +-
 utils/udfsdk/avg_mode.h                       |   1 -
 utils/udfsdk/avgx.cpp                         |   2 +-
 utils/udfsdk/avgx.h                           |   1 -
 utils/udfsdk/distinct_count.cpp               |   3 +-
 utils/udfsdk/distinct_count.h                 |   1 -
 utils/udfsdk/mcsv1_udaf.cpp                   |  56 +-
 utils/udfsdk/mcsv1_udaf.h                     |  42 +-
 utils/udfsdk/median.h                         |   1 -
 utils/udfsdk/ssq.cpp                          |   2 +-
 utils/udfsdk/ssq.h                            |   1 -
 utils/windowfunction/windowfunctiontype.h     |   6 +-
 versioning/BRM/dbrmctl.cpp                    |   1 +
 versioning/BRM/load_brm.cpp                   |   1 +
 versioning/BRM/masternode.cpp                 |   1 +
 versioning/BRM/reset_locks.cpp                |   2 +
 versioning/BRM/rollback.cpp                   |   1 +
 versioning/BRM/save_brm.cpp                   |   1 +
 versioning/BRM/slavenode.cpp                  |   1 +
 writeengine/bulk/we_brmreporter.cpp           |   2 +-
 writeengine/bulk/we_brmreporter.h             |   3 +-
 writeengine/bulk/we_bulkload.cpp              |   2 +-
 writeengine/bulk/we_tableinfo.cpp             |  16 +-
 writeengine/server/we_brmrprtparser.h         |   2 -
 writeengine/server/we_dataloader.h            |   6 +-
 writeengine/server/we_ddlcommon.h             |  70 ++-
 writeengine/server/we_observer.h              |   1 -
 writeengine/server/we_readthread.cpp          |   4 +-
 writeengine/server/we_readthread.h            |   3 +-
 writeengine/splitter/we_brmupdater.cpp        |  10 +-
 writeengine/splitter/we_brmupdater.h          |   2 +-
 writeengine/splitter/we_sdhandler.h           |   4 +-
 writeengine/splitter/we_splclient.cpp         |   2 +-
 writeengine/splitter/we_splclient.h           |   8 +-
 writeengine/splitter/we_splitterapp.cpp       |  28 +-
 writeengine/splitter/we_splitterapp.h         |   3 -
 131 files changed, 600 insertions(+), 630 deletions(-)

diff --git a/.gitignore b/.gitignore
index 93be85e28..73a91cbd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,3 +108,4 @@ columnstoreversion.h
 .idea/
 .build
 /.vs
+/CMakeSettings.json
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42a50a221..be85518bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,17 @@ ENDIF()
 
 MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
 
+OPTION(USE_CCACHE "reduce compile time with ccache." FALSE)
+if(NOT USE_CCACHE)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "")
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "")
+else()
+  find_program(CCACHE_FOUND ccache)
+  if(CCACHE_FOUND)
+      set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+      set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+  endif(CCACHE_FOUND)
+endif()
 # Distinguish between community and non-community builds, with the
 # default being a community build. This does not impact the feature
 # set that will be compiled in; it's merely provided as a hint to
diff --git a/dbcon/execplan/predicateoperator.h b/dbcon/execplan/predicateoperator.h
index b83931394..51d3bc5ee 100644
--- a/dbcon/execplan/predicateoperator.h
+++ b/dbcon/execplan/predicateoperator.h
@@ -294,7 +294,7 @@ inline bool PredicateOperator::getBoolVal(rowgroup::Row& row, bool& isNull, Retu
                 // we won't want to just multiply by scale, as it may move
                 // significant digits out of scope. So we break them apart
                 // and compare each separately 
-                int64_t scale = max(lop->resultType().scale, rop->resultType().scale);
+                int64_t scale = std::max(lop->resultType().scale, rop->resultType().scale);
                 if (scale)
                 {
                     long double intpart1;
diff --git a/dbcon/execplan/treenode.h b/dbcon/execplan/treenode.h
index 106b40d37..9fea74984 100644
--- a/dbcon/execplan/treenode.h
+++ b/dbcon/execplan/treenode.h
@@ -41,9 +41,6 @@
 #include "exceptclasses.h"
 #include "dataconvert.h"
 
-// Workaround for my_global.h #define of isnan(X) causing a std::std namespace
-using namespace std;
-
 namespace messageqcpp
 {
 class ByteStream;
@@ -608,7 +605,7 @@ inline const std::string& TreeNode::getStrVal()
                 int exponent  = (int)floor(log10( fabs(fResult.floatVal)));  // This will round down the exponent
                 double base   = fResult.floatVal * pow(10, -1.0 * exponent);
 
-                if (isnan(exponent) || std::isnan(base))
+                if (std::isnan(exponent) || std::isnan(base))
                 {
                     snprintf(tmp, 312, "%f", fResult.floatVal);
                     fResult.strVal = removeTrailing0(tmp, 312);
@@ -643,7 +640,7 @@ inline const std::string& TreeNode::getStrVal()
                 int exponent  = (int)floor(log10( fabs(fResult.doubleVal)));  // This will round down the exponent
                 double base   = fResult.doubleVal * pow(10, -1.0 * exponent);
 
-                if (isnan(exponent) || std::isnan(base))
+                if (std::isnan(exponent) || std::isnan(base))
                 {
                     snprintf(tmp, 312, "%f", fResult.doubleVal);
                     fResult.strVal = removeTrailing0(tmp, 312);
@@ -677,7 +674,7 @@ inline const std::string& TreeNode::getStrVal()
                 int exponent  = (int)floorl(log10( fabsl(fResult.longDoubleVal)));  // This will round down the exponent
                 long double base   = fResult.longDoubleVal * pow(10, -1.0 * exponent);
 
-                if (isnan(exponent) || isnan(base))
+                if (std::isnan(exponent) || std::isnan(base))
                 {
                     snprintf(tmp, 312, "%Lf", fResult.longDoubleVal);
                     fResult.strVal = removeTrailing0(tmp, 312);
diff --git a/dbcon/execplan/udafcolumn.h b/dbcon/execplan/udafcolumn.h
index 4263a9445..3486740ca 100644
--- a/dbcon/execplan/udafcolumn.h
+++ b/dbcon/execplan/udafcolumn.h
@@ -30,7 +30,6 @@ namespace messageqcpp
 class ByteStream;
 }
 
-using namespace mcsv1sdk;
 /**
  * Namespace
  */
@@ -78,7 +77,7 @@ public:
     /**
      * Accessors and Mutators
      */
-    mcsv1Context& getContext()
+    mcsv1sdk::mcsv1Context& getContext()
     {
         return context;
     }
@@ -122,7 +121,7 @@ public:
     virtual bool operator!=(const UDAFColumn& t) const;
 
 private:
-    mcsv1Context context;
+    mcsv1sdk::mcsv1Context context;
 };
 
 /**
diff --git a/dbcon/joblist/crossenginestep.cpp b/dbcon/joblist/crossenginestep.cpp
index d3cef7928..e9b573713 100644
--- a/dbcon/joblist/crossenginestep.cpp
+++ b/dbcon/joblist/crossenginestep.cpp
@@ -63,9 +63,9 @@ namespace joblist
 {
 
 CrossEngineStep::CrossEngineStep(
-    const string& schema,
-    const string& table,
-    const string& alias,
+    const std::string& schema,
+    const std::string& table,
+    const std::string& alias,
     const JobInfo& jobInfo) :
     BatchPrimitive(jobInfo),
     fRowsRetrieved(0),
@@ -113,7 +113,7 @@ bool CrossEngineStep::deliverStringTableRowGroup() const
 }
 
 
-void CrossEngineStep::addFcnJoinExp(const vector<execplan::SRCP>& fe)
+void CrossEngineStep::addFcnJoinExp(const std::vector<execplan::SRCP>& fe)
 {
     fFeFcnJoin = fe;
 }
@@ -131,7 +131,7 @@ void CrossEngineStep::setFE1Input(const rowgroup::RowGroup& rg)
 }
 
 
-void CrossEngineStep::setFcnExpGroup3(const vector<execplan::SRCP>& fe)
+void CrossEngineStep::setFcnExpGroup3(const std::vector<execplan::SRCP>& fe)
 {
     fFeSelects = fe;
 }
@@ -336,7 +336,7 @@ int64_t CrossEngineStep::convertValueNum(
         case CalpontSystemCatalog::TEXT:
         case CalpontSystemCatalog::CLOB:
         {
-            string i = boost::any_cast<string>(anyVal);
+            std::string i = boost::any_cast<std::string>(anyVal);
             // bug 1932, pad nulls up to the size of v
             i.resize(sizeof(rv), 0);
             rv = *((uint64_t*) i.data());
@@ -435,7 +435,7 @@ void CrossEngineStep::execute()
         if (ret != 0)
             mysql->handleMySqlError(mysql->getError().c_str(), ret);
 
-        string query(makeQuery());
+        std::string query(makeQuery());
         fLogger->logMessage(logging::LOG_TYPE_INFO, "QUERY to foreign engine: " + query);
 
         if (traceOn())
@@ -651,7 +651,7 @@ void CrossEngineStep::setBPP(JobStep* jobStep)
     pDictionaryStep* pds = NULL;
     pDictionaryScan* pdss = NULL;
     FilterStep* fs = NULL;
-    string bop = " AND ";
+    std::string bop = " AND ";
 
     if (pcs != 0)
     {
@@ -690,12 +690,12 @@ void CrossEngineStep::setBPP(JobStep* jobStep)
     }
 }
 
-void CrossEngineStep::addFilterStr(const vector<const Filter*>& f, const string& bop)
+void CrossEngineStep::addFilterStr(const std::vector<const Filter*>& f, const std::string& bop)
 {
     if (f.size() == 0)
         return;
 
-    string filterStr;
+    std::string filterStr;
 
     for (uint64_t i = 0; i < f.size(); i++)
     {
@@ -731,7 +731,7 @@ void CrossEngineStep::setProjectBPP(JobStep* jobStep1, JobStep*)
 }
 
 
-string CrossEngineStep::makeQuery()
+std::string CrossEngineStep::makeQuery()
 {
     ostringstream oss;
     oss << fSelectClause << " FROM " << fTable;
@@ -742,7 +742,7 @@ string CrossEngineStep::makeQuery()
     if (!fWhereClause.empty())
         oss << fWhereClause;
 
-    // the string must consist of a single SQL statement without a terminating semicolon ; or \g.
+    // the std::string must consist of a single SQL statement without a terminating semicolon ; or \g.
     // oss << ";";
     return oss.str();
 }
@@ -832,7 +832,7 @@ uint32_t CrossEngineStep::nextBand(messageqcpp::ByteStream& bs)
 }
 
 
-const string CrossEngineStep::toString() const
+const std::string CrossEngineStep::toString() const
 {
     ostringstream oss;
     oss << "CrossEngineStep ses:" << fSessionId << " txn:" << fTxnId << " st:" << fStepId;
diff --git a/dbcon/joblist/crossenginestep.h b/dbcon/joblist/crossenginestep.h
index 4ebf2ac9d..2e9cc79f0 100644
--- a/dbcon/joblist/crossenginestep.h
+++ b/dbcon/joblist/crossenginestep.h
@@ -30,8 +30,6 @@
 #include "primitivestep.h"
 #include "threadnaming.h"
 
-using namespace std;
-
 // forward reference
 namespace utils
 {
@@ -60,9 +58,9 @@ public:
     /** @brief CrossEngineStep constructor
      */
     CrossEngineStep(
-        const string& schema,
-        const string& table,
-        const string& alias,
+        const std::string& schema,
+        const std::string& table,
+        const std::string& alias,
         const JobInfo& jobInfo);
 
     /** @brief CrossEngineStep destructor
@@ -124,15 +122,15 @@ public:
     {
         return fRowsReturned;
     }
-    const string& schemaName() const
+    const std::string& schemaName() const
     {
         return fSchema;
     }
-    const string& tableName() const
+    const std::string& tableName() const
     {
         return fTable;
     }
-    const string& tableAlias() const
+    const std::string& tableAlias() const
     {
         return fAlias;
     }
@@ -149,10 +147,10 @@ public:
     bool  deliverStringTableRowGroup() const;
     uint32_t nextBand(messageqcpp::ByteStream& bs);
 
-    void addFcnJoinExp(const vector<execplan::SRCP>&);
+    void addFcnJoinExp(const std::vector<execplan::SRCP>&);
     void addFcnExpGroup1(const boost::shared_ptr<execplan::ParseTree>&);
     void setFE1Input(const rowgroup::RowGroup&);
-    void setFcnExpGroup3(const vector<execplan::SRCP>&);
+    void setFcnExpGroup3(const std::vector<execplan::SRCP>&);
     void setFE23Output(const rowgroup::RowGroup&);
 
     void addFilter(JobStep* jobStep);
diff --git a/dbcon/joblist/jlf_execplantojoblist.cpp b/dbcon/joblist/jlf_execplantojoblist.cpp
index f3782c9d5..fef60082b 100644
--- a/dbcon/joblist/jlf_execplantojoblist.cpp
+++ b/dbcon/joblist/jlf_execplantojoblist.cpp
@@ -3374,7 +3374,7 @@ namespace joblist
 // conversion performed by the functions in this file.
 // @bug6131, pre-order traversing
 /* static */ void
-JLF_ExecPlanToJobList::walkTree(ParseTree* n, JobInfo& jobInfo)
+JLF_ExecPlanToJobList::walkTree(execplan::ParseTree* n, JobInfo& jobInfo)
 {
     TreeNode* tn = n->data();
     JobStepVector jsv;
diff --git a/dbcon/joblist/jlf_execplantojoblist.h b/dbcon/joblist/jlf_execplantojoblist.h
index 0232e87a3..6f9fb5daf 100644
--- a/dbcon/joblist/jlf_execplantojoblist.h
+++ b/dbcon/joblist/jlf_execplantojoblist.h
@@ -30,7 +30,7 @@
 #include "calpontexecutionplan.h"
 #include "calpontselectexecutionplan.h"
 #include "calpontsystemcatalog.h"
-using namespace execplan;
+
 
 #include "jlf_common.h"
 
@@ -50,7 +50,7 @@ public:
      * @param ParseTree (in) is CEP to be translated to a joblist
      * @param JobInfo&  (in/out) is the JobInfo reference that is loaded
      */
-    static void walkTree(ParseTree* n, JobInfo& jobInfo);
+    static void walkTree(execplan::ParseTree* n, JobInfo& jobInfo);
 
     /** @brief This function add new job steps to the job step vector in JobInfo
      *
diff --git a/dbcon/joblist/joblistfactory.cpp b/dbcon/joblist/joblistfactory.cpp
index b0c314364..788cf5cc9 100644
--- a/dbcon/joblist/joblistfactory.cpp
+++ b/dbcon/joblist/joblistfactory.cpp
@@ -88,6 +88,7 @@ using namespace logging;
 #include "rowgroup.h"
 using namespace rowgroup;
 
+#include "mcsv1_udaf.h"
 
 namespace
 {
@@ -709,7 +710,7 @@ void updateAggregateColType(AggregateColumn* ac, const SRCP& srcp, int op, JobIn
 
         if (udafc)
         {
-            mcsv1Context& udafContext = udafc->getContext();
+            mcsv1sdk::mcsv1Context& udafContext = udafc->getContext();
             ct.colDataType = udafContext.getResultType();
             ct.colWidth = udafContext.getColWidth();
             ct.scale = udafContext.getScale();
diff --git a/dbcon/joblist/jobstep.cpp b/dbcon/joblist/jobstep.cpp
index f5419558d..8e90bd2a6 100644
--- a/dbcon/joblist/jobstep.cpp
+++ b/dbcon/joblist/jobstep.cpp
@@ -57,7 +57,7 @@ namespace joblist
 {
 boost::mutex JobStep::fLogMutex; //=PTHREAD_MUTEX_INITIALIZER;
 
-ThreadPool JobStep::jobstepThreadPool(defaultJLThreadPoolSize, 0);
+threadpool::ThreadPool JobStep::jobstepThreadPool(defaultJLThreadPoolSize, 0);
 
 ostream& operator<<(ostream& os, const JobStep* rhs)
 {
diff --git a/dbcon/joblist/jobstep.h b/dbcon/joblist/jobstep.h
index 5e917b2f0..d4f5143f4 100644
--- a/dbcon/joblist/jobstep.h
+++ b/dbcon/joblist/jobstep.h
@@ -53,8 +53,6 @@
 #  endif
 #endif
 
-using namespace threadpool;
-
 namespace joblist
 {
 
@@ -423,7 +421,7 @@ public:
         fOnClauseFilter = b;
     }
 
-    static ThreadPool jobstepThreadPool;
+    static threadpool::ThreadPool jobstepThreadPool;
 protected:
 
     //@bug6088, for telemetry posting
diff --git a/dbcon/mysql/ha_calpont_execplan.cpp b/dbcon/mysql/ha_calpont_execplan.cpp
index e553254e3..d962511ef 100644
--- a/dbcon/mysql/ha_calpont_execplan.cpp
+++ b/dbcon/mysql/ha_calpont_execplan.cpp
@@ -44,6 +44,7 @@
 #include <limits>
 
 #include <string.h>
+#include "mcsv1_udaf.h"
 
 using namespace std;
 
@@ -4610,7 +4611,7 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
 
             if (udafc)
             {
-                mcsv1Context& context = udafc->getContext();
+                mcsv1sdk::mcsv1Context& context = udafc->getContext();
                 context.setName(isp->func_name());
 
                 // Set up the return type defaults for the call to init()
@@ -4620,8 +4621,8 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
                 context.setPrecision(udafc->resultType().precision);
 
                 context.setParamCount(udafc->aggParms().size());
-                ColumnDatum colType;
-                ColumnDatum colTypes[udafc->aggParms().size()];
+                mcsv1sdk::ColumnDatum colType;
+                mcsv1sdk::ColumnDatum colTypes[udafc->aggParms().size()];
 
                 // Build the column type vector.
                 // Modified for MCOL-1201 multi-argument aggregate
@@ -4649,7 +4650,7 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
                     return NULL;
                 }
 
-                if (udaf->init(&context, colTypes) == mcsv1_UDAF::ERROR)
+                if (udaf->init(&context, colTypes) == mcsv1sdk::mcsv1_UDAF::ERROR)
                 {
                     gwi.fatalParseError = true;
                     gwi.parseErrorText = udafc->getContext().getErrorMessage();
@@ -4662,7 +4663,7 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
 
                 // UDAF_OVER_REQUIRED means that this function is for Window
                 // Function only. Reject it here in aggregate land.
-                if (udafc->getContext().getRunFlag(UDAF_OVER_REQUIRED))
+                if (udafc->getContext().getRunFlag(mcsv1sdk::UDAF_OVER_REQUIRED))
                 {
                     gwi.fatalParseError = true;
                     gwi.parseErrorText =
diff --git a/dbcon/mysql/ha_calpont_impl.cpp b/dbcon/mysql/ha_calpont_impl.cpp
index 57c17c6e7..685258744 100644
--- a/dbcon/mysql/ha_calpont_impl.cpp
+++ b/dbcon/mysql/ha_calpont_impl.cpp
@@ -3277,7 +3277,7 @@ void ha_calpont_impl_start_bulk_insert(ha_rows rows, TABLE* table)
 
             if (get_local_query(thd))
             {
-                OamCache* oamcache = OamCache::makeOamCache();
+                const auto oamcache = oam::OamCache::makeOamCache();
                 int localModuleId = oamcache->getLocalPMId();
 
                 if (localModuleId == 0)
diff --git a/dbcon/mysql/ha_mcs_client_udfs.cpp b/dbcon/mysql/ha_mcs_client_udfs.cpp
index 1766bdf1c..9113ae51b 100644
--- a/dbcon/mysql/ha_mcs_client_udfs.cpp
+++ b/dbcon/mysql/ha_mcs_client_udfs.cpp
@@ -58,7 +58,7 @@ extern "C"
     const char* invalidParmSizeMessage(uint64_t size, size_t& len)
     {
         static char str[sizeof(InvalidParmSize) + 12] = {0};
-        ostringstream os;
+        std::ostringstream os;
         os << InvalidParmSize << size;
         len = os.str().length();
         strcpy(str, os.str().c_str());
@@ -86,13 +86,13 @@ extern "C"
         uint64_t value = Config::uFromText(valuestr);
 
         THD* thd = current_thd;
-        uint32_t sessionID = CalpontSystemCatalog::idb_tid2sid(thd->thread_id);
+        uint32_t sessionID = execplan::CalpontSystemCatalog::idb_tid2sid(thd->thread_id);
 
         const char* msg = SetParmsError;
         size_t mlen = Elen;
         bool includeInput = true;
 
-        string pstr(parameter);
+        std::string pstr(parameter);
         boost::algorithm::to_lower(pstr);
 
         if (get_fe_conn_info_ptr() == NULL)
@@ -107,7 +107,7 @@ extern "C"
 
             if (rm->getHjTotalUmMaxMemorySmallSide() >= value)
             {
-                ci->rmParms.push_back(RMParam(sessionID, execplan::PMSMALLSIDEMEMORY, value));
+                ci->rmParms.push_back(execplan::RMParam(sessionID, execplan::PMSMALLSIDEMEMORY, value));
 
                 msg = SetParmsPrelude;
                 mlen = Plen;
@@ -254,8 +254,8 @@ extern "C"
         long long oldTrace = ci->traceFlags;
         ci->traceFlags = (uint32_t)(*((long long*)args->args[0]));
         // keep the vtablemode bit
-        ci->traceFlags |= (oldTrace & CalpontSelectExecutionPlan::TRACE_TUPLE_OFF);
-        ci->traceFlags |= (oldTrace & CalpontSelectExecutionPlan::TRACE_TUPLE_AUTOSWITCH);
+        ci->traceFlags |= (oldTrace & execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_OFF);
+        ci->traceFlags |= (oldTrace & execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_AUTOSWITCH);
         return oldTrace;
     }
 
@@ -381,8 +381,8 @@ extern "C"
     {
         long long rtn = 0;
         Oam oam;
-        string PrimaryUMModuleName;
-        string localModule;
+        std::string PrimaryUMModuleName;
+        std::string localModule;
         oamModuleInfo_t st;
 
         try
@@ -396,7 +396,7 @@ extern "C"
             if (PrimaryUMModuleName == "unassigned")
                 rtn = 1;
         }
-        catch (runtime_error& e)
+        catch (std::runtime_error& e)
         {
             // It's difficult to return an error message from a numerical UDF
             //string msg = string("ERROR: Problem getting Primary UM Module Name. ") + e.what();
@@ -469,7 +469,7 @@ extern "C"
             set_fe_conn_info_ptr((void*)new cal_connection_info());
 
         cal_connection_info* ci = reinterpret_cast<cal_connection_info*>(get_fe_conn_info_ptr());
-        CalpontSystemCatalog::TableName tableName;
+        execplan::CalpontSystemCatalog::TableName tableName;
 
         if ( args->arg_count == 2 )
         {
@@ -484,7 +484,7 @@ extern "C"
                 tableName.schema = thd->db.str;
             else
             {
-                string msg("No schema information provided");
+              std::string msg("No schema information provided");
                 memcpy(result, msg.c_str(), msg.length());
                 *length = msg.length();
                 return result;
@@ -497,7 +497,7 @@ extern "C"
             //cout << "viewtablelock starts a new client " << ci->dmlProc << " for session " << thd->thread_id << endl;
         }
 
-        string lockinfo = ha_calpont_impl_viewtablelock(*ci, tableName);
+        std::string lockinfo = ha_calpont_impl_viewtablelock(*ci, tableName);
 
         memcpy(result, lockinfo.c_str(), lockinfo.length());
         *length = lockinfo.length();
@@ -550,7 +550,7 @@ extern "C"
         }
 
         unsigned long long uLockID = lockID;
-        string lockinfo = ha_calpont_impl_cleartablelock(*ci, uLockID);
+        std::string lockinfo = ha_calpont_impl_cleartablelock(*ci, uLockID);
 
         memcpy(result, lockinfo.c_str(), lockinfo.length());
         *length = lockinfo.length();
@@ -604,7 +604,7 @@ extern "C"
     {
         THD* thd = current_thd;
 
-        CalpontSystemCatalog::TableName tableName;
+        execplan::CalpontSystemCatalog::TableName tableName;
         uint64_t nextVal = 0;
 
         if ( args->arg_count == 2 )
@@ -624,9 +624,9 @@ extern "C"
             }
         }
 
-        boost::shared_ptr<CalpontSystemCatalog> csc =
-            CalpontSystemCatalog::makeCalpontSystemCatalog(
-                CalpontSystemCatalog::idb_tid2sid(thd->thread_id));
+        boost::shared_ptr<execplan::CalpontSystemCatalog> csc =
+            execplan::CalpontSystemCatalog::makeCalpontSystemCatalog(
+                execplan::CalpontSystemCatalog::idb_tid2sid(thd->thread_id));
         csc->identity(execplan::CalpontSystemCatalog::FE);
 
         try
@@ -635,7 +635,7 @@ extern "C"
         }
         catch (std::exception&)
         {
-            string msg("No such table found during autincrement");
+          std::string msg("No such table found during autincrement");
             setError(thd, ER_INTERNAL_ERROR, msg);
             return nextVal;
         }
@@ -649,7 +649,7 @@ extern "C"
         //@Bug 3559. Return a message for table without autoincrement column.
         if (nextVal == 0)
         {
-            string msg("Autoincrement does not exist for this table.");
+          std::string msg("Autoincrement does not exist for this table.");
             setError(thd, ER_INTERNAL_ERROR, msg);
             return nextVal;
         }
@@ -705,7 +705,7 @@ extern "C"
                             char* result, unsigned long* length,
                             char* is_null, char* error)
     {
-        const string* msgp;
+        const std::string* msgp;
         int flags = 0;
 
         if (args->arg_count > 0)
@@ -776,7 +776,7 @@ extern "C"
                               char* result, unsigned long* length,
                               char* is_null, char* error)
     {
-        string version(columnstore_version);
+      std::string version(columnstore_version);
         *length = version.size();
         memcpy(result, version.c_str(), *length);
         return result;
diff --git a/ddlproc/ddlprocessor.cpp b/ddlproc/ddlprocessor.cpp
index a10ff31af..fb283f3a7 100644
--- a/ddlproc/ddlprocessor.cpp
+++ b/ddlproc/ddlprocessor.cpp
@@ -20,7 +20,7 @@
  *
  *
  ***********************************************************************/
-
+#include <future> //cxx11test
 #include <map>
 #include <boost/scoped_ptr.hpp>
 using namespace std;
diff --git a/dmlproc/dmlproc.cpp b/dmlproc/dmlproc.cpp
index deb936422..7b1041b1e 100644
--- a/dmlproc/dmlproc.cpp
+++ b/dmlproc/dmlproc.cpp
@@ -20,7 +20,7 @@
 *
 *
 ***********************************************************************/
-
+#include <future> //cxx11test
 #include <unistd.h>
 #include <signal.h>
 #include <string>
@@ -632,7 +632,7 @@ int main(int argc, char* argv[])
     if (rm->getDMLJlThreadPoolDebug() == "Y" || rm->getDMLJlThreadPoolDebug() == "y")
     {
         JobStep::jobstepThreadPool.setDebug(true);
-        JobStep::jobstepThreadPool.invoke(ThreadPoolMonitor(&JobStep::jobstepThreadPool));
+        JobStep::jobstepThreadPool.invoke(threadpool::ThreadPoolMonitor(&JobStep::jobstepThreadPool));
     }
 
     //set ACTIVE state
diff --git a/exemgr/CMakeLists.txt b/exemgr/CMakeLists.txt
index cae1cf3ce..5f77ed886 100644
--- a/exemgr/CMakeLists.txt
+++ b/exemgr/CMakeLists.txt
@@ -8,7 +8,9 @@ set(ExeMgr_SRCS main.cpp activestatementcounter.cpp femsghandler.cpp ../utils/co
 
 add_executable(ExeMgr ${ExeMgr_SRCS})
 
-target_link_libraries(ExeMgr ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} cacheutils threadpool)
+target_link_libraries(ExeMgr ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} cacheutils threadpool stdc++fs)
+
+
 
 install(TARGETS ExeMgr DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
 
diff --git a/exemgr/main.cpp b/exemgr/main.cpp
index 259d1443e..6790fafbb 100644
--- a/exemgr/main.cpp
+++ b/exemgr/main.cpp
@@ -39,82 +39,53 @@
  * on the Front-End Processor where it is returned to the DBMS
  * front-end.
  */
+
+
+
+#include <mutex>
+#include <experimental/filesystem>
 #include <iostream>
-#include <map>
-#include <string>
-#include <stdexcept>
+
+#include <cstdint>
 #include <csignal>
-#include <unistd.h>
-#include <sys/time.h>
-#ifndef _MSC_VER
+
 #include <sys/resource.h>
-#else
-#include <io.h>
-#include <direct.h>
-#endif
-//#define NDEBUG
-#include <cassert>
-#include <clocale>
-#include <ctime>
-using namespace std;
 
-#include <boost/thread.hpp>
-#include <boost/tokenizer.hpp>
-#include <boost/scoped_ptr.hpp>
-using namespace boost;
-
-#include "config.h"
-#include "configcpp.h"
-using namespace config;
-#include "messagequeue.h"
-#include "iosocket.h"
-#include "bytestream.h"
-using namespace messageqcpp;
 #include "calpontselectexecutionplan.h"
-#include "calpontsystemcatalog.h"
-#include "simplecolumn.h"
-using namespace execplan;
-#include "joblist.h"
-#include "joblistfactory.h"
+#include "activestatementcounter.h"
 #include "distributedenginecomm.h"
 #include "resourcemanager.h"
-using namespace joblist;
-#include "liboamcpp.h"
-using namespace oam;
-#include "logger.h"
-#include "sqllogger.h"
-#include "idberrorinfo.h"
-using namespace logging;
-#include "querystats.h"
-using namespace querystats;
-#include "MonitorProcMem.h"
-#include "querytele.h"
-using namespace querytele;
+#include "configcpp.h"
+#include "queryteleserverparms.h"
+#include "iosocket.h"
+#include "joblist.h"
+#include "joblistfactory.h"
 #include "oamcache.h"
-
-#include "activestatementcounter.h"
+#include "simplecolumn.h"
+#include "bytestream.h"
+#include "telestats.h"
+#include "messageobj.h"
+#include "messagelog.h"
+#include "sqllogger.h"
 #include "femsghandler.h"
-
-#include "utils_utf8.h"
-#include "boost/filesystem.hpp"
-
-#include "threadpool.h"
+#include "idberrorinfo.h"
+#include "MonitorProcMem.h"
+#include "liboamcpp.h"
 #include "crashtrace.h"
+#include "utils_utf8.h"
 
 #if defined(SKIP_OAM_INIT)
 #include "dbrm.h"
 #endif
 
 
-#include "installdir.h"
-
 namespace
 {
 
 //If any flags other than the table mode flags are set, produce output to screeen
 const uint32_t flagsWantOutput = (0xffffffff &
-                                  ~CalpontSelectExecutionPlan::TRACE_TUPLE_AUTOSWITCH &
-                                  ~CalpontSelectExecutionPlan::TRACE_TUPLE_OFF);
+                                  ~execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_AUTOSWITCH &
+                                  ~execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_OFF);
 
 int gDebug;
 
@@ -129,46 +100,46 @@ const unsigned logExeMgrExcpt          = logging::M0055;
 
 logging::Logger msgLog(16);
 
-typedef map<uint32_t, size_t> SessionMemMap_t;
+typedef std::map<uint32_t, size_t> SessionMemMap_t;
 SessionMemMap_t sessionMemMap; // track memory% usage during a query
-mutex sessionMemMapMutex;
+std::mutex sessionMemMapMutex;
 
 //...The FrontEnd may establish more than 1 connection (which results in
 //   more than 1 ExeMgr thread) per session.  These threads will share
 //   the same CalpontSystemCatalog object for that session.  Here, we
-//   define a map to track how many threads are sharing each session, so
+//   define a std::map to track how many threads are sharing each session, so
 //   that we know when we can safely delete a CalpontSystemCatalog object
 //   shared by multiple threads per session.
-typedef map<uint32_t, uint32_t> ThreadCntPerSessionMap_t;
+typedef std::map<uint32_t, uint32_t> ThreadCntPerSessionMap_t;
 ThreadCntPerSessionMap_t        threadCntPerSessionMap;
-mutex threadCntPerSessionMapMutex;
+std::mutex threadCntPerSessionMapMutex;
 
 //This var is only accessed using thread-safe inc/dec calls
 ActiveStatementCounter* statementsRunningCount;
 
-DistributedEngineComm* ec;
+joblist::DistributedEngineComm* ec;
 
-ResourceManager* rm = ResourceManager::instance(true);
+auto rm = joblist::ResourceManager::instance(true);
 
-int toInt(const string& val)
+int toInt(const std::string& val)
 {
     if (val.length() == 0) return -1;
 
-    return static_cast<int>(Config::fromText(val));
+    return static_cast<int>(config::Config::fromText(val));
 }
 
-const string ExeMgr("ExeMgr1");
+const std::string ExeMgr("ExeMgr1");
 
-const string prettyPrintMiniInfo(const string& in)
+const std::string prettyPrintMiniInfo(const std::string& in)
 {
-    //1. take the string and tok it by '\n'
+    //1. take the std::string and tok it by '\n'
     //2. for each part in each line calc the longest part
     //3. padding to each longest value, output a header and the lines
     typedef boost::tokenizer<boost::char_separator<char> > my_tokenizer;
     boost::char_separator<char> sep1("\n");
     my_tokenizer tok1(in, sep1);
-    vector<string> lines;
-    string header = "Desc Mode Table TableOID ReferencedColumns PIO LIO PBE Elapsed Rows";
+    std::vector<std::string> lines;
+    std::string header = "Desc Mode Table TableOID ReferencedColumns PIO LIO PBE Elapsed Rows";
     const int header_parts = 10;
     lines.push_back(header);
 
@@ -178,13 +149,13 @@ const string prettyPrintMiniInfo(const string& in)
             lines.push_back(*iter1);
     }
 
-    vector<unsigned> lens;
+    std::vector<unsigned> lens;
 
     for (int i = 0; i < header_parts; i++)
         lens.push_back(0);
 
-    vector<vector<string> > lineparts;
-    vector<string>::iterator iter2;
+    std::vector<std::vector<std::string> > lineparts;
+    std::vector<std::string>::iterator iter2;
     int j;
 
     for (iter2 = lines.begin(), j = 0; iter2 != lines.end(); ++iter2, j++)
@@ -192,14 +163,14 @@ const string prettyPrintMiniInfo(const string& in)
         boost::char_separator<char> sep2(" ");
         my_tokenizer tok2(*iter2, sep2);
         int i;
-        vector<string> parts;
+        std::vector<std::string> parts;
         my_tokenizer::iterator iter3;
 
         for (iter3 = tok2.begin(), i = 0; iter3 != tok2.end(); ++iter3, i++)
         {
             if (i >= header_parts) break;
 
-            string part(*iter3);
+            std::string part(*iter3);
 
             if (j != 0 && i == 8)
                 part.resize(part.size() - 3);
@@ -216,24 +187,24 @@ const string prettyPrintMiniInfo(const string& in)
         lineparts.push_back(parts);
     }
 
-    ostringstream oss;
+    std::ostringstream oss;
 
-    vector<vector<string> >::iterator iter1 = lineparts.begin();
-    vector<vector<string> >::iterator end1 = lineparts.end();
+    std::vector<std::vector<std::string> >::iterator iter1 = lineparts.begin();
+    std::vector<std::vector<std::string> >::iterator end1 = lineparts.end();
 
     oss << "\n";
 
     while (iter1 != end1)
     {
-        vector<string>::iterator iter2 = iter1->begin();
-        vector<string>::iterator end2 = iter1->end();
+        std::vector<std::string>::iterator iter2 = iter1->begin();
+        std::vector<std::string>::iterator end2 = iter1->end();
         assert(distance(iter2, end2) == header_parts);
         int i = 0;
 
         while (iter2 != end2)
         {
             assert(i < header_parts);
-            oss << setw(lens[i]) << left << *iter2 << " ";
+            oss << std::setw(lens[i]) << std::left << *iter2 << " ";
             ++iter2;
             i++;
         }
@@ -245,7 +216,7 @@ const string prettyPrintMiniInfo(const string& in)
     return oss.str();
 }
 
-const string timeNow()
+const std::string timeNow()
 {
     time_t outputTime = time(0);
     struct tm ltm;
@@ -265,13 +236,13 @@ const string timeNow()
     return buf;
 }
 
-QueryTeleServerParms gTeleServerParms;
+querytele::QueryTeleServerParms gTeleServerParms;
 
 class SessionThread
 {
 public:
 
-    SessionThread(const IOSocket& ios, DistributedEngineComm* ec, ResourceManager* rm) :
+    SessionThread(const messageqcpp::IOSocket& ios, joblist::DistributedEngineComm* ec, joblist::ResourceManager* rm) :
         fIos(ios), fEc(ec),
         fRm(rm),
         fStatsRetrieved(false),
@@ -282,20 +253,20 @@ public:
 
 private:
 
-    IOSocket fIos;
-    DistributedEngineComm* fEc;
-    ResourceManager*  fRm;
+    messageqcpp::IOSocket fIos;
+    joblist::DistributedEngineComm* fEc;
+    joblist::ResourceManager*  fRm;
     querystats::QueryStats fStats;
 
     // Variables used to store return stats
     bool       fStatsRetrieved;
 
-    QueryTeleClient fTeleClient;
+    querytele::QueryTeleClient fTeleClient;
 
     oam::OamCache* fOamCachePtr;	//this ptr is copyable...
 
     //...Reinitialize stats for start of a new query
-    void initStats ( uint32_t sessionId, string& sqlText )
+    void initStats ( uint32_t sessionId, std::string& sqlText )
     {
         initMaxMemPct ( sessionId );
 
@@ -314,7 +285,7 @@ private:
 
         if ( sessionId < 0x80000000 )
         {
-            mutex::scoped_lock lk(sessionMemMapMutex);
+            std::lock_guard<std::mutex> lk(sessionMemMapMutex);
             SessionMemMap_t::iterator mapIter =
                 sessionMemMap.find( sessionId );
 
@@ -333,7 +304,7 @@ private:
     {
         if ( sessionId < 0x80000000 )
         {
-            mutex::scoped_lock lk(sessionMemMapMutex);
+            std::lock_guard<std::mutex> lk(sessionMemMapMutex);
             SessionMemMap_t::iterator mapIter =
                 sessionMemMap.find( sessionId );
 
@@ -345,15 +316,15 @@ private:
     }
 
     //...Get and log query stats to specified output stream
-    const string formatQueryStats (
-        SJLP&    jl,			// joblist associated with query
-        const    string& label, // header label to print in front of log output
-        bool     includeNewLine,//include line breaks in query stats string
+    const std::string formatQueryStats (
+        joblist::SJLP&    jl,			// joblist associated with query
+        const    std::string& label, // header label to print in front of log output
+        bool     includeNewLine,//include line breaks in query stats std::string
         bool     vtableModeOn,
         bool     wantExtendedStats,
         uint64_t rowsReturned)
     {
-        ostringstream os;
+        std::ostringstream os;
 
         // Get stats if not already acquired for current query
         if ( !fStatsRetrieved )
@@ -377,7 +348,7 @@ private:
             fStatsRetrieved = true;
         }
 
-        string queryMode;
+        std::string queryMode;
         queryMode = (vtableModeOn ? "Distributed" : "Standard");
 
         // Log stats to specified output stream
@@ -390,7 +361,7 @@ private:
            "; BlocksTouched-" << fStats.fMsgRcvCnt;
 
         if ( includeNewLine )
-            os << endl << "      ";	// insert line break
+            os << std::endl << "      ";	// insert line break
         else
             os << "; ";				// continue without line break
 
@@ -405,7 +376,7 @@ private:
     //...Increment the number of threads using the specified sessionId
     static void incThreadCntPerSession(uint32_t sessionId)
     {
-        mutex::scoped_lock lk(threadCntPerSessionMapMutex);
+        std::lock_guard<std::mutex> lk(threadCntPerSessionMapMutex);
         ThreadCntPerSessionMap_t::iterator mapIter =
             threadCntPerSessionMap.find(sessionId);
 
@@ -425,7 +396,7 @@ private:
     //...debugging/stats purpose, such as result graph, etc.
     static void decThreadCntPerSession(uint32_t sessionId)
     {
-        mutex::scoped_lock lk(threadCntPerSessionMapMutex);
+        std::lock_guard<std::mutex> lk(threadCntPerSessionMapMutex);
         ThreadCntPerSessionMap_t::iterator mapIter =
             threadCntPerSessionMap.find(sessionId);
 
@@ -434,8 +405,8 @@ private:
             if (--mapIter->second == 0)
             {
                 threadCntPerSessionMap.erase(mapIter);
-                CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId);
-                CalpontSystemCatalog::removeCalpontSystemCatalog((sessionId ^ 0x80000000));
+                execplan::CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId);
+                execplan::CalpontSystemCatalog::removeCalpontSystemCatalog((sessionId ^ 0x80000000));
             }
         }
     }
@@ -446,8 +417,8 @@ private:
     {
         if ( sessionId < 0x80000000 )
         {
-            // cout << "Setting pct to 0 for session " << sessionId << endl;
-            mutex::scoped_lock lk(sessionMemMapMutex);
+            // std::cout << "Setting pct to 0 for session " << sessionId << std::endl;
+            std::lock_guard<std::mutex> lk(sessionMemMapMutex);
             SessionMemMap_t::iterator mapIter = sessionMemMap.find( sessionId );
 
             if ( mapIter == sessionMemMap.end() )
@@ -462,7 +433,7 @@ private:
     }
 
     //... Round off to human readable format (KB, MB, or GB).
-    const string roundBytes(uint64_t value) const
+    const std::string roundBytes(uint64_t value) const
     {
         const char* units[] = {"B", "KB", "MB", "GB", "TB"};
         uint64_t i = 0, up = 0;
@@ -478,7 +449,7 @@ private:
         if (up)
             roundedValue++;
 
-        ostringstream oss;
+        std::ostringstream oss;
         oss << roundedValue << units[i];
         return oss.str();
     }
@@ -494,20 +465,20 @@ private:
         return roundedValue;
     }
 
-    void setRMParms ( const CalpontSelectExecutionPlan::RMParmVec& parms )
+    void setRMParms ( const execplan::CalpontSelectExecutionPlan::RMParmVec& parms )
     {
-        for (CalpontSelectExecutionPlan::RMParmVec::const_iterator it = parms.begin();
+        for (execplan::CalpontSelectExecutionPlan::RMParmVec::const_iterator it = parms.begin();
                 it != parms.end(); ++it)
         {
             switch (it->id)
             {
-                case PMSMALLSIDEMEMORY:
+                case execplan::PMSMALLSIDEMEMORY:
                 {
                     fRm->addHJPmMaxSmallSideMap(it->sessionId, it->value);
                     break;
                 }
 
-                case UMSMALLSIDEMEMORY:
+                case execplan::UMSMALLSIDEMEMORY:
                 {
                     fRm->addHJUmMaxSmallSideMap(it->sessionId, it->value);
                     break;
@@ -519,22 +490,22 @@ private:
         }
     }
 
-    void buildSysCache(const CalpontSelectExecutionPlan& csep, boost::shared_ptr<CalpontSystemCatalog> csc)
+    void buildSysCache(const execplan::CalpontSelectExecutionPlan& csep, boost::shared_ptr<execplan::CalpontSystemCatalog> csc)
     {
-        const CalpontSelectExecutionPlan::ColumnMap& colMap = csep.columnMap();
-        CalpontSelectExecutionPlan::ColumnMap::const_iterator it;
-        string schemaName;
+        const execplan::CalpontSelectExecutionPlan::ColumnMap& colMap = csep.columnMap();
+        execplan::CalpontSelectExecutionPlan::ColumnMap::const_iterator it;
+        std::string schemaName;
 
         for (it = colMap.begin(); it != colMap.end(); ++it)
         {
-            SimpleColumn* sc = dynamic_cast<SimpleColumn*>((it->second).get());
+            const auto sc = dynamic_cast<execplan::SimpleColumn*>((it->second).get());
 
             if (sc)
             {
                 schemaName = sc->schemaName();
 
                 // only the first time a schema is got will actually query
-                // system catalog. System catalog keeps a schema name map.
+                // system catalog. System catalog keeps a schema name std::map.
                 // if a schema exists, the call getSchemaInfo returns without
                 // doing anything.
                 if (!schemaName.empty())
@@ -542,11 +513,11 @@ private:
             }
         }
 
-        CalpontSelectExecutionPlan::SelectList::const_iterator subIt;
+        execplan::CalpontSelectExecutionPlan::SelectList::const_iterator subIt;
 
         for (subIt = csep.derivedTableList().begin(); subIt != csep.derivedTableList().end(); ++ subIt)
         {
-            buildSysCache(*(dynamic_cast<CalpontSelectExecutionPlan*>(subIt->get())), csc);
+            buildSysCache(*(dynamic_cast<execplan::CalpontSelectExecutionPlan*>(subIt->get())), csc);
         }
     }
 
@@ -554,10 +525,10 @@ public:
 
     void operator()()
     {
-        ByteStream bs, inbs;
-        CalpontSelectExecutionPlan csep;
+        messageqcpp::ByteStream bs, inbs;
+        execplan::CalpontSelectExecutionPlan csep;
         csep.sessionID(0);
-        SJLP jl;
+        joblist::SJLP jl;
         bool incSessionThreadCnt = true;
 
         bool selfJoin = false;
@@ -579,7 +550,7 @@ public:
                 if (bs.length() == 0)
                 {
                     if (gDebug > 1 || (gDebug && !csep.isInternal()))
-                        cout << "### Got a close(1) for session id " << csep.sessionID() << endl;
+                        std::cout << "### Got a close(1) for session id " << csep.sessionID() << std::endl;
 
                     // connection closed by client
                     fIos.close();
@@ -588,21 +559,21 @@ public:
                 else if (bs.length() < 4) //Not a CalpontSelectExecutionPlan
                 {
                     if (gDebug)
-                        cout << "### Got a not-a-plan for session id " << csep.sessionID()
-                             << " with length " << bs.length() <<  endl;
+                        std::cout << "### Got a not-a-plan for session id " << csep.sessionID()
+                             << " with length " << bs.length() <<  std::endl;
 
                     fIos.close();
                     break;
                 }
                 else if (bs.length() == 4) //possible tuple flag
                 {
-                    ByteStream::quadbyte qb;
+                    messageqcpp::ByteStream::quadbyte qb;
                     bs >> qb;
 
                     if (qb == 4) //UM wants new tuple i/f
                     {
                         if (gDebug)
-                            cout << "### UM wants tuples" << endl;
+                            std::cout << "### UM wants tuples" << std::endl;
 
                         tryTuples = true;
                         // now wait for the CSEP...
@@ -622,7 +593,7 @@ public:
                     else
                     {
                         if (gDebug)
-                            cout << "### Got a not-a-plan value " << qb << endl;
+                            std::cout << "### Got a not-a-plan value " << qb << std::endl;
 
                         fIos.close();
                         break;
@@ -632,14 +603,14 @@ public:
 new_plan:
                 csep.unserialize(bs);
 
-                QueryTeleStats qts;
+                querytele::QueryTeleStats qts;
 
                 if ( !csep.isInternal() &&
                         (csep.queryType() == "SELECT" || csep.queryType() == "INSERT_SELECT") )
                 {
                     qts.query_uuid = csep.uuid();
-                    qts.msg_type = QueryTeleStats::QT_START;
-                    qts.start_time = QueryTeleClient::timeNowms();
+                    qts.msg_type = querytele::QueryTeleStats::QT_START;
+                    qts.start_time = querytele::QueryTeleClient::timeNowms();
                     qts.query = csep.data();
                     qts.session_id = csep.sessionID();
                     qts.query_type = csep.queryType();
@@ -651,7 +622,7 @@ new_plan:
                 }
 
                 if (gDebug > 1 || (gDebug && !csep.isInternal()))
-                    cout << "### For session id " << csep.sessionID() << ", got a CSEP" << endl;
+                    std::cout << "### For session id " << csep.sessionID() << ", got a CSEP" << std::endl;
 
                 setRMParms(csep.rmParms());
 
@@ -659,8 +630,8 @@ new_plan:
                 // skip system catalog queries.
                 if (!csep.isInternal())
                 {
-                    boost::shared_ptr<CalpontSystemCatalog> csc =
-                        CalpontSystemCatalog::makeCalpontSystemCatalog(csep.sessionID());
+                    boost::shared_ptr<execplan::CalpontSystemCatalog> csc =
+                      execplan::CalpontSystemCatalog::makeCalpontSystemCatalog(csep.sessionID());
                     buildSysCache(csep, csc);
                 }
 
@@ -674,9 +645,9 @@ new_plan:
                 }
 
                 bool needDbProfEndStatementMsg = false;
-                Message::Args args;
-                string sqlText = csep.data();
-                LoggingID li(16, csep.sessionID(), csep.txnID());
+                logging::Message::Args args;
+                std::string sqlText = csep.data();
+                logging::LoggingID li(16, csep.sessionID(), csep.txnID());
 
                 // Initialize stats for this query, including
                 // init sessionMemMap entry for this session to 0 memory %.
@@ -694,7 +665,7 @@ new_plan:
                     args.add((int)csep.statementID());
                     args.add((int)csep.verID().currentScn);
                     args.add(sqlText);
-                    msgLog.logMessage(LOG_TYPE_DEBUG,
+                    msgLog.logMessage(logging::LOG_TYPE_DEBUG,
                                       logDbProfStartStatement,
                                       args,
                                       li);
@@ -705,9 +676,9 @@ new_plan:
                 if (selfJoin)
                     sqlText = "";
 
-                ostringstream oss;
+                std::ostringstream oss;
                 oss << sqlText << "; |" << csep.schemaName() << "|";
-                SQLLogger sqlLog(oss.str(), li);
+                logging::SQLLogger sqlLog(oss.str(), li);
 
                 statementsRunningCount->incr(stmtCounted);
 
@@ -715,14 +686,14 @@ new_plan:
                 {
                     try // @bug2244: try/catch around fIos.write() calls responding to makeTupleList
                     {
-                        string emsg("NOERROR");
-                        ByteStream emsgBs;
-                        ByteStream::quadbyte tflg = 0;
-                        jl = JobListFactory::makeJobList(&csep, fRm, true, true);
+                        std::string emsg("NOERROR");
+                        messageqcpp::ByteStream emsgBs;
+                        messageqcpp::ByteStream::quadbyte tflg = 0;
+                        jl = joblist::JobListFactory::makeJobList(&csep, fRm, true, true);
                         // assign query stats
                         jl->queryStats(fStats);
 
-                        ByteStream tbs;
+                        messageqcpp::ByteStream tbs;
 
                         if ((jl->status()) == 0 && (jl->putEngineComm(fEc) == 0))
                         {
@@ -734,7 +705,7 @@ new_plan:
                             emsgBs.reset();
                             emsgBs << emsg;
                             fIos.write(emsgBs);
-                            TupleJobList* tjlp = dynamic_cast<TupleJobList*>(jl.get());
+                            auto tjlp = dynamic_cast<joblist::TupleJobList*>(jl.get());
                             assert(tjlp);
                             tbs.restart();
                             tbs << tjlp->getOutputRowGroup();
@@ -750,60 +721,60 @@ new_plan:
                             emsgBs.reset();
                             emsgBs << emsg;
                             fIos.write(emsgBs);
-                            cerr << "ExeMgr: could not build a tuple joblist: " << emsg << endl;
+                            std::cerr << "ExeMgr: could not build a tuple joblist: " << emsg << std::endl;
                             continue;
                         }
                     }
                     catch (std::exception& ex)
                     {
-                        ostringstream errMsg;
+                        std::ostringstream errMsg;
                         errMsg << "ExeMgr: error writing makeJoblist "
                                "response; " <<  ex.what();
-                        throw runtime_error( errMsg.str() );
+                        throw std::runtime_error( errMsg.str() );
                     }
                     catch (...)
                     {
-                        ostringstream errMsg;
+                        std::ostringstream errMsg;
                         errMsg << "ExeMgr: unknown error writing makeJoblist "
                                "response; ";
-                        throw runtime_error( errMsg.str() );
+                        throw std::runtime_error( errMsg.str() );
                     }
 
                     if (!usingTuples)
                     {
                         if (gDebug)
-                            cout << "### UM wanted tuples but it didn't work out :-(" << endl;
+                            std::cout << "### UM wanted tuples but it didn't work out :-(" << std::endl;
                     }
                     else
                     {
                         if (gDebug)
-                            cout << "### UM wanted tuples and we'll do our best;-)" << endl;
+                            std::cout << "### UM wanted tuples and we'll do our best;-)" << std::endl;
                     }
                 }
                 else
                 {
                     usingTuples = false;
-                    jl = JobListFactory::makeJobList(&csep, fRm, false, true);
+                    jl = joblist::JobListFactory::makeJobList(&csep, fRm, false, true);
 
                     if (jl->status() == 0)
                     {
-                        string emsg;
+                        std::string emsg;
 
                         if (jl->putEngineComm(fEc) != 0)
-                            throw runtime_error(jl->errMsg());
+                            throw std::runtime_error(jl->errMsg());
                     }
                     else
                     {
-                        throw runtime_error("ExeMgr: could not build a JobList!");
+                        throw std::runtime_error("ExeMgr: could not build a JobList!");
                     }
                 }
 
 
                 jl->doQuery();
 
-                CalpontSystemCatalog::OID tableOID;
+                execplan::CalpontSystemCatalog::OID tableOID;
                 bool swallowRows = false;
-                DeliveredTableMap tm;
+                joblist::DeliveredTableMap tm;
                 uint64_t totalBytesSent = 0;
                 uint64_t totalRowCount = 0;
 
@@ -815,14 +786,14 @@ new_plan:
                     if (bs.length() == 0)
                     {
                         if (gDebug > 1 || (gDebug && !csep.isInternal()))
-                            cout << "### Got a close(2) for session id " << csep.sessionID() << endl;
+                            std::cout << "### Got a close(2) for session id " << csep.sessionID() << std::endl;
 
                         break;
                     }
 
                     if (gDebug && bs.length() > 4)
-                        cout << "### For session id " << csep.sessionID() << ", got too many bytes = " <<
-                             bs.length() << endl;
+                        std::cout << "### For session id " << csep.sessionID() << ", got too many bytes = " <<
+                             bs.length() << std::endl;
 
                     //TODO: Holy crud! Can this be right?
                     //@bug 1444 Yes, if there is a self-join
@@ -835,14 +806,14 @@ new_plan:
 
                     assert(bs.length() == 4);
 
-                    ByteStream::quadbyte qb;
+                    messageqcpp::ByteStream::quadbyte qb;
 
                     try // @bug2244: try/catch around fIos.write() calls responding to qb command
                     {
                         bs >> qb;
 
                         if (gDebug > 1 || (gDebug && !csep.isInternal()))
-                            cout << "### For session id " << csep.sessionID() << ", got a command = " << qb << endl;
+                            std::cout << "### For session id " << csep.sessionID() << ", got a command = " << qb << std::endl;
 
                         if (qb == 0)
                         {
@@ -861,46 +832,46 @@ new_plan:
                         {
                             // UM just wants any table
                             assert(swallowRows);
-                            DeliveredTableMap::iterator iter = tm.begin();
+                            auto iter = tm.begin();
 
                             if (iter == tm.end())
                             {
                                 if (gDebug > 1 || (gDebug && !csep.isInternal()))
-                                    cout << "### For session id " << csep.sessionID() << ", returning end flag" << endl;
+                                    std::cout << "### For session id " << csep.sessionID() << ", returning end flag" << std::endl;
 
                                 bs.restart();
-                                bs << (ByteStream::byte)1;
+                                bs << (messageqcpp::ByteStream::byte)1;
                                 fIos.write(bs);
                                 continue;
                             }
 
                             tableOID = iter->first;
                         }
-                        else if (qb == 3) //special option-UM wants job stats string
+                        else if (qb == 3) //special option-UM wants job stats std::string
                         {
-                            string statsString;
+                            std::string statsString;
 
-                            //Log stats string to be sent back to front end
+                            //Log stats std::string to be sent back to front end
                             statsString = formatQueryStats(
                                               jl,
                                               "Query Stats",
                                               false,
-                                              !(csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_TUPLE_OFF),
-                                              (csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_LOG),
+                                              !(csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_OFF),
+                                              (csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_LOG),
                                               totalRowCount
                                           );
 
                             bs.restart();
                             bs << statsString;
 
-                            if ((csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_LOG) != 0)
+                            if ((csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_LOG) != 0)
                             {
                                 bs << jl->extendedInfo();
                                 bs << prettyPrintMiniInfo(jl->miniInfo());
                             }
                             else
                             {
-                                string empty;
+                                std::string empty;
                                 bs << empty;
                                 bs << empty;
                             }
@@ -920,23 +891,23 @@ new_plan:
                         else // (qb > 3)
                         {
                             //Return table bands for the requested tableOID
-                            tableOID = static_cast<CalpontSystemCatalog::OID>(qb);
+                            tableOID = static_cast<execplan::CalpontSystemCatalog::OID>(qb);
                         }
                     }
                     catch (std::exception& ex)
                     {
-                        ostringstream errMsg;
+                        std::ostringstream errMsg;
                         errMsg << "ExeMgr: error writing qb response "
                                "for qb cmd " << qb <<
                                "; " <<  ex.what();
-                        throw runtime_error( errMsg.str() );
+                        throw std::runtime_error( errMsg.str() );
                     }
                     catch (...)
                     {
-                        ostringstream errMsg;
+                        std::ostringstream errMsg;
                         errMsg << "ExeMgr: unknown error writing qb response "
                                "for qb cmd " << qb;
-                        throw runtime_error( errMsg.str() );
+                        throw std::runtime_error( errMsg.str() );
                     }
 
                     if (swallowRows) tm.erase(tableOID);
@@ -957,7 +928,7 @@ new_plan:
 
                         if (jl->status())
                         {
-                            IDBErrorInfo* errInfo = IDBErrorInfo::instance();
+                            const auto errInfo = logging::IDBErrorInfo::instance();
 
                             if (jl->errMsg().length() != 0)
                                 bs << jl->errMsg();
@@ -967,7 +938,7 @@ new_plan:
 
                         try // @bug2244: try/catch around fIos.write() calls projecting rows
                         {
-                            if (csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_NO_ROWS3)
+                            if (csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_NO_ROWS3)
                             {
                                 // Skip the write to the front end until the last empty band.  Used to time queries
                                 // through without any front end waiting.
@@ -982,7 +953,7 @@ new_plan:
                         catch (std::exception& ex)
                         {
                             msgHandler.stop();
-                            ostringstream errMsg;
+                            std::ostringstream errMsg;
                             errMsg << "ExeMgr: error projecting rows "
                                    "for tableOID: " << tableOID <<
                                    "; rowCnt: " << rowCount <<
@@ -1004,12 +975,12 @@ new_plan:
                                 return;
                             }
 
-                            //cout << "connection drop\n";
-                            throw runtime_error( errMsg.str() );
+                            //std::cout << "connection drop\n";
+                            throw std::runtime_error( errMsg.str() );
                         }
                         catch (...)
                         {
-                            ostringstream errMsg;
+                            std::ostringstream errMsg;
                             msgHandler.stop();
                             errMsg << "ExeMgr: unknown error projecting rows "
                                    "for tableOID: " <<
@@ -1020,7 +991,7 @@ new_plan:
                             while (rowCount)
                                 rowCount = jl->projectTable(tableOID, bs);
 
-                            throw runtime_error( errMsg.str() );
+                            throw std::runtime_error( errMsg.str() );
                         }
 
                         totalRowCount += rowCount;
@@ -1051,20 +1022,20 @@ new_plan:
 
                 if (needDbProfEndStatementMsg)
                 {
-                    string ss;
-                    ostringstream prefix;
+                    std::string ss;
+                    std::ostringstream prefix;
                     prefix << "ses:" << csep.sessionID() << " Query Totals";
 
-                    //Log stats string to standard out
+                    //Log stats std::string to standard out
                     ss = formatQueryStats(
                              jl,
                              prefix.str(),
                              true,
-                             !(csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_TUPLE_OFF),
-                             (csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_LOG),
+                             !(csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_OFF),
+                             (csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_LOG),
                              totalRowCount);
                     //@Bug 1306. Added timing info for real time tracking.
-                    cout << ss << " at " << timeNow() << endl;
+                    std::cout << ss << " at " << timeNow() << std::endl;
 
                     // log query status to debug log file
                     args.reset();
@@ -1078,7 +1049,7 @@ new_plan:
                     args.add(fStats.fMsgBytesIn);
                     args.add(fStats.fMsgBytesOut);
                     args.add(fStats.fCPBlocksSkipped);
-                    msgLog.logMessage(LOG_TYPE_DEBUG,
+                    msgLog.logMessage(logging::LOG_TYPE_DEBUG,
                                       logDbProfQueryStats,
                                       args,
                                       li);
@@ -1092,7 +1063,7 @@ new_plan:
                     jl.reset();
                     args.reset();
                     args.add((int)csep.statementID());
-                    msgLog.logMessage(LOG_TYPE_DEBUG,
+                    msgLog.logMessage(logging::LOG_TYPE_DEBUG,
                                       logDbProfEndStatement,
                                       args,
                                       li);
@@ -1101,33 +1072,33 @@ new_plan:
                     // delete sessionMemMap entry for this session's memory % use
                     deleteMaxMemPct( csep.sessionID() );
 
-                string endtime(timeNow());
+                std::string endtime(timeNow());
 
                 if ((csep.traceFlags() & flagsWantOutput) && (csep.sessionID() < 0x80000000))
                 {
-                    cout << "For session " << csep.sessionID() << ": " <<
+                    std::cout << "For session " << csep.sessionID() << ": " <<
                          totalBytesSent <<
-                         " bytes sent back at " << endtime << endl;
+                         " bytes sent back at " << endtime << std::endl;
 
                     // @bug 663 - Implemented caltraceon(16) to replace the
                     // $FIFO_SINK compiler definition in pColStep.
                     // This option consumes rows in the project steps.
                     if (csep.traceFlags() &
-                            CalpontSelectExecutionPlan::TRACE_NO_ROWS4)
+                      execplan::CalpontSelectExecutionPlan::TRACE_NO_ROWS4)
                     {
-                        cout << endl;
-                        cout << "**** No data returned to DM.  Rows consumed "
+                        std::cout << std::endl;
+                        std::cout << "**** No data returned to DM.  Rows consumed "
                              "in ProjectSteps - caltrace(16) is on (FIFO_SINK)."
-                             " ****" << endl;
-                        cout << endl;
+                             " ****" << std::endl;
+                        std::cout << std::endl;
                     }
                     else if (csep.traceFlags() &
-                             CalpontSelectExecutionPlan::TRACE_NO_ROWS3)
+                      execplan::CalpontSelectExecutionPlan::TRACE_NO_ROWS3)
                     {
-                        cout << endl;
-                        cout << "**** No data returned to DM - caltrace(8) is "
-                             "on (SWALLOW_ROWS_EXEMGR). ****" << endl;
-                        cout << endl;
+                        std::cout << std::endl;
+                        std::cout << "**** No data returned to DM - caltrace(8) is "
+                             "on (SWALLOW_ROWS_EXEMGR). ****" << std::endl;
+                        std::cout << std::endl;
                     }
                 }
 
@@ -1136,7 +1107,7 @@ new_plan:
                 if ( !csep.isInternal() &&
                         (csep.queryType() == "SELECT" || csep.queryType() == "INSERT_SELECT") )
                 {
-                    qts.msg_type = QueryTeleStats::QT_SUMMARY;
+                    qts.msg_type = querytele::QueryTeleStats::QT_SUMMARY;
                     qts.max_mem_pct = fStats.fMaxMemPct;
                     qts.num_files = fStats.fNumFiles;
                     qts.phy_io = fStats.fPhyIO;
@@ -1146,7 +1117,7 @@ new_plan:
                     qts.msg_bytes_in = fStats.fMsgBytesIn;
                     qts.msg_bytes_out = fStats.fMsgBytesOut;
                     qts.rows = totalRowCount;
-                    qts.end_time = QueryTeleClient::timeNowms();
+                    qts.end_time = querytele::QueryTeleClient::timeNowms();
                     qts.session_id = csep.sessionID();
                     qts.query_type = csep.queryType();
                     qts.query = csep.data();
@@ -1168,22 +1139,22 @@ new_plan:
         {
             decThreadCntPerSession( csep.sessionID() | 0x80000000 );
             statementsRunningCount->decr(stmtCounted);
-            cerr << "### ExeMgr ses:" << csep.sessionID() << " caught: " << ex.what() << endl;
-            Message::Args args;
-            LoggingID li(16, csep.sessionID(), csep.txnID());
+            std::cerr << "### ExeMgr ses:" << csep.sessionID() << " caught: " << ex.what() << std::endl;
+            logging::Message::Args args;
+            logging::LoggingID li(16, csep.sessionID(), csep.txnID());
             args.add(ex.what());
-            msgLog.logMessage(LOG_TYPE_CRITICAL, logExeMgrExcpt, args, li);
+            msgLog.logMessage(logging::LOG_TYPE_CRITICAL, logExeMgrExcpt, args, li);
             fIos.close();
         }
         catch (...)
         {
             decThreadCntPerSession( csep.sessionID() | 0x80000000 );
             statementsRunningCount->decr(stmtCounted);
-            cerr << "### Exception caught!" << endl;
-            Message::Args args;
-            LoggingID li(16, csep.sessionID(), csep.txnID());
+            std::cerr << "### Exception caught!" << std::endl;
+            logging::Message::Args args;
+            logging::LoggingID li(16, csep.sessionID(), csep.txnID());
             args.add("ExeMgr caught unknown exception");
-            msgLog.logMessage(LOG_TYPE_CRITICAL, logExeMgrExcpt, args, li);
+            msgLog.logMessage(logging::LOG_TYPE_CRITICAL, logExeMgrExcpt, args, li);
             fIos.close();
         }
     }
@@ -1208,41 +1179,42 @@ public:
             {
                 if (fMaxPct >= 95)
                 {
-                    cerr << "Too much memory allocated!" << endl;
-                    Message::Args args;
+                    std::cerr << "Too much memory allocated!" << std::endl;
+                    logging::Message::Args args;
                     args.add((int)pct);
                     args.add((int)fMaxPct);
-                    msgLog.logMessage(LOG_TYPE_CRITICAL, logRssTooBig, args, LoggingID(16));
+                    msgLog.logMessage(logging::LOG_TYPE_CRITICAL, logRssTooBig, args, logging::LoggingID(16));
                     exit(1);
                 }
 
                 if (statementsRunningCount->cur() == 0)
                 {
-                    cerr << "Too much memory allocated!" << endl;
-                    Message::Args args;
+                    std::cerr << "Too much memory allocated!" << std::endl;
+                    logging::Message::Args args;
                     args.add((int)pct);
                     args.add((int)fMaxPct);
-                    msgLog.logMessage(LOG_TYPE_WARNING, logRssTooBig, args, LoggingID(16));
+                    msgLog.logMessage(logging::LOG_TYPE_WARNING, logRssTooBig, args, logging::LoggingID(16));
                     exit(1);
                 }
 
-                cerr << "Too much memory allocated, but stmts running" << endl;
+                std::cerr << "Too much memory allocated, but stmts running" << std::endl;
             }
 
             // Update sessionMemMap entries lower than current mem % use
-            mutex::scoped_lock lk(sessionMemMapMutex);
-
-            for ( SessionMemMap_t::iterator mapIter = sessionMemMap.begin();
-                    mapIter != sessionMemMap.end();
-                    ++mapIter )
             {
-                if ( pct > mapIter->second )
-                {
-                    mapIter->second = pct;
-                }
-            }
+                std::lock_guard<std::mutex> lk(sessionMemMapMutex);
 
-            lk.unlock();
+                for (SessionMemMap_t::iterator mapIter = sessionMemMap.begin();
+                    mapIter != sessionMemMap.end();
+                    ++mapIter)
+                {
+                    if (pct > mapIter->second)
+                    {
+                        mapIter->second = pct;
+                    }
+                }
+
+            }
 
             pause_();
         }
@@ -1263,14 +1235,14 @@ void added_a_pm(int)
     logging::Message msg(1);
     args1.add("exeMgr caught SIGHUP. Resetting connections");
     msg.format( args1 );
-    cout << msg.msg().c_str() << endl;
+    std::cout << msg.msg().c_str() << std::endl;
     logging::Logger logger(logid.fSubsysID);
     logger.logMessage(logging::LOG_TYPE_DEBUG, msg, logid);
 
     if (ec)
     {
         //set BUSY_INIT state while processing the add pm configuration change
-        Oam oam;
+        oam::Oam oam;
 
         try
         {
@@ -1296,7 +1268,7 @@ void added_a_pm(int)
 void printTotalUmMemory(int sig)
 {
     int64_t num = rm->availableMemory();
-    cout << "Total UM memory available: " << num << endl;
+    std::cout << "Total UM memory available: " << num << std::endl;
 }
 
 void setupSignalHandlers()
@@ -1325,9 +1297,9 @@ void setupSignalHandlers()
 #endif
 }
 
-void setupCwd(ResourceManager* rm)
+void setupCwd(joblist::ResourceManager* rm)
 {
-    string workdir = rm->getScWorkingDir();
+    std::string workdir = rm->getScWorkingDir();
     (void)chdir(workdir.c_str());
 
     if (access(".", W_OK) != 0)
@@ -1376,9 +1348,9 @@ int setupResources()
 
 void cleanTempDir()
 {
-    config::Config* config = config::Config::makeConfig();
-    string allowDJS = config->getConfig("HashJoin", "AllowDiskBasedJoin");
-    string tmpPrefix = config->getConfig("HashJoin", "TempFilePath");
+    const auto config = config::Config::makeConfig();
+    std::string allowDJS = config->getConfig("HashJoin", "AllowDiskBasedJoin");
+    std::string tmpPrefix = config->getConfig("HashJoin", "TempFilePath");
 
     if (allowDJS == "N" || allowDJS == "n")
         return;
@@ -1393,31 +1365,31 @@ void cleanTempDir()
     /* This is quite scary as ExeMgr usually runs as root */
     try
     {
-    	boost::filesystem::remove_all(tmpPrefix);
-    	boost::filesystem::create_directories(tmpPrefix);
+        std::experimental::filesystem::remove_all(tmpPrefix);
+        std::experimental::filesystem::create_directories(tmpPrefix);
     }
-    catch (std::exception& ex)
+    catch (const std::exception& ex)
     {
-        cerr << ex.what() << endl;
-        LoggingID logid(16, 0, 0);
-        Message::Args args;
-        Message message(8);
+        std::cerr << ex.what() << std::endl;
+        logging::LoggingID logid(16, 0, 0);
+        logging::Message::Args args;
+        logging::Message message(8);
         args.add("Execption whilst cleaning tmpdir: ");
         args.add(ex.what());
         message.format( args );
         logging::Logger logger(logid.fSubsysID);
-        logger.logMessage(LOG_TYPE_WARNING, message, logid);
+        logger.logMessage(logging::LOG_TYPE_WARNING, message, logid);
     }
     catch (...)
     {
-        cerr << "Caught unknown exception during tmpdir cleanup" << endl;
-        LoggingID logid(16, 0, 0);
-        Message::Args args;
-        Message message(8);
+        std::cerr << "Caught unknown exception during tmpdir cleanup" << std::endl;
+        logging::LoggingID logid(16, 0, 0);
+        logging::Message::Args args;
+        logging::Message message(8);
         args.add("Unknown execption whilst cleaning tmpdir");
         message.format( args );
         logging::Logger logger(logid.fSubsysID);
-        logger.logMessage(LOG_TYPE_WARNING, message, logid);
+        logger.logMessage(logging::LOG_TYPE_WARNING, message, logid);
     }
 }
 
@@ -1425,7 +1397,7 @@ void cleanTempDir()
 int main(int argc, char* argv[])
 {
     // get and set locale language
-    string systemLang = "C";
+    std::string systemLang = "C";
     systemLang = funcexp::utf8::idb_setlocale();
 
     // This is unset due to the way we start it
@@ -1455,7 +1427,7 @@ int main(int argc, char* argv[])
 
     //set BUSY_INIT state
     {
-        Oam oam;
+        oam::Oam oam;
 
         try
         {
@@ -1479,7 +1451,7 @@ int main(int argc, char* argv[])
     int err = 0;
     if (!gDebug)
         err = setupResources();
-    string errMsg;
+    std::string errMsg;
 
     switch (err)
     {
@@ -1502,7 +1474,7 @@ int main(int argc, char* argv[])
 
     if (err < 0)
     {
-        Oam oam;
+        oam::Oam oam;
         logging::Message::Args args;
         logging::Message message;
         args.add( errMsg );
@@ -1510,7 +1482,7 @@ int main(int argc, char* argv[])
         logging::LoggingID lid(16);
         logging::MessageLog ml(lid);
         ml.logCriticalMessage( message );
-        cerr << errMsg << endl;
+        std::cerr << errMsg << std::endl;
 
         try
         {
@@ -1528,23 +1500,23 @@ int main(int argc, char* argv[])
 
     cleanTempDir();
 
-    MsgMap msgMap;
-    msgMap[logDefaultMsg]           = Message(logDefaultMsg);
-    msgMap[logDbProfStartStatement] = Message(logDbProfStartStatement);
-    msgMap[logDbProfEndStatement]   = Message(logDbProfEndStatement);
-    msgMap[logStartSql]             = Message(logStartSql);
-    msgMap[logEndSql]               = Message(logEndSql);
-    msgMap[logRssTooBig]            = Message(logRssTooBig);
-    msgMap[logDbProfQueryStats]     = Message(logDbProfQueryStats);
-    msgMap[logExeMgrExcpt]          = Message(logExeMgrExcpt);
+    logging::MsgMap msgMap;
+    msgMap[logDefaultMsg]           = logging::Message(logDefaultMsg);
+    msgMap[logDbProfStartStatement] = logging::Message(logDbProfStartStatement);
+    msgMap[logDbProfEndStatement]   = logging::Message(logDbProfEndStatement);
+    msgMap[logStartSql]             = logging::Message(logStartSql);
+    msgMap[logEndSql]               = logging::Message(logEndSql);
+    msgMap[logRssTooBig]            = logging::Message(logRssTooBig);
+    msgMap[logDbProfQueryStats]     = logging::Message(logDbProfQueryStats);
+    msgMap[logExeMgrExcpt]          = logging::Message(logExeMgrExcpt);
     msgLog.msgMap(msgMap);
 
-    ec = DistributedEngineComm::instance(rm, true);
+    ec = joblist::DistributedEngineComm::instance(rm, true);
     ec->Open();
 
     bool tellUser = true;
 
-    MessageQueueServer* mqs;
+    messageqcpp::MessageQueueServer* mqs;
 
     statementsRunningCount = new ActiveStatementCounter(rm->getEmExecQueueSize());
 
@@ -1552,18 +1524,18 @@ int main(int argc, char* argv[])
     {
         try
         {
-            mqs = new MessageQueueServer(ExeMgr, rm->getConfig(), ByteStream::BlockSize, 64);
+            mqs = new messageqcpp::MessageQueueServer(ExeMgr, rm->getConfig(), messageqcpp::ByteStream::BlockSize, 64);
             break;
         }
-        catch (runtime_error& re)
+        catch (std::runtime_error& re)
         {
-            string what = re.what();
+            std::string what = re.what();
 
-            if (what.find("Address already in use") != string::npos)
+            if (what.find("Address already in use") != std::string::npos)
             {
                 if (tellUser)
                 {
-                    cerr << "Address already in use, retrying..." << endl;
+                    std::cerr << "Address already in use, retrying..." << std::endl;
                     tellUser = false;
                 }
 
@@ -1581,13 +1553,13 @@ int main(int argc, char* argv[])
     // because rm has a "isExeMgr" flag that is set upon creation (rm is a singleton).
     // From  the pools perspective, it has no idea if it is ExeMgr doing the
     // creation, so it has no idea which way to set the flag. So we set the max here.
-    JobStep::jobstepThreadPool.setMaxThreads(rm->getJLThreadPoolSize());
-    JobStep::jobstepThreadPool.setName("ExeMgrJobList");
+    joblist::JobStep::jobstepThreadPool.setMaxThreads(rm->getJLThreadPoolSize());
+    joblist::JobStep::jobstepThreadPool.setName("ExeMgrJobList");
 
     if (rm->getJlThreadPoolDebug() == "Y" || rm->getJlThreadPoolDebug() == "y")
     {
-        JobStep::jobstepThreadPool.setDebug(true);
-        JobStep::jobstepThreadPool.invoke(ThreadPoolMonitor(&JobStep::jobstepThreadPool));
+      joblist::JobStep::jobstepThreadPool.setDebug(true);
+      joblist::JobStep::jobstepThreadPool.invoke(threadpool::ThreadPoolMonitor(&joblist::JobStep::jobstepThreadPool));
     }
 
     int serverThreads = rm->getEmServerThreads();
@@ -1605,7 +1577,7 @@ int main(int argc, char* argv[])
     setpriority(PRIO_PROCESS, 0, priority);
 #endif
 
-    string teleServerHost(rm->getConfig()->getConfig("QueryTele", "Host"));
+    std::string teleServerHost(rm->getConfig()->getConfig("QueryTele", "Host"));
 
     if (!teleServerHost.empty())
     {
@@ -1618,13 +1590,13 @@ int main(int argc, char* argv[])
         }
     }
 
-    cout << "Starting ExeMgr: st = " << serverThreads <<
+    std::cout << "Starting ExeMgr: st = " << serverThreads <<
          ", qs = " << rm->getEmExecQueueSize() << ", mx = " << maxPct << ", cf = " <<
-         rm->getConfig()->configFile() << endl;
+         rm->getConfig()->configFile() << std::endl;
 
     //set ACTIVE state
     {
-        Oam oam;
+        oam::Oam oam;
 
         try
         {
@@ -1646,12 +1618,12 @@ int main(int argc, char* argv[])
     if (rm->getExeMgrThreadPoolDebug() == "Y" || rm->getExeMgrThreadPoolDebug() == "y")
     {
         exeMgrThreadPool.setDebug(true);
-        exeMgrThreadPool.invoke(ThreadPoolMonitor(&exeMgrThreadPool));
+        exeMgrThreadPool.invoke(threadpool::ThreadPoolMonitor(&exeMgrThreadPool));
     }
 
     for (;;)
     {
-        IOSocket ios;
+        messageqcpp::IOSocket ios;
         ios = mqs->accept();
         exeMgrThreadPool.invoke(SessionThread(ios, ec, rm));
     }
diff --git a/oamapps/columnstoreDB/columnstoreDB.cpp b/oamapps/columnstoreDB/columnstoreDB.cpp
index 25c06d140..58a7e375f 100644
--- a/oamapps/columnstoreDB/columnstoreDB.cpp
+++ b/oamapps/columnstoreDB/columnstoreDB.cpp
@@ -23,6 +23,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <iostream>
 #include <fstream>
diff --git a/oamapps/columnstoreSupport/columnstoreSupport.cpp b/oamapps/columnstoreSupport/columnstoreSupport.cpp
index ccf7714c4..87adb28f7 100644
--- a/oamapps/columnstoreSupport/columnstoreSupport.cpp
+++ b/oamapps/columnstoreSupport/columnstoreSupport.cpp
@@ -10,6 +10,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <iterator>
 #include <numeric>
diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp
index d07c67ffb..6b951133b 100644
--- a/oamapps/mcsadmin/mcsadmin.cpp
+++ b/oamapps/mcsadmin/mcsadmin.cpp
@@ -21,6 +21,7 @@
  * $Id: mcsadmin.cpp 3110 2013-06-20 18:09:12Z dhill $
  *
  ******************************************************************************************/
+#include <future> //cxx11test
 
 #include <clocale>
 #include <netdb.h>
diff --git a/oamapps/postConfigure/getMySQLpw.cpp b/oamapps/postConfigure/getMySQLpw.cpp
index fdc6a6759..0073175bf 100644
--- a/oamapps/postConfigure/getMySQLpw.cpp
+++ b/oamapps/postConfigure/getMySQLpw.cpp
@@ -24,6 +24,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <unistd.h>
 #include <iterator>
diff --git a/oamapps/postConfigure/helpers.cpp b/oamapps/postConfigure/helpers.cpp
index 3238f9c57..e020ff7bc 100644
--- a/oamapps/postConfigure/helpers.cpp
+++ b/oamapps/postConfigure/helpers.cpp
@@ -348,8 +348,8 @@ int sendUpgradeRequest(int IserverTypeInstall, bool pmwithum)
         std::cerr << exc.what() << std::endl;
     }
 
-    ByteStream msg;
-    ByteStream::byte requestID = RUNUPGRADE;
+    messageqcpp::ByteStream msg;
+    messageqcpp::ByteStream::byte requestID = RUNUPGRADE;
 
     msg << requestID;
 
@@ -484,8 +484,8 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pm
                         if ( (*pt).DeviceName == masterModule )
                         {
                             // set for Master MySQL DB distrubution to slaves
-                            ByteStream msg1;
-                            ByteStream::byte requestID = oam::MASTERDIST;
+                            messageqcpp::ByteStream msg1;
+                            messageqcpp::ByteStream::byte requestID = oam::MASTERDIST;
                             msg1 << requestID;
                             msg1 << password;
                             msg1 << "all";	// dist to all slave modules
@@ -499,7 +499,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pm
                             }
 
                             // set for master repl request
-                            ByteStream msg;
+                            messageqcpp::ByteStream msg;
                             requestID = oam::MASTERREP;
                             msg << requestID;
 
@@ -527,8 +527,8 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pm
                                 continue;
                             }
 
-                            ByteStream msg;
-                            ByteStream::byte requestID = oam::SLAVEREP;
+                            messageqcpp::ByteStream msg;
+                            messageqcpp::ByteStream::byte requestID = oam::SLAVEREP;
                             msg << requestID;
 
                             if ( masterLogFile == oam::UnassignedName ||
@@ -574,7 +574,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pm
 * purpose:	Sends a Msg to ProcMon
 *
 ******************************************************************************************/
-int sendMsgProcMon( std::string module, ByteStream msg, int requestID, int timeout )
+int sendMsgProcMon( std::string module, messageqcpp::ByteStream msg, int requestID, int timeout )
 {
     string msgPort = module + "_ProcessMonitor";
     int returnStatus = API_FAILURE;
@@ -602,16 +602,16 @@ int sendMsgProcMon( std::string module, ByteStream msg, int requestID, int timeo
 
     try
     {
-        MessageQueueClient mqRequest(msgPort);
+        messageqcpp::MessageQueueClient mqRequest(msgPort);
         mqRequest.write(msg);
 
         if ( timeout > 0 )
         {
             // wait for response
-            ByteStream::byte returnACK;
-            ByteStream::byte returnRequestID;
-            ByteStream::byte requestStatus;
-            ByteStream receivedMSG;
+            messageqcpp::ByteStream::byte returnACK;
+            messageqcpp::ByteStream::byte returnRequestID;
+            messageqcpp::ByteStream::byte requestStatus;
+            messageqcpp::ByteStream receivedMSG;
 
             struct timespec ts = { timeout, 0 };
 
diff --git a/oamapps/postConfigure/helpers.h b/oamapps/postConfigure/helpers.h
index 5f7b1631a..8eb23bce0 100644
--- a/oamapps/postConfigure/helpers.h
+++ b/oamapps/postConfigure/helpers.h
@@ -21,7 +21,7 @@
 
 #include "liboamcpp.h"
 
-using namespace messageqcpp;
+
 namespace installer
 {
 
@@ -37,7 +37,7 @@ typedef std::vector<ChildModule> ChildModuleList;
 extern bool waitForActive();
 extern void dbrmDirCheck();
 extern void mysqlSetup();
-extern int sendMsgProcMon( std::string module, ByteStream msg, int requestID, int timeout );
+extern int sendMsgProcMon( std::string module, messageqcpp::ByteStream msg, int requestID, int timeout );
 extern int sendUpgradeRequest(int IserverTypeInstall, bool pmwithum = false);
 extern int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pmwithum);
 extern void checkFilesPerPartion(int DBRootCount, Config* sysConfig);
diff --git a/oamapps/postConfigure/installer.cpp b/oamapps/postConfigure/installer.cpp
index 81b69e548..075870275 100644
--- a/oamapps/postConfigure/installer.cpp
+++ b/oamapps/postConfigure/installer.cpp
@@ -27,6 +27,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <iterator>
 #include <numeric>
diff --git a/oamapps/postConfigure/mycnfUpgrade.cpp b/oamapps/postConfigure/mycnfUpgrade.cpp
index 7f785153e..e42a9b64f 100644
--- a/oamapps/postConfigure/mycnfUpgrade.cpp
+++ b/oamapps/postConfigure/mycnfUpgrade.cpp
@@ -25,6 +25,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <unistd.h>
 #include <iterator>
diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp
index fdfc1482c..a115104e5 100644
--- a/oamapps/postConfigure/postConfigure.cpp
+++ b/oamapps/postConfigure/postConfigure.cpp
@@ -29,6 +29,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <unistd.h>
 #include <iterator>
diff --git a/oamapps/serverMonitor/serverMonitor.cpp b/oamapps/serverMonitor/serverMonitor.cpp
index 99d0fb04a..f9a468569 100644
--- a/oamapps/serverMonitor/serverMonitor.cpp
+++ b/oamapps/serverMonitor/serverMonitor.cpp
@@ -21,6 +21,7 @@
  *
  *   Author: David Hill
  ***************************************************************************/
+#include <future> //cxx11test
 
 #include "serverMonitor.h"
 #include "installdir.h"
diff --git a/primitives/primproc/dictstep.h b/primitives/primproc/dictstep.h
index 1652ec8f3..025658d5b 100644
--- a/primitives/primproc/dictstep.h
+++ b/primitives/primproc/dictstep.h
@@ -138,7 +138,7 @@ private:
     int64_t* values;
     boost::scoped_array<std::string>* strValues;
     int compressionType;
-    ByteStream filterString;
+    messageqcpp::ByteStream filterString;
     uint32_t filterCount;
     uint32_t bufferSize;
     uint16_t inputRidCount;
diff --git a/primitives/primproc/primproc.cpp b/primitives/primproc/primproc.cpp
index 2e88493a0..3df972ac1 100644
--- a/primitives/primproc/primproc.cpp
+++ b/primitives/primproc/primproc.cpp
@@ -21,6 +21,8 @@
  *
  *
  ***********************************************************************/
+#include <future> //cxx11test
+
 #include <unistd.h>
 #include <string>
 #include <iostream>
diff --git a/primitives/primproc/umsocketselector.cpp b/primitives/primproc/umsocketselector.cpp
index 574e23e56..5fa76f3bc 100644
--- a/primitives/primproc/umsocketselector.cpp
+++ b/primitives/primproc/umsocketselector.cpp
@@ -243,7 +243,7 @@ UmSocketSelector::addConnection(
 // ioSock (in) - socket/port connection to be deleted
 //------------------------------------------------------------------------------
 void
-UmSocketSelector::delConnection( const IOSocket& ios )
+UmSocketSelector::delConnection( const messageqcpp::IOSocket& ios )
 {
     sockaddr sa = ios.sa();
     const sockaddr_in* sinp = reinterpret_cast<const sockaddr_in*>(&sa);
@@ -271,7 +271,7 @@ UmSocketSelector::delConnection( const IOSocket& ios )
 //------------------------------------------------------------------------------
 bool
 UmSocketSelector::nextIOSocket(
-    const IOSocket& ios,
+    const messageqcpp::IOSocket& ios,
     SP_UM_IOSOCK&   outIos,
     SP_UM_MUTEX&    writeLock )
 {
@@ -405,7 +405,7 @@ UmModuleIPs::addSocketConn(
 // ioSock (in) - socket/port connection to be deleted
 //------------------------------------------------------------------------------
 void
-UmModuleIPs::delSocketConn( const IOSocket& ioSock )
+UmModuleIPs::delSocketConn( const messageqcpp::IOSocket& ioSock )
 {
     boost::mutex::scoped_lock lock( fUmModuleMutex );
 
@@ -565,7 +565,7 @@ UmIPSocketConns::addSocketConn(
 // can benefit from quick random access.
 //------------------------------------------------------------------------------
 void
-UmIPSocketConns::delSocketConn( const IOSocket& ioSock )
+UmIPSocketConns::delSocketConn( const messageqcpp::IOSocket& ioSock )
 {
     for (unsigned int i = 0; i < fIOSockets.size(); ++i)
     {
diff --git a/primitives/primproc/umsocketselector.h b/primitives/primproc/umsocketselector.h
index 0affabec8..c5be55be8 100644
--- a/primitives/primproc/umsocketselector.h
+++ b/primitives/primproc/umsocketselector.h
@@ -52,8 +52,6 @@ typedef uint32_t in_addr_t;
 
 #include "iosocket.h"
 
-using namespace messageqcpp;
-
 namespace primitiveprocessor
 {
 class UmModuleIPs;
@@ -61,7 +59,7 @@ class UmIPSocketConns;
 
 typedef boost::shared_ptr<UmModuleIPs>     SP_UM_MODIPS;
 typedef boost::shared_ptr<UmIPSocketConns> SP_UM_IPCONNS;
-typedef boost::shared_ptr<IOSocket>		   SP_UM_IOSOCK;
+typedef boost::shared_ptr<messageqcpp::IOSocket>		   SP_UM_IOSOCK;
 typedef boost::shared_ptr<boost::mutex>	   SP_UM_MUTEX;
 
 //------------------------------------------------------------------------------
@@ -116,7 +114,7 @@ public:
      *
      * @param ios (in) socket/port connection to be removed.
      */
-    void delConnection( const IOSocket& ios );
+    void delConnection( const messageqcpp::IOSocket& ios );
 
     /** @brief Get the next output IOSocket to use for the specified ios.
      *
@@ -125,7 +123,7 @@ public:
      * @param writeLock (out) mutex to use when writing to outIos.
      * @return boolean indicating if operation was successful.
      */
-    bool nextIOSocket( const IOSocket& ios, SP_UM_IOSOCK& outIos,
+    bool nextIOSocket( const messageqcpp::IOSocket& ios, SP_UM_IOSOCK& outIos,
                        SP_UM_MUTEX& writeLock );
 
     /** @brief toString method used in logging, debugging, etc.
@@ -217,7 +215,7 @@ public:
      *
      * @param ioSock (in) socket/port to delete from the connection list.
      */
-    void delSocketConn ( const IOSocket& ioSock );
+    void delSocketConn ( const messageqcpp::IOSocket& ioSock );
 
     /** @brief Get the "next" available socket/port for this UM module.
      *
@@ -311,7 +309,7 @@ public:
      *
      * @param ioSock (in) socket/port to delete from the connection list.
      */
-    void delSocketConn ( const IOSocket& ioSock );
+    void delSocketConn ( const messageqcpp::IOSocket& ioSock );
 
     /** @brief Get the "next" available socket/port for this IP address.
      *
diff --git a/procmgr/main.cpp b/procmgr/main.cpp
index c81f5fd69..54529ae0a 100644
--- a/procmgr/main.cpp
+++ b/procmgr/main.cpp
@@ -21,6 +21,7 @@
 * $Id: main.cpp 2203 2013-07-08 16:50:51Z bpaul $
 *
 *****************************************************************************************/
+#include <future> //cxx11test
 
 
 #include <clocale>
diff --git a/procmon/main.cpp b/procmon/main.cpp
index 0d2d2ab4a..37afe274c 100644
--- a/procmon/main.cpp
+++ b/procmon/main.cpp
@@ -15,6 +15,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
+#include <future> //cxx11test
 
 #include <boost/interprocess/shared_memory_object.hpp>
 #include <boost/interprocess/mapped_region.hpp>
diff --git a/tools/clearShm/main.cpp b/tools/clearShm/main.cpp
index e883bc0f6..e80a8c79d 100644
--- a/tools/clearShm/main.cpp
+++ b/tools/clearShm/main.cpp
@@ -16,6 +16,7 @@
    MA 02110-1301, USA. */
 
 // $Id: main.cpp 2101 2013-01-21 14:12:52Z rdempsey $
+#include <future> //cxx11test
 
 #include "config.h"
 
@@ -46,7 +47,7 @@ namespace
 
 bool vFlg;
 bool nFlg;
-mutex coutMutex;
+std::mutex coutMutex;
 
 void shmDoit(key_t shm_key, const string& label)
 {
@@ -61,7 +62,7 @@ void shmDoit(key_t shm_key, const string& label)
                                             bi::read_only);
             bi::offset_t memSize = 0;
             memObj.get_size(memSize);
-            mutex::scoped_lock lk(coutMutex);
+            std::lock_guard<std::mutex> lk(coutMutex);
             cout << label << ": shm_key: " << shm_key <<
                  "; key_name: " << key_name <<
                  "; size: " << memSize << endl;
@@ -102,7 +103,7 @@ void semDoit(key_t sem_key, const string& label)
                                             bi::read_only);
             bi::offset_t memSize = 0;
             memObj.get_size(memSize);
-            mutex::scoped_lock lk(coutMutex);
+            std::lock_guard<std::mutex> lk(coutMutex);
             cout << label << ": sem_key: " << sem_key <<
                  "; key_name: " << key_name <<
                  "; size: " << memSize << endl;
diff --git a/tools/cleartablelock/cleartablelock.cpp b/tools/cleartablelock/cleartablelock.cpp
index a18148343..cb22cb343 100644
--- a/tools/cleartablelock/cleartablelock.cpp
+++ b/tools/cleartablelock/cleartablelock.cpp
@@ -18,6 +18,7 @@
 /*
 * $Id: cleartablelock.cpp 2336 2013-06-25 19:11:36Z rdempsey $
 */
+#include <future> //cxx11test
 
 #include <cstdlib>
 #include <iostream>
diff --git a/tools/configMgt/autoConfigure.cpp b/tools/configMgt/autoConfigure.cpp
index 85702952a..fbd5d739a 100644
--- a/tools/configMgt/autoConfigure.cpp
+++ b/tools/configMgt/autoConfigure.cpp
@@ -28,6 +28,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <iterator>
 #include <numeric>
diff --git a/tools/configMgt/autoInstaller.cpp b/tools/configMgt/autoInstaller.cpp
index 15ac98c33..e3699449e 100644
--- a/tools/configMgt/autoInstaller.cpp
+++ b/tools/configMgt/autoInstaller.cpp
@@ -28,6 +28,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <iostream>
 #include <cstdlib>
diff --git a/tools/configMgt/svnQuery.cpp b/tools/configMgt/svnQuery.cpp
index 1aaee0117..c1de2c065 100644
--- a/tools/configMgt/svnQuery.cpp
+++ b/tools/configMgt/svnQuery.cpp
@@ -24,6 +24,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <iterator>
 #include <numeric>
diff --git a/tools/cplogger/main.cpp b/tools/cplogger/main.cpp
index 0f1b1e32e..4d45cd527 100644
--- a/tools/cplogger/main.cpp
+++ b/tools/cplogger/main.cpp
@@ -16,6 +16,7 @@
    MA 02110-1301, USA. */
 
 // $Id: main.cpp 2336 2013-06-25 19:11:36Z rdempsey $
+#include <future> //cxx11test
 #include <unistd.h>
 #include <cstdio>
 #include <iostream>
diff --git a/tools/dbbuilder/dbbuilder.cpp b/tools/dbbuilder/dbbuilder.cpp
index aec094b89..6f62eeb0a 100644
--- a/tools/dbbuilder/dbbuilder.cpp
+++ b/tools/dbbuilder/dbbuilder.cpp
@@ -19,6 +19,7 @@
 * $Id: dbbuilder.cpp 2101 2013-01-21 14:12:52Z rdempsey $
 *
 *******************************************************************************/
+#include <future> //cxx11test
 #include <stdio.h>
 #include <unistd.h>
 #include <cerrno>
diff --git a/tools/dbloadxml/colxml.cpp b/tools/dbloadxml/colxml.cpp
index 00171ffc0..4e359c599 100644
--- a/tools/dbloadxml/colxml.cpp
+++ b/tools/dbloadxml/colxml.cpp
@@ -19,6 +19,7 @@
  * $Id: colxml.cpp 2237 2013-05-05 23:42:37Z dcathey $
  *
  ******************************************************************************/
+#include <future> //cxx11test
 
 #include <clocale>
 
diff --git a/tools/ddlcleanup/ddlcleanup.cpp b/tools/ddlcleanup/ddlcleanup.cpp
index f09e50d7a..9924f91be 100644
--- a/tools/ddlcleanup/ddlcleanup.cpp
+++ b/tools/ddlcleanup/ddlcleanup.cpp
@@ -18,6 +18,7 @@
 /*
 * $Id: ddlcleanup.cpp 967 2009-10-15 13:57:29Z rdempsey $
 */
+#include <future> //cxx11test
 
 #include <iostream>
 #include <fstream>
diff --git a/tools/editem/editem.cpp b/tools/editem/editem.cpp
index 12ff29221..81c34c407 100644
--- a/tools/editem/editem.cpp
+++ b/tools/editem/editem.cpp
@@ -18,6 +18,7 @@
 /*
 * $Id: editem.cpp 2336 2013-06-25 19:11:36Z rdempsey $
 */
+#include <future> //cxx11test
 
 #include <iostream>
 #include <vector>
diff --git a/tools/getConfig/main.cpp b/tools/getConfig/main.cpp
index 87e5ed724..e895f603b 100644
--- a/tools/getConfig/main.cpp
+++ b/tools/getConfig/main.cpp
@@ -19,6 +19,7 @@
 * $Id: main.cpp 2101 2013-01-21 14:12:52Z rdempsey $
 *
 *****************************************************************************/
+#include <future> //cxx11test
 #include <iostream>
 #include <cassert>
 #include <unistd.h>
diff --git a/tools/idbmeminfo/idbmeminfo.cpp b/tools/idbmeminfo/idbmeminfo.cpp
index b0be99d35..4c84403a3 100644
--- a/tools/idbmeminfo/idbmeminfo.cpp
+++ b/tools/idbmeminfo/idbmeminfo.cpp
@@ -14,6 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
+#include <future> //cxx11test
 
 #ifdef _MSC_VER
 #define WIN32_LEAN_AND_MEAN
diff --git a/tools/setConfig/main.cpp b/tools/setConfig/main.cpp
index d74d51ed9..fb66c9bc7 100644
--- a/tools/setConfig/main.cpp
+++ b/tools/setConfig/main.cpp
@@ -19,6 +19,7 @@
 * $Id: main.cpp 210 2007-06-08 17:08:26Z rdempsey $
 *
 *****************************************************************************/
+#include <future> //cxx11test
 #include <unistd.h>
 #include <iostream>
 #include <cassert>
diff --git a/tools/viewtablelock/viewtablelock.cpp b/tools/viewtablelock/viewtablelock.cpp
index cec87cfec..6d163e3e5 100644
--- a/tools/viewtablelock/viewtablelock.cpp
+++ b/tools/viewtablelock/viewtablelock.cpp
@@ -18,6 +18,7 @@
 /*
 * $Id: viewtablelock.cpp 2101 2013-01-21 14:12:52Z rdempsey $
 */
+#include <future> //cxx11test
 
 #include <ctime>
 #include <iostream>
diff --git a/utils/funcexp/func_date.cpp b/utils/funcexp/func_date.cpp
index 7fc990ab6..719b068df 100644
--- a/utils/funcexp/func_date.cpp
+++ b/utils/funcexp/func_date.cpp
@@ -56,8 +56,8 @@ int64_t Func_date::getIntVal(rowgroup::Row& row,
 
     string value = "";
 
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (type)
     {
@@ -79,7 +79,7 @@ int64_t Func_date::getIntVal(rowgroup::Row& row,
         case CalpontSystemCatalog::TIME:
         {
             int64_t val;
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             aDateTime.hour = 0;
diff --git a/utils/funcexp/func_day.cpp b/utils/funcexp/func_day.cpp
index 7ff2bab9a..6adfc9c25 100644
--- a/utils/funcexp/func_day.cpp
+++ b/utils/funcexp/func_day.cpp
@@ -49,8 +49,8 @@ int64_t Func_day::getIntVal(rowgroup::Row& row,
 {
     int64_t val = 0;
 
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -64,7 +64,7 @@ int64_t Func_day::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_dayname.cpp b/utils/funcexp/func_dayname.cpp
index 5da6d8943..15933080e 100644
--- a/utils/funcexp/func_dayname.cpp
+++ b/utils/funcexp/func_dayname.cpp
@@ -54,8 +54,8 @@ int64_t Func_dayname::getIntVal(rowgroup::Row& row,
     int64_t val = 0;
     int32_t dayofweek = 0;
 
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -75,7 +75,7 @@ int64_t Func_dayname::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_dayofweek.cpp b/utils/funcexp/func_dayofweek.cpp
index ec84f5738..e9cb9f0e4 100644
--- a/utils/funcexp/func_dayofweek.cpp
+++ b/utils/funcexp/func_dayofweek.cpp
@@ -52,8 +52,8 @@ int64_t Func_dayofweek::getIntVal(rowgroup::Row& row,
     uint32_t day = 0;
     int64_t val = 0;
 
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -73,7 +73,7 @@ int64_t Func_dayofweek::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_dayofyear.cpp b/utils/funcexp/func_dayofyear.cpp
index ee3b9cf30..782e7e1af 100644
--- a/utils/funcexp/func_dayofyear.cpp
+++ b/utils/funcexp/func_dayofyear.cpp
@@ -52,8 +52,8 @@ int64_t Func_dayofyear::getIntVal(rowgroup::Row& row,
     uint32_t day = 0;
     int64_t val = 0;
 
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -73,7 +73,7 @@ int64_t Func_dayofyear::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_month.cpp b/utils/funcexp/func_month.cpp
index 5479270d0..e11cee296 100644
--- a/utils/funcexp/func_month.cpp
+++ b/utils/funcexp/func_month.cpp
@@ -48,8 +48,8 @@ int64_t Func_month::getIntVal(rowgroup::Row& row,
                               CalpontSystemCatalog::ColType& op_ct)
 {
     int64_t val = 0;
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -63,7 +63,7 @@ int64_t Func_month::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_monthname.cpp b/utils/funcexp/func_monthname.cpp
index 9657b1ea2..70bba26e0 100644
--- a/utils/funcexp/func_monthname.cpp
+++ b/utils/funcexp/func_monthname.cpp
@@ -79,8 +79,8 @@ int64_t Func_monthname::getIntVal(rowgroup::Row& row,
                                   CalpontSystemCatalog::ColType& op_ct)
 {
     int64_t val = 0;
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -94,7 +94,7 @@ int64_t Func_monthname::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_quarter.cpp b/utils/funcexp/func_quarter.cpp
index 78559d68d..4f476e2ff 100644
--- a/utils/funcexp/func_quarter.cpp
+++ b/utils/funcexp/func_quarter.cpp
@@ -50,8 +50,8 @@ int64_t Func_quarter::getIntVal(rowgroup::Row& row,
 {
     // try to cast to date/datetime
     int64_t val = 0, month = 0;
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -67,7 +67,7 @@ int64_t Func_quarter::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_to_days.cpp b/utils/funcexp/func_to_days.cpp
index f16642958..33f72b22d 100644
--- a/utils/funcexp/func_to_days.cpp
+++ b/utils/funcexp/func_to_days.cpp
@@ -59,8 +59,8 @@ int64_t Func_to_days::getIntVal(rowgroup::Row& row,
              month = 0,
              day = 0;
 
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (type)
     {
@@ -89,7 +89,7 @@ int64_t Func_to_days::getIntVal(rowgroup::Row& row,
         case CalpontSystemCatalog::TIME:
         {
             int64_t val;
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aDateTime.hour = 0;
             aDateTime.minute = 0;
diff --git a/utils/funcexp/func_week.cpp b/utils/funcexp/func_week.cpp
index a9e47bd4b..ec6131b26 100644
--- a/utils/funcexp/func_week.cpp
+++ b/utils/funcexp/func_week.cpp
@@ -53,8 +53,8 @@ int64_t Func_week::getIntVal(rowgroup::Row& row,
 
     int64_t val = 0;
     int16_t mode = 0;
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     if (parm.size() > 1)  // mode value
         mode = parm[1]->data()->getIntVal(row, isNull);
@@ -77,7 +77,7 @@ int64_t Func_week::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_weekday.cpp b/utils/funcexp/func_weekday.cpp
index 9666710f5..6b5c1f55d 100644
--- a/utils/funcexp/func_weekday.cpp
+++ b/utils/funcexp/func_weekday.cpp
@@ -52,8 +52,8 @@ int64_t Func_weekday::getIntVal(rowgroup::Row& row,
     uint32_t month = 0;
     uint32_t day = 0;
     int64_t val = 0;
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -73,7 +73,7 @@ int64_t Func_weekday::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_year.cpp b/utils/funcexp/func_year.cpp
index 17ff4f2d0..6e71b8a03 100644
--- a/utils/funcexp/func_year.cpp
+++ b/utils/funcexp/func_year.cpp
@@ -48,8 +48,8 @@ int64_t Func_year::getIntVal(rowgroup::Row& row,
                              CalpontSystemCatalog::ColType& op_ct)
 {
     int64_t val = 0;
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -63,7 +63,7 @@ int64_t Func_year::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_yearweek.cpp b/utils/funcexp/func_yearweek.cpp
index e567440b4..5568b763c 100644
--- a/utils/funcexp/func_yearweek.cpp
+++ b/utils/funcexp/func_yearweek.cpp
@@ -54,8 +54,8 @@ int64_t Func_yearweek::getIntVal(rowgroup::Row& row,
 
     int64_t val = 0;
     int16_t mode = 0;	// default to 2
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     if (parm.size() > 1)   // mode value
         mode = parm[1]->data()->getIntVal(row, isNull);
@@ -80,7 +80,7 @@ int64_t Func_yearweek::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/functor.h b/utils/funcexp/functor.h
index 9904c6831..890fddeae 100644
--- a/utils/funcexp/functor.h
+++ b/utils/funcexp/functor.h
@@ -36,7 +36,6 @@
 #include "calpontsystemcatalog.h"
 
 #include "dataconvert.h"
-using namespace dataconvert;
 
 namespace rowgroup
 {
@@ -178,7 +177,7 @@ protected:
     virtual std::string longDoubleToString(long double);
 
     virtual int64_t nowDatetime();
-    virtual int64_t addTime(DateTime& dt1, dataconvert::Time& dt2);
+    virtual int64_t addTime(dataconvert::DateTime& dt1, dataconvert::Time& dt2);
     virtual int64_t addTime(dataconvert::Time& dt1, dataconvert::Time& dt2);
 
     std::string fFuncName;
diff --git a/utils/funcexp/functor_str.h b/utils/funcexp/functor_str.h
index 5402cc646..fc8de1d9f 100644
--- a/utils/funcexp/functor_str.h
+++ b/utils/funcexp/functor_str.h
@@ -25,8 +25,6 @@
 
 #include "functor.h"
 
-using namespace std;
-
 namespace funcexp
 {
 
@@ -141,7 +139,7 @@ protected:
         exponent = (int)floor(log10( fabsl(floatVal)));
         base = floatVal * pow(10, -1.0 * exponent);
 
-        if (isnan(exponent) || isnan(base))
+        if (std::isnan(exponent) || std::isnan(base))
         {
             snprintf(buf, 20, "%Lf", floatVal);
             fFloatStr = execplan::removeTrailing0(buf, 20);
@@ -325,7 +323,7 @@ public:
   */
 class Func_lpad : public Func_Str
 {
-    static const string fPad;
+    static const std::string fPad;
 public:
     Func_lpad() : Func_Str("lpad") {}
     virtual ~Func_lpad() {}
@@ -343,7 +341,7 @@ public:
   */
 class Func_rpad : public Func_Str
 {
-    static const string fPad;
+    static const std::string fPad;
 public:
     Func_rpad() : Func_Str("rpad") {}
     virtual ~Func_rpad() {}
diff --git a/utils/funcexp/utils_utf8.h b/utils/funcexp/utils_utf8.h
index 6f5cb26a8..442ca6297 100644
--- a/utils/funcexp/utils_utf8.h
+++ b/utils/funcexp/utils_utf8.h
@@ -37,12 +37,9 @@
 
 #include <clocale>
 
-#include "alarmmanager.h"
-using namespace alarmmanager;
+#include "ALARMManager.h"
 
 #include "liboamcpp.h"
-using namespace oam;
-
 
 /** @file */
 
@@ -63,7 +60,7 @@ std::string idb_setlocale()
 {
     // get and set locale language
     std::string systemLang("C");
-    Oam oam;
+    oam::Oam oam;
 
     try
     {
@@ -81,9 +78,9 @@ std::string idb_setlocale()
         try
         {
             //send alarm
-            ALARMManager alarmMgr;
+            alarmmanager::ALARMManager alarmMgr;
             std::string alarmItem = "system";
-            alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, SET);
+            alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, alarmmanager::SET);
             printf("Failed to set locale : %s, Critical alarm generated\n", systemLang.c_str());
         }
         catch (...)
@@ -96,9 +93,9 @@ std::string idb_setlocale()
         try
         {
             //send alarm
-            ALARMManager alarmMgr;
+            alarmmanager::ALARMManager alarmMgr;
             std::string alarmItem = "system";
-            alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, CLEAR);
+            alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, alarmmanager::CLEAR);
         }
         catch (...)
         {
diff --git a/utils/regr/corr.cpp b/utils/regr/corr.cpp
index c1c388da9..ac69357df 100644
--- a/utils/regr/corr.cpp
+++ b/utils/regr/corr.cpp
@@ -66,7 +66,7 @@ mcsv1_UDAF::ReturnCode corr::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(corr_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/corr.h b/utils/regr/corr.h
index eba7597eb..649cea2e3 100644
--- a/utils/regr/corr.h
+++ b/utils/regr/corr.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/covar_pop.cpp b/utils/regr/covar_pop.cpp
index 876be1f30..672da9d75 100644
--- a/utils/regr/covar_pop.cpp
+++ b/utils/regr/covar_pop.cpp
@@ -64,7 +64,7 @@ mcsv1_UDAF::ReturnCode covar_pop::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(covar_pop_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/covar_pop.h b/utils/regr/covar_pop.h
index fc47d4497..c05e4966a 100644
--- a/utils/regr/covar_pop.h
+++ b/utils/regr/covar_pop.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/covar_samp.cpp b/utils/regr/covar_samp.cpp
index ccc302046..81e9fc212 100644
--- a/utils/regr/covar_samp.cpp
+++ b/utils/regr/covar_samp.cpp
@@ -64,7 +64,7 @@ mcsv1_UDAF::ReturnCode covar_samp::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(covar_samp_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/covar_samp.h b/utils/regr/covar_samp.h
index 6aba65054..05d563d8e 100644
--- a/utils/regr/covar_samp.h
+++ b/utils/regr/covar_samp.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_avgx.cpp b/utils/regr/regr_avgx.cpp
index bf010e648..f474c544c 100644
--- a/utils/regr/regr_avgx.cpp
+++ b/utils/regr/regr_avgx.cpp
@@ -72,7 +72,7 @@ mcsv1_UDAF::ReturnCode regr_avgx::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_avgx_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(colTypes[1].scale + 4);
     context->setPrecision(19);
diff --git a/utils/regr/regr_avgx.h b/utils/regr/regr_avgx.h
index 75791f769..187291176 100644
--- a/utils/regr/regr_avgx.h
+++ b/utils/regr/regr_avgx.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_avgy.cpp b/utils/regr/regr_avgy.cpp
index 7325d991f..015cc5ea7 100644
--- a/utils/regr/regr_avgy.cpp
+++ b/utils/regr/regr_avgy.cpp
@@ -72,7 +72,7 @@ mcsv1_UDAF::ReturnCode regr_avgy::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_avgy_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(colTypes[0].scale + 4);
     context->setPrecision(19);
diff --git a/utils/regr/regr_avgy.h b/utils/regr/regr_avgy.h
index c99021f9f..209f97098 100644
--- a/utils/regr/regr_avgy.h
+++ b/utils/regr/regr_avgy.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_count.cpp b/utils/regr/regr_count.cpp
index c65a1f4a6..8b5993d33 100644
--- a/utils/regr/regr_count.cpp
+++ b/utils/regr/regr_count.cpp
@@ -54,7 +54,7 @@ mcsv1_UDAF::ReturnCode regr_count::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_count_data));
-    context->setResultType(CalpontSystemCatalog::BIGINT);
+    context->setResultType(execplan::CalpontSystemCatalog::BIGINT);
     context->setColWidth(8);
     context->setRunFlag(mcsv1sdk::UDAF_IGNORE_NULLS);
     return mcsv1_UDAF::SUCCESS;
diff --git a/utils/regr/regr_count.h b/utils/regr/regr_count.h
index 4f4fc558e..bde8d1cfd 100644
--- a/utils/regr/regr_count.h
+++ b/utils/regr/regr_count.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_intercept.cpp b/utils/regr/regr_intercept.cpp
index df9310f03..9b457243c 100644
--- a/utils/regr/regr_intercept.cpp
+++ b/utils/regr/regr_intercept.cpp
@@ -65,7 +65,7 @@ mcsv1_UDAF::ReturnCode regr_intercept::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_intercept_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/regr_intercept.h b/utils/regr/regr_intercept.h
index ed82477cd..72856d250 100644
--- a/utils/regr/regr_intercept.h
+++ b/utils/regr/regr_intercept.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_r2.cpp b/utils/regr/regr_r2.cpp
index 1abd3ea2e..60bcad65c 100644
--- a/utils/regr/regr_r2.cpp
+++ b/utils/regr/regr_r2.cpp
@@ -66,7 +66,7 @@ mcsv1_UDAF::ReturnCode regr_r2::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_r2_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/regr_r2.h b/utils/regr/regr_r2.h
index d440ad5a1..7494114a6 100644
--- a/utils/regr/regr_r2.h
+++ b/utils/regr/regr_r2.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_slope.cpp b/utils/regr/regr_slope.cpp
index de9eab5c7..17e662f2c 100644
--- a/utils/regr/regr_slope.cpp
+++ b/utils/regr/regr_slope.cpp
@@ -64,7 +64,7 @@ mcsv1_UDAF::ReturnCode regr_slope::init(mcsv1Context* context,
         return mcsv1_UDAF::ERROR;
     }
     context->setUserDataSize(sizeof(regr_slope_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/regr_slope.h b/utils/regr/regr_slope.h
index 9c148d895..084b12aac 100644
--- a/utils/regr/regr_slope.h
+++ b/utils/regr/regr_slope.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_sxx.cpp b/utils/regr/regr_sxx.cpp
index 5769a227b..afa379f68 100644
--- a/utils/regr/regr_sxx.cpp
+++ b/utils/regr/regr_sxx.cpp
@@ -63,7 +63,7 @@ mcsv1_UDAF::ReturnCode regr_sxx::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_sxx_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/regr_sxx.h b/utils/regr/regr_sxx.h
index 14d82bd55..007c032f1 100644
--- a/utils/regr/regr_sxx.h
+++ b/utils/regr/regr_sxx.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_sxy.cpp b/utils/regr/regr_sxy.cpp
index 76e1373c4..daef4333e 100644
--- a/utils/regr/regr_sxy.cpp
+++ b/utils/regr/regr_sxy.cpp
@@ -64,7 +64,7 @@ mcsv1_UDAF::ReturnCode regr_sxy::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_sxy_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/regr_sxy.h b/utils/regr/regr_sxy.h
index 25aa34145..257a61663 100644
--- a/utils/regr/regr_sxy.h
+++ b/utils/regr/regr_sxy.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_syy.cpp b/utils/regr/regr_syy.cpp
index 014a28389..f8e4c5b0c 100644
--- a/utils/regr/regr_syy.cpp
+++ b/utils/regr/regr_syy.cpp
@@ -63,7 +63,7 @@ mcsv1_UDAF::ReturnCode regr_syy::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_syy_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/regr_syy.h b/utils/regr/regr_syy.h
index a837fab13..cce37e9c0 100644
--- a/utils/regr/regr_syy.h
+++ b/utils/regr/regr_syy.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/rowgroup/rowaggregation.cpp b/utils/rowgroup/rowaggregation.cpp
index 4bfbf87b6..0be02629a 100644
--- a/utils/rowgroup/rowaggregation.cpp
+++ b/utils/rowgroup/rowaggregation.cpp
@@ -1903,7 +1903,7 @@ void RowAggregation::doUDAF(const Row& rowIn, int64_t colIn, int64_t colOut,
     // The vector of parameters to be sent to the UDAF
     mcsv1sdk::ColumnDatum valsIn[paramCount];
     uint32_t dataFlags[paramCount];
-    ConstantColumn* cc;
+    execplan::ConstantColumn* cc;
     bool bIsNull = false;
     execplan::CalpontSystemCatalog::ColDataType colDataType;
 
@@ -1919,10 +1919,10 @@ void RowAggregation::doUDAF(const Row& rowIn, int64_t colIn, int64_t colOut,
 
         if (fFunctionCols[funcColsIdx]->fpConstCol)
         {
-            cc = dynamic_cast<ConstantColumn*>(fFunctionCols[funcColsIdx]->fpConstCol.get());
+            cc = dynamic_cast<execplan::ConstantColumn*>(fFunctionCols[funcColsIdx]->fpConstCol.get());
         }
 
-        if ((cc && cc->type() == ConstantColumn::NULLDATA)
+        if ((cc && cc->type() == execplan::ConstantColumn::NULLDATA)
                 ||  (!cc && isNull(&fRowGroupIn, rowIn, colIn) == true))
         {
             if (fRGContext.getRunFlag(mcsv1sdk::UDAF_IGNORE_NULLS))
@@ -3680,7 +3680,7 @@ void RowAggregationUM::doNotNullConstantAggregate(const ConstantAggData& aggData
 
             // Create a datum item for sending to UDAF
             mcsv1sdk::ColumnDatum& datum = valsIn[0];
-            datum.dataType = (CalpontSystemCatalog::ColDataType)colDataType;
+            datum.dataType = (execplan::CalpontSystemCatalog::ColDataType)colDataType;
 
             switch (colDataType)
             {
diff --git a/utils/rowgroup/rowaggregation.h b/utils/rowgroup/rowaggregation.h
index 4817ed476..23df1f6d0 100644
--- a/utils/rowgroup/rowaggregation.h
+++ b/utils/rowgroup/rowaggregation.h
@@ -207,7 +207,7 @@ struct RowAggFunctionCol
     // The first will be a RowUDAFFunctionCol. Subsequent ones will be RowAggFunctionCol
     // with fAggFunction == ROWAGG_MULTI_PARM. Order is important.
     // If this parameter is constant, that value is here.
-    SRCP fpConstCol;
+    execplan::SRCP fpConstCol;
 };
 
 
@@ -272,7 +272,7 @@ inline void RowAggFunctionCol::deserialize(messageqcpp::ByteStream& bs)
 
     if (t)
     {
-        fpConstCol.reset(new ConstantColumn);
+        fpConstCol.reset(new execplan::ConstantColumn);
         fpConstCol.get()->unserialize(bs);
     }
 }
diff --git a/utils/rowgroup/rowgroup.h b/utils/rowgroup/rowgroup.h
index 27f0b98a4..e60148010 100644
--- a/utils/rowgroup/rowgroup.h
+++ b/utils/rowgroup/rowgroup.h
@@ -59,7 +59,6 @@
 #include "../winport/winport.h"
 
 // Workaround for my_global.h #define of isnan(X) causing a std::std namespace
-using namespace std;
 
 namespace rowgroup
 {
@@ -1028,7 +1027,7 @@ inline void Row::setFloatField(float val, uint32_t colIndex)
     //N.B. There is a bug in boost::any or in gcc where, if you store a nan, you will get back a nan,
     //  but not necessarily the same bits that you put in. This only seems to be for float (double seems
     //  to work).
-    if (isnan(val))
+    if (std::isnan(val))
         setUintField<4>(joblist::FLOATNULL, colIndex);
     else
         *((float*) &data[offsets[colIndex]]) = val;
diff --git a/utils/threadpool/prioritythreadpool.cpp b/utils/threadpool/prioritythreadpool.cpp
index 92fd0ad98..e25cd7af8 100644
--- a/utils/threadpool/prioritythreadpool.cpp
+++ b/utils/threadpool/prioritythreadpool.cpp
@@ -282,7 +282,7 @@ void PriorityThreadPool::sendErrorMsg(uint32_t id, uint32_t step, primitiveproce
     ism.Status =  logging::primitiveServerErr;
     ph.UniqueID = id;
     ph.StepID = step;
-    ByteStream msg(sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader));
+    messageqcpp::ByteStream msg(sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader));
     msg.append((uint8_t*) &ism, sizeof(ism));
     msg.append((uint8_t*) &ph, sizeof(ph));
 
diff --git a/utils/udfsdk/allnull.cpp b/utils/udfsdk/allnull.cpp
index 247b9e28f..ee6669789 100644
--- a/utils/udfsdk/allnull.cpp
+++ b/utils/udfsdk/allnull.cpp
@@ -39,7 +39,7 @@ mcsv1_UDAF::ReturnCode allnull::init(mcsv1Context* context,
         return mcsv1_UDAF::ERROR;
     }
 
-    context->setResultType(CalpontSystemCatalog::TINYINT);
+    context->setResultType(execplan::CalpontSystemCatalog::TINYINT);
 
     return mcsv1_UDAF::SUCCESS;
 }
diff --git a/utils/udfsdk/allnull.h b/utils/udfsdk/allnull.h
index 6a727caf6..40e5ce709 100644
--- a/utils/udfsdk/allnull.h
+++ b/utils/udfsdk/allnull.h
@@ -57,7 +57,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/udfsdk/avg_mode.cpp b/utils/udfsdk/avg_mode.cpp
index dba0859fb..317ccce93 100644
--- a/utils/udfsdk/avg_mode.cpp
+++ b/utils/udfsdk/avg_mode.cpp
@@ -49,7 +49,7 @@ mcsv1_UDAF::ReturnCode avg_mode::init(mcsv1Context* context,
         return mcsv1_UDAF::ERROR;
     }
 
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(context->getScale() * 2);
     context->setPrecision(19);
diff --git a/utils/udfsdk/avg_mode.h b/utils/udfsdk/avg_mode.h
index fba1fcdcc..d37c3b83b 100644
--- a/utils/udfsdk/avg_mode.h
+++ b/utils/udfsdk/avg_mode.h
@@ -65,7 +65,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/udfsdk/avgx.cpp b/utils/udfsdk/avgx.cpp
index 15548db36..a7ee4eb75 100644
--- a/utils/udfsdk/avgx.cpp
+++ b/utils/udfsdk/avgx.cpp
@@ -54,7 +54,7 @@ mcsv1_UDAF::ReturnCode avgx::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(avgx_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(colTypes[0].scale + 4);
     context->setPrecision(19);
diff --git a/utils/udfsdk/avgx.h b/utils/udfsdk/avgx.h
index a830c6803..0268df021 100644
--- a/utils/udfsdk/avgx.h
+++ b/utils/udfsdk/avgx.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/udfsdk/distinct_count.cpp b/utils/udfsdk/distinct_count.cpp
index 66dcea18f..11c2ce776 100644
--- a/utils/udfsdk/distinct_count.cpp
+++ b/utils/udfsdk/distinct_count.cpp
@@ -16,6 +16,7 @@
    MA 02110-1301, USA. */
 
 #include "distinct_count.h"
+#include "calpontsystemcatalog.h"
 
 using namespace mcsv1sdk;
 
@@ -36,7 +37,7 @@ mcsv1_UDAF::ReturnCode distinct_count::init(mcsv1Context* context,
         context->setErrorMessage("avgx() with other than 1 arguments");
 		return mcsv1_UDAF::ERROR;
 	}
-	context->setResultType(CalpontSystemCatalog::BIGINT);
+	context->setResultType(execplan::CalpontSystemCatalog::BIGINT);
 	context->setColWidth(8);
 	context->setRunFlag(mcsv1sdk::UDAF_IGNORE_NULLS);
 	context->setRunFlag(mcsv1sdk::UDAF_DISTINCT);
diff --git a/utils/udfsdk/distinct_count.h b/utils/udfsdk/distinct_count.h
index 1d804eaa8..7ad43f952 100644
--- a/utils/udfsdk/distinct_count.h
+++ b/utils/udfsdk/distinct_count.h
@@ -52,7 +52,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/udfsdk/mcsv1_udaf.cpp b/utils/udfsdk/mcsv1_udaf.cpp
index 9d513ced2..4dc30a3ef 100644
--- a/utils/udfsdk/mcsv1_udaf.cpp
+++ b/utils/udfsdk/mcsv1_udaf.cpp
@@ -75,41 +75,41 @@ int32_t mcsv1Context::getColWidth()
     // JIT initialization for types that have a defined size.
     switch (fResultType)
     {
-        case CalpontSystemCatalog::BIT:
-        case CalpontSystemCatalog::TINYINT:
-        case CalpontSystemCatalog::UTINYINT:
-        case CalpontSystemCatalog::CHAR:
+        case execplan::CalpontSystemCatalog::BIT:
+        case execplan::CalpontSystemCatalog::TINYINT:
+        case execplan::CalpontSystemCatalog::UTINYINT:
+        case execplan::CalpontSystemCatalog::CHAR:
             fColWidth = 1;
             break;
 
-        case CalpontSystemCatalog::SMALLINT:
-        case CalpontSystemCatalog::USMALLINT:
+        case execplan::CalpontSystemCatalog::SMALLINT:
+        case execplan::CalpontSystemCatalog::USMALLINT:
             fColWidth = 2;
             break;
 
-        case CalpontSystemCatalog::MEDINT:
-        case CalpontSystemCatalog::INT:
-        case CalpontSystemCatalog::UMEDINT:
-        case CalpontSystemCatalog::UINT:
-        case CalpontSystemCatalog::FLOAT:
-        case CalpontSystemCatalog::UFLOAT:
-        case CalpontSystemCatalog::DATE:
+        case execplan::CalpontSystemCatalog::MEDINT:
+        case execplan::CalpontSystemCatalog::INT:
+        case execplan::CalpontSystemCatalog::UMEDINT:
+        case execplan::CalpontSystemCatalog::UINT:
+        case execplan::CalpontSystemCatalog::FLOAT:
+        case execplan::CalpontSystemCatalog::UFLOAT:
+        case execplan::CalpontSystemCatalog::DATE:
             fColWidth = 4;
             break;
 
-        case CalpontSystemCatalog::BIGINT:
-        case CalpontSystemCatalog::UBIGINT:
-        case CalpontSystemCatalog::DECIMAL:
-        case CalpontSystemCatalog::UDECIMAL:
-        case CalpontSystemCatalog::DOUBLE:
-        case CalpontSystemCatalog::UDOUBLE:
-        case CalpontSystemCatalog::DATETIME:
-        case CalpontSystemCatalog::TIME:
-        case CalpontSystemCatalog::STRINT:
+        case execplan::CalpontSystemCatalog::BIGINT:
+        case execplan::CalpontSystemCatalog::UBIGINT:
+        case execplan::CalpontSystemCatalog::DECIMAL:
+        case execplan::CalpontSystemCatalog::UDECIMAL:
+        case execplan::CalpontSystemCatalog::DOUBLE:
+        case execplan::CalpontSystemCatalog::UDOUBLE:
+        case execplan::CalpontSystemCatalog::DATETIME:
+        case execplan::CalpontSystemCatalog::TIME:
+        case execplan::CalpontSystemCatalog::STRINT:
             fColWidth = 8;
             break;
 
-        case CalpontSystemCatalog::LONGDOUBLE:
+        case execplan::CalpontSystemCatalog::LONGDOUBLE:
             fColWidth = sizeof(long double);
             break;
 
@@ -212,7 +212,7 @@ void mcsv1Context::createUserData()
 void mcsv1Context::serialize(messageqcpp::ByteStream& b) const
 {
     b.needAtLeast(sizeof(mcsv1Context));
-    b << (ObjectReader::id_t) ObjectReader::MCSV1_CONTEXT;
+    b << (execplan::ObjectReader::id_t) execplan::ObjectReader::MCSV1_CONTEXT;
     b << functionName;
     b << fRunFlags;
     // Dont send context flags, These are set for each call
@@ -232,21 +232,21 @@ void mcsv1Context::serialize(messageqcpp::ByteStream& b) const
 
 void mcsv1Context::unserialize(messageqcpp::ByteStream& b)
 {
-    ObjectReader::checkType(b, ObjectReader::MCSV1_CONTEXT);
+    execplan::ObjectReader::checkType(b, execplan::ObjectReader::MCSV1_CONTEXT);
     b >> functionName;
     b >> fRunFlags;
     b >> fUserDataSize;
     uint32_t iResultType;
     b >> iResultType;
-    fResultType = (CalpontSystemCatalog::ColDataType)iResultType;
+    fResultType = (execplan::CalpontSystemCatalog::ColDataType)iResultType;
     b >> fResultscale;
     b >> fResultPrecision;
     b >> errorMsg;
     uint32_t frame;
     b >> frame;
-    fStartFrame = (WF_FRAME)frame;
+    fStartFrame = (execplan::WF_FRAME)frame;
     b >> frame;
-    fEndFrame = (WF_FRAME)frame;
+    fEndFrame = (execplan::WF_FRAME)frame;
     b >> fStartConstant;
     b >> fEndConstant;
     b >> fParamCount;
diff --git a/utils/udfsdk/mcsv1_udaf.h b/utils/udfsdk/mcsv1_udaf.h
index d6ba04483..0fcd877c9 100644
--- a/utils/udfsdk/mcsv1_udaf.h
+++ b/utils/udfsdk/mcsv1_udaf.h
@@ -78,8 +78,6 @@
 #include "wf_frame.h"
 #include "my_decimal_limits.h"
 
-using namespace execplan;
-
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
 #else
@@ -282,7 +280,7 @@ public:
     EXPORT bool isParamConstant(int paramIdx);
 
     // For getting the result type.
-    EXPORT CalpontSystemCatalog::ColDataType getResultType() const;
+    EXPORT execplan::CalpontSystemCatalog::ColDataType getResultType() const;
 
     // For getting the decimal characteristics for the return type.
     // These will be set to the default before init().
@@ -291,7 +289,7 @@ public:
 
     // If you want to change the result type
     // valid in init()
-    EXPORT bool setResultType(CalpontSystemCatalog::ColDataType resultType);
+    EXPORT bool setResultType(execplan::CalpontSystemCatalog::ColDataType resultType);
 
     // For setting the decimal characteristics for the return value.
     // This only makes sense if the return type is decimal, but should be set
@@ -339,14 +337,14 @@ public:
     // If WF_PRECEEdING and/or WF_FOLLOWING, a start or end constant should
     // be included to say how many preceeding or following is the default
     // Set this during init()
-    EXPORT bool  setDefaultWindowFrame(WF_FRAME defaultStartFrame,
-                                       WF_FRAME defaultEndFrame,
+    EXPORT bool  setDefaultWindowFrame(execplan::WF_FRAME defaultStartFrame,
+                                      execplan::WF_FRAME defaultEndFrame,
                                        int32_t startConstant = 0, // For WF_PRECEEDING or WF_FOLLOWING
                                        int32_t endConstant = 0);  // For WF_PRECEEDING or WF_FOLLOWING
 
     // There may be times you want to know the actual frame set by the caller
-    EXPORT void  getStartFrame(WF_FRAME& startFrame, int32_t& startConstant) const;
-    EXPORT void  getEndFrame(WF_FRAME& endFrame, int32_t& endConstant) const;
+    EXPORT void  getStartFrame(execplan::WF_FRAME& startFrame, int32_t& startConstant) const;
+    EXPORT void  getEndFrame(execplan::WF_FRAME& endFrame, int32_t& endConstant) const;
 
     // Deep Equivalence
     bool operator==(const mcsv1Context& c) const;
@@ -367,15 +365,15 @@ private:
     uint64_t fContextFlags;   // Set by the framework to define this specific call.
     int32_t fUserDataSize;
     boost::shared_ptr<UserData> fUserData;
-    CalpontSystemCatalog::ColDataType fResultType;
+    execplan::CalpontSystemCatalog::ColDataType fResultType;
     int32_t  fColWidth;       // The length in bytes of the return type
     int32_t  fResultscale;    // For scale, the number of digits to the right of the decimal
     int32_t  fResultPrecision; // The max number of digits allowed in the decimal value
     std::string errorMsg;
     uint32_t* dataFlags;      // an integer array wirh one entry for each parameter
     bool*    bInterrupted;    // Gets set to true by the Framework if something happens
-    WF_FRAME fStartFrame;     // Is set to default to start, then modified by the actual frame in the call
-    WF_FRAME fEndFrame;       // Is set to default to start, then modified by the actual frame in the call
+    execplan::WF_FRAME fStartFrame;     // Is set to default to start, then modified by the actual frame in the call
+    execplan::WF_FRAME fEndFrame;       // Is set to default to start, then modified by the actual frame in the call
     int32_t  fStartConstant;  // for start frame WF_PRECEEDIMG or WF_FOLLOWING
     int32_t  fEndConstant;    // for end frame WF_PRECEEDIMG or WF_FOLLOWING
     std::string functionName;
@@ -422,12 +420,12 @@ public:
 // For char, varchar, text, varbinary and blob types, columnData will be std::string.
 struct ColumnDatum
 {
-    CalpontSystemCatalog::ColDataType dataType;   // defined in calpontsystemcatalog.h
+  execplan::CalpontSystemCatalog::ColDataType dataType;   // defined in calpontsystemcatalog.h
     static_any::any  columnData;  // Not valid in init()
     uint32_t    scale;     // If dataType is a DECIMAL type
     uint32_t    precision; // If dataType is a DECIMAL type
     std::string alias;     // Only filled in for init()
-    ColumnDatum() : dataType(CalpontSystemCatalog::UNDEFINED), scale(0), precision(-1) {};
+    ColumnDatum() : dataType(execplan::CalpontSystemCatalog::UNDEFINED), scale(0), precision(-1) {};
 };
 
 // Override mcsv1_UDAF to build your User Defined Aggregate (UDAF) and/or
@@ -636,14 +634,14 @@ inline mcsv1Context::mcsv1Context() :
     fRunFlags(UDAF_OVER_ALLOWED | UDAF_ORDER_ALLOWED | UDAF_WINDOWFRAME_ALLOWED),
     fContextFlags(0),
     fUserDataSize(0),
-    fResultType(CalpontSystemCatalog::UNDEFINED),
+    fResultType(execplan::CalpontSystemCatalog::UNDEFINED),
     fColWidth(0),
     fResultscale(0),
     fResultPrecision(18),
     dataFlags(NULL),
     bInterrupted(NULL),
-    fStartFrame(WF_UNBOUNDED_PRECEDING),
-    fEndFrame(WF_CURRENT_ROW),
+    fStartFrame(execplan::WF_UNBOUNDED_PRECEDING),
+    fEndFrame(execplan::WF_CURRENT_ROW),
     fStartConstant(0),
     fEndConstant(0),
     func(NULL),
@@ -774,12 +772,12 @@ inline bool mcsv1Context::isParamConstant(int paramIdx)
     return false;
 }
 
-inline CalpontSystemCatalog::ColDataType mcsv1Context::getResultType() const
+inline execplan::CalpontSystemCatalog::ColDataType mcsv1Context::getResultType() const
 {
     return fResultType;
 }
 
-inline bool mcsv1Context::setResultType(CalpontSystemCatalog::ColDataType resultType)
+inline bool mcsv1Context::setResultType(execplan::CalpontSystemCatalog::ColDataType resultType)
 {
     fResultType = resultType;
     return true;  // We may want to sanity check here.
@@ -878,8 +876,8 @@ inline void mcsv1Context::setUserData(UserData* userData)
     }
 }
 
-inline bool mcsv1Context::setDefaultWindowFrame(WF_FRAME defaultStartFrame,
-        WF_FRAME defaultEndFrame,
+inline bool mcsv1Context::setDefaultWindowFrame(execplan::WF_FRAME defaultStartFrame,
+        execplan::WF_FRAME defaultEndFrame,
         int32_t startConstant,
         int32_t endConstant)
 {
@@ -891,13 +889,13 @@ inline bool mcsv1Context::setDefaultWindowFrame(WF_FRAME defaultStartFrame,
     return true;
 }
 
-inline void mcsv1Context::getStartFrame(WF_FRAME& startFrame, int32_t& startConstant) const
+inline void mcsv1Context::getStartFrame(execplan::WF_FRAME& startFrame, int32_t& startConstant) const
 {
     startFrame = fStartFrame;
     startConstant = fStartConstant;
 }
 
-inline void mcsv1Context::getEndFrame(WF_FRAME& endFrame, int32_t& endConstant) const
+inline void mcsv1Context::getEndFrame(execplan::WF_FRAME& endFrame, int32_t& endConstant) const
 {
     endFrame = fEndFrame;
     endConstant = fEndConstant;
diff --git a/utils/udfsdk/median.h b/utils/udfsdk/median.h
index 48bd93c70..ead9eede4 100644
--- a/utils/udfsdk/median.h
+++ b/utils/udfsdk/median.h
@@ -65,7 +65,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/udfsdk/ssq.cpp b/utils/udfsdk/ssq.cpp
index 74b60b5f6..4886acdb1 100644
--- a/utils/udfsdk/ssq.cpp
+++ b/utils/udfsdk/ssq.cpp
@@ -59,7 +59,7 @@ mcsv1_UDAF::ReturnCode ssq::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(ssq_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(context->getScale() * 2);
     context->setPrecision(19);
diff --git a/utils/udfsdk/ssq.h b/utils/udfsdk/ssq.h
index e27ecf1fa..58d42084b 100644
--- a/utils/udfsdk/ssq.h
+++ b/utils/udfsdk/ssq.h
@@ -65,7 +65,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/windowfunction/windowfunctiontype.h b/utils/windowfunction/windowfunctiontype.h
index e0a1aa832..ecf8f694e 100644
--- a/utils/windowfunction/windowfunctiontype.h
+++ b/utils/windowfunction/windowfunctiontype.h
@@ -199,9 +199,9 @@ public:
         fStep = step;
     }
 
-    void constParms(const std::vector<SRCP>& functionParms);
+    void constParms(const std::vector<execplan::SRCP>& functionParms);
 
-    static boost::shared_ptr<WindowFunctionType> makeWindowFunction(const std::string&, int ct, WindowFunctionColumn* wc);
+    static boost::shared_ptr<WindowFunctionType> makeWindowFunction(const std::string&, int ct, execplan::WindowFunctionColumn* wc);
 
 protected:
 
@@ -255,7 +255,7 @@ protected:
     std::vector<int64_t>                        fFieldIndex;
 
     // constant function parameters -- needed for udaf with constant
-    std::vector<SRCP>                           fConstantParms;
+    std::vector<execplan::SRCP>                           fConstantParms;
 
     // row meta data
     rowgroup::RowGroup	                        fRowGroup;
diff --git a/versioning/BRM/dbrmctl.cpp b/versioning/BRM/dbrmctl.cpp
index b9bca4d7c..45bf68f36 100644
--- a/versioning/BRM/dbrmctl.cpp
+++ b/versioning/BRM/dbrmctl.cpp
@@ -19,6 +19,7 @@
  * $Id: dbrmctl.cpp 1823 2013-01-21 14:13:09Z rdempsey $
  *
  ****************************************************************************/
+#include <future> //cxx11test
 
 #include <unistd.h>
 #include <iostream>
diff --git a/versioning/BRM/load_brm.cpp b/versioning/BRM/load_brm.cpp
index 4650fc5ec..871a51122 100644
--- a/versioning/BRM/load_brm.cpp
+++ b/versioning/BRM/load_brm.cpp
@@ -19,6 +19,7 @@
  * $Id: load_brm.cpp 1905 2013-06-14 18:42:28Z rdempsey $
  *
  ****************************************************************************/
+#include <future> //cxx11test
 #include <unistd.h>
 #include <iostream>
 #include <string>
diff --git a/versioning/BRM/masternode.cpp b/versioning/BRM/masternode.cpp
index cb3eb5024..ea4832dae 100644
--- a/versioning/BRM/masternode.cpp
+++ b/versioning/BRM/masternode.cpp
@@ -23,6 +23,7 @@
 /*
  * The executable source that runs a Master DBRM Node.
  */
+#include <future> //cxx11test
 
 #include "masterdbrmnode.h"
 #include "liboamcpp.h"
diff --git a/versioning/BRM/reset_locks.cpp b/versioning/BRM/reset_locks.cpp
index 895e34600..47237aafa 100644
--- a/versioning/BRM/reset_locks.cpp
+++ b/versioning/BRM/reset_locks.cpp
@@ -17,6 +17,8 @@
 
 // $Id: reset_locks.cpp 1823 2013-01-21 14:13:09Z rdempsey $
 //
+#include <future> //cxx11test
+
 #include <unistd.h>
 #include <iostream>
 using namespace std;
diff --git a/versioning/BRM/rollback.cpp b/versioning/BRM/rollback.cpp
index 1944f2938..509635248 100644
--- a/versioning/BRM/rollback.cpp
+++ b/versioning/BRM/rollback.cpp
@@ -28,6 +28,7 @@
  * 		rollback -p   (to get the transaction(s) that need to be rolled back)
  * 		rollback -r transID  	(for each one to roll them back)
  */
+#include <future> //cxx11test
 
 #include "dbrm.h"
 
diff --git a/versioning/BRM/save_brm.cpp b/versioning/BRM/save_brm.cpp
index d53507082..6993fd8fb 100644
--- a/versioning/BRM/save_brm.cpp
+++ b/versioning/BRM/save_brm.cpp
@@ -25,6 +25,7 @@
  *
  * More detailed description
  */
+#include <future> //cxx11test
 
 #include <unistd.h>
 #include <iostream>
diff --git a/versioning/BRM/slavenode.cpp b/versioning/BRM/slavenode.cpp
index 1fd89ff7d..26701504a 100644
--- a/versioning/BRM/slavenode.cpp
+++ b/versioning/BRM/slavenode.cpp
@@ -19,6 +19,7 @@
  * $Id: slavenode.cpp 1931 2013-07-08 16:53:02Z bpaul $
  *
  ****************************************************************************/
+#include <future> //cxx11test
 
 #include <iostream>
 #include <signal.h>
diff --git a/writeengine/bulk/we_brmreporter.cpp b/writeengine/bulk/we_brmreporter.cpp
index 4c0f1511c..fd9691ef9 100644
--- a/writeengine/bulk/we_brmreporter.cpp
+++ b/writeengine/bulk/we_brmreporter.cpp
@@ -321,7 +321,7 @@ void BRMReporter::sendCPToFile( )
 void BRMReporter::reportTotals(
     uint64_t totalReadRows,
     uint64_t totalInsertedRows,
-    const std::vector<boost::tuple<CalpontSystemCatalog::ColDataType, uint64_t, uint64_t> >& satCounts)
+    const std::vector<boost::tuple<execplan::CalpontSystemCatalog::ColDataType, uint64_t, uint64_t> >& satCounts)
 {
     if (fRptFile.is_open())
     {
diff --git a/writeengine/bulk/we_brmreporter.h b/writeengine/bulk/we_brmreporter.h
index b5e43f867..e71310ff1 100644
--- a/writeengine/bulk/we_brmreporter.h
+++ b/writeengine/bulk/we_brmreporter.h
@@ -28,7 +28,6 @@
 
 #include "brmtypes.h"
 #include "calpontsystemcatalog.h"
-using namespace execplan;
 /** @file
  * class BRMReporter
  */
@@ -107,7 +106,7 @@ public:
      */
     void reportTotals(uint64_t totalReadRows,
                       uint64_t totalInsertedRows,
-                      const std::vector<boost::tuple<CalpontSystemCatalog::ColDataType,
+                      const std::vector<boost::tuple<execplan::CalpontSystemCatalog::ColDataType,
                       uint64_t, uint64_t> >& satCounts);
 
     /** @brief Generate report for job that exceeds error limit
diff --git a/writeengine/bulk/we_bulkload.cpp b/writeengine/bulk/we_bulkload.cpp
index 48cc79f07..134bb07af 100644
--- a/writeengine/bulk/we_bulkload.cpp
+++ b/writeengine/bulk/we_bulkload.cpp
@@ -473,7 +473,7 @@ int BulkLoad::preProcess( Job& job, int tableNo,
     int         rc = NO_ERROR, minWidth = 9999; // give a big number
     HWM         minHWM = 999999;  // rp 9/25/07 Bug 473
     ColStruct   curColStruct;
-    CalpontSystemCatalog::ColDataType colDataType;
+    execplan::CalpontSystemCatalog::ColDataType colDataType;
 
     // Initialize portions of TableInfo object
     tableInfo->setBufferSize(fBufferSize);
diff --git a/writeengine/bulk/we_tableinfo.cpp b/writeengine/bulk/we_tableinfo.cpp
index 2885d1462..92f8ac19f 100644
--- a/writeengine/bulk/we_tableinfo.cpp
+++ b/writeengine/bulk/we_tableinfo.cpp
@@ -957,7 +957,7 @@ void TableInfo::reportTotals(double elapsedTime)
     fLog->logMsg(oss2.str(), MSGLVL_INFO2);
 
     // @bug 3504: Loop through columns to print saturation counts
-    std::vector<boost::tuple<CalpontSystemCatalog::ColDataType, uint64_t, uint64_t> > satCounts;
+    std::vector<boost::tuple<execplan::CalpontSystemCatalog::ColDataType, uint64_t, uint64_t> > satCounts;
 
     for (unsigned i = 0; i < fColumns.size(); ++i)
     {
@@ -977,30 +977,28 @@ void TableInfo::reportTotals(double elapsedTime)
             ossSatCnt << "Column " << fTableName << '.' <<
                       fColumns[i].column.colName << "; Number of ";
 
-            if (fColumns[i].column.dataType == CalpontSystemCatalog::DATE)
+            if (fColumns[i].column.dataType == execplan::CalpontSystemCatalog::DATE)
             {
                 ossSatCnt <<
                           "invalid dates replaced with zero value : ";
             }
             else if (fColumns[i].column.dataType ==
-                     CalpontSystemCatalog::DATETIME)
+              execplan::CalpontSystemCatalog::DATETIME)
             {
                 //bug5383
                 ossSatCnt <<
                           "invalid date/times replaced with zero value : ";
             }
-            else if (fColumns[i].column.dataType == CalpontSystemCatalog::TIME)
+            else if (fColumns[i].column.dataType == execplan::CalpontSystemCatalog::TIME)
             {
                 ossSatCnt <<
                           "invalid times replaced with zero value : ";
             }
-            else if (fColumns[i].column.dataType == CalpontSystemCatalog::CHAR)
-                ossSatCnt <<
-                          "character strings truncated: ";
-            else if (fColumns[i].column.dataType ==
-                     CalpontSystemCatalog::VARCHAR)
+            else if (fColumns[i].column.dataType == execplan::CalpontSystemCatalog::CHAR)
                 ossSatCnt <<
                           "character strings truncated: ";
+            else if (fColumns[i].column.dataType == execplan::CalpontSystemCatalog::VARCHAR)
+                ossSatCnt << "character strings truncated: ";
             else
                 ossSatCnt <<
                           "rows inserted with saturated values: ";
diff --git a/writeengine/server/we_brmrprtparser.h b/writeengine/server/we_brmrprtparser.h
index e9525a744..9b179f070 100644
--- a/writeengine/server/we_brmrprtparser.h
+++ b/writeengine/server/we_brmrprtparser.h
@@ -31,11 +31,9 @@
 
 #include <fstream>
 #include <iostream>
-using namespace std;
 
 #include "bytestream.h"
 #include "messagequeue.h"
-using namespace messageqcpp;
 
 /*
  *
diff --git a/writeengine/server/we_dataloader.h b/writeengine/server/we_dataloader.h
index 4415a3ab4..8750f469b 100644
--- a/writeengine/server/we_dataloader.h
+++ b/writeengine/server/we_dataloader.h
@@ -67,7 +67,7 @@ public:
     void str2Argv(std::string CmdLine, std::vector<char*>& V);
     std::string getCalpontHome();
     std::string getPrgmPath(std::string& PrgmName);
-    void updateCmdLineWithPath(string& CmdLine);
+    void updateCmdLineWithPath(std::string& CmdLine);
 
 
 public:
@@ -179,8 +179,8 @@ private:
     SplitterReadThread& fRef;
 
     int fMode;
-    ofstream fDataDumpFile;
-    ofstream fJobFile;
+    std::ofstream fDataDumpFile;
+    std::ofstream fJobFile;
     unsigned int fTxBytes;
     unsigned int fRxBytes;
     char fPmId;
diff --git a/writeengine/server/we_ddlcommon.h b/writeengine/server/we_ddlcommon.h
index b1e4e48f1..6af26b143 100644
--- a/writeengine/server/we_ddlcommon.h
+++ b/writeengine/server/we_ddlcommon.h
@@ -51,11 +51,7 @@
 #define EXPORT
 #endif
 
-using namespace std;
-using namespace execplan;
-
 #include <boost/algorithm/string/case_conv.hpp>
-using namespace boost::algorithm;
 
 template <class T>
 bool from_string(T& t,
@@ -72,7 +68,7 @@ struct DDLColumn
 {
     execplan::CalpontSystemCatalog::OID oid;
     execplan::CalpontSystemCatalog::ColType colType;
-    execplan:: CalpontSystemCatalog::TableColName tableColName;
+    execplan::CalpontSystemCatalog::TableColName tableColName;
 };
 
 typedef std::vector<DDLColumn> ColumnList;
@@ -104,23 +100,23 @@ inline void  getColumnsForTable(uint32_t sessionID, std::string schema, std::str
                                 ColumnList& colList)
 {
 
-    CalpontSystemCatalog::TableName tableName;
+  execplan::CalpontSystemCatalog::TableName tableName;
     tableName.schema = schema;
     tableName.table = table;
     std::string err;
 
     try
     {
-        boost::shared_ptr<CalpontSystemCatalog> systemCatalogPtr = CalpontSystemCatalog::makeCalpontSystemCatalog(sessionID);
-        systemCatalogPtr->identity(CalpontSystemCatalog::EC);
+        boost::shared_ptr<execplan::CalpontSystemCatalog> systemCatalogPtr = execplan::CalpontSystemCatalog::makeCalpontSystemCatalog(sessionID);
+        systemCatalogPtr->identity(execplan::CalpontSystemCatalog::EC);
 
-        const CalpontSystemCatalog::RIDList ridList = systemCatalogPtr->columnRIDs(tableName);
+        const execplan::CalpontSystemCatalog::RIDList ridList = systemCatalogPtr->columnRIDs(tableName);
 
-        CalpontSystemCatalog::RIDList::const_iterator rid_iterator = ridList.begin();
+        execplan::CalpontSystemCatalog::RIDList::const_iterator rid_iterator = ridList.begin();
 
         while (rid_iterator != ridList.end())
         {
-            CalpontSystemCatalog::ROPair roPair = *rid_iterator;
+          execplan::CalpontSystemCatalog::ROPair roPair = *rid_iterator;
 
             DDLColumn column;
             column.oid = roPair.objnum;
@@ -381,112 +377,112 @@ inline int convertDataType(int dataType)
     switch (dataType)
     {
         case ddlpackage::DDL_CHAR:
-            calpontDataType = CalpontSystemCatalog::CHAR;
+            calpontDataType = execplan::CalpontSystemCatalog::CHAR;
             break;
 
         case ddlpackage::DDL_VARCHAR:
-            calpontDataType = CalpontSystemCatalog::VARCHAR;
+            calpontDataType = execplan::CalpontSystemCatalog::VARCHAR;
             break;
 
         case ddlpackage::DDL_VARBINARY:
-            calpontDataType = CalpontSystemCatalog::VARBINARY;
+            calpontDataType = execplan::CalpontSystemCatalog::VARBINARY;
             break;
 
         case ddlpackage::DDL_BIT:
-            calpontDataType = CalpontSystemCatalog::BIT;
+            calpontDataType = execplan::CalpontSystemCatalog::BIT;
             break;
 
         case ddlpackage::DDL_REAL:
         case ddlpackage::DDL_DECIMAL:
         case ddlpackage::DDL_NUMERIC:
         case ddlpackage::DDL_NUMBER:
-            calpontDataType = CalpontSystemCatalog::DECIMAL;
+            calpontDataType = execplan::CalpontSystemCatalog::DECIMAL;
             break;
 
         case ddlpackage::DDL_FLOAT:
-            calpontDataType = CalpontSystemCatalog::FLOAT;
+            calpontDataType = execplan::CalpontSystemCatalog::FLOAT;
             break;
 
         case ddlpackage::DDL_DOUBLE:
-            calpontDataType = CalpontSystemCatalog::DOUBLE;
+            calpontDataType = execplan::CalpontSystemCatalog::DOUBLE;
             break;
 
         case ddlpackage::DDL_INT:
         case ddlpackage::DDL_INTEGER:
-            calpontDataType = CalpontSystemCatalog::INT;
+            calpontDataType = execplan::CalpontSystemCatalog::INT;
             break;
 
         case ddlpackage::DDL_BIGINT:
-            calpontDataType = CalpontSystemCatalog::BIGINT;
+            calpontDataType = execplan::CalpontSystemCatalog::BIGINT;
             break;
 
         case ddlpackage::DDL_MEDINT:
-            calpontDataType = CalpontSystemCatalog::MEDINT;
+            calpontDataType = execplan::CalpontSystemCatalog::MEDINT;
             break;
 
         case ddlpackage::DDL_SMALLINT:
-            calpontDataType = CalpontSystemCatalog::SMALLINT;
+            calpontDataType = execplan::CalpontSystemCatalog::SMALLINT;
             break;
 
         case ddlpackage::DDL_TINYINT:
-            calpontDataType = CalpontSystemCatalog::TINYINT;
+            calpontDataType = execplan::CalpontSystemCatalog::TINYINT;
             break;
 
         case ddlpackage::DDL_DATE:
-            calpontDataType = CalpontSystemCatalog::DATE;
+            calpontDataType = execplan::CalpontSystemCatalog::DATE;
             break;
 
         case ddlpackage::DDL_DATETIME:
-            calpontDataType = CalpontSystemCatalog::DATETIME;
+            calpontDataType = execplan::CalpontSystemCatalog::DATETIME;
             break;
 
         case ddlpackage::DDL_TIME:
-            calpontDataType = CalpontSystemCatalog::TIME;
+            calpontDataType = execplan::CalpontSystemCatalog::TIME;
             break;
 
         case ddlpackage::DDL_CLOB:
-            calpontDataType = CalpontSystemCatalog::CLOB;
+            calpontDataType = execplan::CalpontSystemCatalog::CLOB;
             break;
 
         case ddlpackage::DDL_BLOB:
-            calpontDataType = CalpontSystemCatalog::BLOB;
+            calpontDataType = execplan::CalpontSystemCatalog::BLOB;
             break;
 
         case ddlpackage::DDL_TEXT:
-            calpontDataType = CalpontSystemCatalog::TEXT;
+            calpontDataType = execplan::CalpontSystemCatalog::TEXT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_TINYINT:
-            calpontDataType = CalpontSystemCatalog::UTINYINT;
+            calpontDataType = execplan::CalpontSystemCatalog::UTINYINT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_SMALLINT:
-            calpontDataType = CalpontSystemCatalog::USMALLINT;
+            calpontDataType = execplan::CalpontSystemCatalog::USMALLINT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_MEDINT:
-            calpontDataType = CalpontSystemCatalog::UMEDINT;
+            calpontDataType = execplan::CalpontSystemCatalog::UMEDINT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_INT:
-            calpontDataType = CalpontSystemCatalog::UINT;
+            calpontDataType = execplan::CalpontSystemCatalog::UINT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_BIGINT:
-            calpontDataType = CalpontSystemCatalog::UBIGINT;
+            calpontDataType = execplan::CalpontSystemCatalog::UBIGINT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_DECIMAL:
         case ddlpackage::DDL_UNSIGNED_NUMERIC:
-            calpontDataType = CalpontSystemCatalog::UDECIMAL;
+            calpontDataType = execplan::CalpontSystemCatalog::UDECIMAL;
             break;
 
         case ddlpackage::DDL_UNSIGNED_FLOAT:
-            calpontDataType = CalpontSystemCatalog::UFLOAT;
+            calpontDataType = execplan::CalpontSystemCatalog::UFLOAT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_DOUBLE:
-            calpontDataType = CalpontSystemCatalog::UDOUBLE;
+            calpontDataType = execplan::CalpontSystemCatalog::UDOUBLE;
             break;
 
         default:
diff --git a/writeengine/server/we_observer.h b/writeengine/server/we_observer.h
index 85401d885..ac3039318 100644
--- a/writeengine/server/we_observer.h
+++ b/writeengine/server/we_observer.h
@@ -31,7 +31,6 @@
 #define OBSERVER_H_
 
 #include <list>
-using namespace std;
 
 
 namespace WriteEngine
diff --git a/writeengine/server/we_readthread.cpp b/writeengine/server/we_readthread.cpp
index 76653ff56..f27ed9795 100644
--- a/writeengine/server/we_readthread.cpp
+++ b/writeengine/server/we_readthread.cpp
@@ -651,7 +651,7 @@ void SplitterReadThread::operator()()
         catch (...)
         {
             fIbs.restart();     //setting length=0, get out of loop
-            cout << "Broken Pipe" << endl;
+            std::cout << "Broken Pipe" << std::endl;
 
             logging::LoggingID logid(19, 0, 0);
             logging::Message::Args args;
@@ -889,7 +889,7 @@ void ReadThreadFactory::CreateReadThread(ThreadPool& Tp, IOSocket& Ios, BRM::DBR
     }
     catch (std::exception& ex)
     {
-        cout << "Handled : " << ex.what() << endl;
+      std::cout << "Handled : " << ex.what() << std::endl;
         logging::LoggingID logid(19, 0, 0);
         logging::Message::Args args;
         logging::Message msg(1);
diff --git a/writeengine/server/we_readthread.h b/writeengine/server/we_readthread.h
index 52ce114c9..39f6267dd 100644
--- a/writeengine/server/we_readthread.h
+++ b/writeengine/server/we_readthread.h
@@ -27,7 +27,6 @@
 #include "messagequeue.h"
 #include "threadpool.h"
 #include "we_ddlcommandproc.h"
-using namespace threadpool;
 
 #include "we_ddlcommandproc.h"
 #include "we_dmlcommandproc.h"
@@ -149,7 +148,7 @@ public:
     virtual ~ReadThreadFactory() {}
 
 public:
-    static void CreateReadThread(ThreadPool& Tp, IOSocket& ios, BRM::DBRM& dbrm);
+    static void CreateReadThread(threadpool::ThreadPool& Tp, IOSocket& ios, BRM::DBRM& dbrm);
 
 
 };
diff --git a/writeengine/splitter/we_brmupdater.cpp b/writeengine/splitter/we_brmupdater.cpp
index 96a3e9d11..ea728fb27 100644
--- a/writeengine/splitter/we_brmupdater.cpp
+++ b/writeengine/splitter/we_brmupdater.cpp
@@ -512,13 +512,13 @@ bool WEBrmUpdater::prepareRowsInsertedInfo(std::string Entry,
 
 bool WEBrmUpdater::prepareColumnOutOfRangeInfo(std::string Entry,
         int& ColNum,
-        CalpontSystemCatalog::ColDataType& ColType,
+        execplan::CalpontSystemCatalog::ColDataType& ColType,
         std::string& ColName,
         int& OorValues)
 {
     bool aFound = false;
-    boost::shared_ptr<CalpontSystemCatalog> systemCatalogPtr =
-        CalpontSystemCatalog::makeCalpontSystemCatalog();
+    boost::shared_ptr<execplan::CalpontSystemCatalog> systemCatalogPtr =
+      execplan::CalpontSystemCatalog::makeCalpontSystemCatalog();
 
     //DATA: 3 1
     if ((!Entry.empty()) && (Entry.at(0) == 'D'))
@@ -553,7 +553,7 @@ bool WEBrmUpdater::prepareColumnOutOfRangeInfo(std::string Entry,
 
         if (pTok)
         {
-            ColType = (CalpontSystemCatalog::ColDataType)atoi(pTok);
+            ColType = (execplan::CalpontSystemCatalog::ColDataType)atoi(pTok);
         }
         else
         {
@@ -566,7 +566,7 @@ bool WEBrmUpdater::prepareColumnOutOfRangeInfo(std::string Entry,
         if (pTok)
         {
             uint64_t columnOid = strtol(pTok, NULL, 10);
-            CalpontSystemCatalog::TableColName colname = systemCatalogPtr->colName(columnOid);
+            execplan::CalpontSystemCatalog::TableColName colname = systemCatalogPtr->colName(columnOid);
             ColName = colname.schema + "." + colname.table + "." + colname.column;
         }
         else
diff --git a/writeengine/splitter/we_brmupdater.h b/writeengine/splitter/we_brmupdater.h
index b14cf4430..c575b3bd1 100644
--- a/writeengine/splitter/we_brmupdater.h
+++ b/writeengine/splitter/we_brmupdater.h
@@ -68,7 +68,7 @@ public:
     static bool prepareRowsInsertedInfo(std::string Entry, int64_t& TotRows,
                                         int64_t& InsRows);
     static bool prepareColumnOutOfRangeInfo(std::string Entry, int& ColNum,
-                                            CalpontSystemCatalog::ColDataType& ColType,
+      execplan::CalpontSystemCatalog::ColDataType& ColType,
                                             std::string& ColName, int& OorValues);
     static bool prepareErrorFileInfo(std::string Entry, std::string& ErrFileName);
     static bool prepareBadDataFileInfo(std::string Entry, std::string& BadFileName);
diff --git a/writeengine/splitter/we_sdhandler.h b/writeengine/splitter/we_sdhandler.h
index f31f40c63..551df4d9f 100644
--- a/writeengine/splitter/we_sdhandler.h
+++ b/writeengine/splitter/we_sdhandler.h
@@ -233,7 +233,7 @@ public:
         fWeSplClients[PmId]->setRowsUploadInfo(RowsRead, RowsInserted);
     }
     void add2ColOutOfRangeInfo(int PmId, int ColNum,
-                               CalpontSystemCatalog::ColDataType ColType,
+            execplan::CalpontSystemCatalog::ColDataType ColType,
                                std::string&  ColName, int NoOfOors)
     {
         fWeSplClients[PmId]->add2ColOutOfRangeInfo(ColNum, ColType, ColName, NoOfOors);
@@ -326,7 +326,7 @@ private:
         {
             fRowsIns += Rows;
         }
-        void updateColOutOfRangeInfo(int aColNum, CalpontSystemCatalog::ColDataType aColType,
+        void updateColOutOfRangeInfo(int aColNum, execplan::CalpontSystemCatalog::ColDataType aColType,
                                      std::string aColName, int aNoOfOors)
         {
             WEColOorVec::iterator aIt = fColOorVec.begin();
diff --git a/writeengine/splitter/we_splclient.cpp b/writeengine/splitter/we_splclient.cpp
index de84abe8e..59b776888 100644
--- a/writeengine/splitter/we_splclient.cpp
+++ b/writeengine/splitter/we_splclient.cpp
@@ -453,7 +453,7 @@ void WESplClient::setRowsUploadInfo(int64_t RowsRead, int64_t RowsInserted)
 //------------------------------------------------------------------------------
 
 void WESplClient::add2ColOutOfRangeInfo(int ColNum,
-                                        CalpontSystemCatalog::ColDataType ColType,
+  execplan::CalpontSystemCatalog::ColDataType ColType,
                                         std::string&  ColName, int NoOfOors)
 {
     WEColOORInfo aColOorInfo;
diff --git a/writeengine/splitter/we_splclient.h b/writeengine/splitter/we_splclient.h
index 1d86b0610..63c54c337 100644
--- a/writeengine/splitter/we_splclient.h
+++ b/writeengine/splitter/we_splclient.h
@@ -35,7 +35,6 @@
 
 #include "we_messages.h"
 #include "calpontsystemcatalog.h"
-using namespace execplan;
 
 namespace WriteEngine
 {
@@ -47,11 +46,11 @@ class WESplClient;			//forward decleration
 class WEColOORInfo		// Column Out-Of-Range Info
 {
 public:
-    WEColOORInfo(): fColNum(0), fColType(CalpontSystemCatalog::INT), fNoOfOORs(0) {}
+    WEColOORInfo(): fColNum(0), fColType(execplan::CalpontSystemCatalog::INT), fNoOfOORs(0) {}
     ~WEColOORInfo() {}
 public:
     int fColNum;
-    CalpontSystemCatalog::ColDataType fColType;
+    execplan::CalpontSystemCatalog::ColDataType fColType;
     std::string fColName;
     int fNoOfOORs;
 };
@@ -390,8 +389,7 @@ private:
     std::string fErrInfoFile;
 
     void setRowsUploadInfo(int64_t RowsRead, int64_t RowsInserted);
-    void add2ColOutOfRangeInfo(int ColNum,
-                               CalpontSystemCatalog::ColDataType ColType,
+    void add2ColOutOfRangeInfo(int ColNum, execplan::CalpontSystemCatalog::ColDataType ColType,
                                std::string&  ColName, int NoOfOors);
     void setBadDataFile(const std::string& BadDataFile);
     void setErrInfoFile(const std::string& ErrInfoFile);
diff --git a/writeengine/splitter/we_splitterapp.cpp b/writeengine/splitter/we_splitterapp.cpp
index dac0c7387..1b62c6bcd 100644
--- a/writeengine/splitter/we_splitterapp.cpp
+++ b/writeengine/splitter/we_splitterapp.cpp
@@ -249,8 +249,8 @@ void WESplitterApp::processMessages()
     {
         try
         {
-            aBs << (ByteStream::byte) WE_CLT_SRV_MODE;
-            aBs << (ByteStream::quadbyte) fCmdArgs.getMode();
+            aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_MODE;
+            aBs << (messageqcpp::ByteStream::quadbyte) fCmdArgs.getMode();
             fDh.send2Pm(aBs);
 
             std::string aJobId = fCmdArgs.getJobId();
@@ -268,7 +268,7 @@ void WESplitterApp::processMessages()
             if (fDh.getDebugLvl())
                 cout << "CPImport cmd line - " << aCpImpCmd << endl;
 
-            aBs << (ByteStream::byte) WE_CLT_SRV_CMDLINEARGS;
+            aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_CMDLINEARGS;
             aBs << aCpImpCmd;
             fDh.send2Pm(aBs);
 
@@ -278,7 +278,7 @@ void WESplitterApp::processMessages()
             if (fDh.getDebugLvl())
                 cout << "BrmReport FileName - " << aBrmRpt << endl;
 
-            aBs << (ByteStream::byte) WE_CLT_SRV_BRMRPT;
+            aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_BRMRPT;
             aBs << aBrmRpt;
             fDh.send2Pm(aBs);
 
@@ -297,8 +297,8 @@ void WESplitterApp::processMessages()
         {
             // In this mode we ignore almost all cmd lines args which
             // are usually send to cpimport
-            aBs << (ByteStream::byte) WE_CLT_SRV_MODE;
-            aBs << (ByteStream::quadbyte) fCmdArgs.getMode();
+            aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_MODE;
+            aBs << (messageqcpp::ByteStream::quadbyte) fCmdArgs.getMode();
             fDh.send2Pm(aBs);
 
             std::string aJobId = fCmdArgs.getJobId();
@@ -323,7 +323,7 @@ void WESplitterApp::processMessages()
             if (fDh.getDebugLvl())
                 cout << "CPImport cmd line - " << aCpImpCmd << endl;
 
-            aBs << (ByteStream::byte) WE_CLT_SRV_CMDLINEARGS;
+            aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_CMDLINEARGS;
             aBs << aCpImpCmd;
             fDh.send2Pm(aBs);
 
@@ -333,7 +333,7 @@ void WESplitterApp::processMessages()
             if (fDh.getDebugLvl())
                 cout << "BrmReport FileName - " << aBrmRpt << endl;
 
-            aBs << (ByteStream::byte) WE_CLT_SRV_BRMRPT;
+            aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_BRMRPT;
             aBs << aBrmRpt;
             fDh.send2Pm(aBs);
 
@@ -352,8 +352,8 @@ void WESplitterApp::processMessages()
         {
             // In this mode we ignore almost all cmd lines args which
             // are usually send to cpimport
-            aBs << (ByteStream::byte) WE_CLT_SRV_MODE;
-            aBs << (ByteStream::quadbyte) fCmdArgs.getMode();
+            aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_MODE;
+            aBs << (messageqcpp::ByteStream::quadbyte) fCmdArgs.getMode();
             fDh.send2Pm(aBs);
 
             aBs.restart();
@@ -373,7 +373,7 @@ void WESplitterApp::processMessages()
             if (fDh.getDebugLvl())
                 cout << "CPImport FileName - " << aCpImpFileName << endl;
 
-            aBs << (ByteStream::byte) WE_CLT_SRV_IMPFILENAME;
+            aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_IMPFILENAME;
             aBs << aCpImpFileName;
             fDh.send2Pm(aBs);
         }
@@ -450,8 +450,8 @@ void WESplitterApp::processMessages()
             if (aNoSec < 10) aNoSec++;		//progressively go up to 10Sec interval
 
             aBs.restart();
-            aBs << (ByteStream::byte) WE_CLT_SRV_KEEPALIVE;
-            mutex::scoped_lock aLock(fDh.fSendMutex);
+            aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_KEEPALIVE;
+            boost::mutex::scoped_lock aLock(fDh.fSendMutex);
             fDh.send2Pm(aBs);
             aLock.unlock();
             //fDh.sendHeartbeats();
@@ -633,7 +633,7 @@ int main(int argc, char** argv)
                     errMsgArgs.add(err);
                     aWESplitterApp.fpSysLog->logMsg(errMsgArgs, logging::LOG_TYPE_ERROR, logging::M0000);
                     SPLTR_EXIT_STATUS = 1;
-                    aWESplitterApp.fDh.fLog.logMsg( err, MSGLVL_ERROR );
+                    aWESplitterApp.fDh.fLog.logMsg( err, WriteEngine::MSGLVL_ERROR );
                     aWESplitterApp.fContinue = false;
                     //throw runtime_error(err); BUG 4298
                 }
diff --git a/writeengine/splitter/we_splitterapp.h b/writeengine/splitter/we_splitterapp.h
index 5f9436922..5968914ed 100644
--- a/writeengine/splitter/we_splitterapp.h
+++ b/writeengine/splitter/we_splitterapp.h
@@ -32,15 +32,12 @@
 #include <boost/thread/condition.hpp>
 #include <boost/scoped_array.hpp>
 #include <boost/thread.hpp>
-using namespace boost;
 
 #include "bytestream.h"
-using namespace messageqcpp;
 
 #include "we_cmdargs.h"
 #include "we_sdhandler.h"
 #include "we_simplesyslog.h"
-using namespace WriteEngine;
 
 namespace WriteEngine
 {

From 0f760d34b33f3a76e25dc1ae1f7235bc8fc95114 Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Fri, 26 Apr 2019 09:40:35 -0500
Subject: [PATCH 09/33] remove faulty test code

---
 CMakeLists.txt                                    | 14 +++++++-------
 ddlproc/ddlprocessor.cpp                          |  1 -
 dmlproc/dmlproc.cpp                               |  1 -
 oamapps/columnstoreDB/columnstoreDB.cpp           |  1 -
 oamapps/columnstoreSupport/columnstoreSupport.cpp |  1 -
 oamapps/mcsadmin/mcsadmin.cpp                     |  1 -
 oamapps/postConfigure/getMySQLpw.cpp              |  2 +-
 oamapps/postConfigure/installer.cpp               |  2 +-
 oamapps/postConfigure/mycnfUpgrade.cpp            |  2 +-
 oamapps/postConfigure/postConfigure.cpp           |  2 +-
 oamapps/serverMonitor/serverMonitor.cpp           |  2 +-
 primitives/primproc/primproc.cpp                  |  2 +-
 procmgr/main.cpp                                  |  2 +-
 procmon/main.cpp                                  |  2 +-
 tools/clearShm/main.cpp                           |  3 ++-
 tools/cleartablelock/cleartablelock.cpp           |  2 +-
 tools/configMgt/autoConfigure.cpp                 |  2 +-
 tools/configMgt/autoInstaller.cpp                 |  2 +-
 tools/configMgt/svnQuery.cpp                      |  2 +-
 tools/cplogger/main.cpp                           |  2 +-
 tools/dbbuilder/dbbuilder.cpp                     |  2 +-
 tools/dbloadxml/colxml.cpp                        |  2 +-
 tools/ddlcleanup/ddlcleanup.cpp                   |  2 +-
 tools/editem/editem.cpp                           |  2 +-
 tools/getConfig/main.cpp                          |  2 +-
 tools/idbmeminfo/idbmeminfo.cpp                   |  2 +-
 tools/setConfig/main.cpp                          |  2 +-
 tools/viewtablelock/viewtablelock.cpp             |  2 +-
 versioning/BRM/dbrmctl.cpp                        |  2 +-
 versioning/BRM/load_brm.cpp                       |  2 +-
 versioning/BRM/masternode.cpp                     |  2 +-
 versioning/BRM/reset_locks.cpp                    |  2 +-
 versioning/BRM/rollback.cpp                       |  2 +-
 versioning/BRM/save_brm.cpp                       |  2 +-
 versioning/BRM/slavenode.cpp                      |  2 +-
 35 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be85518bb..d0da43339 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,13 +26,13 @@ MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
 
 OPTION(USE_CCACHE "reduce compile time with ccache." FALSE)
 if(NOT USE_CCACHE)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "")
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "")
-else()
-  find_program(CCACHE_FOUND ccache)
-  if(CCACHE_FOUND)
-      set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-      set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "")
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "")
+else()
+  find_program(CCACHE_FOUND ccache)
+  if(CCACHE_FOUND)
+      set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+      set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
   endif(CCACHE_FOUND)
 endif()
 # Distinguish between community and non-community builds, with the
diff --git a/ddlproc/ddlprocessor.cpp b/ddlproc/ddlprocessor.cpp
index fb283f3a7..45bae8bac 100644
--- a/ddlproc/ddlprocessor.cpp
+++ b/ddlproc/ddlprocessor.cpp
@@ -20,7 +20,6 @@
  *
  *
  ***********************************************************************/
-#include <future> //cxx11test
 #include <map>
 #include <boost/scoped_ptr.hpp>
 using namespace std;
diff --git a/dmlproc/dmlproc.cpp b/dmlproc/dmlproc.cpp
index 7b1041b1e..f7fedbf18 100644
--- a/dmlproc/dmlproc.cpp
+++ b/dmlproc/dmlproc.cpp
@@ -20,7 +20,6 @@
 *
 *
 ***********************************************************************/
-#include <future> //cxx11test
 #include <unistd.h>
 #include <signal.h>
 #include <string>
diff --git a/oamapps/columnstoreDB/columnstoreDB.cpp b/oamapps/columnstoreDB/columnstoreDB.cpp
index 58a7e375f..25c06d140 100644
--- a/oamapps/columnstoreDB/columnstoreDB.cpp
+++ b/oamapps/columnstoreDB/columnstoreDB.cpp
@@ -23,7 +23,6 @@
 /**
  * @file
  */
-#include <future> //cxx11test
 
 #include <iostream>
 #include <fstream>
diff --git a/oamapps/columnstoreSupport/columnstoreSupport.cpp b/oamapps/columnstoreSupport/columnstoreSupport.cpp
index 87adb28f7..ccf7714c4 100644
--- a/oamapps/columnstoreSupport/columnstoreSupport.cpp
+++ b/oamapps/columnstoreSupport/columnstoreSupport.cpp
@@ -10,7 +10,6 @@
 /**
  * @file
  */
-#include <future> //cxx11test
 
 #include <iterator>
 #include <numeric>
diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp
index 6b951133b..d07c67ffb 100644
--- a/oamapps/mcsadmin/mcsadmin.cpp
+++ b/oamapps/mcsadmin/mcsadmin.cpp
@@ -21,7 +21,6 @@
  * $Id: mcsadmin.cpp 3110 2013-06-20 18:09:12Z dhill $
  *
  ******************************************************************************************/
-#include <future> //cxx11test
 
 #include <clocale>
 #include <netdb.h>
diff --git a/oamapps/postConfigure/getMySQLpw.cpp b/oamapps/postConfigure/getMySQLpw.cpp
index 0073175bf..815d1e7e1 100644
--- a/oamapps/postConfigure/getMySQLpw.cpp
+++ b/oamapps/postConfigure/getMySQLpw.cpp
@@ -24,7 +24,7 @@
 /**
  * @file
  */
-#include <future> //cxx11test
+
 
 #include <unistd.h>
 #include <iterator>
diff --git a/oamapps/postConfigure/installer.cpp b/oamapps/postConfigure/installer.cpp
index 075870275..50d9fb9fc 100644
--- a/oamapps/postConfigure/installer.cpp
+++ b/oamapps/postConfigure/installer.cpp
@@ -27,7 +27,7 @@
 /**
  * @file
  */
-#include <future> //cxx11test
+
 
 #include <iterator>
 #include <numeric>
diff --git a/oamapps/postConfigure/mycnfUpgrade.cpp b/oamapps/postConfigure/mycnfUpgrade.cpp
index e42a9b64f..745da6179 100644
--- a/oamapps/postConfigure/mycnfUpgrade.cpp
+++ b/oamapps/postConfigure/mycnfUpgrade.cpp
@@ -25,7 +25,7 @@
 /**
  * @file
  */
-#include <future> //cxx11test
+
 
 #include <unistd.h>
 #include <iterator>
diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp
index a115104e5..ad7d27d7a 100644
--- a/oamapps/postConfigure/postConfigure.cpp
+++ b/oamapps/postConfigure/postConfigure.cpp
@@ -29,7 +29,7 @@
 /**
  * @file
  */
-#include <future> //cxx11test
+
 
 #include <unistd.h>
 #include <iterator>
diff --git a/oamapps/serverMonitor/serverMonitor.cpp b/oamapps/serverMonitor/serverMonitor.cpp
index f9a468569..dc25aa871 100644
--- a/oamapps/serverMonitor/serverMonitor.cpp
+++ b/oamapps/serverMonitor/serverMonitor.cpp
@@ -21,7 +21,7 @@
  *
  *   Author: David Hill
  ***************************************************************************/
-#include <future> //cxx11test
+
 
 #include "serverMonitor.h"
 #include "installdir.h"
diff --git a/primitives/primproc/primproc.cpp b/primitives/primproc/primproc.cpp
index 3df972ac1..3fbd23d45 100644
--- a/primitives/primproc/primproc.cpp
+++ b/primitives/primproc/primproc.cpp
@@ -21,7 +21,7 @@
  *
  *
  ***********************************************************************/
-#include <future> //cxx11test
+
 
 #include <unistd.h>
 #include <string>
diff --git a/procmgr/main.cpp b/procmgr/main.cpp
index 54529ae0a..35f544a75 100644
--- a/procmgr/main.cpp
+++ b/procmgr/main.cpp
@@ -21,7 +21,7 @@
 * $Id: main.cpp 2203 2013-07-08 16:50:51Z bpaul $
 *
 *****************************************************************************************/
-#include <future> //cxx11test
+
 
 
 #include <clocale>
diff --git a/procmon/main.cpp b/procmon/main.cpp
index 37afe274c..41cbebefd 100644
--- a/procmon/main.cpp
+++ b/procmon/main.cpp
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
-#include <future> //cxx11test
+
 
 #include <boost/interprocess/shared_memory_object.hpp>
 #include <boost/interprocess/mapped_region.hpp>
diff --git a/tools/clearShm/main.cpp b/tools/clearShm/main.cpp
index e80a8c79d..4ab97c2d6 100644
--- a/tools/clearShm/main.cpp
+++ b/tools/clearShm/main.cpp
@@ -16,7 +16,7 @@
    MA 02110-1301, USA. */
 
 // $Id: main.cpp 2101 2013-01-21 14:12:52Z rdempsey $
-#include <future> //cxx11test
+
 
 #include "config.h"
 
@@ -30,6 +30,7 @@
 #include <sstream>
 #include <iomanip>
 #include <string>
+#include <mutex>
 using namespace std;
 
 #include <boost/interprocess/shared_memory_object.hpp>
diff --git a/tools/cleartablelock/cleartablelock.cpp b/tools/cleartablelock/cleartablelock.cpp
index cb22cb343..df660ec5d 100644
--- a/tools/cleartablelock/cleartablelock.cpp
+++ b/tools/cleartablelock/cleartablelock.cpp
@@ -18,7 +18,7 @@
 /*
 * $Id: cleartablelock.cpp 2336 2013-06-25 19:11:36Z rdempsey $
 */
-#include <future> //cxx11test
+
 
 #include <cstdlib>
 #include <iostream>
diff --git a/tools/configMgt/autoConfigure.cpp b/tools/configMgt/autoConfigure.cpp
index fbd5d739a..10d7318ee 100644
--- a/tools/configMgt/autoConfigure.cpp
+++ b/tools/configMgt/autoConfigure.cpp
@@ -28,7 +28,7 @@
 /**
  * @file
  */
-#include <future> //cxx11test
+
 
 #include <iterator>
 #include <numeric>
diff --git a/tools/configMgt/autoInstaller.cpp b/tools/configMgt/autoInstaller.cpp
index e3699449e..fa748056d 100644
--- a/tools/configMgt/autoInstaller.cpp
+++ b/tools/configMgt/autoInstaller.cpp
@@ -28,7 +28,7 @@
 /**
  * @file
  */
-#include <future> //cxx11test
+
 
 #include <iostream>
 #include <cstdlib>
diff --git a/tools/configMgt/svnQuery.cpp b/tools/configMgt/svnQuery.cpp
index c1de2c065..05aef02fb 100644
--- a/tools/configMgt/svnQuery.cpp
+++ b/tools/configMgt/svnQuery.cpp
@@ -24,7 +24,7 @@
 /**
  * @file
  */
-#include <future> //cxx11test
+
 
 #include <iterator>
 #include <numeric>
diff --git a/tools/cplogger/main.cpp b/tools/cplogger/main.cpp
index 4d45cd527..4bf673c57 100644
--- a/tools/cplogger/main.cpp
+++ b/tools/cplogger/main.cpp
@@ -16,7 +16,7 @@
    MA 02110-1301, USA. */
 
 // $Id: main.cpp 2336 2013-06-25 19:11:36Z rdempsey $
-#include <future> //cxx11test
+
 #include <unistd.h>
 #include <cstdio>
 #include <iostream>
diff --git a/tools/dbbuilder/dbbuilder.cpp b/tools/dbbuilder/dbbuilder.cpp
index 6f62eeb0a..31e33c7df 100644
--- a/tools/dbbuilder/dbbuilder.cpp
+++ b/tools/dbbuilder/dbbuilder.cpp
@@ -19,7 +19,7 @@
 * $Id: dbbuilder.cpp 2101 2013-01-21 14:12:52Z rdempsey $
 *
 *******************************************************************************/
-#include <future> //cxx11test
+
 #include <stdio.h>
 #include <unistd.h>
 #include <cerrno>
diff --git a/tools/dbloadxml/colxml.cpp b/tools/dbloadxml/colxml.cpp
index 4e359c599..87ef4b1a8 100644
--- a/tools/dbloadxml/colxml.cpp
+++ b/tools/dbloadxml/colxml.cpp
@@ -19,7 +19,7 @@
  * $Id: colxml.cpp 2237 2013-05-05 23:42:37Z dcathey $
  *
  ******************************************************************************/
-#include <future> //cxx11test
+
 
 #include <clocale>
 
diff --git a/tools/ddlcleanup/ddlcleanup.cpp b/tools/ddlcleanup/ddlcleanup.cpp
index 9924f91be..14e6334a2 100644
--- a/tools/ddlcleanup/ddlcleanup.cpp
+++ b/tools/ddlcleanup/ddlcleanup.cpp
@@ -18,7 +18,7 @@
 /*
 * $Id: ddlcleanup.cpp 967 2009-10-15 13:57:29Z rdempsey $
 */
-#include <future> //cxx11test
+
 
 #include <iostream>
 #include <fstream>
diff --git a/tools/editem/editem.cpp b/tools/editem/editem.cpp
index 81c34c407..15d4d2a5f 100644
--- a/tools/editem/editem.cpp
+++ b/tools/editem/editem.cpp
@@ -18,7 +18,7 @@
 /*
 * $Id: editem.cpp 2336 2013-06-25 19:11:36Z rdempsey $
 */
-#include <future> //cxx11test
+
 
 #include <iostream>
 #include <vector>
diff --git a/tools/getConfig/main.cpp b/tools/getConfig/main.cpp
index e895f603b..8c8171840 100644
--- a/tools/getConfig/main.cpp
+++ b/tools/getConfig/main.cpp
@@ -19,7 +19,7 @@
 * $Id: main.cpp 2101 2013-01-21 14:12:52Z rdempsey $
 *
 *****************************************************************************/
-#include <future> //cxx11test
+
 #include <iostream>
 #include <cassert>
 #include <unistd.h>
diff --git a/tools/idbmeminfo/idbmeminfo.cpp b/tools/idbmeminfo/idbmeminfo.cpp
index 4c84403a3..800385f61 100644
--- a/tools/idbmeminfo/idbmeminfo.cpp
+++ b/tools/idbmeminfo/idbmeminfo.cpp
@@ -14,7 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
-#include <future> //cxx11test
+
 
 #ifdef _MSC_VER
 #define WIN32_LEAN_AND_MEAN
diff --git a/tools/setConfig/main.cpp b/tools/setConfig/main.cpp
index fb66c9bc7..fa9cdc7ad 100644
--- a/tools/setConfig/main.cpp
+++ b/tools/setConfig/main.cpp
@@ -19,7 +19,7 @@
 * $Id: main.cpp 210 2007-06-08 17:08:26Z rdempsey $
 *
 *****************************************************************************/
-#include <future> //cxx11test
+
 #include <unistd.h>
 #include <iostream>
 #include <cassert>
diff --git a/tools/viewtablelock/viewtablelock.cpp b/tools/viewtablelock/viewtablelock.cpp
index 6d163e3e5..142c1ba8a 100644
--- a/tools/viewtablelock/viewtablelock.cpp
+++ b/tools/viewtablelock/viewtablelock.cpp
@@ -18,7 +18,7 @@
 /*
 * $Id: viewtablelock.cpp 2101 2013-01-21 14:12:52Z rdempsey $
 */
-#include <future> //cxx11test
+
 
 #include <ctime>
 #include <iostream>
diff --git a/versioning/BRM/dbrmctl.cpp b/versioning/BRM/dbrmctl.cpp
index 45bf68f36..f3942bc49 100644
--- a/versioning/BRM/dbrmctl.cpp
+++ b/versioning/BRM/dbrmctl.cpp
@@ -19,7 +19,7 @@
  * $Id: dbrmctl.cpp 1823 2013-01-21 14:13:09Z rdempsey $
  *
  ****************************************************************************/
-#include <future> //cxx11test
+
 
 #include <unistd.h>
 #include <iostream>
diff --git a/versioning/BRM/load_brm.cpp b/versioning/BRM/load_brm.cpp
index 871a51122..6eaebd2af 100644
--- a/versioning/BRM/load_brm.cpp
+++ b/versioning/BRM/load_brm.cpp
@@ -19,7 +19,7 @@
  * $Id: load_brm.cpp 1905 2013-06-14 18:42:28Z rdempsey $
  *
  ****************************************************************************/
-#include <future> //cxx11test
+
 #include <unistd.h>
 #include <iostream>
 #include <string>
diff --git a/versioning/BRM/masternode.cpp b/versioning/BRM/masternode.cpp
index ea4832dae..a43c41479 100644
--- a/versioning/BRM/masternode.cpp
+++ b/versioning/BRM/masternode.cpp
@@ -23,7 +23,7 @@
 /*
  * The executable source that runs a Master DBRM Node.
  */
-#include <future> //cxx11test
+
 
 #include "masterdbrmnode.h"
 #include "liboamcpp.h"
diff --git a/versioning/BRM/reset_locks.cpp b/versioning/BRM/reset_locks.cpp
index 47237aafa..390942ca3 100644
--- a/versioning/BRM/reset_locks.cpp
+++ b/versioning/BRM/reset_locks.cpp
@@ -17,7 +17,7 @@
 
 // $Id: reset_locks.cpp 1823 2013-01-21 14:13:09Z rdempsey $
 //
-#include <future> //cxx11test
+
 
 #include <unistd.h>
 #include <iostream>
diff --git a/versioning/BRM/rollback.cpp b/versioning/BRM/rollback.cpp
index 509635248..2db4720e0 100644
--- a/versioning/BRM/rollback.cpp
+++ b/versioning/BRM/rollback.cpp
@@ -28,7 +28,7 @@
  * 		rollback -p   (to get the transaction(s) that need to be rolled back)
  * 		rollback -r transID  	(for each one to roll them back)
  */
-#include <future> //cxx11test
+
 
 #include "dbrm.h"
 
diff --git a/versioning/BRM/save_brm.cpp b/versioning/BRM/save_brm.cpp
index 6993fd8fb..5eef1a9bf 100644
--- a/versioning/BRM/save_brm.cpp
+++ b/versioning/BRM/save_brm.cpp
@@ -25,7 +25,7 @@
  *
  * More detailed description
  */
-#include <future> //cxx11test
+
 
 #include <unistd.h>
 #include <iostream>
diff --git a/versioning/BRM/slavenode.cpp b/versioning/BRM/slavenode.cpp
index 26701504a..7c0bf2638 100644
--- a/versioning/BRM/slavenode.cpp
+++ b/versioning/BRM/slavenode.cpp
@@ -19,7 +19,7 @@
  * $Id: slavenode.cpp 1931 2013-07-08 16:53:02Z bpaul $
  *
  ****************************************************************************/
-#include <future> //cxx11test
+
 
 #include <iostream>
 #include <signal.h>

From a9be1f0baa3caf41b5b925f353298ae2ee394064 Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Sun, 28 Apr 2019 16:56:55 -0500
Subject: [PATCH 10/33] Add a few missing qualifiers

---
 dbcon/joblist/subquerystep.h                           |  4 ++--
 dbcon/joblist/tupleaggregatestep.h                     |  2 +-
 dbcon/joblist/windowfunctionstep.h                     | 10 +++++-----
 primitives/primproc/primitiveserver.h                  |  2 +-
 .../redistribute/we_redistributecontrolthread.h        |  2 +-
 writeengine/splitter/we_xmlgetter.h                    | 10 +++++-----
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/dbcon/joblist/subquerystep.h b/dbcon/joblist/subquerystep.h
index d69863df5..e7c479ba2 100644
--- a/dbcon/joblist/subquerystep.h
+++ b/dbcon/joblist/subquerystep.h
@@ -227,11 +227,11 @@ public:
 
     /** @brief add function columns (returned columns)
      */
-    void addExpression(const vector<execplan::SRCP>&);
+    void addExpression(const std::vector<execplan::SRCP>&);
 
     /** @brief add function join expresssion
      */
-    void addFcnJoinExp(const vector<execplan::SRCP>&);
+    void addFcnJoinExp(const std::vector<execplan::SRCP>&);
 
 
 protected:
diff --git a/dbcon/joblist/tupleaggregatestep.h b/dbcon/joblist/tupleaggregatestep.h
index ae356e156..f137daf6f 100644
--- a/dbcon/joblist/tupleaggregatestep.h
+++ b/dbcon/joblist/tupleaggregatestep.h
@@ -199,7 +199,7 @@ private:
     std::vector<rowgroup::RGData > fRowGroupDatas;
     std::vector<rowgroup::SP_ROWAGG_UM_t> fAggregators;
     std::vector<rowgroup::RowGroup> fRowGroupIns;
-    vector<rowgroup::RowGroup> fRowGroupOuts;
+    std::vector<rowgroup::RowGroup> fRowGroupOuts;
     std::vector<std::vector<rowgroup::RGData> > fRowGroupsDeliveredData;
     bool fIsMultiThread;
     int fInputIter; // iterator
diff --git a/dbcon/joblist/windowfunctionstep.h b/dbcon/joblist/windowfunctionstep.h
index f483c6027..b57d06324 100644
--- a/dbcon/joblist/windowfunctionstep.h
+++ b/dbcon/joblist/windowfunctionstep.h
@@ -134,15 +134,15 @@ private:
     uint64_t nextFunctionIndex();
 
     boost::shared_ptr<windowfunction::FrameBound> parseFrameBound(const execplan::WF_Boundary&,
-            const map<uint64_t, uint64_t>&, const vector<execplan::SRCP>&,
+            const std::map<uint64_t, uint64_t>&, const std::vector<execplan::SRCP>&,
             const boost::shared_ptr<ordering::EqualCompData>&, JobInfo&, bool, bool);
     boost::shared_ptr<windowfunction::FrameBound> parseFrameBoundRows(
-        const execplan::WF_Boundary&, const map<uint64_t, uint64_t>&, JobInfo&);
+        const execplan::WF_Boundary&, const std::map<uint64_t, uint64_t>&, JobInfo&);
     boost::shared_ptr<windowfunction::FrameBound> parseFrameBoundRange(
-        const execplan::WF_Boundary&, const map<uint64_t, uint64_t>&, const vector<execplan::SRCP>&,
+        const execplan::WF_Boundary&, const std::map<uint64_t, uint64_t>&, const std::vector<execplan::SRCP>&,
         JobInfo&);
-    void updateWindowCols(execplan::ParseTree*, const map<uint64_t, uint64_t>&, JobInfo&);
-    void updateWindowCols(execplan::ReturnedColumn*, const map<uint64_t, uint64_t>&, JobInfo&);
+    void updateWindowCols(execplan::ParseTree*, const std::map<uint64_t, uint64_t>&, JobInfo&);
+    void updateWindowCols(execplan::ReturnedColumn*, const std::map<uint64_t, uint64_t>&, JobInfo&);
     void sort(std::vector<joblist::RowPosition>::iterator, uint64_t);
 
     void formatMiniStats();
diff --git a/primitives/primproc/primitiveserver.h b/primitives/primproc/primitiveserver.h
index d50edb3be..f212fd9fd 100644
--- a/primitives/primproc/primitiveserver.h
+++ b/primitives/primproc/primitiveserver.h
@@ -58,7 +58,7 @@ extern boost::mutex bppLock;
 extern uint32_t highPriorityThreads, medPriorityThreads, lowPriorityThreads;
 
 #ifdef PRIMPROC_STOPWATCH
-extern map<pthread_t, logging::StopWatch*> stopwatchMap;
+extern std::map<pthread_t, logging::StopWatch*> stopwatchMap;
 extern pthread_mutex_t stopwatchMapMutex;
 extern bool stopwatchThreadCreated;
 
diff --git a/writeengine/redistribute/we_redistributecontrolthread.h b/writeengine/redistribute/we_redistributecontrolthread.h
index 21b47b7da..9b28fe9d7 100644
--- a/writeengine/redistribute/we_redistributecontrolthread.h
+++ b/writeengine/redistribute/we_redistributecontrolthread.h
@@ -102,7 +102,7 @@ private:
     int  executeRedistributePlan();
 
     int  connectToWes(int);
-    void dumpPlanToFile(uint64_t, vector<PartitionInfo>&, int);
+    void dumpPlanToFile(uint64_t, std::vector<PartitionInfo>&, int);
     void displayPlan();
 
     uint32_t                      fAction;
diff --git a/writeengine/splitter/we_xmlgetter.h b/writeengine/splitter/we_xmlgetter.h
index 4f6e3dfbc..935cd4d27 100644
--- a/writeengine/splitter/we_xmlgetter.h
+++ b/writeengine/splitter/we_xmlgetter.h
@@ -43,15 +43,15 @@ public:
 
 public:
     //..Public methods
-    std::string getValue(const vector<string>& section) const;
-    std::string getAttribute(const std::vector<string>& sections,
+    std::string getValue(const std::vector<std::string>& section) const;
+    std::string getAttribute(const std::vector<std::string>& sections,
                              const std::string& Tag) const;
     void getConfig(const std::string& section,
                    const std::string& name, std::vector<std::string>& values ) const;
     void getAttributeListForAllChildren(
-        const vector<string>& sections,
-        const string& attributeTag,
-        vector<string>& attributeValues);
+        const std::vector<std::string>& sections,
+        const std::string& attributeTag,
+      std::vector<std::string>& attributeValues);
 
 private:
     //..Private methods

From 121aa1debb56594849b4c27f420b357f07ce8418 Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Sun, 28 Apr 2019 21:26:20 -0500
Subject: [PATCH 11/33] break compile dependecy on ALARMManager.h

---
 utils/rowgroup/rowaggregation.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/utils/rowgroup/rowaggregation.cpp b/utils/rowgroup/rowaggregation.cpp
index 0be02629a..53cb0c866 100644
--- a/utils/rowgroup/rowaggregation.cpp
+++ b/utils/rowgroup/rowaggregation.cpp
@@ -47,7 +47,7 @@
 #include "funcexp.h"
 #include "rowaggregation.h"
 #include "calpontsystemcatalog.h"
-#include "utils_utf8.h"
+//#include "utils_utf8.h"
 
 //..comment out NDEBUG to enable assertions, uncomment NDEBUG to disable
 //#define NDEBUG
@@ -57,6 +57,15 @@ using namespace std;
 using namespace boost;
 using namespace dataconvert;
 
+namespace funcexp
+{
+  namespace utf8
+  {
+    int idb_strcoll(const char*, const char*);
+  }
+}
+
+
 // inlines of RowAggregation that used only in this file
 namespace
 {
@@ -380,6 +389,7 @@ inline void RowAggregation::updateFloatMinMax(float val1, float val2, int64_t co
 }
 
 
+
 #define STRCOLL_ENH__
 
 void RowAggregation::updateStringMinMax(string val1, string val2, int64_t col, int func)

From 4b9d046c6e338d6fe63a8a960d9df62b6efb68f7 Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Fri, 26 Apr 2019 08:21:47 -0500
Subject: [PATCH 12/33] Fully resolve potentially ambiguous symbols by removing
 using namespace statements from headers which have a cascading effect. This
 causes potential behavior changes when switching to c++11 since symbols can
 be exported from std and boost while both have been imported into the global
 namespace.

---
 .gitignore                                    |   1 +
 CMakeLists.txt                                |  11 +
 dbcon/execplan/predicateoperator.h            |   2 +-
 dbcon/execplan/treenode.h                     |   9 +-
 dbcon/execplan/udafcolumn.h                   |   5 +-
 dbcon/joblist/crossenginestep.cpp             |  26 +-
 dbcon/joblist/crossenginestep.h               |  18 +-
 dbcon/joblist/jlf_execplantojoblist.cpp       |   2 +-
 dbcon/joblist/jlf_execplantojoblist.h         |   4 +-
 dbcon/joblist/joblistfactory.cpp              |   3 +-
 dbcon/joblist/jobstep.cpp                     |   2 +-
 dbcon/joblist/jobstep.h                       |   4 +-
 dbcon/mysql/ha_calpont_execplan.cpp           |  11 +-
 dbcon/mysql/ha_calpont_impl.cpp               |   2 +-
 dbcon/mysql/ha_mcs_client_udfs.cpp            |  42 +-
 ddlproc/ddlprocessor.cpp                      |   2 +-
 dmlproc/dmlproc.cpp                           |   4 +-
 exemgr/CMakeLists.txt                         |   4 +-
 exemgr/main.cpp                               | 542 +++++++++---------
 oamapps/columnstoreDB/columnstoreDB.cpp       |   1 +
 .../columnstoreSupport/columnstoreSupport.cpp |   1 +
 oamapps/mcsadmin/mcsadmin.cpp                 |   1 +
 oamapps/postConfigure/getMySQLpw.cpp          |   1 +
 oamapps/postConfigure/helpers.cpp             |  26 +-
 oamapps/postConfigure/helpers.h               |   4 +-
 oamapps/postConfigure/installer.cpp           |   1 +
 oamapps/postConfigure/mycnfUpgrade.cpp        |   1 +
 oamapps/postConfigure/postConfigure.cpp       |   1 +
 oamapps/serverMonitor/serverMonitor.cpp       |   1 +
 primitives/primproc/dictstep.h                |   2 +-
 primitives/primproc/primproc.cpp              |   2 +
 primitives/primproc/umsocketselector.cpp      |   8 +-
 primitives/primproc/umsocketselector.h        |  12 +-
 procmgr/main.cpp                              |   1 +
 procmon/main.cpp                              |   1 +
 tools/clearShm/main.cpp                       |   7 +-
 tools/cleartablelock/cleartablelock.cpp       |   1 +
 tools/configMgt/autoConfigure.cpp             |   1 +
 tools/configMgt/autoInstaller.cpp             |   1 +
 tools/configMgt/svnQuery.cpp                  |   1 +
 tools/cplogger/main.cpp                       |   1 +
 tools/dbbuilder/dbbuilder.cpp                 |   1 +
 tools/dbloadxml/colxml.cpp                    |   1 +
 tools/ddlcleanup/ddlcleanup.cpp               |   1 +
 tools/editem/editem.cpp                       |   1 +
 tools/getConfig/main.cpp                      |   1 +
 tools/idbmeminfo/idbmeminfo.cpp               |   1 +
 tools/setConfig/main.cpp                      |   1 +
 tools/viewtablelock/viewtablelock.cpp         |   1 +
 utils/funcexp/func_date.cpp                   |   6 +-
 utils/funcexp/func_day.cpp                    |   6 +-
 utils/funcexp/func_dayname.cpp                |   6 +-
 utils/funcexp/func_dayofweek.cpp              |   6 +-
 utils/funcexp/func_dayofyear.cpp              |   6 +-
 utils/funcexp/func_month.cpp                  |   6 +-
 utils/funcexp/func_monthname.cpp              |   6 +-
 utils/funcexp/func_quarter.cpp                |   6 +-
 utils/funcexp/func_to_days.cpp                |   6 +-
 utils/funcexp/func_week.cpp                   |   6 +-
 utils/funcexp/func_weekday.cpp                |   6 +-
 utils/funcexp/func_year.cpp                   |   6 +-
 utils/funcexp/func_yearweek.cpp               |   6 +-
 utils/funcexp/functor.h                       |   3 +-
 utils/funcexp/functor_str.h                   |   8 +-
 utils/funcexp/utils_utf8.h                    |  15 +-
 utils/regr/corr.cpp                           |   2 +-
 utils/regr/corr.h                             |   1 -
 utils/regr/covar_pop.cpp                      |   2 +-
 utils/regr/covar_pop.h                        |   1 -
 utils/regr/covar_samp.cpp                     |   2 +-
 utils/regr/covar_samp.h                       |   1 -
 utils/regr/regr_avgx.cpp                      |   2 +-
 utils/regr/regr_avgx.h                        |   1 -
 utils/regr/regr_avgy.cpp                      |   2 +-
 utils/regr/regr_avgy.h                        |   1 -
 utils/regr/regr_count.cpp                     |   2 +-
 utils/regr/regr_count.h                       |   1 -
 utils/regr/regr_intercept.cpp                 |   2 +-
 utils/regr/regr_intercept.h                   |   1 -
 utils/regr/regr_r2.cpp                        |   2 +-
 utils/regr/regr_r2.h                          |   1 -
 utils/regr/regr_slope.cpp                     |   2 +-
 utils/regr/regr_slope.h                       |   1 -
 utils/regr/regr_sxx.cpp                       |   2 +-
 utils/regr/regr_sxx.h                         |   1 -
 utils/regr/regr_sxy.cpp                       |   2 +-
 utils/regr/regr_sxy.h                         |   1 -
 utils/regr/regr_syy.cpp                       |   2 +-
 utils/regr/regr_syy.h                         |   1 -
 utils/rowgroup/rowaggregation.cpp             |   8 +-
 utils/rowgroup/rowaggregation.h               |   4 +-
 utils/rowgroup/rowgroup.h                     |   3 +-
 utils/threadpool/prioritythreadpool.cpp       |   2 +-
 utils/udfsdk/allnull.cpp                      |   2 +-
 utils/udfsdk/allnull.h                        |   1 -
 utils/udfsdk/avg_mode.cpp                     |   2 +-
 utils/udfsdk/avg_mode.h                       |   1 -
 utils/udfsdk/avgx.cpp                         |   2 +-
 utils/udfsdk/avgx.h                           |   1 -
 utils/udfsdk/distinct_count.cpp               |   3 +-
 utils/udfsdk/distinct_count.h                 |   1 -
 utils/udfsdk/mcsv1_udaf.cpp                   |  56 +-
 utils/udfsdk/mcsv1_udaf.h                     |  42 +-
 utils/udfsdk/median.h                         |   1 -
 utils/udfsdk/ssq.cpp                          |   2 +-
 utils/udfsdk/ssq.h                            |   1 -
 utils/windowfunction/windowfunctiontype.h     |   6 +-
 versioning/BRM/dbrmctl.cpp                    |   1 +
 versioning/BRM/load_brm.cpp                   |   1 +
 versioning/BRM/masternode.cpp                 |   1 +
 versioning/BRM/reset_locks.cpp                |   2 +
 versioning/BRM/rollback.cpp                   |   1 +
 versioning/BRM/save_brm.cpp                   |   1 +
 versioning/BRM/slavenode.cpp                  |   1 +
 writeengine/bulk/we_brmreporter.cpp           |   2 +-
 writeengine/bulk/we_brmreporter.h             |   3 +-
 writeengine/bulk/we_bulkload.cpp              |   2 +-
 writeengine/bulk/we_tableinfo.cpp             |  16 +-
 writeengine/server/we_brmrprtparser.h         |   2 -
 writeengine/server/we_dataloader.h            |   6 +-
 writeengine/server/we_ddlcommon.h             |  70 ++-
 writeengine/server/we_observer.h              |   1 -
 writeengine/server/we_readthread.cpp          |   4 +-
 writeengine/server/we_readthread.h            |   3 +-
 writeengine/splitter/we_brmupdater.cpp        |  10 +-
 writeengine/splitter/we_brmupdater.h          |   2 +-
 writeengine/splitter/we_sdhandler.h           |   4 +-
 writeengine/splitter/we_splclient.cpp         |   2 +-
 writeengine/splitter/we_splclient.h           |   8 +-
 writeengine/splitter/we_splitterapp.cpp       |  28 +-
 writeengine/splitter/we_splitterapp.h         |   3 -
 131 files changed, 600 insertions(+), 630 deletions(-)

diff --git a/.gitignore b/.gitignore
index 93be85e28..73a91cbd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,3 +108,4 @@ columnstoreversion.h
 .idea/
 .build
 /.vs
+/CMakeSettings.json
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42a50a221..be85518bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,17 @@ ENDIF()
 
 MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
 
+OPTION(USE_CCACHE "reduce compile time with ccache." FALSE)
+if(NOT USE_CCACHE)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "")
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "")
+else()
+  find_program(CCACHE_FOUND ccache)
+  if(CCACHE_FOUND)
+      set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+      set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+  endif(CCACHE_FOUND)
+endif()
 # Distinguish between community and non-community builds, with the
 # default being a community build. This does not impact the feature
 # set that will be compiled in; it's merely provided as a hint to
diff --git a/dbcon/execplan/predicateoperator.h b/dbcon/execplan/predicateoperator.h
index 08f0c40cf..66a12ec32 100644
--- a/dbcon/execplan/predicateoperator.h
+++ b/dbcon/execplan/predicateoperator.h
@@ -295,7 +295,7 @@ inline bool PredicateOperator::getBoolVal(rowgroup::Row& row, bool& isNull, Retu
                 // we won't want to just multiply by scale, as it may move
                 // significant digits out of scope. So we break them apart
                 // and compare each separately 
-                int64_t scale = max(lop->resultType().scale, rop->resultType().scale);
+                int64_t scale = std::max(lop->resultType().scale, rop->resultType().scale);
                 if (scale)
                 {
                     long double intpart1;
diff --git a/dbcon/execplan/treenode.h b/dbcon/execplan/treenode.h
index 106b40d37..9fea74984 100644
--- a/dbcon/execplan/treenode.h
+++ b/dbcon/execplan/treenode.h
@@ -41,9 +41,6 @@
 #include "exceptclasses.h"
 #include "dataconvert.h"
 
-// Workaround for my_global.h #define of isnan(X) causing a std::std namespace
-using namespace std;
-
 namespace messageqcpp
 {
 class ByteStream;
@@ -608,7 +605,7 @@ inline const std::string& TreeNode::getStrVal()
                 int exponent  = (int)floor(log10( fabs(fResult.floatVal)));  // This will round down the exponent
                 double base   = fResult.floatVal * pow(10, -1.0 * exponent);
 
-                if (isnan(exponent) || std::isnan(base))
+                if (std::isnan(exponent) || std::isnan(base))
                 {
                     snprintf(tmp, 312, "%f", fResult.floatVal);
                     fResult.strVal = removeTrailing0(tmp, 312);
@@ -643,7 +640,7 @@ inline const std::string& TreeNode::getStrVal()
                 int exponent  = (int)floor(log10( fabs(fResult.doubleVal)));  // This will round down the exponent
                 double base   = fResult.doubleVal * pow(10, -1.0 * exponent);
 
-                if (isnan(exponent) || std::isnan(base))
+                if (std::isnan(exponent) || std::isnan(base))
                 {
                     snprintf(tmp, 312, "%f", fResult.doubleVal);
                     fResult.strVal = removeTrailing0(tmp, 312);
@@ -677,7 +674,7 @@ inline const std::string& TreeNode::getStrVal()
                 int exponent  = (int)floorl(log10( fabsl(fResult.longDoubleVal)));  // This will round down the exponent
                 long double base   = fResult.longDoubleVal * pow(10, -1.0 * exponent);
 
-                if (isnan(exponent) || isnan(base))
+                if (std::isnan(exponent) || std::isnan(base))
                 {
                     snprintf(tmp, 312, "%Lf", fResult.longDoubleVal);
                     fResult.strVal = removeTrailing0(tmp, 312);
diff --git a/dbcon/execplan/udafcolumn.h b/dbcon/execplan/udafcolumn.h
index 4263a9445..3486740ca 100644
--- a/dbcon/execplan/udafcolumn.h
+++ b/dbcon/execplan/udafcolumn.h
@@ -30,7 +30,6 @@ namespace messageqcpp
 class ByteStream;
 }
 
-using namespace mcsv1sdk;
 /**
  * Namespace
  */
@@ -78,7 +77,7 @@ public:
     /**
      * Accessors and Mutators
      */
-    mcsv1Context& getContext()
+    mcsv1sdk::mcsv1Context& getContext()
     {
         return context;
     }
@@ -122,7 +121,7 @@ public:
     virtual bool operator!=(const UDAFColumn& t) const;
 
 private:
-    mcsv1Context context;
+    mcsv1sdk::mcsv1Context context;
 };
 
 /**
diff --git a/dbcon/joblist/crossenginestep.cpp b/dbcon/joblist/crossenginestep.cpp
index d3cef7928..e9b573713 100644
--- a/dbcon/joblist/crossenginestep.cpp
+++ b/dbcon/joblist/crossenginestep.cpp
@@ -63,9 +63,9 @@ namespace joblist
 {
 
 CrossEngineStep::CrossEngineStep(
-    const string& schema,
-    const string& table,
-    const string& alias,
+    const std::string& schema,
+    const std::string& table,
+    const std::string& alias,
     const JobInfo& jobInfo) :
     BatchPrimitive(jobInfo),
     fRowsRetrieved(0),
@@ -113,7 +113,7 @@ bool CrossEngineStep::deliverStringTableRowGroup() const
 }
 
 
-void CrossEngineStep::addFcnJoinExp(const vector<execplan::SRCP>& fe)
+void CrossEngineStep::addFcnJoinExp(const std::vector<execplan::SRCP>& fe)
 {
     fFeFcnJoin = fe;
 }
@@ -131,7 +131,7 @@ void CrossEngineStep::setFE1Input(const rowgroup::RowGroup& rg)
 }
 
 
-void CrossEngineStep::setFcnExpGroup3(const vector<execplan::SRCP>& fe)
+void CrossEngineStep::setFcnExpGroup3(const std::vector<execplan::SRCP>& fe)
 {
     fFeSelects = fe;
 }
@@ -336,7 +336,7 @@ int64_t CrossEngineStep::convertValueNum(
         case CalpontSystemCatalog::TEXT:
         case CalpontSystemCatalog::CLOB:
         {
-            string i = boost::any_cast<string>(anyVal);
+            std::string i = boost::any_cast<std::string>(anyVal);
             // bug 1932, pad nulls up to the size of v
             i.resize(sizeof(rv), 0);
             rv = *((uint64_t*) i.data());
@@ -435,7 +435,7 @@ void CrossEngineStep::execute()
         if (ret != 0)
             mysql->handleMySqlError(mysql->getError().c_str(), ret);
 
-        string query(makeQuery());
+        std::string query(makeQuery());
         fLogger->logMessage(logging::LOG_TYPE_INFO, "QUERY to foreign engine: " + query);
 
         if (traceOn())
@@ -651,7 +651,7 @@ void CrossEngineStep::setBPP(JobStep* jobStep)
     pDictionaryStep* pds = NULL;
     pDictionaryScan* pdss = NULL;
     FilterStep* fs = NULL;
-    string bop = " AND ";
+    std::string bop = " AND ";
 
     if (pcs != 0)
     {
@@ -690,12 +690,12 @@ void CrossEngineStep::setBPP(JobStep* jobStep)
     }
 }
 
-void CrossEngineStep::addFilterStr(const vector<const Filter*>& f, const string& bop)
+void CrossEngineStep::addFilterStr(const std::vector<const Filter*>& f, const std::string& bop)
 {
     if (f.size() == 0)
         return;
 
-    string filterStr;
+    std::string filterStr;
 
     for (uint64_t i = 0; i < f.size(); i++)
     {
@@ -731,7 +731,7 @@ void CrossEngineStep::setProjectBPP(JobStep* jobStep1, JobStep*)
 }
 
 
-string CrossEngineStep::makeQuery()
+std::string CrossEngineStep::makeQuery()
 {
     ostringstream oss;
     oss << fSelectClause << " FROM " << fTable;
@@ -742,7 +742,7 @@ string CrossEngineStep::makeQuery()
     if (!fWhereClause.empty())
         oss << fWhereClause;
 
-    // the string must consist of a single SQL statement without a terminating semicolon ; or \g.
+    // the std::string must consist of a single SQL statement without a terminating semicolon ; or \g.
     // oss << ";";
     return oss.str();
 }
@@ -832,7 +832,7 @@ uint32_t CrossEngineStep::nextBand(messageqcpp::ByteStream& bs)
 }
 
 
-const string CrossEngineStep::toString() const
+const std::string CrossEngineStep::toString() const
 {
     ostringstream oss;
     oss << "CrossEngineStep ses:" << fSessionId << " txn:" << fTxnId << " st:" << fStepId;
diff --git a/dbcon/joblist/crossenginestep.h b/dbcon/joblist/crossenginestep.h
index 4ebf2ac9d..2e9cc79f0 100644
--- a/dbcon/joblist/crossenginestep.h
+++ b/dbcon/joblist/crossenginestep.h
@@ -30,8 +30,6 @@
 #include "primitivestep.h"
 #include "threadnaming.h"
 
-using namespace std;
-
 // forward reference
 namespace utils
 {
@@ -60,9 +58,9 @@ public:
     /** @brief CrossEngineStep constructor
      */
     CrossEngineStep(
-        const string& schema,
-        const string& table,
-        const string& alias,
+        const std::string& schema,
+        const std::string& table,
+        const std::string& alias,
         const JobInfo& jobInfo);
 
     /** @brief CrossEngineStep destructor
@@ -124,15 +122,15 @@ public:
     {
         return fRowsReturned;
     }
-    const string& schemaName() const
+    const std::string& schemaName() const
     {
         return fSchema;
     }
-    const string& tableName() const
+    const std::string& tableName() const
     {
         return fTable;
     }
-    const string& tableAlias() const
+    const std::string& tableAlias() const
     {
         return fAlias;
     }
@@ -149,10 +147,10 @@ public:
     bool  deliverStringTableRowGroup() const;
     uint32_t nextBand(messageqcpp::ByteStream& bs);
 
-    void addFcnJoinExp(const vector<execplan::SRCP>&);
+    void addFcnJoinExp(const std::vector<execplan::SRCP>&);
     void addFcnExpGroup1(const boost::shared_ptr<execplan::ParseTree>&);
     void setFE1Input(const rowgroup::RowGroup&);
-    void setFcnExpGroup3(const vector<execplan::SRCP>&);
+    void setFcnExpGroup3(const std::vector<execplan::SRCP>&);
     void setFE23Output(const rowgroup::RowGroup&);
 
     void addFilter(JobStep* jobStep);
diff --git a/dbcon/joblist/jlf_execplantojoblist.cpp b/dbcon/joblist/jlf_execplantojoblist.cpp
index fff1b12fb..7bbb8a136 100644
--- a/dbcon/joblist/jlf_execplantojoblist.cpp
+++ b/dbcon/joblist/jlf_execplantojoblist.cpp
@@ -3373,7 +3373,7 @@ namespace joblist
 // conversion performed by the functions in this file.
 // @bug6131, pre-order traversing
 /* static */ void
-JLF_ExecPlanToJobList::walkTree(ParseTree* n, JobInfo& jobInfo)
+JLF_ExecPlanToJobList::walkTree(execplan::ParseTree* n, JobInfo& jobInfo)
 {
     TreeNode* tn = n->data();
     JobStepVector jsv;
diff --git a/dbcon/joblist/jlf_execplantojoblist.h b/dbcon/joblist/jlf_execplantojoblist.h
index 0232e87a3..6f9fb5daf 100644
--- a/dbcon/joblist/jlf_execplantojoblist.h
+++ b/dbcon/joblist/jlf_execplantojoblist.h
@@ -30,7 +30,7 @@
 #include "calpontexecutionplan.h"
 #include "calpontselectexecutionplan.h"
 #include "calpontsystemcatalog.h"
-using namespace execplan;
+
 
 #include "jlf_common.h"
 
@@ -50,7 +50,7 @@ public:
      * @param ParseTree (in) is CEP to be translated to a joblist
      * @param JobInfo&  (in/out) is the JobInfo reference that is loaded
      */
-    static void walkTree(ParseTree* n, JobInfo& jobInfo);
+    static void walkTree(execplan::ParseTree* n, JobInfo& jobInfo);
 
     /** @brief This function add new job steps to the job step vector in JobInfo
      *
diff --git a/dbcon/joblist/joblistfactory.cpp b/dbcon/joblist/joblistfactory.cpp
index b0c314364..788cf5cc9 100644
--- a/dbcon/joblist/joblistfactory.cpp
+++ b/dbcon/joblist/joblistfactory.cpp
@@ -88,6 +88,7 @@ using namespace logging;
 #include "rowgroup.h"
 using namespace rowgroup;
 
+#include "mcsv1_udaf.h"
 
 namespace
 {
@@ -709,7 +710,7 @@ void updateAggregateColType(AggregateColumn* ac, const SRCP& srcp, int op, JobIn
 
         if (udafc)
         {
-            mcsv1Context& udafContext = udafc->getContext();
+            mcsv1sdk::mcsv1Context& udafContext = udafc->getContext();
             ct.colDataType = udafContext.getResultType();
             ct.colWidth = udafContext.getColWidth();
             ct.scale = udafContext.getScale();
diff --git a/dbcon/joblist/jobstep.cpp b/dbcon/joblist/jobstep.cpp
index f5419558d..8e90bd2a6 100644
--- a/dbcon/joblist/jobstep.cpp
+++ b/dbcon/joblist/jobstep.cpp
@@ -57,7 +57,7 @@ namespace joblist
 {
 boost::mutex JobStep::fLogMutex; //=PTHREAD_MUTEX_INITIALIZER;
 
-ThreadPool JobStep::jobstepThreadPool(defaultJLThreadPoolSize, 0);
+threadpool::ThreadPool JobStep::jobstepThreadPool(defaultJLThreadPoolSize, 0);
 
 ostream& operator<<(ostream& os, const JobStep* rhs)
 {
diff --git a/dbcon/joblist/jobstep.h b/dbcon/joblist/jobstep.h
index 5e917b2f0..d4f5143f4 100644
--- a/dbcon/joblist/jobstep.h
+++ b/dbcon/joblist/jobstep.h
@@ -53,8 +53,6 @@
 #  endif
 #endif
 
-using namespace threadpool;
-
 namespace joblist
 {
 
@@ -423,7 +421,7 @@ public:
         fOnClauseFilter = b;
     }
 
-    static ThreadPool jobstepThreadPool;
+    static threadpool::ThreadPool jobstepThreadPool;
 protected:
 
     //@bug6088, for telemetry posting
diff --git a/dbcon/mysql/ha_calpont_execplan.cpp b/dbcon/mysql/ha_calpont_execplan.cpp
index e617e5959..e6acfadb9 100644
--- a/dbcon/mysql/ha_calpont_execplan.cpp
+++ b/dbcon/mysql/ha_calpont_execplan.cpp
@@ -44,6 +44,7 @@
 #include <limits>
 
 #include <string.h>
+#include "mcsv1_udaf.h"
 
 using namespace std;
 
@@ -4610,7 +4611,7 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
 
             if (udafc)
             {
-                mcsv1Context& context = udafc->getContext();
+                mcsv1sdk::mcsv1Context& context = udafc->getContext();
                 context.setName(isp->func_name());
 
                 // Set up the return type defaults for the call to init()
@@ -4620,8 +4621,8 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
                 context.setPrecision(udafc->resultType().precision);
 
                 context.setParamCount(udafc->aggParms().size());
-                ColumnDatum colType;
-                ColumnDatum colTypes[udafc->aggParms().size()];
+                mcsv1sdk::ColumnDatum colType;
+                mcsv1sdk::ColumnDatum colTypes[udafc->aggParms().size()];
 
                 // Build the column type vector.
                 // Modified for MCOL-1201 multi-argument aggregate
@@ -4649,7 +4650,7 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
                     return NULL;
                 }
 
-                if (udaf->init(&context, colTypes) == mcsv1_UDAF::ERROR)
+                if (udaf->init(&context, colTypes) == mcsv1sdk::mcsv1_UDAF::ERROR)
                 {
                     gwi.fatalParseError = true;
                     gwi.parseErrorText = udafc->getContext().getErrorMessage();
@@ -4662,7 +4663,7 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
 
                 // UDAF_OVER_REQUIRED means that this function is for Window
                 // Function only. Reject it here in aggregate land.
-                if (udafc->getContext().getRunFlag(UDAF_OVER_REQUIRED))
+                if (udafc->getContext().getRunFlag(mcsv1sdk::UDAF_OVER_REQUIRED))
                 {
                     gwi.fatalParseError = true;
                     gwi.parseErrorText =
diff --git a/dbcon/mysql/ha_calpont_impl.cpp b/dbcon/mysql/ha_calpont_impl.cpp
index 83442b3d3..a2f4cfbe7 100644
--- a/dbcon/mysql/ha_calpont_impl.cpp
+++ b/dbcon/mysql/ha_calpont_impl.cpp
@@ -3295,7 +3295,7 @@ void ha_calpont_impl_start_bulk_insert(ha_rows rows, TABLE* table)
 
             if (get_local_query(thd))
             {
-                OamCache* oamcache = OamCache::makeOamCache();
+                const auto oamcache = oam::OamCache::makeOamCache();
                 int localModuleId = oamcache->getLocalPMId();
 
                 if (localModuleId == 0)
diff --git a/dbcon/mysql/ha_mcs_client_udfs.cpp b/dbcon/mysql/ha_mcs_client_udfs.cpp
index 1766bdf1c..9113ae51b 100644
--- a/dbcon/mysql/ha_mcs_client_udfs.cpp
+++ b/dbcon/mysql/ha_mcs_client_udfs.cpp
@@ -58,7 +58,7 @@ extern "C"
     const char* invalidParmSizeMessage(uint64_t size, size_t& len)
     {
         static char str[sizeof(InvalidParmSize) + 12] = {0};
-        ostringstream os;
+        std::ostringstream os;
         os << InvalidParmSize << size;
         len = os.str().length();
         strcpy(str, os.str().c_str());
@@ -86,13 +86,13 @@ extern "C"
         uint64_t value = Config::uFromText(valuestr);
 
         THD* thd = current_thd;
-        uint32_t sessionID = CalpontSystemCatalog::idb_tid2sid(thd->thread_id);
+        uint32_t sessionID = execplan::CalpontSystemCatalog::idb_tid2sid(thd->thread_id);
 
         const char* msg = SetParmsError;
         size_t mlen = Elen;
         bool includeInput = true;
 
-        string pstr(parameter);
+        std::string pstr(parameter);
         boost::algorithm::to_lower(pstr);
 
         if (get_fe_conn_info_ptr() == NULL)
@@ -107,7 +107,7 @@ extern "C"
 
             if (rm->getHjTotalUmMaxMemorySmallSide() >= value)
             {
-                ci->rmParms.push_back(RMParam(sessionID, execplan::PMSMALLSIDEMEMORY, value));
+                ci->rmParms.push_back(execplan::RMParam(sessionID, execplan::PMSMALLSIDEMEMORY, value));
 
                 msg = SetParmsPrelude;
                 mlen = Plen;
@@ -254,8 +254,8 @@ extern "C"
         long long oldTrace = ci->traceFlags;
         ci->traceFlags = (uint32_t)(*((long long*)args->args[0]));
         // keep the vtablemode bit
-        ci->traceFlags |= (oldTrace & CalpontSelectExecutionPlan::TRACE_TUPLE_OFF);
-        ci->traceFlags |= (oldTrace & CalpontSelectExecutionPlan::TRACE_TUPLE_AUTOSWITCH);
+        ci->traceFlags |= (oldTrace & execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_OFF);
+        ci->traceFlags |= (oldTrace & execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_AUTOSWITCH);
         return oldTrace;
     }
 
@@ -381,8 +381,8 @@ extern "C"
     {
         long long rtn = 0;
         Oam oam;
-        string PrimaryUMModuleName;
-        string localModule;
+        std::string PrimaryUMModuleName;
+        std::string localModule;
         oamModuleInfo_t st;
 
         try
@@ -396,7 +396,7 @@ extern "C"
             if (PrimaryUMModuleName == "unassigned")
                 rtn = 1;
         }
-        catch (runtime_error& e)
+        catch (std::runtime_error& e)
         {
             // It's difficult to return an error message from a numerical UDF
             //string msg = string("ERROR: Problem getting Primary UM Module Name. ") + e.what();
@@ -469,7 +469,7 @@ extern "C"
             set_fe_conn_info_ptr((void*)new cal_connection_info());
 
         cal_connection_info* ci = reinterpret_cast<cal_connection_info*>(get_fe_conn_info_ptr());
-        CalpontSystemCatalog::TableName tableName;
+        execplan::CalpontSystemCatalog::TableName tableName;
 
         if ( args->arg_count == 2 )
         {
@@ -484,7 +484,7 @@ extern "C"
                 tableName.schema = thd->db.str;
             else
             {
-                string msg("No schema information provided");
+              std::string msg("No schema information provided");
                 memcpy(result, msg.c_str(), msg.length());
                 *length = msg.length();
                 return result;
@@ -497,7 +497,7 @@ extern "C"
             //cout << "viewtablelock starts a new client " << ci->dmlProc << " for session " << thd->thread_id << endl;
         }
 
-        string lockinfo = ha_calpont_impl_viewtablelock(*ci, tableName);
+        std::string lockinfo = ha_calpont_impl_viewtablelock(*ci, tableName);
 
         memcpy(result, lockinfo.c_str(), lockinfo.length());
         *length = lockinfo.length();
@@ -550,7 +550,7 @@ extern "C"
         }
 
         unsigned long long uLockID = lockID;
-        string lockinfo = ha_calpont_impl_cleartablelock(*ci, uLockID);
+        std::string lockinfo = ha_calpont_impl_cleartablelock(*ci, uLockID);
 
         memcpy(result, lockinfo.c_str(), lockinfo.length());
         *length = lockinfo.length();
@@ -604,7 +604,7 @@ extern "C"
     {
         THD* thd = current_thd;
 
-        CalpontSystemCatalog::TableName tableName;
+        execplan::CalpontSystemCatalog::TableName tableName;
         uint64_t nextVal = 0;
 
         if ( args->arg_count == 2 )
@@ -624,9 +624,9 @@ extern "C"
             }
         }
 
-        boost::shared_ptr<CalpontSystemCatalog> csc =
-            CalpontSystemCatalog::makeCalpontSystemCatalog(
-                CalpontSystemCatalog::idb_tid2sid(thd->thread_id));
+        boost::shared_ptr<execplan::CalpontSystemCatalog> csc =
+            execplan::CalpontSystemCatalog::makeCalpontSystemCatalog(
+                execplan::CalpontSystemCatalog::idb_tid2sid(thd->thread_id));
         csc->identity(execplan::CalpontSystemCatalog::FE);
 
         try
@@ -635,7 +635,7 @@ extern "C"
         }
         catch (std::exception&)
         {
-            string msg("No such table found during autincrement");
+          std::string msg("No such table found during autincrement");
             setError(thd, ER_INTERNAL_ERROR, msg);
             return nextVal;
         }
@@ -649,7 +649,7 @@ extern "C"
         //@Bug 3559. Return a message for table without autoincrement column.
         if (nextVal == 0)
         {
-            string msg("Autoincrement does not exist for this table.");
+          std::string msg("Autoincrement does not exist for this table.");
             setError(thd, ER_INTERNAL_ERROR, msg);
             return nextVal;
         }
@@ -705,7 +705,7 @@ extern "C"
                             char* result, unsigned long* length,
                             char* is_null, char* error)
     {
-        const string* msgp;
+        const std::string* msgp;
         int flags = 0;
 
         if (args->arg_count > 0)
@@ -776,7 +776,7 @@ extern "C"
                               char* result, unsigned long* length,
                               char* is_null, char* error)
     {
-        string version(columnstore_version);
+      std::string version(columnstore_version);
         *length = version.size();
         memcpy(result, version.c_str(), *length);
         return result;
diff --git a/ddlproc/ddlprocessor.cpp b/ddlproc/ddlprocessor.cpp
index a10ff31af..fb283f3a7 100644
--- a/ddlproc/ddlprocessor.cpp
+++ b/ddlproc/ddlprocessor.cpp
@@ -20,7 +20,7 @@
  *
  *
  ***********************************************************************/
-
+#include <future> //cxx11test
 #include <map>
 #include <boost/scoped_ptr.hpp>
 using namespace std;
diff --git a/dmlproc/dmlproc.cpp b/dmlproc/dmlproc.cpp
index deb936422..7b1041b1e 100644
--- a/dmlproc/dmlproc.cpp
+++ b/dmlproc/dmlproc.cpp
@@ -20,7 +20,7 @@
 *
 *
 ***********************************************************************/
-
+#include <future> //cxx11test
 #include <unistd.h>
 #include <signal.h>
 #include <string>
@@ -632,7 +632,7 @@ int main(int argc, char* argv[])
     if (rm->getDMLJlThreadPoolDebug() == "Y" || rm->getDMLJlThreadPoolDebug() == "y")
     {
         JobStep::jobstepThreadPool.setDebug(true);
-        JobStep::jobstepThreadPool.invoke(ThreadPoolMonitor(&JobStep::jobstepThreadPool));
+        JobStep::jobstepThreadPool.invoke(threadpool::ThreadPoolMonitor(&JobStep::jobstepThreadPool));
     }
 
     //set ACTIVE state
diff --git a/exemgr/CMakeLists.txt b/exemgr/CMakeLists.txt
index cae1cf3ce..5f77ed886 100644
--- a/exemgr/CMakeLists.txt
+++ b/exemgr/CMakeLists.txt
@@ -8,7 +8,9 @@ set(ExeMgr_SRCS main.cpp activestatementcounter.cpp femsghandler.cpp ../utils/co
 
 add_executable(ExeMgr ${ExeMgr_SRCS})
 
-target_link_libraries(ExeMgr ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} cacheutils threadpool)
+target_link_libraries(ExeMgr ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} cacheutils threadpool stdc++fs)
+
+
 
 install(TARGETS ExeMgr DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
 
diff --git a/exemgr/main.cpp b/exemgr/main.cpp
index 259d1443e..6790fafbb 100644
--- a/exemgr/main.cpp
+++ b/exemgr/main.cpp
@@ -39,82 +39,53 @@
  * on the Front-End Processor where it is returned to the DBMS
  * front-end.
  */
+
+
+
+#include <mutex>
+#include <experimental/filesystem>
 #include <iostream>
-#include <map>
-#include <string>
-#include <stdexcept>
+
+#include <cstdint>
 #include <csignal>
-#include <unistd.h>
-#include <sys/time.h>
-#ifndef _MSC_VER
+
 #include <sys/resource.h>
-#else
-#include <io.h>
-#include <direct.h>
-#endif
-//#define NDEBUG
-#include <cassert>
-#include <clocale>
-#include <ctime>
-using namespace std;
 
-#include <boost/thread.hpp>
-#include <boost/tokenizer.hpp>
-#include <boost/scoped_ptr.hpp>
-using namespace boost;
-
-#include "config.h"
-#include "configcpp.h"
-using namespace config;
-#include "messagequeue.h"
-#include "iosocket.h"
-#include "bytestream.h"
-using namespace messageqcpp;
 #include "calpontselectexecutionplan.h"
-#include "calpontsystemcatalog.h"
-#include "simplecolumn.h"
-using namespace execplan;
-#include "joblist.h"
-#include "joblistfactory.h"
+#include "activestatementcounter.h"
 #include "distributedenginecomm.h"
 #include "resourcemanager.h"
-using namespace joblist;
-#include "liboamcpp.h"
-using namespace oam;
-#include "logger.h"
-#include "sqllogger.h"
-#include "idberrorinfo.h"
-using namespace logging;
-#include "querystats.h"
-using namespace querystats;
-#include "MonitorProcMem.h"
-#include "querytele.h"
-using namespace querytele;
+#include "configcpp.h"
+#include "queryteleserverparms.h"
+#include "iosocket.h"
+#include "joblist.h"
+#include "joblistfactory.h"
 #include "oamcache.h"
-
-#include "activestatementcounter.h"
+#include "simplecolumn.h"
+#include "bytestream.h"
+#include "telestats.h"
+#include "messageobj.h"
+#include "messagelog.h"
+#include "sqllogger.h"
 #include "femsghandler.h"
-
-#include "utils_utf8.h"
-#include "boost/filesystem.hpp"
-
-#include "threadpool.h"
+#include "idberrorinfo.h"
+#include "MonitorProcMem.h"
+#include "liboamcpp.h"
 #include "crashtrace.h"
+#include "utils_utf8.h"
 
 #if defined(SKIP_OAM_INIT)
 #include "dbrm.h"
 #endif
 
 
-#include "installdir.h"
-
 namespace
 {
 
 //If any flags other than the table mode flags are set, produce output to screeen
 const uint32_t flagsWantOutput = (0xffffffff &
-                                  ~CalpontSelectExecutionPlan::TRACE_TUPLE_AUTOSWITCH &
-                                  ~CalpontSelectExecutionPlan::TRACE_TUPLE_OFF);
+                                  ~execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_AUTOSWITCH &
+                                  ~execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_OFF);
 
 int gDebug;
 
@@ -129,46 +100,46 @@ const unsigned logExeMgrExcpt          = logging::M0055;
 
 logging::Logger msgLog(16);
 
-typedef map<uint32_t, size_t> SessionMemMap_t;
+typedef std::map<uint32_t, size_t> SessionMemMap_t;
 SessionMemMap_t sessionMemMap; // track memory% usage during a query
-mutex sessionMemMapMutex;
+std::mutex sessionMemMapMutex;
 
 //...The FrontEnd may establish more than 1 connection (which results in
 //   more than 1 ExeMgr thread) per session.  These threads will share
 //   the same CalpontSystemCatalog object for that session.  Here, we
-//   define a map to track how many threads are sharing each session, so
+//   define a std::map to track how many threads are sharing each session, so
 //   that we know when we can safely delete a CalpontSystemCatalog object
 //   shared by multiple threads per session.
-typedef map<uint32_t, uint32_t> ThreadCntPerSessionMap_t;
+typedef std::map<uint32_t, uint32_t> ThreadCntPerSessionMap_t;
 ThreadCntPerSessionMap_t        threadCntPerSessionMap;
-mutex threadCntPerSessionMapMutex;
+std::mutex threadCntPerSessionMapMutex;
 
 //This var is only accessed using thread-safe inc/dec calls
 ActiveStatementCounter* statementsRunningCount;
 
-DistributedEngineComm* ec;
+joblist::DistributedEngineComm* ec;
 
-ResourceManager* rm = ResourceManager::instance(true);
+auto rm = joblist::ResourceManager::instance(true);
 
-int toInt(const string& val)
+int toInt(const std::string& val)
 {
     if (val.length() == 0) return -1;
 
-    return static_cast<int>(Config::fromText(val));
+    return static_cast<int>(config::Config::fromText(val));
 }
 
-const string ExeMgr("ExeMgr1");
+const std::string ExeMgr("ExeMgr1");
 
-const string prettyPrintMiniInfo(const string& in)
+const std::string prettyPrintMiniInfo(const std::string& in)
 {
-    //1. take the string and tok it by '\n'
+    //1. take the std::string and tok it by '\n'
     //2. for each part in each line calc the longest part
     //3. padding to each longest value, output a header and the lines
     typedef boost::tokenizer<boost::char_separator<char> > my_tokenizer;
     boost::char_separator<char> sep1("\n");
     my_tokenizer tok1(in, sep1);
-    vector<string> lines;
-    string header = "Desc Mode Table TableOID ReferencedColumns PIO LIO PBE Elapsed Rows";
+    std::vector<std::string> lines;
+    std::string header = "Desc Mode Table TableOID ReferencedColumns PIO LIO PBE Elapsed Rows";
     const int header_parts = 10;
     lines.push_back(header);
 
@@ -178,13 +149,13 @@ const string prettyPrintMiniInfo(const string& in)
             lines.push_back(*iter1);
     }
 
-    vector<unsigned> lens;
+    std::vector<unsigned> lens;
 
     for (int i = 0; i < header_parts; i++)
         lens.push_back(0);
 
-    vector<vector<string> > lineparts;
-    vector<string>::iterator iter2;
+    std::vector<std::vector<std::string> > lineparts;
+    std::vector<std::string>::iterator iter2;
     int j;
 
     for (iter2 = lines.begin(), j = 0; iter2 != lines.end(); ++iter2, j++)
@@ -192,14 +163,14 @@ const string prettyPrintMiniInfo(const string& in)
         boost::char_separator<char> sep2(" ");
         my_tokenizer tok2(*iter2, sep2);
         int i;
-        vector<string> parts;
+        std::vector<std::string> parts;
         my_tokenizer::iterator iter3;
 
         for (iter3 = tok2.begin(), i = 0; iter3 != tok2.end(); ++iter3, i++)
         {
             if (i >= header_parts) break;
 
-            string part(*iter3);
+            std::string part(*iter3);
 
             if (j != 0 && i == 8)
                 part.resize(part.size() - 3);
@@ -216,24 +187,24 @@ const string prettyPrintMiniInfo(const string& in)
         lineparts.push_back(parts);
     }
 
-    ostringstream oss;
+    std::ostringstream oss;
 
-    vector<vector<string> >::iterator iter1 = lineparts.begin();
-    vector<vector<string> >::iterator end1 = lineparts.end();
+    std::vector<std::vector<std::string> >::iterator iter1 = lineparts.begin();
+    std::vector<std::vector<std::string> >::iterator end1 = lineparts.end();
 
     oss << "\n";
 
     while (iter1 != end1)
     {
-        vector<string>::iterator iter2 = iter1->begin();
-        vector<string>::iterator end2 = iter1->end();
+        std::vector<std::string>::iterator iter2 = iter1->begin();
+        std::vector<std::string>::iterator end2 = iter1->end();
         assert(distance(iter2, end2) == header_parts);
         int i = 0;
 
         while (iter2 != end2)
         {
             assert(i < header_parts);
-            oss << setw(lens[i]) << left << *iter2 << " ";
+            oss << std::setw(lens[i]) << std::left << *iter2 << " ";
             ++iter2;
             i++;
         }
@@ -245,7 +216,7 @@ const string prettyPrintMiniInfo(const string& in)
     return oss.str();
 }
 
-const string timeNow()
+const std::string timeNow()
 {
     time_t outputTime = time(0);
     struct tm ltm;
@@ -265,13 +236,13 @@ const string timeNow()
     return buf;
 }
 
-QueryTeleServerParms gTeleServerParms;
+querytele::QueryTeleServerParms gTeleServerParms;
 
 class SessionThread
 {
 public:
 
-    SessionThread(const IOSocket& ios, DistributedEngineComm* ec, ResourceManager* rm) :
+    SessionThread(const messageqcpp::IOSocket& ios, joblist::DistributedEngineComm* ec, joblist::ResourceManager* rm) :
         fIos(ios), fEc(ec),
         fRm(rm),
         fStatsRetrieved(false),
@@ -282,20 +253,20 @@ public:
 
 private:
 
-    IOSocket fIos;
-    DistributedEngineComm* fEc;
-    ResourceManager*  fRm;
+    messageqcpp::IOSocket fIos;
+    joblist::DistributedEngineComm* fEc;
+    joblist::ResourceManager*  fRm;
     querystats::QueryStats fStats;
 
     // Variables used to store return stats
     bool       fStatsRetrieved;
 
-    QueryTeleClient fTeleClient;
+    querytele::QueryTeleClient fTeleClient;
 
     oam::OamCache* fOamCachePtr;	//this ptr is copyable...
 
     //...Reinitialize stats for start of a new query
-    void initStats ( uint32_t sessionId, string& sqlText )
+    void initStats ( uint32_t sessionId, std::string& sqlText )
     {
         initMaxMemPct ( sessionId );
 
@@ -314,7 +285,7 @@ private:
 
         if ( sessionId < 0x80000000 )
         {
-            mutex::scoped_lock lk(sessionMemMapMutex);
+            std::lock_guard<std::mutex> lk(sessionMemMapMutex);
             SessionMemMap_t::iterator mapIter =
                 sessionMemMap.find( sessionId );
 
@@ -333,7 +304,7 @@ private:
     {
         if ( sessionId < 0x80000000 )
         {
-            mutex::scoped_lock lk(sessionMemMapMutex);
+            std::lock_guard<std::mutex> lk(sessionMemMapMutex);
             SessionMemMap_t::iterator mapIter =
                 sessionMemMap.find( sessionId );
 
@@ -345,15 +316,15 @@ private:
     }
 
     //...Get and log query stats to specified output stream
-    const string formatQueryStats (
-        SJLP&    jl,			// joblist associated with query
-        const    string& label, // header label to print in front of log output
-        bool     includeNewLine,//include line breaks in query stats string
+    const std::string formatQueryStats (
+        joblist::SJLP&    jl,			// joblist associated with query
+        const    std::string& label, // header label to print in front of log output
+        bool     includeNewLine,//include line breaks in query stats std::string
         bool     vtableModeOn,
         bool     wantExtendedStats,
         uint64_t rowsReturned)
     {
-        ostringstream os;
+        std::ostringstream os;
 
         // Get stats if not already acquired for current query
         if ( !fStatsRetrieved )
@@ -377,7 +348,7 @@ private:
             fStatsRetrieved = true;
         }
 
-        string queryMode;
+        std::string queryMode;
         queryMode = (vtableModeOn ? "Distributed" : "Standard");
 
         // Log stats to specified output stream
@@ -390,7 +361,7 @@ private:
            "; BlocksTouched-" << fStats.fMsgRcvCnt;
 
         if ( includeNewLine )
-            os << endl << "      ";	// insert line break
+            os << std::endl << "      ";	// insert line break
         else
             os << "; ";				// continue without line break
 
@@ -405,7 +376,7 @@ private:
     //...Increment the number of threads using the specified sessionId
     static void incThreadCntPerSession(uint32_t sessionId)
     {
-        mutex::scoped_lock lk(threadCntPerSessionMapMutex);
+        std::lock_guard<std::mutex> lk(threadCntPerSessionMapMutex);
         ThreadCntPerSessionMap_t::iterator mapIter =
             threadCntPerSessionMap.find(sessionId);
 
@@ -425,7 +396,7 @@ private:
     //...debugging/stats purpose, such as result graph, etc.
     static void decThreadCntPerSession(uint32_t sessionId)
     {
-        mutex::scoped_lock lk(threadCntPerSessionMapMutex);
+        std::lock_guard<std::mutex> lk(threadCntPerSessionMapMutex);
         ThreadCntPerSessionMap_t::iterator mapIter =
             threadCntPerSessionMap.find(sessionId);
 
@@ -434,8 +405,8 @@ private:
             if (--mapIter->second == 0)
             {
                 threadCntPerSessionMap.erase(mapIter);
-                CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId);
-                CalpontSystemCatalog::removeCalpontSystemCatalog((sessionId ^ 0x80000000));
+                execplan::CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId);
+                execplan::CalpontSystemCatalog::removeCalpontSystemCatalog((sessionId ^ 0x80000000));
             }
         }
     }
@@ -446,8 +417,8 @@ private:
     {
         if ( sessionId < 0x80000000 )
         {
-            // cout << "Setting pct to 0 for session " << sessionId << endl;
-            mutex::scoped_lock lk(sessionMemMapMutex);
+            // std::cout << "Setting pct to 0 for session " << sessionId << std::endl;
+            std::lock_guard<std::mutex> lk(sessionMemMapMutex);
             SessionMemMap_t::iterator mapIter = sessionMemMap.find( sessionId );
 
             if ( mapIter == sessionMemMap.end() )
@@ -462,7 +433,7 @@ private:
     }
 
     //... Round off to human readable format (KB, MB, or GB).
-    const string roundBytes(uint64_t value) const
+    const std::string roundBytes(uint64_t value) const
     {
         const char* units[] = {"B", "KB", "MB", "GB", "TB"};
         uint64_t i = 0, up = 0;
@@ -478,7 +449,7 @@ private:
         if (up)
             roundedValue++;
 
-        ostringstream oss;
+        std::ostringstream oss;
         oss << roundedValue << units[i];
         return oss.str();
     }
@@ -494,20 +465,20 @@ private:
         return roundedValue;
     }
 
-    void setRMParms ( const CalpontSelectExecutionPlan::RMParmVec& parms )
+    void setRMParms ( const execplan::CalpontSelectExecutionPlan::RMParmVec& parms )
     {
-        for (CalpontSelectExecutionPlan::RMParmVec::const_iterator it = parms.begin();
+        for (execplan::CalpontSelectExecutionPlan::RMParmVec::const_iterator it = parms.begin();
                 it != parms.end(); ++it)
         {
             switch (it->id)
             {
-                case PMSMALLSIDEMEMORY:
+                case execplan::PMSMALLSIDEMEMORY:
                 {
                     fRm->addHJPmMaxSmallSideMap(it->sessionId, it->value);
                     break;
                 }
 
-                case UMSMALLSIDEMEMORY:
+                case execplan::UMSMALLSIDEMEMORY:
                 {
                     fRm->addHJUmMaxSmallSideMap(it->sessionId, it->value);
                     break;
@@ -519,22 +490,22 @@ private:
         }
     }
 
-    void buildSysCache(const CalpontSelectExecutionPlan& csep, boost::shared_ptr<CalpontSystemCatalog> csc)
+    void buildSysCache(const execplan::CalpontSelectExecutionPlan& csep, boost::shared_ptr<execplan::CalpontSystemCatalog> csc)
     {
-        const CalpontSelectExecutionPlan::ColumnMap& colMap = csep.columnMap();
-        CalpontSelectExecutionPlan::ColumnMap::const_iterator it;
-        string schemaName;
+        const execplan::CalpontSelectExecutionPlan::ColumnMap& colMap = csep.columnMap();
+        execplan::CalpontSelectExecutionPlan::ColumnMap::const_iterator it;
+        std::string schemaName;
 
         for (it = colMap.begin(); it != colMap.end(); ++it)
         {
-            SimpleColumn* sc = dynamic_cast<SimpleColumn*>((it->second).get());
+            const auto sc = dynamic_cast<execplan::SimpleColumn*>((it->second).get());
 
             if (sc)
             {
                 schemaName = sc->schemaName();
 
                 // only the first time a schema is got will actually query
-                // system catalog. System catalog keeps a schema name map.
+                // system catalog. System catalog keeps a schema name std::map.
                 // if a schema exists, the call getSchemaInfo returns without
                 // doing anything.
                 if (!schemaName.empty())
@@ -542,11 +513,11 @@ private:
             }
         }
 
-        CalpontSelectExecutionPlan::SelectList::const_iterator subIt;
+        execplan::CalpontSelectExecutionPlan::SelectList::const_iterator subIt;
 
         for (subIt = csep.derivedTableList().begin(); subIt != csep.derivedTableList().end(); ++ subIt)
         {
-            buildSysCache(*(dynamic_cast<CalpontSelectExecutionPlan*>(subIt->get())), csc);
+            buildSysCache(*(dynamic_cast<execplan::CalpontSelectExecutionPlan*>(subIt->get())), csc);
         }
     }
 
@@ -554,10 +525,10 @@ public:
 
     void operator()()
     {
-        ByteStream bs, inbs;
-        CalpontSelectExecutionPlan csep;
+        messageqcpp::ByteStream bs, inbs;
+        execplan::CalpontSelectExecutionPlan csep;
         csep.sessionID(0);
-        SJLP jl;
+        joblist::SJLP jl;
         bool incSessionThreadCnt = true;
 
         bool selfJoin = false;
@@ -579,7 +550,7 @@ public:
                 if (bs.length() == 0)
                 {
                     if (gDebug > 1 || (gDebug && !csep.isInternal()))
-                        cout << "### Got a close(1) for session id " << csep.sessionID() << endl;
+                        std::cout << "### Got a close(1) for session id " << csep.sessionID() << std::endl;
 
                     // connection closed by client
                     fIos.close();
@@ -588,21 +559,21 @@ public:
                 else if (bs.length() < 4) //Not a CalpontSelectExecutionPlan
                 {
                     if (gDebug)
-                        cout << "### Got a not-a-plan for session id " << csep.sessionID()
-                             << " with length " << bs.length() <<  endl;
+                        std::cout << "### Got a not-a-plan for session id " << csep.sessionID()
+                             << " with length " << bs.length() <<  std::endl;
 
                     fIos.close();
                     break;
                 }
                 else if (bs.length() == 4) //possible tuple flag
                 {
-                    ByteStream::quadbyte qb;
+                    messageqcpp::ByteStream::quadbyte qb;
                     bs >> qb;
 
                     if (qb == 4) //UM wants new tuple i/f
                     {
                         if (gDebug)
-                            cout << "### UM wants tuples" << endl;
+                            std::cout << "### UM wants tuples" << std::endl;
 
                         tryTuples = true;
                         // now wait for the CSEP...
@@ -622,7 +593,7 @@ public:
                     else
                     {
                         if (gDebug)
-                            cout << "### Got a not-a-plan value " << qb << endl;
+                            std::cout << "### Got a not-a-plan value " << qb << std::endl;
 
                         fIos.close();
                         break;
@@ -632,14 +603,14 @@ public:
 new_plan:
                 csep.unserialize(bs);
 
-                QueryTeleStats qts;
+                querytele::QueryTeleStats qts;
 
                 if ( !csep.isInternal() &&
                         (csep.queryType() == "SELECT" || csep.queryType() == "INSERT_SELECT") )
                 {
                     qts.query_uuid = csep.uuid();
-                    qts.msg_type = QueryTeleStats::QT_START;
-                    qts.start_time = QueryTeleClient::timeNowms();
+                    qts.msg_type = querytele::QueryTeleStats::QT_START;
+                    qts.start_time = querytele::QueryTeleClient::timeNowms();
                     qts.query = csep.data();
                     qts.session_id = csep.sessionID();
                     qts.query_type = csep.queryType();
@@ -651,7 +622,7 @@ new_plan:
                 }
 
                 if (gDebug > 1 || (gDebug && !csep.isInternal()))
-                    cout << "### For session id " << csep.sessionID() << ", got a CSEP" << endl;
+                    std::cout << "### For session id " << csep.sessionID() << ", got a CSEP" << std::endl;
 
                 setRMParms(csep.rmParms());
 
@@ -659,8 +630,8 @@ new_plan:
                 // skip system catalog queries.
                 if (!csep.isInternal())
                 {
-                    boost::shared_ptr<CalpontSystemCatalog> csc =
-                        CalpontSystemCatalog::makeCalpontSystemCatalog(csep.sessionID());
+                    boost::shared_ptr<execplan::CalpontSystemCatalog> csc =
+                      execplan::CalpontSystemCatalog::makeCalpontSystemCatalog(csep.sessionID());
                     buildSysCache(csep, csc);
                 }
 
@@ -674,9 +645,9 @@ new_plan:
                 }
 
                 bool needDbProfEndStatementMsg = false;
-                Message::Args args;
-                string sqlText = csep.data();
-                LoggingID li(16, csep.sessionID(), csep.txnID());
+                logging::Message::Args args;
+                std::string sqlText = csep.data();
+                logging::LoggingID li(16, csep.sessionID(), csep.txnID());
 
                 // Initialize stats for this query, including
                 // init sessionMemMap entry for this session to 0 memory %.
@@ -694,7 +665,7 @@ new_plan:
                     args.add((int)csep.statementID());
                     args.add((int)csep.verID().currentScn);
                     args.add(sqlText);
-                    msgLog.logMessage(LOG_TYPE_DEBUG,
+                    msgLog.logMessage(logging::LOG_TYPE_DEBUG,
                                       logDbProfStartStatement,
                                       args,
                                       li);
@@ -705,9 +676,9 @@ new_plan:
                 if (selfJoin)
                     sqlText = "";
 
-                ostringstream oss;
+                std::ostringstream oss;
                 oss << sqlText << "; |" << csep.schemaName() << "|";
-                SQLLogger sqlLog(oss.str(), li);
+                logging::SQLLogger sqlLog(oss.str(), li);
 
                 statementsRunningCount->incr(stmtCounted);
 
@@ -715,14 +686,14 @@ new_plan:
                 {
                     try // @bug2244: try/catch around fIos.write() calls responding to makeTupleList
                     {
-                        string emsg("NOERROR");
-                        ByteStream emsgBs;
-                        ByteStream::quadbyte tflg = 0;
-                        jl = JobListFactory::makeJobList(&csep, fRm, true, true);
+                        std::string emsg("NOERROR");
+                        messageqcpp::ByteStream emsgBs;
+                        messageqcpp::ByteStream::quadbyte tflg = 0;
+                        jl = joblist::JobListFactory::makeJobList(&csep, fRm, true, true);
                         // assign query stats
                         jl->queryStats(fStats);
 
-                        ByteStream tbs;
+                        messageqcpp::ByteStream tbs;
 
                         if ((jl->status()) == 0 && (jl->putEngineComm(fEc) == 0))
                         {
@@ -734,7 +705,7 @@ new_plan:
                             emsgBs.reset();
                             emsgBs << emsg;
                             fIos.write(emsgBs);
-                            TupleJobList* tjlp = dynamic_cast<TupleJobList*>(jl.get());
+                            auto tjlp = dynamic_cast<joblist::TupleJobList*>(jl.get());
                             assert(tjlp);
                             tbs.restart();
                             tbs << tjlp->getOutputRowGroup();
@@ -750,60 +721,60 @@ new_plan:
                             emsgBs.reset();
                             emsgBs << emsg;
                             fIos.write(emsgBs);
-                            cerr << "ExeMgr: could not build a tuple joblist: " << emsg << endl;
+                            std::cerr << "ExeMgr: could not build a tuple joblist: " << emsg << std::endl;
                             continue;
                         }
                     }
                     catch (std::exception& ex)
                     {
-                        ostringstream errMsg;
+                        std::ostringstream errMsg;
                         errMsg << "ExeMgr: error writing makeJoblist "
                                "response; " <<  ex.what();
-                        throw runtime_error( errMsg.str() );
+                        throw std::runtime_error( errMsg.str() );
                     }
                     catch (...)
                     {
-                        ostringstream errMsg;
+                        std::ostringstream errMsg;
                         errMsg << "ExeMgr: unknown error writing makeJoblist "
                                "response; ";
-                        throw runtime_error( errMsg.str() );
+                        throw std::runtime_error( errMsg.str() );
                     }
 
                     if (!usingTuples)
                     {
                         if (gDebug)
-                            cout << "### UM wanted tuples but it didn't work out :-(" << endl;
+                            std::cout << "### UM wanted tuples but it didn't work out :-(" << std::endl;
                     }
                     else
                     {
                         if (gDebug)
-                            cout << "### UM wanted tuples and we'll do our best;-)" << endl;
+                            std::cout << "### UM wanted tuples and we'll do our best;-)" << std::endl;
                     }
                 }
                 else
                 {
                     usingTuples = false;
-                    jl = JobListFactory::makeJobList(&csep, fRm, false, true);
+                    jl = joblist::JobListFactory::makeJobList(&csep, fRm, false, true);
 
                     if (jl->status() == 0)
                     {
-                        string emsg;
+                        std::string emsg;
 
                         if (jl->putEngineComm(fEc) != 0)
-                            throw runtime_error(jl->errMsg());
+                            throw std::runtime_error(jl->errMsg());
                     }
                     else
                     {
-                        throw runtime_error("ExeMgr: could not build a JobList!");
+                        throw std::runtime_error("ExeMgr: could not build a JobList!");
                     }
                 }
 
 
                 jl->doQuery();
 
-                CalpontSystemCatalog::OID tableOID;
+                execplan::CalpontSystemCatalog::OID tableOID;
                 bool swallowRows = false;
-                DeliveredTableMap tm;
+                joblist::DeliveredTableMap tm;
                 uint64_t totalBytesSent = 0;
                 uint64_t totalRowCount = 0;
 
@@ -815,14 +786,14 @@ new_plan:
                     if (bs.length() == 0)
                     {
                         if (gDebug > 1 || (gDebug && !csep.isInternal()))
-                            cout << "### Got a close(2) for session id " << csep.sessionID() << endl;
+                            std::cout << "### Got a close(2) for session id " << csep.sessionID() << std::endl;
 
                         break;
                     }
 
                     if (gDebug && bs.length() > 4)
-                        cout << "### For session id " << csep.sessionID() << ", got too many bytes = " <<
-                             bs.length() << endl;
+                        std::cout << "### For session id " << csep.sessionID() << ", got too many bytes = " <<
+                             bs.length() << std::endl;
 
                     //TODO: Holy crud! Can this be right?
                     //@bug 1444 Yes, if there is a self-join
@@ -835,14 +806,14 @@ new_plan:
 
                     assert(bs.length() == 4);
 
-                    ByteStream::quadbyte qb;
+                    messageqcpp::ByteStream::quadbyte qb;
 
                     try // @bug2244: try/catch around fIos.write() calls responding to qb command
                     {
                         bs >> qb;
 
                         if (gDebug > 1 || (gDebug && !csep.isInternal()))
-                            cout << "### For session id " << csep.sessionID() << ", got a command = " << qb << endl;
+                            std::cout << "### For session id " << csep.sessionID() << ", got a command = " << qb << std::endl;
 
                         if (qb == 0)
                         {
@@ -861,46 +832,46 @@ new_plan:
                         {
                             // UM just wants any table
                             assert(swallowRows);
-                            DeliveredTableMap::iterator iter = tm.begin();
+                            auto iter = tm.begin();
 
                             if (iter == tm.end())
                             {
                                 if (gDebug > 1 || (gDebug && !csep.isInternal()))
-                                    cout << "### For session id " << csep.sessionID() << ", returning end flag" << endl;
+                                    std::cout << "### For session id " << csep.sessionID() << ", returning end flag" << std::endl;
 
                                 bs.restart();
-                                bs << (ByteStream::byte)1;
+                                bs << (messageqcpp::ByteStream::byte)1;
                                 fIos.write(bs);
                                 continue;
                             }
 
                             tableOID = iter->first;
                         }
-                        else if (qb == 3) //special option-UM wants job stats string
+                        else if (qb == 3) //special option-UM wants job stats std::string
                         {
-                            string statsString;
+                            std::string statsString;
 
-                            //Log stats string to be sent back to front end
+                            //Log stats std::string to be sent back to front end
                             statsString = formatQueryStats(
                                               jl,
                                               "Query Stats",
                                               false,
-                                              !(csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_TUPLE_OFF),
-                                              (csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_LOG),
+                                              !(csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_OFF),
+                                              (csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_LOG),
                                               totalRowCount
                                           );
 
                             bs.restart();
                             bs << statsString;
 
-                            if ((csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_LOG) != 0)
+                            if ((csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_LOG) != 0)
                             {
                                 bs << jl->extendedInfo();
                                 bs << prettyPrintMiniInfo(jl->miniInfo());
                             }
                             else
                             {
-                                string empty;
+                                std::string empty;
                                 bs << empty;
                                 bs << empty;
                             }
@@ -920,23 +891,23 @@ new_plan:
                         else // (qb > 3)
                         {
                             //Return table bands for the requested tableOID
-                            tableOID = static_cast<CalpontSystemCatalog::OID>(qb);
+                            tableOID = static_cast<execplan::CalpontSystemCatalog::OID>(qb);
                         }
                     }
                     catch (std::exception& ex)
                     {
-                        ostringstream errMsg;
+                        std::ostringstream errMsg;
                         errMsg << "ExeMgr: error writing qb response "
                                "for qb cmd " << qb <<
                                "; " <<  ex.what();
-                        throw runtime_error( errMsg.str() );
+                        throw std::runtime_error( errMsg.str() );
                     }
                     catch (...)
                     {
-                        ostringstream errMsg;
+                        std::ostringstream errMsg;
                         errMsg << "ExeMgr: unknown error writing qb response "
                                "for qb cmd " << qb;
-                        throw runtime_error( errMsg.str() );
+                        throw std::runtime_error( errMsg.str() );
                     }
 
                     if (swallowRows) tm.erase(tableOID);
@@ -957,7 +928,7 @@ new_plan:
 
                         if (jl->status())
                         {
-                            IDBErrorInfo* errInfo = IDBErrorInfo::instance();
+                            const auto errInfo = logging::IDBErrorInfo::instance();
 
                             if (jl->errMsg().length() != 0)
                                 bs << jl->errMsg();
@@ -967,7 +938,7 @@ new_plan:
 
                         try // @bug2244: try/catch around fIos.write() calls projecting rows
                         {
-                            if (csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_NO_ROWS3)
+                            if (csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_NO_ROWS3)
                             {
                                 // Skip the write to the front end until the last empty band.  Used to time queries
                                 // through without any front end waiting.
@@ -982,7 +953,7 @@ new_plan:
                         catch (std::exception& ex)
                         {
                             msgHandler.stop();
-                            ostringstream errMsg;
+                            std::ostringstream errMsg;
                             errMsg << "ExeMgr: error projecting rows "
                                    "for tableOID: " << tableOID <<
                                    "; rowCnt: " << rowCount <<
@@ -1004,12 +975,12 @@ new_plan:
                                 return;
                             }
 
-                            //cout << "connection drop\n";
-                            throw runtime_error( errMsg.str() );
+                            //std::cout << "connection drop\n";
+                            throw std::runtime_error( errMsg.str() );
                         }
                         catch (...)
                         {
-                            ostringstream errMsg;
+                            std::ostringstream errMsg;
                             msgHandler.stop();
                             errMsg << "ExeMgr: unknown error projecting rows "
                                    "for tableOID: " <<
@@ -1020,7 +991,7 @@ new_plan:
                             while (rowCount)
                                 rowCount = jl->projectTable(tableOID, bs);
 
-                            throw runtime_error( errMsg.str() );
+                            throw std::runtime_error( errMsg.str() );
                         }
 
                         totalRowCount += rowCount;
@@ -1051,20 +1022,20 @@ new_plan:
 
                 if (needDbProfEndStatementMsg)
                 {
-                    string ss;
-                    ostringstream prefix;
+                    std::string ss;
+                    std::ostringstream prefix;
                     prefix << "ses:" << csep.sessionID() << " Query Totals";
 
-                    //Log stats string to standard out
+                    //Log stats std::string to standard out
                     ss = formatQueryStats(
                              jl,
                              prefix.str(),
                              true,
-                             !(csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_TUPLE_OFF),
-                             (csep.traceFlags() & CalpontSelectExecutionPlan::TRACE_LOG),
+                             !(csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_TUPLE_OFF),
+                             (csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_LOG),
                              totalRowCount);
                     //@Bug 1306. Added timing info for real time tracking.
-                    cout << ss << " at " << timeNow() << endl;
+                    std::cout << ss << " at " << timeNow() << std::endl;
 
                     // log query status to debug log file
                     args.reset();
@@ -1078,7 +1049,7 @@ new_plan:
                     args.add(fStats.fMsgBytesIn);
                     args.add(fStats.fMsgBytesOut);
                     args.add(fStats.fCPBlocksSkipped);
-                    msgLog.logMessage(LOG_TYPE_DEBUG,
+                    msgLog.logMessage(logging::LOG_TYPE_DEBUG,
                                       logDbProfQueryStats,
                                       args,
                                       li);
@@ -1092,7 +1063,7 @@ new_plan:
                     jl.reset();
                     args.reset();
                     args.add((int)csep.statementID());
-                    msgLog.logMessage(LOG_TYPE_DEBUG,
+                    msgLog.logMessage(logging::LOG_TYPE_DEBUG,
                                       logDbProfEndStatement,
                                       args,
                                       li);
@@ -1101,33 +1072,33 @@ new_plan:
                     // delete sessionMemMap entry for this session's memory % use
                     deleteMaxMemPct( csep.sessionID() );
 
-                string endtime(timeNow());
+                std::string endtime(timeNow());
 
                 if ((csep.traceFlags() & flagsWantOutput) && (csep.sessionID() < 0x80000000))
                 {
-                    cout << "For session " << csep.sessionID() << ": " <<
+                    std::cout << "For session " << csep.sessionID() << ": " <<
                          totalBytesSent <<
-                         " bytes sent back at " << endtime << endl;
+                         " bytes sent back at " << endtime << std::endl;
 
                     // @bug 663 - Implemented caltraceon(16) to replace the
                     // $FIFO_SINK compiler definition in pColStep.
                     // This option consumes rows in the project steps.
                     if (csep.traceFlags() &
-                            CalpontSelectExecutionPlan::TRACE_NO_ROWS4)
+                      execplan::CalpontSelectExecutionPlan::TRACE_NO_ROWS4)
                     {
-                        cout << endl;
-                        cout << "**** No data returned to DM.  Rows consumed "
+                        std::cout << std::endl;
+                        std::cout << "**** No data returned to DM.  Rows consumed "
                              "in ProjectSteps - caltrace(16) is on (FIFO_SINK)."
-                             " ****" << endl;
-                        cout << endl;
+                             " ****" << std::endl;
+                        std::cout << std::endl;
                     }
                     else if (csep.traceFlags() &
-                             CalpontSelectExecutionPlan::TRACE_NO_ROWS3)
+                      execplan::CalpontSelectExecutionPlan::TRACE_NO_ROWS3)
                     {
-                        cout << endl;
-                        cout << "**** No data returned to DM - caltrace(8) is "
-                             "on (SWALLOW_ROWS_EXEMGR). ****" << endl;
-                        cout << endl;
+                        std::cout << std::endl;
+                        std::cout << "**** No data returned to DM - caltrace(8) is "
+                             "on (SWALLOW_ROWS_EXEMGR). ****" << std::endl;
+                        std::cout << std::endl;
                     }
                 }
 
@@ -1136,7 +1107,7 @@ new_plan:
                 if ( !csep.isInternal() &&
                         (csep.queryType() == "SELECT" || csep.queryType() == "INSERT_SELECT") )
                 {
-                    qts.msg_type = QueryTeleStats::QT_SUMMARY;
+                    qts.msg_type = querytele::QueryTeleStats::QT_SUMMARY;
                     qts.max_mem_pct = fStats.fMaxMemPct;
                     qts.num_files = fStats.fNumFiles;
                     qts.phy_io = fStats.fPhyIO;
@@ -1146,7 +1117,7 @@ new_plan:
                     qts.msg_bytes_in = fStats.fMsgBytesIn;
                     qts.msg_bytes_out = fStats.fMsgBytesOut;
                     qts.rows = totalRowCount;
-                    qts.end_time = QueryTeleClient::timeNowms();
+                    qts.end_time = querytele::QueryTeleClient::timeNowms();
                     qts.session_id = csep.sessionID();
                     qts.query_type = csep.queryType();
                     qts.query = csep.data();
@@ -1168,22 +1139,22 @@ new_plan:
         {
             decThreadCntPerSession( csep.sessionID() | 0x80000000 );
             statementsRunningCount->decr(stmtCounted);
-            cerr << "### ExeMgr ses:" << csep.sessionID() << " caught: " << ex.what() << endl;
-            Message::Args args;
-            LoggingID li(16, csep.sessionID(), csep.txnID());
+            std::cerr << "### ExeMgr ses:" << csep.sessionID() << " caught: " << ex.what() << std::endl;
+            logging::Message::Args args;
+            logging::LoggingID li(16, csep.sessionID(), csep.txnID());
             args.add(ex.what());
-            msgLog.logMessage(LOG_TYPE_CRITICAL, logExeMgrExcpt, args, li);
+            msgLog.logMessage(logging::LOG_TYPE_CRITICAL, logExeMgrExcpt, args, li);
             fIos.close();
         }
         catch (...)
         {
             decThreadCntPerSession( csep.sessionID() | 0x80000000 );
             statementsRunningCount->decr(stmtCounted);
-            cerr << "### Exception caught!" << endl;
-            Message::Args args;
-            LoggingID li(16, csep.sessionID(), csep.txnID());
+            std::cerr << "### Exception caught!" << std::endl;
+            logging::Message::Args args;
+            logging::LoggingID li(16, csep.sessionID(), csep.txnID());
             args.add("ExeMgr caught unknown exception");
-            msgLog.logMessage(LOG_TYPE_CRITICAL, logExeMgrExcpt, args, li);
+            msgLog.logMessage(logging::LOG_TYPE_CRITICAL, logExeMgrExcpt, args, li);
             fIos.close();
         }
     }
@@ -1208,41 +1179,42 @@ public:
             {
                 if (fMaxPct >= 95)
                 {
-                    cerr << "Too much memory allocated!" << endl;
-                    Message::Args args;
+                    std::cerr << "Too much memory allocated!" << std::endl;
+                    logging::Message::Args args;
                     args.add((int)pct);
                     args.add((int)fMaxPct);
-                    msgLog.logMessage(LOG_TYPE_CRITICAL, logRssTooBig, args, LoggingID(16));
+                    msgLog.logMessage(logging::LOG_TYPE_CRITICAL, logRssTooBig, args, logging::LoggingID(16));
                     exit(1);
                 }
 
                 if (statementsRunningCount->cur() == 0)
                 {
-                    cerr << "Too much memory allocated!" << endl;
-                    Message::Args args;
+                    std::cerr << "Too much memory allocated!" << std::endl;
+                    logging::Message::Args args;
                     args.add((int)pct);
                     args.add((int)fMaxPct);
-                    msgLog.logMessage(LOG_TYPE_WARNING, logRssTooBig, args, LoggingID(16));
+                    msgLog.logMessage(logging::LOG_TYPE_WARNING, logRssTooBig, args, logging::LoggingID(16));
                     exit(1);
                 }
 
-                cerr << "Too much memory allocated, but stmts running" << endl;
+                std::cerr << "Too much memory allocated, but stmts running" << std::endl;
             }
 
             // Update sessionMemMap entries lower than current mem % use
-            mutex::scoped_lock lk(sessionMemMapMutex);
-
-            for ( SessionMemMap_t::iterator mapIter = sessionMemMap.begin();
-                    mapIter != sessionMemMap.end();
-                    ++mapIter )
             {
-                if ( pct > mapIter->second )
-                {
-                    mapIter->second = pct;
-                }
-            }
+                std::lock_guard<std::mutex> lk(sessionMemMapMutex);
 
-            lk.unlock();
+                for (SessionMemMap_t::iterator mapIter = sessionMemMap.begin();
+                    mapIter != sessionMemMap.end();
+                    ++mapIter)
+                {
+                    if (pct > mapIter->second)
+                    {
+                        mapIter->second = pct;
+                    }
+                }
+
+            }
 
             pause_();
         }
@@ -1263,14 +1235,14 @@ void added_a_pm(int)
     logging::Message msg(1);
     args1.add("exeMgr caught SIGHUP. Resetting connections");
     msg.format( args1 );
-    cout << msg.msg().c_str() << endl;
+    std::cout << msg.msg().c_str() << std::endl;
     logging::Logger logger(logid.fSubsysID);
     logger.logMessage(logging::LOG_TYPE_DEBUG, msg, logid);
 
     if (ec)
     {
         //set BUSY_INIT state while processing the add pm configuration change
-        Oam oam;
+        oam::Oam oam;
 
         try
         {
@@ -1296,7 +1268,7 @@ void added_a_pm(int)
 void printTotalUmMemory(int sig)
 {
     int64_t num = rm->availableMemory();
-    cout << "Total UM memory available: " << num << endl;
+    std::cout << "Total UM memory available: " << num << std::endl;
 }
 
 void setupSignalHandlers()
@@ -1325,9 +1297,9 @@ void setupSignalHandlers()
 #endif
 }
 
-void setupCwd(ResourceManager* rm)
+void setupCwd(joblist::ResourceManager* rm)
 {
-    string workdir = rm->getScWorkingDir();
+    std::string workdir = rm->getScWorkingDir();
     (void)chdir(workdir.c_str());
 
     if (access(".", W_OK) != 0)
@@ -1376,9 +1348,9 @@ int setupResources()
 
 void cleanTempDir()
 {
-    config::Config* config = config::Config::makeConfig();
-    string allowDJS = config->getConfig("HashJoin", "AllowDiskBasedJoin");
-    string tmpPrefix = config->getConfig("HashJoin", "TempFilePath");
+    const auto config = config::Config::makeConfig();
+    std::string allowDJS = config->getConfig("HashJoin", "AllowDiskBasedJoin");
+    std::string tmpPrefix = config->getConfig("HashJoin", "TempFilePath");
 
     if (allowDJS == "N" || allowDJS == "n")
         return;
@@ -1393,31 +1365,31 @@ void cleanTempDir()
     /* This is quite scary as ExeMgr usually runs as root */
     try
     {
-    	boost::filesystem::remove_all(tmpPrefix);
-    	boost::filesystem::create_directories(tmpPrefix);
+        std::experimental::filesystem::remove_all(tmpPrefix);
+        std::experimental::filesystem::create_directories(tmpPrefix);
     }
-    catch (std::exception& ex)
+    catch (const std::exception& ex)
     {
-        cerr << ex.what() << endl;
-        LoggingID logid(16, 0, 0);
-        Message::Args args;
-        Message message(8);
+        std::cerr << ex.what() << std::endl;
+        logging::LoggingID logid(16, 0, 0);
+        logging::Message::Args args;
+        logging::Message message(8);
         args.add("Execption whilst cleaning tmpdir: ");
         args.add(ex.what());
         message.format( args );
         logging::Logger logger(logid.fSubsysID);
-        logger.logMessage(LOG_TYPE_WARNING, message, logid);
+        logger.logMessage(logging::LOG_TYPE_WARNING, message, logid);
     }
     catch (...)
     {
-        cerr << "Caught unknown exception during tmpdir cleanup" << endl;
-        LoggingID logid(16, 0, 0);
-        Message::Args args;
-        Message message(8);
+        std::cerr << "Caught unknown exception during tmpdir cleanup" << std::endl;
+        logging::LoggingID logid(16, 0, 0);
+        logging::Message::Args args;
+        logging::Message message(8);
         args.add("Unknown execption whilst cleaning tmpdir");
         message.format( args );
         logging::Logger logger(logid.fSubsysID);
-        logger.logMessage(LOG_TYPE_WARNING, message, logid);
+        logger.logMessage(logging::LOG_TYPE_WARNING, message, logid);
     }
 }
 
@@ -1425,7 +1397,7 @@ void cleanTempDir()
 int main(int argc, char* argv[])
 {
     // get and set locale language
-    string systemLang = "C";
+    std::string systemLang = "C";
     systemLang = funcexp::utf8::idb_setlocale();
 
     // This is unset due to the way we start it
@@ -1455,7 +1427,7 @@ int main(int argc, char* argv[])
 
     //set BUSY_INIT state
     {
-        Oam oam;
+        oam::Oam oam;
 
         try
         {
@@ -1479,7 +1451,7 @@ int main(int argc, char* argv[])
     int err = 0;
     if (!gDebug)
         err = setupResources();
-    string errMsg;
+    std::string errMsg;
 
     switch (err)
     {
@@ -1502,7 +1474,7 @@ int main(int argc, char* argv[])
 
     if (err < 0)
     {
-        Oam oam;
+        oam::Oam oam;
         logging::Message::Args args;
         logging::Message message;
         args.add( errMsg );
@@ -1510,7 +1482,7 @@ int main(int argc, char* argv[])
         logging::LoggingID lid(16);
         logging::MessageLog ml(lid);
         ml.logCriticalMessage( message );
-        cerr << errMsg << endl;
+        std::cerr << errMsg << std::endl;
 
         try
         {
@@ -1528,23 +1500,23 @@ int main(int argc, char* argv[])
 
     cleanTempDir();
 
-    MsgMap msgMap;
-    msgMap[logDefaultMsg]           = Message(logDefaultMsg);
-    msgMap[logDbProfStartStatement] = Message(logDbProfStartStatement);
-    msgMap[logDbProfEndStatement]   = Message(logDbProfEndStatement);
-    msgMap[logStartSql]             = Message(logStartSql);
-    msgMap[logEndSql]               = Message(logEndSql);
-    msgMap[logRssTooBig]            = Message(logRssTooBig);
-    msgMap[logDbProfQueryStats]     = Message(logDbProfQueryStats);
-    msgMap[logExeMgrExcpt]          = Message(logExeMgrExcpt);
+    logging::MsgMap msgMap;
+    msgMap[logDefaultMsg]           = logging::Message(logDefaultMsg);
+    msgMap[logDbProfStartStatement] = logging::Message(logDbProfStartStatement);
+    msgMap[logDbProfEndStatement]   = logging::Message(logDbProfEndStatement);
+    msgMap[logStartSql]             = logging::Message(logStartSql);
+    msgMap[logEndSql]               = logging::Message(logEndSql);
+    msgMap[logRssTooBig]            = logging::Message(logRssTooBig);
+    msgMap[logDbProfQueryStats]     = logging::Message(logDbProfQueryStats);
+    msgMap[logExeMgrExcpt]          = logging::Message(logExeMgrExcpt);
     msgLog.msgMap(msgMap);
 
-    ec = DistributedEngineComm::instance(rm, true);
+    ec = joblist::DistributedEngineComm::instance(rm, true);
     ec->Open();
 
     bool tellUser = true;
 
-    MessageQueueServer* mqs;
+    messageqcpp::MessageQueueServer* mqs;
 
     statementsRunningCount = new ActiveStatementCounter(rm->getEmExecQueueSize());
 
@@ -1552,18 +1524,18 @@ int main(int argc, char* argv[])
     {
         try
         {
-            mqs = new MessageQueueServer(ExeMgr, rm->getConfig(), ByteStream::BlockSize, 64);
+            mqs = new messageqcpp::MessageQueueServer(ExeMgr, rm->getConfig(), messageqcpp::ByteStream::BlockSize, 64);
             break;
         }
-        catch (runtime_error& re)
+        catch (std::runtime_error& re)
         {
-            string what = re.what();
+            std::string what = re.what();
 
-            if (what.find("Address already in use") != string::npos)
+            if (what.find("Address already in use") != std::string::npos)
             {
                 if (tellUser)
                 {
-                    cerr << "Address already in use, retrying..." << endl;
+                    std::cerr << "Address already in use, retrying..." << std::endl;
                     tellUser = false;
                 }
 
@@ -1581,13 +1553,13 @@ int main(int argc, char* argv[])
     // because rm has a "isExeMgr" flag that is set upon creation (rm is a singleton).
     // From  the pools perspective, it has no idea if it is ExeMgr doing the
     // creation, so it has no idea which way to set the flag. So we set the max here.
-    JobStep::jobstepThreadPool.setMaxThreads(rm->getJLThreadPoolSize());
-    JobStep::jobstepThreadPool.setName("ExeMgrJobList");
+    joblist::JobStep::jobstepThreadPool.setMaxThreads(rm->getJLThreadPoolSize());
+    joblist::JobStep::jobstepThreadPool.setName("ExeMgrJobList");
 
     if (rm->getJlThreadPoolDebug() == "Y" || rm->getJlThreadPoolDebug() == "y")
     {
-        JobStep::jobstepThreadPool.setDebug(true);
-        JobStep::jobstepThreadPool.invoke(ThreadPoolMonitor(&JobStep::jobstepThreadPool));
+      joblist::JobStep::jobstepThreadPool.setDebug(true);
+      joblist::JobStep::jobstepThreadPool.invoke(threadpool::ThreadPoolMonitor(&joblist::JobStep::jobstepThreadPool));
     }
 
     int serverThreads = rm->getEmServerThreads();
@@ -1605,7 +1577,7 @@ int main(int argc, char* argv[])
     setpriority(PRIO_PROCESS, 0, priority);
 #endif
 
-    string teleServerHost(rm->getConfig()->getConfig("QueryTele", "Host"));
+    std::string teleServerHost(rm->getConfig()->getConfig("QueryTele", "Host"));
 
     if (!teleServerHost.empty())
     {
@@ -1618,13 +1590,13 @@ int main(int argc, char* argv[])
         }
     }
 
-    cout << "Starting ExeMgr: st = " << serverThreads <<
+    std::cout << "Starting ExeMgr: st = " << serverThreads <<
          ", qs = " << rm->getEmExecQueueSize() << ", mx = " << maxPct << ", cf = " <<
-         rm->getConfig()->configFile() << endl;
+         rm->getConfig()->configFile() << std::endl;
 
     //set ACTIVE state
     {
-        Oam oam;
+        oam::Oam oam;
 
         try
         {
@@ -1646,12 +1618,12 @@ int main(int argc, char* argv[])
     if (rm->getExeMgrThreadPoolDebug() == "Y" || rm->getExeMgrThreadPoolDebug() == "y")
     {
         exeMgrThreadPool.setDebug(true);
-        exeMgrThreadPool.invoke(ThreadPoolMonitor(&exeMgrThreadPool));
+        exeMgrThreadPool.invoke(threadpool::ThreadPoolMonitor(&exeMgrThreadPool));
     }
 
     for (;;)
     {
-        IOSocket ios;
+        messageqcpp::IOSocket ios;
         ios = mqs->accept();
         exeMgrThreadPool.invoke(SessionThread(ios, ec, rm));
     }
diff --git a/oamapps/columnstoreDB/columnstoreDB.cpp b/oamapps/columnstoreDB/columnstoreDB.cpp
index 25c06d140..58a7e375f 100644
--- a/oamapps/columnstoreDB/columnstoreDB.cpp
+++ b/oamapps/columnstoreDB/columnstoreDB.cpp
@@ -23,6 +23,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <iostream>
 #include <fstream>
diff --git a/oamapps/columnstoreSupport/columnstoreSupport.cpp b/oamapps/columnstoreSupport/columnstoreSupport.cpp
index ccf7714c4..87adb28f7 100644
--- a/oamapps/columnstoreSupport/columnstoreSupport.cpp
+++ b/oamapps/columnstoreSupport/columnstoreSupport.cpp
@@ -10,6 +10,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <iterator>
 #include <numeric>
diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp
index d07c67ffb..6b951133b 100644
--- a/oamapps/mcsadmin/mcsadmin.cpp
+++ b/oamapps/mcsadmin/mcsadmin.cpp
@@ -21,6 +21,7 @@
  * $Id: mcsadmin.cpp 3110 2013-06-20 18:09:12Z dhill $
  *
  ******************************************************************************************/
+#include <future> //cxx11test
 
 #include <clocale>
 #include <netdb.h>
diff --git a/oamapps/postConfigure/getMySQLpw.cpp b/oamapps/postConfigure/getMySQLpw.cpp
index fdc6a6759..0073175bf 100644
--- a/oamapps/postConfigure/getMySQLpw.cpp
+++ b/oamapps/postConfigure/getMySQLpw.cpp
@@ -24,6 +24,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <unistd.h>
 #include <iterator>
diff --git a/oamapps/postConfigure/helpers.cpp b/oamapps/postConfigure/helpers.cpp
index 3238f9c57..e020ff7bc 100644
--- a/oamapps/postConfigure/helpers.cpp
+++ b/oamapps/postConfigure/helpers.cpp
@@ -348,8 +348,8 @@ int sendUpgradeRequest(int IserverTypeInstall, bool pmwithum)
         std::cerr << exc.what() << std::endl;
     }
 
-    ByteStream msg;
-    ByteStream::byte requestID = RUNUPGRADE;
+    messageqcpp::ByteStream msg;
+    messageqcpp::ByteStream::byte requestID = RUNUPGRADE;
 
     msg << requestID;
 
@@ -484,8 +484,8 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pm
                         if ( (*pt).DeviceName == masterModule )
                         {
                             // set for Master MySQL DB distrubution to slaves
-                            ByteStream msg1;
-                            ByteStream::byte requestID = oam::MASTERDIST;
+                            messageqcpp::ByteStream msg1;
+                            messageqcpp::ByteStream::byte requestID = oam::MASTERDIST;
                             msg1 << requestID;
                             msg1 << password;
                             msg1 << "all";	// dist to all slave modules
@@ -499,7 +499,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pm
                             }
 
                             // set for master repl request
-                            ByteStream msg;
+                            messageqcpp::ByteStream msg;
                             requestID = oam::MASTERREP;
                             msg << requestID;
 
@@ -527,8 +527,8 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pm
                                 continue;
                             }
 
-                            ByteStream msg;
-                            ByteStream::byte requestID = oam::SLAVEREP;
+                            messageqcpp::ByteStream msg;
+                            messageqcpp::ByteStream::byte requestID = oam::SLAVEREP;
                             msg << requestID;
 
                             if ( masterLogFile == oam::UnassignedName ||
@@ -574,7 +574,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pm
 * purpose:	Sends a Msg to ProcMon
 *
 ******************************************************************************************/
-int sendMsgProcMon( std::string module, ByteStream msg, int requestID, int timeout )
+int sendMsgProcMon( std::string module, messageqcpp::ByteStream msg, int requestID, int timeout )
 {
     string msgPort = module + "_ProcessMonitor";
     int returnStatus = API_FAILURE;
@@ -602,16 +602,16 @@ int sendMsgProcMon( std::string module, ByteStream msg, int requestID, int timeo
 
     try
     {
-        MessageQueueClient mqRequest(msgPort);
+        messageqcpp::MessageQueueClient mqRequest(msgPort);
         mqRequest.write(msg);
 
         if ( timeout > 0 )
         {
             // wait for response
-            ByteStream::byte returnACK;
-            ByteStream::byte returnRequestID;
-            ByteStream::byte requestStatus;
-            ByteStream receivedMSG;
+            messageqcpp::ByteStream::byte returnACK;
+            messageqcpp::ByteStream::byte returnRequestID;
+            messageqcpp::ByteStream::byte requestStatus;
+            messageqcpp::ByteStream receivedMSG;
 
             struct timespec ts = { timeout, 0 };
 
diff --git a/oamapps/postConfigure/helpers.h b/oamapps/postConfigure/helpers.h
index 5f7b1631a..8eb23bce0 100644
--- a/oamapps/postConfigure/helpers.h
+++ b/oamapps/postConfigure/helpers.h
@@ -21,7 +21,7 @@
 
 #include "liboamcpp.h"
 
-using namespace messageqcpp;
+
 namespace installer
 {
 
@@ -37,7 +37,7 @@ typedef std::vector<ChildModule> ChildModuleList;
 extern bool waitForActive();
 extern void dbrmDirCheck();
 extern void mysqlSetup();
-extern int sendMsgProcMon( std::string module, ByteStream msg, int requestID, int timeout );
+extern int sendMsgProcMon( std::string module, messageqcpp::ByteStream msg, int requestID, int timeout );
 extern int sendUpgradeRequest(int IserverTypeInstall, bool pmwithum = false);
 extern int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pmwithum);
 extern void checkFilesPerPartion(int DBRootCount, Config* sysConfig);
diff --git a/oamapps/postConfigure/installer.cpp b/oamapps/postConfigure/installer.cpp
index 81b69e548..075870275 100644
--- a/oamapps/postConfigure/installer.cpp
+++ b/oamapps/postConfigure/installer.cpp
@@ -27,6 +27,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <iterator>
 #include <numeric>
diff --git a/oamapps/postConfigure/mycnfUpgrade.cpp b/oamapps/postConfigure/mycnfUpgrade.cpp
index 7f785153e..e42a9b64f 100644
--- a/oamapps/postConfigure/mycnfUpgrade.cpp
+++ b/oamapps/postConfigure/mycnfUpgrade.cpp
@@ -25,6 +25,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <unistd.h>
 #include <iterator>
diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp
index fdfc1482c..a115104e5 100644
--- a/oamapps/postConfigure/postConfigure.cpp
+++ b/oamapps/postConfigure/postConfigure.cpp
@@ -29,6 +29,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <unistd.h>
 #include <iterator>
diff --git a/oamapps/serverMonitor/serverMonitor.cpp b/oamapps/serverMonitor/serverMonitor.cpp
index 99d0fb04a..f9a468569 100644
--- a/oamapps/serverMonitor/serverMonitor.cpp
+++ b/oamapps/serverMonitor/serverMonitor.cpp
@@ -21,6 +21,7 @@
  *
  *   Author: David Hill
  ***************************************************************************/
+#include <future> //cxx11test
 
 #include "serverMonitor.h"
 #include "installdir.h"
diff --git a/primitives/primproc/dictstep.h b/primitives/primproc/dictstep.h
index 1652ec8f3..025658d5b 100644
--- a/primitives/primproc/dictstep.h
+++ b/primitives/primproc/dictstep.h
@@ -138,7 +138,7 @@ private:
     int64_t* values;
     boost::scoped_array<std::string>* strValues;
     int compressionType;
-    ByteStream filterString;
+    messageqcpp::ByteStream filterString;
     uint32_t filterCount;
     uint32_t bufferSize;
     uint16_t inputRidCount;
diff --git a/primitives/primproc/primproc.cpp b/primitives/primproc/primproc.cpp
index 2e88493a0..3df972ac1 100644
--- a/primitives/primproc/primproc.cpp
+++ b/primitives/primproc/primproc.cpp
@@ -21,6 +21,8 @@
  *
  *
  ***********************************************************************/
+#include <future> //cxx11test
+
 #include <unistd.h>
 #include <string>
 #include <iostream>
diff --git a/primitives/primproc/umsocketselector.cpp b/primitives/primproc/umsocketselector.cpp
index 574e23e56..5fa76f3bc 100644
--- a/primitives/primproc/umsocketselector.cpp
+++ b/primitives/primproc/umsocketselector.cpp
@@ -243,7 +243,7 @@ UmSocketSelector::addConnection(
 // ioSock (in) - socket/port connection to be deleted
 //------------------------------------------------------------------------------
 void
-UmSocketSelector::delConnection( const IOSocket& ios )
+UmSocketSelector::delConnection( const messageqcpp::IOSocket& ios )
 {
     sockaddr sa = ios.sa();
     const sockaddr_in* sinp = reinterpret_cast<const sockaddr_in*>(&sa);
@@ -271,7 +271,7 @@ UmSocketSelector::delConnection( const IOSocket& ios )
 //------------------------------------------------------------------------------
 bool
 UmSocketSelector::nextIOSocket(
-    const IOSocket& ios,
+    const messageqcpp::IOSocket& ios,
     SP_UM_IOSOCK&   outIos,
     SP_UM_MUTEX&    writeLock )
 {
@@ -405,7 +405,7 @@ UmModuleIPs::addSocketConn(
 // ioSock (in) - socket/port connection to be deleted
 //------------------------------------------------------------------------------
 void
-UmModuleIPs::delSocketConn( const IOSocket& ioSock )
+UmModuleIPs::delSocketConn( const messageqcpp::IOSocket& ioSock )
 {
     boost::mutex::scoped_lock lock( fUmModuleMutex );
 
@@ -565,7 +565,7 @@ UmIPSocketConns::addSocketConn(
 // can benefit from quick random access.
 //------------------------------------------------------------------------------
 void
-UmIPSocketConns::delSocketConn( const IOSocket& ioSock )
+UmIPSocketConns::delSocketConn( const messageqcpp::IOSocket& ioSock )
 {
     for (unsigned int i = 0; i < fIOSockets.size(); ++i)
     {
diff --git a/primitives/primproc/umsocketselector.h b/primitives/primproc/umsocketselector.h
index 0affabec8..c5be55be8 100644
--- a/primitives/primproc/umsocketselector.h
+++ b/primitives/primproc/umsocketselector.h
@@ -52,8 +52,6 @@ typedef uint32_t in_addr_t;
 
 #include "iosocket.h"
 
-using namespace messageqcpp;
-
 namespace primitiveprocessor
 {
 class UmModuleIPs;
@@ -61,7 +59,7 @@ class UmIPSocketConns;
 
 typedef boost::shared_ptr<UmModuleIPs>     SP_UM_MODIPS;
 typedef boost::shared_ptr<UmIPSocketConns> SP_UM_IPCONNS;
-typedef boost::shared_ptr<IOSocket>		   SP_UM_IOSOCK;
+typedef boost::shared_ptr<messageqcpp::IOSocket>		   SP_UM_IOSOCK;
 typedef boost::shared_ptr<boost::mutex>	   SP_UM_MUTEX;
 
 //------------------------------------------------------------------------------
@@ -116,7 +114,7 @@ public:
      *
      * @param ios (in) socket/port connection to be removed.
      */
-    void delConnection( const IOSocket& ios );
+    void delConnection( const messageqcpp::IOSocket& ios );
 
     /** @brief Get the next output IOSocket to use for the specified ios.
      *
@@ -125,7 +123,7 @@ public:
      * @param writeLock (out) mutex to use when writing to outIos.
      * @return boolean indicating if operation was successful.
      */
-    bool nextIOSocket( const IOSocket& ios, SP_UM_IOSOCK& outIos,
+    bool nextIOSocket( const messageqcpp::IOSocket& ios, SP_UM_IOSOCK& outIos,
                        SP_UM_MUTEX& writeLock );
 
     /** @brief toString method used in logging, debugging, etc.
@@ -217,7 +215,7 @@ public:
      *
      * @param ioSock (in) socket/port to delete from the connection list.
      */
-    void delSocketConn ( const IOSocket& ioSock );
+    void delSocketConn ( const messageqcpp::IOSocket& ioSock );
 
     /** @brief Get the "next" available socket/port for this UM module.
      *
@@ -311,7 +309,7 @@ public:
      *
      * @param ioSock (in) socket/port to delete from the connection list.
      */
-    void delSocketConn ( const IOSocket& ioSock );
+    void delSocketConn ( const messageqcpp::IOSocket& ioSock );
 
     /** @brief Get the "next" available socket/port for this IP address.
      *
diff --git a/procmgr/main.cpp b/procmgr/main.cpp
index c81f5fd69..54529ae0a 100644
--- a/procmgr/main.cpp
+++ b/procmgr/main.cpp
@@ -21,6 +21,7 @@
 * $Id: main.cpp 2203 2013-07-08 16:50:51Z bpaul $
 *
 *****************************************************************************************/
+#include <future> //cxx11test
 
 
 #include <clocale>
diff --git a/procmon/main.cpp b/procmon/main.cpp
index 0d2d2ab4a..37afe274c 100644
--- a/procmon/main.cpp
+++ b/procmon/main.cpp
@@ -15,6 +15,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
+#include <future> //cxx11test
 
 #include <boost/interprocess/shared_memory_object.hpp>
 #include <boost/interprocess/mapped_region.hpp>
diff --git a/tools/clearShm/main.cpp b/tools/clearShm/main.cpp
index e883bc0f6..e80a8c79d 100644
--- a/tools/clearShm/main.cpp
+++ b/tools/clearShm/main.cpp
@@ -16,6 +16,7 @@
    MA 02110-1301, USA. */
 
 // $Id: main.cpp 2101 2013-01-21 14:12:52Z rdempsey $
+#include <future> //cxx11test
 
 #include "config.h"
 
@@ -46,7 +47,7 @@ namespace
 
 bool vFlg;
 bool nFlg;
-mutex coutMutex;
+std::mutex coutMutex;
 
 void shmDoit(key_t shm_key, const string& label)
 {
@@ -61,7 +62,7 @@ void shmDoit(key_t shm_key, const string& label)
                                             bi::read_only);
             bi::offset_t memSize = 0;
             memObj.get_size(memSize);
-            mutex::scoped_lock lk(coutMutex);
+            std::lock_guard<std::mutex> lk(coutMutex);
             cout << label << ": shm_key: " << shm_key <<
                  "; key_name: " << key_name <<
                  "; size: " << memSize << endl;
@@ -102,7 +103,7 @@ void semDoit(key_t sem_key, const string& label)
                                             bi::read_only);
             bi::offset_t memSize = 0;
             memObj.get_size(memSize);
-            mutex::scoped_lock lk(coutMutex);
+            std::lock_guard<std::mutex> lk(coutMutex);
             cout << label << ": sem_key: " << sem_key <<
                  "; key_name: " << key_name <<
                  "; size: " << memSize << endl;
diff --git a/tools/cleartablelock/cleartablelock.cpp b/tools/cleartablelock/cleartablelock.cpp
index a18148343..cb22cb343 100644
--- a/tools/cleartablelock/cleartablelock.cpp
+++ b/tools/cleartablelock/cleartablelock.cpp
@@ -18,6 +18,7 @@
 /*
 * $Id: cleartablelock.cpp 2336 2013-06-25 19:11:36Z rdempsey $
 */
+#include <future> //cxx11test
 
 #include <cstdlib>
 #include <iostream>
diff --git a/tools/configMgt/autoConfigure.cpp b/tools/configMgt/autoConfigure.cpp
index 85702952a..fbd5d739a 100644
--- a/tools/configMgt/autoConfigure.cpp
+++ b/tools/configMgt/autoConfigure.cpp
@@ -28,6 +28,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <iterator>
 #include <numeric>
diff --git a/tools/configMgt/autoInstaller.cpp b/tools/configMgt/autoInstaller.cpp
index 15ac98c33..e3699449e 100644
--- a/tools/configMgt/autoInstaller.cpp
+++ b/tools/configMgt/autoInstaller.cpp
@@ -28,6 +28,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <iostream>
 #include <cstdlib>
diff --git a/tools/configMgt/svnQuery.cpp b/tools/configMgt/svnQuery.cpp
index 1aaee0117..c1de2c065 100644
--- a/tools/configMgt/svnQuery.cpp
+++ b/tools/configMgt/svnQuery.cpp
@@ -24,6 +24,7 @@
 /**
  * @file
  */
+#include <future> //cxx11test
 
 #include <iterator>
 #include <numeric>
diff --git a/tools/cplogger/main.cpp b/tools/cplogger/main.cpp
index 0f1b1e32e..4d45cd527 100644
--- a/tools/cplogger/main.cpp
+++ b/tools/cplogger/main.cpp
@@ -16,6 +16,7 @@
    MA 02110-1301, USA. */
 
 // $Id: main.cpp 2336 2013-06-25 19:11:36Z rdempsey $
+#include <future> //cxx11test
 #include <unistd.h>
 #include <cstdio>
 #include <iostream>
diff --git a/tools/dbbuilder/dbbuilder.cpp b/tools/dbbuilder/dbbuilder.cpp
index aec094b89..6f62eeb0a 100644
--- a/tools/dbbuilder/dbbuilder.cpp
+++ b/tools/dbbuilder/dbbuilder.cpp
@@ -19,6 +19,7 @@
 * $Id: dbbuilder.cpp 2101 2013-01-21 14:12:52Z rdempsey $
 *
 *******************************************************************************/
+#include <future> //cxx11test
 #include <stdio.h>
 #include <unistd.h>
 #include <cerrno>
diff --git a/tools/dbloadxml/colxml.cpp b/tools/dbloadxml/colxml.cpp
index 00171ffc0..4e359c599 100644
--- a/tools/dbloadxml/colxml.cpp
+++ b/tools/dbloadxml/colxml.cpp
@@ -19,6 +19,7 @@
  * $Id: colxml.cpp 2237 2013-05-05 23:42:37Z dcathey $
  *
  ******************************************************************************/
+#include <future> //cxx11test
 
 #include <clocale>
 
diff --git a/tools/ddlcleanup/ddlcleanup.cpp b/tools/ddlcleanup/ddlcleanup.cpp
index f09e50d7a..9924f91be 100644
--- a/tools/ddlcleanup/ddlcleanup.cpp
+++ b/tools/ddlcleanup/ddlcleanup.cpp
@@ -18,6 +18,7 @@
 /*
 * $Id: ddlcleanup.cpp 967 2009-10-15 13:57:29Z rdempsey $
 */
+#include <future> //cxx11test
 
 #include <iostream>
 #include <fstream>
diff --git a/tools/editem/editem.cpp b/tools/editem/editem.cpp
index 12ff29221..81c34c407 100644
--- a/tools/editem/editem.cpp
+++ b/tools/editem/editem.cpp
@@ -18,6 +18,7 @@
 /*
 * $Id: editem.cpp 2336 2013-06-25 19:11:36Z rdempsey $
 */
+#include <future> //cxx11test
 
 #include <iostream>
 #include <vector>
diff --git a/tools/getConfig/main.cpp b/tools/getConfig/main.cpp
index 87e5ed724..e895f603b 100644
--- a/tools/getConfig/main.cpp
+++ b/tools/getConfig/main.cpp
@@ -19,6 +19,7 @@
 * $Id: main.cpp 2101 2013-01-21 14:12:52Z rdempsey $
 *
 *****************************************************************************/
+#include <future> //cxx11test
 #include <iostream>
 #include <cassert>
 #include <unistd.h>
diff --git a/tools/idbmeminfo/idbmeminfo.cpp b/tools/idbmeminfo/idbmeminfo.cpp
index b0be99d35..4c84403a3 100644
--- a/tools/idbmeminfo/idbmeminfo.cpp
+++ b/tools/idbmeminfo/idbmeminfo.cpp
@@ -14,6 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
+#include <future> //cxx11test
 
 #ifdef _MSC_VER
 #define WIN32_LEAN_AND_MEAN
diff --git a/tools/setConfig/main.cpp b/tools/setConfig/main.cpp
index d74d51ed9..fb66c9bc7 100644
--- a/tools/setConfig/main.cpp
+++ b/tools/setConfig/main.cpp
@@ -19,6 +19,7 @@
 * $Id: main.cpp 210 2007-06-08 17:08:26Z rdempsey $
 *
 *****************************************************************************/
+#include <future> //cxx11test
 #include <unistd.h>
 #include <iostream>
 #include <cassert>
diff --git a/tools/viewtablelock/viewtablelock.cpp b/tools/viewtablelock/viewtablelock.cpp
index cec87cfec..6d163e3e5 100644
--- a/tools/viewtablelock/viewtablelock.cpp
+++ b/tools/viewtablelock/viewtablelock.cpp
@@ -18,6 +18,7 @@
 /*
 * $Id: viewtablelock.cpp 2101 2013-01-21 14:12:52Z rdempsey $
 */
+#include <future> //cxx11test
 
 #include <ctime>
 #include <iostream>
diff --git a/utils/funcexp/func_date.cpp b/utils/funcexp/func_date.cpp
index 7fc990ab6..719b068df 100644
--- a/utils/funcexp/func_date.cpp
+++ b/utils/funcexp/func_date.cpp
@@ -56,8 +56,8 @@ int64_t Func_date::getIntVal(rowgroup::Row& row,
 
     string value = "";
 
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (type)
     {
@@ -79,7 +79,7 @@ int64_t Func_date::getIntVal(rowgroup::Row& row,
         case CalpontSystemCatalog::TIME:
         {
             int64_t val;
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             aDateTime.hour = 0;
diff --git a/utils/funcexp/func_day.cpp b/utils/funcexp/func_day.cpp
index 7ff2bab9a..6adfc9c25 100644
--- a/utils/funcexp/func_day.cpp
+++ b/utils/funcexp/func_day.cpp
@@ -49,8 +49,8 @@ int64_t Func_day::getIntVal(rowgroup::Row& row,
 {
     int64_t val = 0;
 
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -64,7 +64,7 @@ int64_t Func_day::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_dayname.cpp b/utils/funcexp/func_dayname.cpp
index 5da6d8943..15933080e 100644
--- a/utils/funcexp/func_dayname.cpp
+++ b/utils/funcexp/func_dayname.cpp
@@ -54,8 +54,8 @@ int64_t Func_dayname::getIntVal(rowgroup::Row& row,
     int64_t val = 0;
     int32_t dayofweek = 0;
 
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -75,7 +75,7 @@ int64_t Func_dayname::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_dayofweek.cpp b/utils/funcexp/func_dayofweek.cpp
index ec84f5738..e9cb9f0e4 100644
--- a/utils/funcexp/func_dayofweek.cpp
+++ b/utils/funcexp/func_dayofweek.cpp
@@ -52,8 +52,8 @@ int64_t Func_dayofweek::getIntVal(rowgroup::Row& row,
     uint32_t day = 0;
     int64_t val = 0;
 
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -73,7 +73,7 @@ int64_t Func_dayofweek::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_dayofyear.cpp b/utils/funcexp/func_dayofyear.cpp
index ee3b9cf30..782e7e1af 100644
--- a/utils/funcexp/func_dayofyear.cpp
+++ b/utils/funcexp/func_dayofyear.cpp
@@ -52,8 +52,8 @@ int64_t Func_dayofyear::getIntVal(rowgroup::Row& row,
     uint32_t day = 0;
     int64_t val = 0;
 
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -73,7 +73,7 @@ int64_t Func_dayofyear::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_month.cpp b/utils/funcexp/func_month.cpp
index 5479270d0..e11cee296 100644
--- a/utils/funcexp/func_month.cpp
+++ b/utils/funcexp/func_month.cpp
@@ -48,8 +48,8 @@ int64_t Func_month::getIntVal(rowgroup::Row& row,
                               CalpontSystemCatalog::ColType& op_ct)
 {
     int64_t val = 0;
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -63,7 +63,7 @@ int64_t Func_month::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_monthname.cpp b/utils/funcexp/func_monthname.cpp
index 9657b1ea2..70bba26e0 100644
--- a/utils/funcexp/func_monthname.cpp
+++ b/utils/funcexp/func_monthname.cpp
@@ -79,8 +79,8 @@ int64_t Func_monthname::getIntVal(rowgroup::Row& row,
                                   CalpontSystemCatalog::ColType& op_ct)
 {
     int64_t val = 0;
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -94,7 +94,7 @@ int64_t Func_monthname::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_quarter.cpp b/utils/funcexp/func_quarter.cpp
index 78559d68d..4f476e2ff 100644
--- a/utils/funcexp/func_quarter.cpp
+++ b/utils/funcexp/func_quarter.cpp
@@ -50,8 +50,8 @@ int64_t Func_quarter::getIntVal(rowgroup::Row& row,
 {
     // try to cast to date/datetime
     int64_t val = 0, month = 0;
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -67,7 +67,7 @@ int64_t Func_quarter::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_to_days.cpp b/utils/funcexp/func_to_days.cpp
index f16642958..33f72b22d 100644
--- a/utils/funcexp/func_to_days.cpp
+++ b/utils/funcexp/func_to_days.cpp
@@ -59,8 +59,8 @@ int64_t Func_to_days::getIntVal(rowgroup::Row& row,
              month = 0,
              day = 0;
 
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (type)
     {
@@ -89,7 +89,7 @@ int64_t Func_to_days::getIntVal(rowgroup::Row& row,
         case CalpontSystemCatalog::TIME:
         {
             int64_t val;
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aDateTime.hour = 0;
             aDateTime.minute = 0;
diff --git a/utils/funcexp/func_week.cpp b/utils/funcexp/func_week.cpp
index a9e47bd4b..ec6131b26 100644
--- a/utils/funcexp/func_week.cpp
+++ b/utils/funcexp/func_week.cpp
@@ -53,8 +53,8 @@ int64_t Func_week::getIntVal(rowgroup::Row& row,
 
     int64_t val = 0;
     int16_t mode = 0;
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     if (parm.size() > 1)  // mode value
         mode = parm[1]->data()->getIntVal(row, isNull);
@@ -77,7 +77,7 @@ int64_t Func_week::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_weekday.cpp b/utils/funcexp/func_weekday.cpp
index 9666710f5..6b5c1f55d 100644
--- a/utils/funcexp/func_weekday.cpp
+++ b/utils/funcexp/func_weekday.cpp
@@ -52,8 +52,8 @@ int64_t Func_weekday::getIntVal(rowgroup::Row& row,
     uint32_t month = 0;
     uint32_t day = 0;
     int64_t val = 0;
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -73,7 +73,7 @@ int64_t Func_weekday::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_year.cpp b/utils/funcexp/func_year.cpp
index 17ff4f2d0..6e71b8a03 100644
--- a/utils/funcexp/func_year.cpp
+++ b/utils/funcexp/func_year.cpp
@@ -48,8 +48,8 @@ int64_t Func_year::getIntVal(rowgroup::Row& row,
                              CalpontSystemCatalog::ColType& op_ct)
 {
     int64_t val = 0;
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     switch (parm[0]->data()->resultType().colDataType)
     {
@@ -63,7 +63,7 @@ int64_t Func_year::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/func_yearweek.cpp b/utils/funcexp/func_yearweek.cpp
index e567440b4..5568b763c 100644
--- a/utils/funcexp/func_yearweek.cpp
+++ b/utils/funcexp/func_yearweek.cpp
@@ -54,8 +54,8 @@ int64_t Func_yearweek::getIntVal(rowgroup::Row& row,
 
     int64_t val = 0;
     int16_t mode = 0;	// default to 2
-    DateTime aDateTime;
-    Time     aTime;
+    dataconvert::DateTime aDateTime;
+    dataconvert::Time     aTime;
 
     if (parm.size() > 1)   // mode value
         mode = parm[1]->data()->getIntVal(row, isNull);
@@ -80,7 +80,7 @@ int64_t Func_yearweek::getIntVal(rowgroup::Row& row,
 
         // Time adds to now() and then gets value
         case CalpontSystemCatalog::TIME:
-            aDateTime = static_cast<DateTime>(nowDatetime());
+            aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
             aTime = parm[0]->data()->getTimeIntVal(row, isNull);
             aTime.day = 0;
             val = addTime(aDateTime, aTime);
diff --git a/utils/funcexp/functor.h b/utils/funcexp/functor.h
index 9904c6831..890fddeae 100644
--- a/utils/funcexp/functor.h
+++ b/utils/funcexp/functor.h
@@ -36,7 +36,6 @@
 #include "calpontsystemcatalog.h"
 
 #include "dataconvert.h"
-using namespace dataconvert;
 
 namespace rowgroup
 {
@@ -178,7 +177,7 @@ protected:
     virtual std::string longDoubleToString(long double);
 
     virtual int64_t nowDatetime();
-    virtual int64_t addTime(DateTime& dt1, dataconvert::Time& dt2);
+    virtual int64_t addTime(dataconvert::DateTime& dt1, dataconvert::Time& dt2);
     virtual int64_t addTime(dataconvert::Time& dt1, dataconvert::Time& dt2);
 
     std::string fFuncName;
diff --git a/utils/funcexp/functor_str.h b/utils/funcexp/functor_str.h
index 5402cc646..fc8de1d9f 100644
--- a/utils/funcexp/functor_str.h
+++ b/utils/funcexp/functor_str.h
@@ -25,8 +25,6 @@
 
 #include "functor.h"
 
-using namespace std;
-
 namespace funcexp
 {
 
@@ -141,7 +139,7 @@ protected:
         exponent = (int)floor(log10( fabsl(floatVal)));
         base = floatVal * pow(10, -1.0 * exponent);
 
-        if (isnan(exponent) || isnan(base))
+        if (std::isnan(exponent) || std::isnan(base))
         {
             snprintf(buf, 20, "%Lf", floatVal);
             fFloatStr = execplan::removeTrailing0(buf, 20);
@@ -325,7 +323,7 @@ public:
   */
 class Func_lpad : public Func_Str
 {
-    static const string fPad;
+    static const std::string fPad;
 public:
     Func_lpad() : Func_Str("lpad") {}
     virtual ~Func_lpad() {}
@@ -343,7 +341,7 @@ public:
   */
 class Func_rpad : public Func_Str
 {
-    static const string fPad;
+    static const std::string fPad;
 public:
     Func_rpad() : Func_Str("rpad") {}
     virtual ~Func_rpad() {}
diff --git a/utils/funcexp/utils_utf8.h b/utils/funcexp/utils_utf8.h
index 6f5cb26a8..442ca6297 100644
--- a/utils/funcexp/utils_utf8.h
+++ b/utils/funcexp/utils_utf8.h
@@ -37,12 +37,9 @@
 
 #include <clocale>
 
-#include "alarmmanager.h"
-using namespace alarmmanager;
+#include "ALARMManager.h"
 
 #include "liboamcpp.h"
-using namespace oam;
-
 
 /** @file */
 
@@ -63,7 +60,7 @@ std::string idb_setlocale()
 {
     // get and set locale language
     std::string systemLang("C");
-    Oam oam;
+    oam::Oam oam;
 
     try
     {
@@ -81,9 +78,9 @@ std::string idb_setlocale()
         try
         {
             //send alarm
-            ALARMManager alarmMgr;
+            alarmmanager::ALARMManager alarmMgr;
             std::string alarmItem = "system";
-            alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, SET);
+            alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, alarmmanager::SET);
             printf("Failed to set locale : %s, Critical alarm generated\n", systemLang.c_str());
         }
         catch (...)
@@ -96,9 +93,9 @@ std::string idb_setlocale()
         try
         {
             //send alarm
-            ALARMManager alarmMgr;
+            alarmmanager::ALARMManager alarmMgr;
             std::string alarmItem = "system";
-            alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, CLEAR);
+            alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, alarmmanager::CLEAR);
         }
         catch (...)
         {
diff --git a/utils/regr/corr.cpp b/utils/regr/corr.cpp
index c1c388da9..ac69357df 100644
--- a/utils/regr/corr.cpp
+++ b/utils/regr/corr.cpp
@@ -66,7 +66,7 @@ mcsv1_UDAF::ReturnCode corr::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(corr_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/corr.h b/utils/regr/corr.h
index d1b5f55ac..389b61195 100644
--- a/utils/regr/corr.h
+++ b/utils/regr/corr.h
@@ -43,7 +43,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/covar_pop.cpp b/utils/regr/covar_pop.cpp
index 876be1f30..672da9d75 100644
--- a/utils/regr/covar_pop.cpp
+++ b/utils/regr/covar_pop.cpp
@@ -64,7 +64,7 @@ mcsv1_UDAF::ReturnCode covar_pop::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(covar_pop_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/covar_pop.h b/utils/regr/covar_pop.h
index dda396fb9..c3f6dde4a 100644
--- a/utils/regr/covar_pop.h
+++ b/utils/regr/covar_pop.h
@@ -43,7 +43,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/covar_samp.cpp b/utils/regr/covar_samp.cpp
index ccc302046..81e9fc212 100644
--- a/utils/regr/covar_samp.cpp
+++ b/utils/regr/covar_samp.cpp
@@ -64,7 +64,7 @@ mcsv1_UDAF::ReturnCode covar_samp::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(covar_samp_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/covar_samp.h b/utils/regr/covar_samp.h
index a65625520..fe0352fe8 100644
--- a/utils/regr/covar_samp.h
+++ b/utils/regr/covar_samp.h
@@ -43,7 +43,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_avgx.cpp b/utils/regr/regr_avgx.cpp
index 8e4314d01..c27d075ad 100644
--- a/utils/regr/regr_avgx.cpp
+++ b/utils/regr/regr_avgx.cpp
@@ -65,7 +65,7 @@ mcsv1_UDAF::ReturnCode regr_avgx::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_avgx_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(colTypes[1].scale + 4);
     context->setPrecision(19);
diff --git a/utils/regr/regr_avgx.h b/utils/regr/regr_avgx.h
index 960a6a892..e76ecf56c 100644
--- a/utils/regr/regr_avgx.h
+++ b/utils/regr/regr_avgx.h
@@ -43,7 +43,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_avgy.cpp b/utils/regr/regr_avgy.cpp
index 3d49e96b4..f22959354 100644
--- a/utils/regr/regr_avgy.cpp
+++ b/utils/regr/regr_avgy.cpp
@@ -65,7 +65,7 @@ mcsv1_UDAF::ReturnCode regr_avgy::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_avgy_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(colTypes[0].scale + 4);
     context->setPrecision(19);
diff --git a/utils/regr/regr_avgy.h b/utils/regr/regr_avgy.h
index c2a3020da..9e425a7bd 100644
--- a/utils/regr/regr_avgy.h
+++ b/utils/regr/regr_avgy.h
@@ -43,7 +43,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_count.cpp b/utils/regr/regr_count.cpp
index c65a1f4a6..8b5993d33 100644
--- a/utils/regr/regr_count.cpp
+++ b/utils/regr/regr_count.cpp
@@ -54,7 +54,7 @@ mcsv1_UDAF::ReturnCode regr_count::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_count_data));
-    context->setResultType(CalpontSystemCatalog::BIGINT);
+    context->setResultType(execplan::CalpontSystemCatalog::BIGINT);
     context->setColWidth(8);
     context->setRunFlag(mcsv1sdk::UDAF_IGNORE_NULLS);
     return mcsv1_UDAF::SUCCESS;
diff --git a/utils/regr/regr_count.h b/utils/regr/regr_count.h
index 25cde7898..0fa140d56 100644
--- a/utils/regr/regr_count.h
+++ b/utils/regr/regr_count.h
@@ -43,7 +43,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_intercept.cpp b/utils/regr/regr_intercept.cpp
index df9310f03..9b457243c 100644
--- a/utils/regr/regr_intercept.cpp
+++ b/utils/regr/regr_intercept.cpp
@@ -65,7 +65,7 @@ mcsv1_UDAF::ReturnCode regr_intercept::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_intercept_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/regr_intercept.h b/utils/regr/regr_intercept.h
index ef8dc6de5..50c7fbdd9 100644
--- a/utils/regr/regr_intercept.h
+++ b/utils/regr/regr_intercept.h
@@ -43,7 +43,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_r2.cpp b/utils/regr/regr_r2.cpp
index 1abd3ea2e..60bcad65c 100644
--- a/utils/regr/regr_r2.cpp
+++ b/utils/regr/regr_r2.cpp
@@ -66,7 +66,7 @@ mcsv1_UDAF::ReturnCode regr_r2::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_r2_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/regr_r2.h b/utils/regr/regr_r2.h
index 968814067..fac04eac8 100644
--- a/utils/regr/regr_r2.h
+++ b/utils/regr/regr_r2.h
@@ -43,7 +43,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_slope.cpp b/utils/regr/regr_slope.cpp
index de9eab5c7..17e662f2c 100644
--- a/utils/regr/regr_slope.cpp
+++ b/utils/regr/regr_slope.cpp
@@ -64,7 +64,7 @@ mcsv1_UDAF::ReturnCode regr_slope::init(mcsv1Context* context,
         return mcsv1_UDAF::ERROR;
     }
     context->setUserDataSize(sizeof(regr_slope_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/regr_slope.h b/utils/regr/regr_slope.h
index 8a20494c1..d32223ae9 100644
--- a/utils/regr/regr_slope.h
+++ b/utils/regr/regr_slope.h
@@ -43,7 +43,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_sxx.cpp b/utils/regr/regr_sxx.cpp
index 4d5fac370..2338d4436 100644
--- a/utils/regr/regr_sxx.cpp
+++ b/utils/regr/regr_sxx.cpp
@@ -63,7 +63,7 @@ mcsv1_UDAF::ReturnCode regr_sxx::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_sxx_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/regr_sxx.h b/utils/regr/regr_sxx.h
index 53c771b6f..82ec7e154 100644
--- a/utils/regr/regr_sxx.h
+++ b/utils/regr/regr_sxx.h
@@ -43,7 +43,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_sxy.cpp b/utils/regr/regr_sxy.cpp
index 76e1373c4..daef4333e 100644
--- a/utils/regr/regr_sxy.cpp
+++ b/utils/regr/regr_sxy.cpp
@@ -64,7 +64,7 @@ mcsv1_UDAF::ReturnCode regr_sxy::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_sxy_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/regr_sxy.h b/utils/regr/regr_sxy.h
index 6371c6fed..47e6c30e6 100644
--- a/utils/regr/regr_sxy.h
+++ b/utils/regr/regr_sxy.h
@@ -43,7 +43,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/regr/regr_syy.cpp b/utils/regr/regr_syy.cpp
index 6febb9579..6d803d992 100644
--- a/utils/regr/regr_syy.cpp
+++ b/utils/regr/regr_syy.cpp
@@ -63,7 +63,7 @@ mcsv1_UDAF::ReturnCode regr_syy::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(regr_syy_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(DECIMAL_NOT_SPECIFIED);
     context->setPrecision(0);
diff --git a/utils/regr/regr_syy.h b/utils/regr/regr_syy.h
index d1a582f4d..26c8cc1e7 100644
--- a/utils/regr/regr_syy.h
+++ b/utils/regr/regr_syy.h
@@ -43,7 +43,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/rowgroup/rowaggregation.cpp b/utils/rowgroup/rowaggregation.cpp
index 55be66459..bae0e8e27 100644
--- a/utils/rowgroup/rowaggregation.cpp
+++ b/utils/rowgroup/rowaggregation.cpp
@@ -1929,7 +1929,7 @@ void RowAggregation::doUDAF(const Row& rowIn, int64_t colIn, int64_t colOut,
     // The vector of parameters to be sent to the UDAF
     mcsv1sdk::ColumnDatum valsIn[paramCount];
     uint32_t dataFlags[paramCount];
-    ConstantColumn* cc;
+    execplan::ConstantColumn* cc;
     bool bIsNull = false;
     execplan::CalpontSystemCatalog::ColDataType colDataType;
 
@@ -1945,10 +1945,10 @@ void RowAggregation::doUDAF(const Row& rowIn, int64_t colIn, int64_t colOut,
 
         if (fFunctionCols[funcColsIdx]->fpConstCol)
         {
-            cc = dynamic_cast<ConstantColumn*>(fFunctionCols[funcColsIdx]->fpConstCol.get());
+            cc = dynamic_cast<execplan::ConstantColumn*>(fFunctionCols[funcColsIdx]->fpConstCol.get());
         }
 
-        if ((cc && cc->type() == ConstantColumn::NULLDATA)
+        if ((cc && cc->type() == execplan::ConstantColumn::NULLDATA)
                 ||  (!cc && isNull(&fRowGroupIn, rowIn, colIn) == true))
         {
             if (fRGContext.getRunFlag(mcsv1sdk::UDAF_IGNORE_NULLS))
@@ -3706,7 +3706,7 @@ void RowAggregationUM::doNotNullConstantAggregate(const ConstantAggData& aggData
 
             // Create a datum item for sending to UDAF
             mcsv1sdk::ColumnDatum& datum = valsIn[0];
-            datum.dataType = (CalpontSystemCatalog::ColDataType)colDataType;
+            datum.dataType = (execplan::CalpontSystemCatalog::ColDataType)colDataType;
 
             switch (colDataType)
             {
diff --git a/utils/rowgroup/rowaggregation.h b/utils/rowgroup/rowaggregation.h
index c829cdefc..7475a71b7 100644
--- a/utils/rowgroup/rowaggregation.h
+++ b/utils/rowgroup/rowaggregation.h
@@ -207,7 +207,7 @@ struct RowAggFunctionCol
     // The first will be a RowUDAFFunctionCol. Subsequent ones will be RowAggFunctionCol
     // with fAggFunction == ROWAGG_MULTI_PARM. Order is important.
     // If this parameter is constant, that value is here.
-    SRCP fpConstCol;
+    execplan::SRCP fpConstCol;
 };
 
 
@@ -272,7 +272,7 @@ inline void RowAggFunctionCol::deserialize(messageqcpp::ByteStream& bs)
 
     if (t)
     {
-        fpConstCol.reset(new ConstantColumn);
+        fpConstCol.reset(new execplan::ConstantColumn);
         fpConstCol.get()->unserialize(bs);
     }
 }
diff --git a/utils/rowgroup/rowgroup.h b/utils/rowgroup/rowgroup.h
index b91e0f0ef..d496cbcb0 100644
--- a/utils/rowgroup/rowgroup.h
+++ b/utils/rowgroup/rowgroup.h
@@ -59,7 +59,6 @@
 #include "../winport/winport.h"
 
 // Workaround for my_global.h #define of isnan(X) causing a std::std namespace
-using namespace std;
 
 namespace rowgroup
 {
@@ -1028,7 +1027,7 @@ inline void Row::setFloatField(float val, uint32_t colIndex)
     //N.B. There is a bug in boost::any or in gcc where, if you store a nan, you will get back a nan,
     //  but not necessarily the same bits that you put in. This only seems to be for float (double seems
     //  to work).
-    if (isnan(val))
+    if (std::isnan(val))
         setUintField<4>(joblist::FLOATNULL, colIndex);
     else
         *((float*) &data[offsets[colIndex]]) = val;
diff --git a/utils/threadpool/prioritythreadpool.cpp b/utils/threadpool/prioritythreadpool.cpp
index 92fd0ad98..e25cd7af8 100644
--- a/utils/threadpool/prioritythreadpool.cpp
+++ b/utils/threadpool/prioritythreadpool.cpp
@@ -282,7 +282,7 @@ void PriorityThreadPool::sendErrorMsg(uint32_t id, uint32_t step, primitiveproce
     ism.Status =  logging::primitiveServerErr;
     ph.UniqueID = id;
     ph.StepID = step;
-    ByteStream msg(sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader));
+    messageqcpp::ByteStream msg(sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader));
     msg.append((uint8_t*) &ism, sizeof(ism));
     msg.append((uint8_t*) &ph, sizeof(ph));
 
diff --git a/utils/udfsdk/allnull.cpp b/utils/udfsdk/allnull.cpp
index 247b9e28f..ee6669789 100644
--- a/utils/udfsdk/allnull.cpp
+++ b/utils/udfsdk/allnull.cpp
@@ -39,7 +39,7 @@ mcsv1_UDAF::ReturnCode allnull::init(mcsv1Context* context,
         return mcsv1_UDAF::ERROR;
     }
 
-    context->setResultType(CalpontSystemCatalog::TINYINT);
+    context->setResultType(execplan::CalpontSystemCatalog::TINYINT);
 
     return mcsv1_UDAF::SUCCESS;
 }
diff --git a/utils/udfsdk/allnull.h b/utils/udfsdk/allnull.h
index 6a727caf6..40e5ce709 100644
--- a/utils/udfsdk/allnull.h
+++ b/utils/udfsdk/allnull.h
@@ -57,7 +57,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/udfsdk/avg_mode.cpp b/utils/udfsdk/avg_mode.cpp
index dba0859fb..317ccce93 100644
--- a/utils/udfsdk/avg_mode.cpp
+++ b/utils/udfsdk/avg_mode.cpp
@@ -49,7 +49,7 @@ mcsv1_UDAF::ReturnCode avg_mode::init(mcsv1Context* context,
         return mcsv1_UDAF::ERROR;
     }
 
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(context->getScale() * 2);
     context->setPrecision(19);
diff --git a/utils/udfsdk/avg_mode.h b/utils/udfsdk/avg_mode.h
index fba1fcdcc..d37c3b83b 100644
--- a/utils/udfsdk/avg_mode.h
+++ b/utils/udfsdk/avg_mode.h
@@ -65,7 +65,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/udfsdk/avgx.cpp b/utils/udfsdk/avgx.cpp
index 15548db36..a7ee4eb75 100644
--- a/utils/udfsdk/avgx.cpp
+++ b/utils/udfsdk/avgx.cpp
@@ -54,7 +54,7 @@ mcsv1_UDAF::ReturnCode avgx::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(avgx_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(colTypes[0].scale + 4);
     context->setPrecision(19);
diff --git a/utils/udfsdk/avgx.h b/utils/udfsdk/avgx.h
index a830c6803..0268df021 100644
--- a/utils/udfsdk/avgx.h
+++ b/utils/udfsdk/avgx.h
@@ -44,7 +44,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/udfsdk/distinct_count.cpp b/utils/udfsdk/distinct_count.cpp
index 66dcea18f..11c2ce776 100644
--- a/utils/udfsdk/distinct_count.cpp
+++ b/utils/udfsdk/distinct_count.cpp
@@ -16,6 +16,7 @@
    MA 02110-1301, USA. */
 
 #include "distinct_count.h"
+#include "calpontsystemcatalog.h"
 
 using namespace mcsv1sdk;
 
@@ -36,7 +37,7 @@ mcsv1_UDAF::ReturnCode distinct_count::init(mcsv1Context* context,
         context->setErrorMessage("avgx() with other than 1 arguments");
 		return mcsv1_UDAF::ERROR;
 	}
-	context->setResultType(CalpontSystemCatalog::BIGINT);
+	context->setResultType(execplan::CalpontSystemCatalog::BIGINT);
 	context->setColWidth(8);
 	context->setRunFlag(mcsv1sdk::UDAF_IGNORE_NULLS);
 	context->setRunFlag(mcsv1sdk::UDAF_DISTINCT);
diff --git a/utils/udfsdk/distinct_count.h b/utils/udfsdk/distinct_count.h
index 1d804eaa8..7ad43f952 100644
--- a/utils/udfsdk/distinct_count.h
+++ b/utils/udfsdk/distinct_count.h
@@ -52,7 +52,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/udfsdk/mcsv1_udaf.cpp b/utils/udfsdk/mcsv1_udaf.cpp
index 9d513ced2..4dc30a3ef 100644
--- a/utils/udfsdk/mcsv1_udaf.cpp
+++ b/utils/udfsdk/mcsv1_udaf.cpp
@@ -75,41 +75,41 @@ int32_t mcsv1Context::getColWidth()
     // JIT initialization for types that have a defined size.
     switch (fResultType)
     {
-        case CalpontSystemCatalog::BIT:
-        case CalpontSystemCatalog::TINYINT:
-        case CalpontSystemCatalog::UTINYINT:
-        case CalpontSystemCatalog::CHAR:
+        case execplan::CalpontSystemCatalog::BIT:
+        case execplan::CalpontSystemCatalog::TINYINT:
+        case execplan::CalpontSystemCatalog::UTINYINT:
+        case execplan::CalpontSystemCatalog::CHAR:
             fColWidth = 1;
             break;
 
-        case CalpontSystemCatalog::SMALLINT:
-        case CalpontSystemCatalog::USMALLINT:
+        case execplan::CalpontSystemCatalog::SMALLINT:
+        case execplan::CalpontSystemCatalog::USMALLINT:
             fColWidth = 2;
             break;
 
-        case CalpontSystemCatalog::MEDINT:
-        case CalpontSystemCatalog::INT:
-        case CalpontSystemCatalog::UMEDINT:
-        case CalpontSystemCatalog::UINT:
-        case CalpontSystemCatalog::FLOAT:
-        case CalpontSystemCatalog::UFLOAT:
-        case CalpontSystemCatalog::DATE:
+        case execplan::CalpontSystemCatalog::MEDINT:
+        case execplan::CalpontSystemCatalog::INT:
+        case execplan::CalpontSystemCatalog::UMEDINT:
+        case execplan::CalpontSystemCatalog::UINT:
+        case execplan::CalpontSystemCatalog::FLOAT:
+        case execplan::CalpontSystemCatalog::UFLOAT:
+        case execplan::CalpontSystemCatalog::DATE:
             fColWidth = 4;
             break;
 
-        case CalpontSystemCatalog::BIGINT:
-        case CalpontSystemCatalog::UBIGINT:
-        case CalpontSystemCatalog::DECIMAL:
-        case CalpontSystemCatalog::UDECIMAL:
-        case CalpontSystemCatalog::DOUBLE:
-        case CalpontSystemCatalog::UDOUBLE:
-        case CalpontSystemCatalog::DATETIME:
-        case CalpontSystemCatalog::TIME:
-        case CalpontSystemCatalog::STRINT:
+        case execplan::CalpontSystemCatalog::BIGINT:
+        case execplan::CalpontSystemCatalog::UBIGINT:
+        case execplan::CalpontSystemCatalog::DECIMAL:
+        case execplan::CalpontSystemCatalog::UDECIMAL:
+        case execplan::CalpontSystemCatalog::DOUBLE:
+        case execplan::CalpontSystemCatalog::UDOUBLE:
+        case execplan::CalpontSystemCatalog::DATETIME:
+        case execplan::CalpontSystemCatalog::TIME:
+        case execplan::CalpontSystemCatalog::STRINT:
             fColWidth = 8;
             break;
 
-        case CalpontSystemCatalog::LONGDOUBLE:
+        case execplan::CalpontSystemCatalog::LONGDOUBLE:
             fColWidth = sizeof(long double);
             break;
 
@@ -212,7 +212,7 @@ void mcsv1Context::createUserData()
 void mcsv1Context::serialize(messageqcpp::ByteStream& b) const
 {
     b.needAtLeast(sizeof(mcsv1Context));
-    b << (ObjectReader::id_t) ObjectReader::MCSV1_CONTEXT;
+    b << (execplan::ObjectReader::id_t) execplan::ObjectReader::MCSV1_CONTEXT;
     b << functionName;
     b << fRunFlags;
     // Dont send context flags, These are set for each call
@@ -232,21 +232,21 @@ void mcsv1Context::serialize(messageqcpp::ByteStream& b) const
 
 void mcsv1Context::unserialize(messageqcpp::ByteStream& b)
 {
-    ObjectReader::checkType(b, ObjectReader::MCSV1_CONTEXT);
+    execplan::ObjectReader::checkType(b, execplan::ObjectReader::MCSV1_CONTEXT);
     b >> functionName;
     b >> fRunFlags;
     b >> fUserDataSize;
     uint32_t iResultType;
     b >> iResultType;
-    fResultType = (CalpontSystemCatalog::ColDataType)iResultType;
+    fResultType = (execplan::CalpontSystemCatalog::ColDataType)iResultType;
     b >> fResultscale;
     b >> fResultPrecision;
     b >> errorMsg;
     uint32_t frame;
     b >> frame;
-    fStartFrame = (WF_FRAME)frame;
+    fStartFrame = (execplan::WF_FRAME)frame;
     b >> frame;
-    fEndFrame = (WF_FRAME)frame;
+    fEndFrame = (execplan::WF_FRAME)frame;
     b >> fStartConstant;
     b >> fEndConstant;
     b >> fParamCount;
diff --git a/utils/udfsdk/mcsv1_udaf.h b/utils/udfsdk/mcsv1_udaf.h
index d6ba04483..0fcd877c9 100644
--- a/utils/udfsdk/mcsv1_udaf.h
+++ b/utils/udfsdk/mcsv1_udaf.h
@@ -78,8 +78,6 @@
 #include "wf_frame.h"
 #include "my_decimal_limits.h"
 
-using namespace execplan;
-
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
 #else
@@ -282,7 +280,7 @@ public:
     EXPORT bool isParamConstant(int paramIdx);
 
     // For getting the result type.
-    EXPORT CalpontSystemCatalog::ColDataType getResultType() const;
+    EXPORT execplan::CalpontSystemCatalog::ColDataType getResultType() const;
 
     // For getting the decimal characteristics for the return type.
     // These will be set to the default before init().
@@ -291,7 +289,7 @@ public:
 
     // If you want to change the result type
     // valid in init()
-    EXPORT bool setResultType(CalpontSystemCatalog::ColDataType resultType);
+    EXPORT bool setResultType(execplan::CalpontSystemCatalog::ColDataType resultType);
 
     // For setting the decimal characteristics for the return value.
     // This only makes sense if the return type is decimal, but should be set
@@ -339,14 +337,14 @@ public:
     // If WF_PRECEEdING and/or WF_FOLLOWING, a start or end constant should
     // be included to say how many preceeding or following is the default
     // Set this during init()
-    EXPORT bool  setDefaultWindowFrame(WF_FRAME defaultStartFrame,
-                                       WF_FRAME defaultEndFrame,
+    EXPORT bool  setDefaultWindowFrame(execplan::WF_FRAME defaultStartFrame,
+                                      execplan::WF_FRAME defaultEndFrame,
                                        int32_t startConstant = 0, // For WF_PRECEEDING or WF_FOLLOWING
                                        int32_t endConstant = 0);  // For WF_PRECEEDING or WF_FOLLOWING
 
     // There may be times you want to know the actual frame set by the caller
-    EXPORT void  getStartFrame(WF_FRAME& startFrame, int32_t& startConstant) const;
-    EXPORT void  getEndFrame(WF_FRAME& endFrame, int32_t& endConstant) const;
+    EXPORT void  getStartFrame(execplan::WF_FRAME& startFrame, int32_t& startConstant) const;
+    EXPORT void  getEndFrame(execplan::WF_FRAME& endFrame, int32_t& endConstant) const;
 
     // Deep Equivalence
     bool operator==(const mcsv1Context& c) const;
@@ -367,15 +365,15 @@ private:
     uint64_t fContextFlags;   // Set by the framework to define this specific call.
     int32_t fUserDataSize;
     boost::shared_ptr<UserData> fUserData;
-    CalpontSystemCatalog::ColDataType fResultType;
+    execplan::CalpontSystemCatalog::ColDataType fResultType;
     int32_t  fColWidth;       // The length in bytes of the return type
     int32_t  fResultscale;    // For scale, the number of digits to the right of the decimal
     int32_t  fResultPrecision; // The max number of digits allowed in the decimal value
     std::string errorMsg;
     uint32_t* dataFlags;      // an integer array wirh one entry for each parameter
     bool*    bInterrupted;    // Gets set to true by the Framework if something happens
-    WF_FRAME fStartFrame;     // Is set to default to start, then modified by the actual frame in the call
-    WF_FRAME fEndFrame;       // Is set to default to start, then modified by the actual frame in the call
+    execplan::WF_FRAME fStartFrame;     // Is set to default to start, then modified by the actual frame in the call
+    execplan::WF_FRAME fEndFrame;       // Is set to default to start, then modified by the actual frame in the call
     int32_t  fStartConstant;  // for start frame WF_PRECEEDIMG or WF_FOLLOWING
     int32_t  fEndConstant;    // for end frame WF_PRECEEDIMG or WF_FOLLOWING
     std::string functionName;
@@ -422,12 +420,12 @@ public:
 // For char, varchar, text, varbinary and blob types, columnData will be std::string.
 struct ColumnDatum
 {
-    CalpontSystemCatalog::ColDataType dataType;   // defined in calpontsystemcatalog.h
+  execplan::CalpontSystemCatalog::ColDataType dataType;   // defined in calpontsystemcatalog.h
     static_any::any  columnData;  // Not valid in init()
     uint32_t    scale;     // If dataType is a DECIMAL type
     uint32_t    precision; // If dataType is a DECIMAL type
     std::string alias;     // Only filled in for init()
-    ColumnDatum() : dataType(CalpontSystemCatalog::UNDEFINED), scale(0), precision(-1) {};
+    ColumnDatum() : dataType(execplan::CalpontSystemCatalog::UNDEFINED), scale(0), precision(-1) {};
 };
 
 // Override mcsv1_UDAF to build your User Defined Aggregate (UDAF) and/or
@@ -636,14 +634,14 @@ inline mcsv1Context::mcsv1Context() :
     fRunFlags(UDAF_OVER_ALLOWED | UDAF_ORDER_ALLOWED | UDAF_WINDOWFRAME_ALLOWED),
     fContextFlags(0),
     fUserDataSize(0),
-    fResultType(CalpontSystemCatalog::UNDEFINED),
+    fResultType(execplan::CalpontSystemCatalog::UNDEFINED),
     fColWidth(0),
     fResultscale(0),
     fResultPrecision(18),
     dataFlags(NULL),
     bInterrupted(NULL),
-    fStartFrame(WF_UNBOUNDED_PRECEDING),
-    fEndFrame(WF_CURRENT_ROW),
+    fStartFrame(execplan::WF_UNBOUNDED_PRECEDING),
+    fEndFrame(execplan::WF_CURRENT_ROW),
     fStartConstant(0),
     fEndConstant(0),
     func(NULL),
@@ -774,12 +772,12 @@ inline bool mcsv1Context::isParamConstant(int paramIdx)
     return false;
 }
 
-inline CalpontSystemCatalog::ColDataType mcsv1Context::getResultType() const
+inline execplan::CalpontSystemCatalog::ColDataType mcsv1Context::getResultType() const
 {
     return fResultType;
 }
 
-inline bool mcsv1Context::setResultType(CalpontSystemCatalog::ColDataType resultType)
+inline bool mcsv1Context::setResultType(execplan::CalpontSystemCatalog::ColDataType resultType)
 {
     fResultType = resultType;
     return true;  // We may want to sanity check here.
@@ -878,8 +876,8 @@ inline void mcsv1Context::setUserData(UserData* userData)
     }
 }
 
-inline bool mcsv1Context::setDefaultWindowFrame(WF_FRAME defaultStartFrame,
-        WF_FRAME defaultEndFrame,
+inline bool mcsv1Context::setDefaultWindowFrame(execplan::WF_FRAME defaultStartFrame,
+        execplan::WF_FRAME defaultEndFrame,
         int32_t startConstant,
         int32_t endConstant)
 {
@@ -891,13 +889,13 @@ inline bool mcsv1Context::setDefaultWindowFrame(WF_FRAME defaultStartFrame,
     return true;
 }
 
-inline void mcsv1Context::getStartFrame(WF_FRAME& startFrame, int32_t& startConstant) const
+inline void mcsv1Context::getStartFrame(execplan::WF_FRAME& startFrame, int32_t& startConstant) const
 {
     startFrame = fStartFrame;
     startConstant = fStartConstant;
 }
 
-inline void mcsv1Context::getEndFrame(WF_FRAME& endFrame, int32_t& endConstant) const
+inline void mcsv1Context::getEndFrame(execplan::WF_FRAME& endFrame, int32_t& endConstant) const
 {
     endFrame = fEndFrame;
     endConstant = fEndConstant;
diff --git a/utils/udfsdk/median.h b/utils/udfsdk/median.h
index 48bd93c70..ead9eede4 100644
--- a/utils/udfsdk/median.h
+++ b/utils/udfsdk/median.h
@@ -65,7 +65,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/udfsdk/ssq.cpp b/utils/udfsdk/ssq.cpp
index 74b60b5f6..4886acdb1 100644
--- a/utils/udfsdk/ssq.cpp
+++ b/utils/udfsdk/ssq.cpp
@@ -59,7 +59,7 @@ mcsv1_UDAF::ReturnCode ssq::init(mcsv1Context* context,
     }
 
     context->setUserDataSize(sizeof(ssq_data));
-    context->setResultType(CalpontSystemCatalog::DOUBLE);
+    context->setResultType(execplan::CalpontSystemCatalog::DOUBLE);
     context->setColWidth(8);
     context->setScale(context->getScale() * 2);
     context->setPrecision(19);
diff --git a/utils/udfsdk/ssq.h b/utils/udfsdk/ssq.h
index e27ecf1fa..58d42084b 100644
--- a/utils/udfsdk/ssq.h
+++ b/utils/udfsdk/ssq.h
@@ -65,7 +65,6 @@
 #include "mcsv1_udaf.h"
 #include "calpontsystemcatalog.h"
 #include "windowfunctioncolumn.h"
-using namespace execplan;
 
 #if defined(_MSC_VER) && defined(xxxRGNODE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
diff --git a/utils/windowfunction/windowfunctiontype.h b/utils/windowfunction/windowfunctiontype.h
index e0a1aa832..ecf8f694e 100644
--- a/utils/windowfunction/windowfunctiontype.h
+++ b/utils/windowfunction/windowfunctiontype.h
@@ -199,9 +199,9 @@ public:
         fStep = step;
     }
 
-    void constParms(const std::vector<SRCP>& functionParms);
+    void constParms(const std::vector<execplan::SRCP>& functionParms);
 
-    static boost::shared_ptr<WindowFunctionType> makeWindowFunction(const std::string&, int ct, WindowFunctionColumn* wc);
+    static boost::shared_ptr<WindowFunctionType> makeWindowFunction(const std::string&, int ct, execplan::WindowFunctionColumn* wc);
 
 protected:
 
@@ -255,7 +255,7 @@ protected:
     std::vector<int64_t>                        fFieldIndex;
 
     // constant function parameters -- needed for udaf with constant
-    std::vector<SRCP>                           fConstantParms;
+    std::vector<execplan::SRCP>                           fConstantParms;
 
     // row meta data
     rowgroup::RowGroup	                        fRowGroup;
diff --git a/versioning/BRM/dbrmctl.cpp b/versioning/BRM/dbrmctl.cpp
index b9bca4d7c..45bf68f36 100644
--- a/versioning/BRM/dbrmctl.cpp
+++ b/versioning/BRM/dbrmctl.cpp
@@ -19,6 +19,7 @@
  * $Id: dbrmctl.cpp 1823 2013-01-21 14:13:09Z rdempsey $
  *
  ****************************************************************************/
+#include <future> //cxx11test
 
 #include <unistd.h>
 #include <iostream>
diff --git a/versioning/BRM/load_brm.cpp b/versioning/BRM/load_brm.cpp
index 4650fc5ec..871a51122 100644
--- a/versioning/BRM/load_brm.cpp
+++ b/versioning/BRM/load_brm.cpp
@@ -19,6 +19,7 @@
  * $Id: load_brm.cpp 1905 2013-06-14 18:42:28Z rdempsey $
  *
  ****************************************************************************/
+#include <future> //cxx11test
 #include <unistd.h>
 #include <iostream>
 #include <string>
diff --git a/versioning/BRM/masternode.cpp b/versioning/BRM/masternode.cpp
index cb3eb5024..ea4832dae 100644
--- a/versioning/BRM/masternode.cpp
+++ b/versioning/BRM/masternode.cpp
@@ -23,6 +23,7 @@
 /*
  * The executable source that runs a Master DBRM Node.
  */
+#include <future> //cxx11test
 
 #include "masterdbrmnode.h"
 #include "liboamcpp.h"
diff --git a/versioning/BRM/reset_locks.cpp b/versioning/BRM/reset_locks.cpp
index 895e34600..47237aafa 100644
--- a/versioning/BRM/reset_locks.cpp
+++ b/versioning/BRM/reset_locks.cpp
@@ -17,6 +17,8 @@
 
 // $Id: reset_locks.cpp 1823 2013-01-21 14:13:09Z rdempsey $
 //
+#include <future> //cxx11test
+
 #include <unistd.h>
 #include <iostream>
 using namespace std;
diff --git a/versioning/BRM/rollback.cpp b/versioning/BRM/rollback.cpp
index 1944f2938..509635248 100644
--- a/versioning/BRM/rollback.cpp
+++ b/versioning/BRM/rollback.cpp
@@ -28,6 +28,7 @@
  * 		rollback -p   (to get the transaction(s) that need to be rolled back)
  * 		rollback -r transID  	(for each one to roll them back)
  */
+#include <future> //cxx11test
 
 #include "dbrm.h"
 
diff --git a/versioning/BRM/save_brm.cpp b/versioning/BRM/save_brm.cpp
index d53507082..6993fd8fb 100644
--- a/versioning/BRM/save_brm.cpp
+++ b/versioning/BRM/save_brm.cpp
@@ -25,6 +25,7 @@
  *
  * More detailed description
  */
+#include <future> //cxx11test
 
 #include <unistd.h>
 #include <iostream>
diff --git a/versioning/BRM/slavenode.cpp b/versioning/BRM/slavenode.cpp
index 1fd89ff7d..26701504a 100644
--- a/versioning/BRM/slavenode.cpp
+++ b/versioning/BRM/slavenode.cpp
@@ -19,6 +19,7 @@
  * $Id: slavenode.cpp 1931 2013-07-08 16:53:02Z bpaul $
  *
  ****************************************************************************/
+#include <future> //cxx11test
 
 #include <iostream>
 #include <signal.h>
diff --git a/writeengine/bulk/we_brmreporter.cpp b/writeengine/bulk/we_brmreporter.cpp
index 4c0f1511c..fd9691ef9 100644
--- a/writeengine/bulk/we_brmreporter.cpp
+++ b/writeengine/bulk/we_brmreporter.cpp
@@ -321,7 +321,7 @@ void BRMReporter::sendCPToFile( )
 void BRMReporter::reportTotals(
     uint64_t totalReadRows,
     uint64_t totalInsertedRows,
-    const std::vector<boost::tuple<CalpontSystemCatalog::ColDataType, uint64_t, uint64_t> >& satCounts)
+    const std::vector<boost::tuple<execplan::CalpontSystemCatalog::ColDataType, uint64_t, uint64_t> >& satCounts)
 {
     if (fRptFile.is_open())
     {
diff --git a/writeengine/bulk/we_brmreporter.h b/writeengine/bulk/we_brmreporter.h
index b5e43f867..e71310ff1 100644
--- a/writeengine/bulk/we_brmreporter.h
+++ b/writeengine/bulk/we_brmreporter.h
@@ -28,7 +28,6 @@
 
 #include "brmtypes.h"
 #include "calpontsystemcatalog.h"
-using namespace execplan;
 /** @file
  * class BRMReporter
  */
@@ -107,7 +106,7 @@ public:
      */
     void reportTotals(uint64_t totalReadRows,
                       uint64_t totalInsertedRows,
-                      const std::vector<boost::tuple<CalpontSystemCatalog::ColDataType,
+                      const std::vector<boost::tuple<execplan::CalpontSystemCatalog::ColDataType,
                       uint64_t, uint64_t> >& satCounts);
 
     /** @brief Generate report for job that exceeds error limit
diff --git a/writeengine/bulk/we_bulkload.cpp b/writeengine/bulk/we_bulkload.cpp
index 48cc79f07..134bb07af 100644
--- a/writeengine/bulk/we_bulkload.cpp
+++ b/writeengine/bulk/we_bulkload.cpp
@@ -473,7 +473,7 @@ int BulkLoad::preProcess( Job& job, int tableNo,
     int         rc = NO_ERROR, minWidth = 9999; // give a big number
     HWM         minHWM = 999999;  // rp 9/25/07 Bug 473
     ColStruct   curColStruct;
-    CalpontSystemCatalog::ColDataType colDataType;
+    execplan::CalpontSystemCatalog::ColDataType colDataType;
 
     // Initialize portions of TableInfo object
     tableInfo->setBufferSize(fBufferSize);
diff --git a/writeengine/bulk/we_tableinfo.cpp b/writeengine/bulk/we_tableinfo.cpp
index 2885d1462..92f8ac19f 100644
--- a/writeengine/bulk/we_tableinfo.cpp
+++ b/writeengine/bulk/we_tableinfo.cpp
@@ -957,7 +957,7 @@ void TableInfo::reportTotals(double elapsedTime)
     fLog->logMsg(oss2.str(), MSGLVL_INFO2);
 
     // @bug 3504: Loop through columns to print saturation counts
-    std::vector<boost::tuple<CalpontSystemCatalog::ColDataType, uint64_t, uint64_t> > satCounts;
+    std::vector<boost::tuple<execplan::CalpontSystemCatalog::ColDataType, uint64_t, uint64_t> > satCounts;
 
     for (unsigned i = 0; i < fColumns.size(); ++i)
     {
@@ -977,30 +977,28 @@ void TableInfo::reportTotals(double elapsedTime)
             ossSatCnt << "Column " << fTableName << '.' <<
                       fColumns[i].column.colName << "; Number of ";
 
-            if (fColumns[i].column.dataType == CalpontSystemCatalog::DATE)
+            if (fColumns[i].column.dataType == execplan::CalpontSystemCatalog::DATE)
             {
                 ossSatCnt <<
                           "invalid dates replaced with zero value : ";
             }
             else if (fColumns[i].column.dataType ==
-                     CalpontSystemCatalog::DATETIME)
+              execplan::CalpontSystemCatalog::DATETIME)
             {
                 //bug5383
                 ossSatCnt <<
                           "invalid date/times replaced with zero value : ";
             }
-            else if (fColumns[i].column.dataType == CalpontSystemCatalog::TIME)
+            else if (fColumns[i].column.dataType == execplan::CalpontSystemCatalog::TIME)
             {
                 ossSatCnt <<
                           "invalid times replaced with zero value : ";
             }
-            else if (fColumns[i].column.dataType == CalpontSystemCatalog::CHAR)
-                ossSatCnt <<
-                          "character strings truncated: ";
-            else if (fColumns[i].column.dataType ==
-                     CalpontSystemCatalog::VARCHAR)
+            else if (fColumns[i].column.dataType == execplan::CalpontSystemCatalog::CHAR)
                 ossSatCnt <<
                           "character strings truncated: ";
+            else if (fColumns[i].column.dataType == execplan::CalpontSystemCatalog::VARCHAR)
+                ossSatCnt << "character strings truncated: ";
             else
                 ossSatCnt <<
                           "rows inserted with saturated values: ";
diff --git a/writeengine/server/we_brmrprtparser.h b/writeengine/server/we_brmrprtparser.h
index e9525a744..9b179f070 100644
--- a/writeengine/server/we_brmrprtparser.h
+++ b/writeengine/server/we_brmrprtparser.h
@@ -31,11 +31,9 @@
 
 #include <fstream>
 #include <iostream>
-using namespace std;
 
 #include "bytestream.h"
 #include "messagequeue.h"
-using namespace messageqcpp;
 
 /*
  *
diff --git a/writeengine/server/we_dataloader.h b/writeengine/server/we_dataloader.h
index 4415a3ab4..8750f469b 100644
--- a/writeengine/server/we_dataloader.h
+++ b/writeengine/server/we_dataloader.h
@@ -67,7 +67,7 @@ public:
     void str2Argv(std::string CmdLine, std::vector<char*>& V);
     std::string getCalpontHome();
     std::string getPrgmPath(std::string& PrgmName);
-    void updateCmdLineWithPath(string& CmdLine);
+    void updateCmdLineWithPath(std::string& CmdLine);
 
 
 public:
@@ -179,8 +179,8 @@ private:
     SplitterReadThread& fRef;
 
     int fMode;
-    ofstream fDataDumpFile;
-    ofstream fJobFile;
+    std::ofstream fDataDumpFile;
+    std::ofstream fJobFile;
     unsigned int fTxBytes;
     unsigned int fRxBytes;
     char fPmId;
diff --git a/writeengine/server/we_ddlcommon.h b/writeengine/server/we_ddlcommon.h
index b1e4e48f1..6af26b143 100644
--- a/writeengine/server/we_ddlcommon.h
+++ b/writeengine/server/we_ddlcommon.h
@@ -51,11 +51,7 @@
 #define EXPORT
 #endif
 
-using namespace std;
-using namespace execplan;
-
 #include <boost/algorithm/string/case_conv.hpp>
-using namespace boost::algorithm;
 
 template <class T>
 bool from_string(T& t,
@@ -72,7 +68,7 @@ struct DDLColumn
 {
     execplan::CalpontSystemCatalog::OID oid;
     execplan::CalpontSystemCatalog::ColType colType;
-    execplan:: CalpontSystemCatalog::TableColName tableColName;
+    execplan::CalpontSystemCatalog::TableColName tableColName;
 };
 
 typedef std::vector<DDLColumn> ColumnList;
@@ -104,23 +100,23 @@ inline void  getColumnsForTable(uint32_t sessionID, std::string schema, std::str
                                 ColumnList& colList)
 {
 
-    CalpontSystemCatalog::TableName tableName;
+  execplan::CalpontSystemCatalog::TableName tableName;
     tableName.schema = schema;
     tableName.table = table;
     std::string err;
 
     try
     {
-        boost::shared_ptr<CalpontSystemCatalog> systemCatalogPtr = CalpontSystemCatalog::makeCalpontSystemCatalog(sessionID);
-        systemCatalogPtr->identity(CalpontSystemCatalog::EC);
+        boost::shared_ptr<execplan::CalpontSystemCatalog> systemCatalogPtr = execplan::CalpontSystemCatalog::makeCalpontSystemCatalog(sessionID);
+        systemCatalogPtr->identity(execplan::CalpontSystemCatalog::EC);
 
-        const CalpontSystemCatalog::RIDList ridList = systemCatalogPtr->columnRIDs(tableName);
+        const execplan::CalpontSystemCatalog::RIDList ridList = systemCatalogPtr->columnRIDs(tableName);
 
-        CalpontSystemCatalog::RIDList::const_iterator rid_iterator = ridList.begin();
+        execplan::CalpontSystemCatalog::RIDList::const_iterator rid_iterator = ridList.begin();
 
         while (rid_iterator != ridList.end())
         {
-            CalpontSystemCatalog::ROPair roPair = *rid_iterator;
+          execplan::CalpontSystemCatalog::ROPair roPair = *rid_iterator;
 
             DDLColumn column;
             column.oid = roPair.objnum;
@@ -381,112 +377,112 @@ inline int convertDataType(int dataType)
     switch (dataType)
     {
         case ddlpackage::DDL_CHAR:
-            calpontDataType = CalpontSystemCatalog::CHAR;
+            calpontDataType = execplan::CalpontSystemCatalog::CHAR;
             break;
 
         case ddlpackage::DDL_VARCHAR:
-            calpontDataType = CalpontSystemCatalog::VARCHAR;
+            calpontDataType = execplan::CalpontSystemCatalog::VARCHAR;
             break;
 
         case ddlpackage::DDL_VARBINARY:
-            calpontDataType = CalpontSystemCatalog::VARBINARY;
+            calpontDataType = execplan::CalpontSystemCatalog::VARBINARY;
             break;
 
         case ddlpackage::DDL_BIT:
-            calpontDataType = CalpontSystemCatalog::BIT;
+            calpontDataType = execplan::CalpontSystemCatalog::BIT;
             break;
 
         case ddlpackage::DDL_REAL:
         case ddlpackage::DDL_DECIMAL:
         case ddlpackage::DDL_NUMERIC:
         case ddlpackage::DDL_NUMBER:
-            calpontDataType = CalpontSystemCatalog::DECIMAL;
+            calpontDataType = execplan::CalpontSystemCatalog::DECIMAL;
             break;
 
         case ddlpackage::DDL_FLOAT:
-            calpontDataType = CalpontSystemCatalog::FLOAT;
+            calpontDataType = execplan::CalpontSystemCatalog::FLOAT;
             break;
 
         case ddlpackage::DDL_DOUBLE:
-            calpontDataType = CalpontSystemCatalog::DOUBLE;
+            calpontDataType = execplan::CalpontSystemCatalog::DOUBLE;
             break;
 
         case ddlpackage::DDL_INT:
         case ddlpackage::DDL_INTEGER:
-            calpontDataType = CalpontSystemCatalog::INT;
+            calpontDataType = execplan::CalpontSystemCatalog::INT;
             break;
 
         case ddlpackage::DDL_BIGINT:
-            calpontDataType = CalpontSystemCatalog::BIGINT;
+            calpontDataType = execplan::CalpontSystemCatalog::BIGINT;
             break;
 
         case ddlpackage::DDL_MEDINT:
-            calpontDataType = CalpontSystemCatalog::MEDINT;
+            calpontDataType = execplan::CalpontSystemCatalog::MEDINT;
             break;
 
         case ddlpackage::DDL_SMALLINT:
-            calpontDataType = CalpontSystemCatalog::SMALLINT;
+            calpontDataType = execplan::CalpontSystemCatalog::SMALLINT;
             break;
 
         case ddlpackage::DDL_TINYINT:
-            calpontDataType = CalpontSystemCatalog::TINYINT;
+            calpontDataType = execplan::CalpontSystemCatalog::TINYINT;
             break;
 
         case ddlpackage::DDL_DATE:
-            calpontDataType = CalpontSystemCatalog::DATE;
+            calpontDataType = execplan::CalpontSystemCatalog::DATE;
             break;
 
         case ddlpackage::DDL_DATETIME:
-            calpontDataType = CalpontSystemCatalog::DATETIME;
+            calpontDataType = execplan::CalpontSystemCatalog::DATETIME;
             break;
 
         case ddlpackage::DDL_TIME:
-            calpontDataType = CalpontSystemCatalog::TIME;
+            calpontDataType = execplan::CalpontSystemCatalog::TIME;
             break;
 
         case ddlpackage::DDL_CLOB:
-            calpontDataType = CalpontSystemCatalog::CLOB;
+            calpontDataType = execplan::CalpontSystemCatalog::CLOB;
             break;
 
         case ddlpackage::DDL_BLOB:
-            calpontDataType = CalpontSystemCatalog::BLOB;
+            calpontDataType = execplan::CalpontSystemCatalog::BLOB;
             break;
 
         case ddlpackage::DDL_TEXT:
-            calpontDataType = CalpontSystemCatalog::TEXT;
+            calpontDataType = execplan::CalpontSystemCatalog::TEXT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_TINYINT:
-            calpontDataType = CalpontSystemCatalog::UTINYINT;
+            calpontDataType = execplan::CalpontSystemCatalog::UTINYINT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_SMALLINT:
-            calpontDataType = CalpontSystemCatalog::USMALLINT;
+            calpontDataType = execplan::CalpontSystemCatalog::USMALLINT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_MEDINT:
-            calpontDataType = CalpontSystemCatalog::UMEDINT;
+            calpontDataType = execplan::CalpontSystemCatalog::UMEDINT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_INT:
-            calpontDataType = CalpontSystemCatalog::UINT;
+            calpontDataType = execplan::CalpontSystemCatalog::UINT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_BIGINT:
-            calpontDataType = CalpontSystemCatalog::UBIGINT;
+            calpontDataType = execplan::CalpontSystemCatalog::UBIGINT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_DECIMAL:
         case ddlpackage::DDL_UNSIGNED_NUMERIC:
-            calpontDataType = CalpontSystemCatalog::UDECIMAL;
+            calpontDataType = execplan::CalpontSystemCatalog::UDECIMAL;
             break;
 
         case ddlpackage::DDL_UNSIGNED_FLOAT:
-            calpontDataType = CalpontSystemCatalog::UFLOAT;
+            calpontDataType = execplan::CalpontSystemCatalog::UFLOAT;
             break;
 
         case ddlpackage::DDL_UNSIGNED_DOUBLE:
-            calpontDataType = CalpontSystemCatalog::UDOUBLE;
+            calpontDataType = execplan::CalpontSystemCatalog::UDOUBLE;
             break;
 
         default:
diff --git a/writeengine/server/we_observer.h b/writeengine/server/we_observer.h
index 85401d885..ac3039318 100644
--- a/writeengine/server/we_observer.h
+++ b/writeengine/server/we_observer.h
@@ -31,7 +31,6 @@
 #define OBSERVER_H_
 
 #include <list>
-using namespace std;
 
 
 namespace WriteEngine
diff --git a/writeengine/server/we_readthread.cpp b/writeengine/server/we_readthread.cpp
index 76653ff56..f27ed9795 100644
--- a/writeengine/server/we_readthread.cpp
+++ b/writeengine/server/we_readthread.cpp
@@ -651,7 +651,7 @@ void SplitterReadThread::operator()()
         catch (...)
         {
             fIbs.restart();     //setting length=0, get out of loop
-            cout << "Broken Pipe" << endl;
+            std::cout << "Broken Pipe" << std::endl;
 
             logging::LoggingID logid(19, 0, 0);
             logging::Message::Args args;
@@ -889,7 +889,7 @@ void ReadThreadFactory::CreateReadThread(ThreadPool& Tp, IOSocket& Ios, BRM::DBR
     }
     catch (std::exception& ex)
     {
-        cout << "Handled : " << ex.what() << endl;
+      std::cout << "Handled : " << ex.what() << std::endl;
         logging::LoggingID logid(19, 0, 0);
         logging::Message::Args args;
         logging::Message msg(1);
diff --git a/writeengine/server/we_readthread.h b/writeengine/server/we_readthread.h
index 52ce114c9..39f6267dd 100644
--- a/writeengine/server/we_readthread.h
+++ b/writeengine/server/we_readthread.h
@@ -27,7 +27,6 @@
 #include "messagequeue.h"
 #include "threadpool.h"
 #include "we_ddlcommandproc.h"
-using namespace threadpool;
 
 #include "we_ddlcommandproc.h"
 #include "we_dmlcommandproc.h"
@@ -149,7 +148,7 @@ public:
     virtual ~ReadThreadFactory() {}
 
 public:
-    static void CreateReadThread(ThreadPool& Tp, IOSocket& ios, BRM::DBRM& dbrm);
+    static void CreateReadThread(threadpool::ThreadPool& Tp, IOSocket& ios, BRM::DBRM& dbrm);
 
 
 };
diff --git a/writeengine/splitter/we_brmupdater.cpp b/writeengine/splitter/we_brmupdater.cpp
index 96a3e9d11..ea728fb27 100644
--- a/writeengine/splitter/we_brmupdater.cpp
+++ b/writeengine/splitter/we_brmupdater.cpp
@@ -512,13 +512,13 @@ bool WEBrmUpdater::prepareRowsInsertedInfo(std::string Entry,
 
 bool WEBrmUpdater::prepareColumnOutOfRangeInfo(std::string Entry,
         int& ColNum,
-        CalpontSystemCatalog::ColDataType& ColType,
+        execplan::CalpontSystemCatalog::ColDataType& ColType,
         std::string& ColName,
         int& OorValues)
 {
     bool aFound = false;
-    boost::shared_ptr<CalpontSystemCatalog> systemCatalogPtr =
-        CalpontSystemCatalog::makeCalpontSystemCatalog();
+    boost::shared_ptr<execplan::CalpontSystemCatalog> systemCatalogPtr =
+      execplan::CalpontSystemCatalog::makeCalpontSystemCatalog();
 
     //DATA: 3 1
     if ((!Entry.empty()) && (Entry.at(0) == 'D'))
@@ -553,7 +553,7 @@ bool WEBrmUpdater::prepareColumnOutOfRangeInfo(std::string Entry,
 
         if (pTok)
         {
-            ColType = (CalpontSystemCatalog::ColDataType)atoi(pTok);
+            ColType = (execplan::CalpontSystemCatalog::ColDataType)atoi(pTok);
         }
         else
         {
@@ -566,7 +566,7 @@ bool WEBrmUpdater::prepareColumnOutOfRangeInfo(std::string Entry,
         if (pTok)
         {
             uint64_t columnOid = strtol(pTok, NULL, 10);
-            CalpontSystemCatalog::TableColName colname = systemCatalogPtr->colName(columnOid);
+            execplan::CalpontSystemCatalog::TableColName colname = systemCatalogPtr->colName(columnOid);
             ColName = colname.schema + "." + colname.table + "." + colname.column;
         }
         else
diff --git a/writeengine/splitter/we_brmupdater.h b/writeengine/splitter/we_brmupdater.h
index b14cf4430..c575b3bd1 100644
--- a/writeengine/splitter/we_brmupdater.h
+++ b/writeengine/splitter/we_brmupdater.h
@@ -68,7 +68,7 @@ public:
     static bool prepareRowsInsertedInfo(std::string Entry, int64_t& TotRows,
                                         int64_t& InsRows);
     static bool prepareColumnOutOfRangeInfo(std::string Entry, int& ColNum,
-                                            CalpontSystemCatalog::ColDataType& ColType,
+      execplan::CalpontSystemCatalog::ColDataType& ColType,
                                             std::string& ColName, int& OorValues);
     static bool prepareErrorFileInfo(std::string Entry, std::string& ErrFileName);
     static bool prepareBadDataFileInfo(std::string Entry, std::string& BadFileName);
diff --git a/writeengine/splitter/we_sdhandler.h b/writeengine/splitter/we_sdhandler.h
index f31f40c63..551df4d9f 100644
--- a/writeengine/splitter/we_sdhandler.h
+++ b/writeengine/splitter/we_sdhandler.h
@@ -233,7 +233,7 @@ public:
         fWeSplClients[PmId]->setRowsUploadInfo(RowsRead, RowsInserted);
     }
     void add2ColOutOfRangeInfo(int PmId, int ColNum,
-                               CalpontSystemCatalog::ColDataType ColType,
+            execplan::CalpontSystemCatalog::ColDataType ColType,
                                std::string&  ColName, int NoOfOors)
     {
         fWeSplClients[PmId]->add2ColOutOfRangeInfo(ColNum, ColType, ColName, NoOfOors);
@@ -326,7 +326,7 @@ private:
         {
             fRowsIns += Rows;
         }
-        void updateColOutOfRangeInfo(int aColNum, CalpontSystemCatalog::ColDataType aColType,
+        void updateColOutOfRangeInfo(int aColNum, execplan::CalpontSystemCatalog::ColDataType aColType,
                                      std::string aColName, int aNoOfOors)
         {
             WEColOorVec::iterator aIt = fColOorVec.begin();
diff --git a/writeengine/splitter/we_splclient.cpp b/writeengine/splitter/we_splclient.cpp
index de84abe8e..59b776888 100644
--- a/writeengine/splitter/we_splclient.cpp
+++ b/writeengine/splitter/we_splclient.cpp
@@ -453,7 +453,7 @@ void WESplClient::setRowsUploadInfo(int64_t RowsRead, int64_t RowsInserted)
 //------------------------------------------------------------------------------
 
 void WESplClient::add2ColOutOfRangeInfo(int ColNum,
-                                        CalpontSystemCatalog::ColDataType ColType,
+  execplan::CalpontSystemCatalog::ColDataType ColType,
                                         std::string&  ColName, int NoOfOors)
 {
     WEColOORInfo aColOorInfo;
diff --git a/writeengine/splitter/we_splclient.h b/writeengine/splitter/we_splclient.h
index 1d86b0610..63c54c337 100644
--- a/writeengine/splitter/we_splclient.h
+++ b/writeengine/splitter/we_splclient.h
@@ -35,7 +35,6 @@
 
 #include "we_messages.h"
 #include "calpontsystemcatalog.h"
-using namespace execplan;
 
 namespace WriteEngine
 {
@@ -47,11 +46,11 @@ class WESplClient;			//forward decleration
 class WEColOORInfo		// Column Out-Of-Range Info
 {
 public:
-    WEColOORInfo(): fColNum(0), fColType(CalpontSystemCatalog::INT), fNoOfOORs(0) {}
+    WEColOORInfo(): fColNum(0), fColType(execplan::CalpontSystemCatalog::INT), fNoOfOORs(0) {}
     ~WEColOORInfo() {}
 public:
     int fColNum;
-    CalpontSystemCatalog::ColDataType fColType;
+    execplan::CalpontSystemCatalog::ColDataType fColType;
     std::string fColName;
     int fNoOfOORs;
 };
@@ -390,8 +389,7 @@ private:
     std::string fErrInfoFile;
 
     void setRowsUploadInfo(int64_t RowsRead, int64_t RowsInserted);
-    void add2ColOutOfRangeInfo(int ColNum,
-                               CalpontSystemCatalog::ColDataType ColType,
+    void add2ColOutOfRangeInfo(int ColNum, execplan::CalpontSystemCatalog::ColDataType ColType,
                                std::string&  ColName, int NoOfOors);
     void setBadDataFile(const std::string& BadDataFile);
     void setErrInfoFile(const std::string& ErrInfoFile);
diff --git a/writeengine/splitter/we_splitterapp.cpp b/writeengine/splitter/we_splitterapp.cpp
index dac0c7387..1b62c6bcd 100644
--- a/writeengine/splitter/we_splitterapp.cpp
+++ b/writeengine/splitter/we_splitterapp.cpp
@@ -249,8 +249,8 @@ void WESplitterApp::processMessages()
     {
         try
         {
-            aBs << (ByteStream::byte) WE_CLT_SRV_MODE;
-            aBs << (ByteStream::quadbyte) fCmdArgs.getMode();
+            aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_MODE;
+            aBs << (messageqcpp::ByteStream::quadbyte) fCmdArgs.getMode();
             fDh.send2Pm(aBs);
 
             std::string aJobId = fCmdArgs.getJobId();
@@ -268,7 +268,7 @@ void WESplitterApp::processMessages()
             if (fDh.getDebugLvl())
                 cout << "CPImport cmd line - " << aCpImpCmd << endl;
 
-            aBs << (ByteStream::byte) WE_CLT_SRV_CMDLINEARGS;
+            aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_CMDLINEARGS;
             aBs << aCpImpCmd;
             fDh.send2Pm(aBs);
 
@@ -278,7 +278,7 @@ void WESplitterApp::processMessages()
             if (fDh.getDebugLvl())
                 cout << "BrmReport FileName - " << aBrmRpt << endl;
 
-            aBs << (ByteStream::byte) WE_CLT_SRV_BRMRPT;
+            aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_BRMRPT;
             aBs << aBrmRpt;
             fDh.send2Pm(aBs);
 
@@ -297,8 +297,8 @@ void WESplitterApp::processMessages()
         {
             // In this mode we ignore almost all cmd lines args which
             // are usually send to cpimport
-            aBs << (ByteStream::byte) WE_CLT_SRV_MODE;
-            aBs << (ByteStream::quadbyte) fCmdArgs.getMode();
+            aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_MODE;
+            aBs << (messageqcpp::ByteStream::quadbyte) fCmdArgs.getMode();
             fDh.send2Pm(aBs);
 
             std::string aJobId = fCmdArgs.getJobId();
@@ -323,7 +323,7 @@ void WESplitterApp::processMessages()
             if (fDh.getDebugLvl())
                 cout << "CPImport cmd line - " << aCpImpCmd << endl;
 
-            aBs << (ByteStream::byte) WE_CLT_SRV_CMDLINEARGS;
+            aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_CMDLINEARGS;
             aBs << aCpImpCmd;
             fDh.send2Pm(aBs);
 
@@ -333,7 +333,7 @@ void WESplitterApp::processMessages()
             if (fDh.getDebugLvl())
                 cout << "BrmReport FileName - " << aBrmRpt << endl;
 
-            aBs << (ByteStream::byte) WE_CLT_SRV_BRMRPT;
+            aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_BRMRPT;
             aBs << aBrmRpt;
             fDh.send2Pm(aBs);
 
@@ -352,8 +352,8 @@ void WESplitterApp::processMessages()
         {
             // In this mode we ignore almost all cmd lines args which
             // are usually send to cpimport
-            aBs << (ByteStream::byte) WE_CLT_SRV_MODE;
-            aBs << (ByteStream::quadbyte) fCmdArgs.getMode();
+            aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_MODE;
+            aBs << (messageqcpp::ByteStream::quadbyte) fCmdArgs.getMode();
             fDh.send2Pm(aBs);
 
             aBs.restart();
@@ -373,7 +373,7 @@ void WESplitterApp::processMessages()
             if (fDh.getDebugLvl())
                 cout << "CPImport FileName - " << aCpImpFileName << endl;
 
-            aBs << (ByteStream::byte) WE_CLT_SRV_IMPFILENAME;
+            aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_IMPFILENAME;
             aBs << aCpImpFileName;
             fDh.send2Pm(aBs);
         }
@@ -450,8 +450,8 @@ void WESplitterApp::processMessages()
             if (aNoSec < 10) aNoSec++;		//progressively go up to 10Sec interval
 
             aBs.restart();
-            aBs << (ByteStream::byte) WE_CLT_SRV_KEEPALIVE;
-            mutex::scoped_lock aLock(fDh.fSendMutex);
+            aBs << (messageqcpp::ByteStream::byte) WE_CLT_SRV_KEEPALIVE;
+            boost::mutex::scoped_lock aLock(fDh.fSendMutex);
             fDh.send2Pm(aBs);
             aLock.unlock();
             //fDh.sendHeartbeats();
@@ -633,7 +633,7 @@ int main(int argc, char** argv)
                     errMsgArgs.add(err);
                     aWESplitterApp.fpSysLog->logMsg(errMsgArgs, logging::LOG_TYPE_ERROR, logging::M0000);
                     SPLTR_EXIT_STATUS = 1;
-                    aWESplitterApp.fDh.fLog.logMsg( err, MSGLVL_ERROR );
+                    aWESplitterApp.fDh.fLog.logMsg( err, WriteEngine::MSGLVL_ERROR );
                     aWESplitterApp.fContinue = false;
                     //throw runtime_error(err); BUG 4298
                 }
diff --git a/writeengine/splitter/we_splitterapp.h b/writeengine/splitter/we_splitterapp.h
index 5f9436922..5968914ed 100644
--- a/writeengine/splitter/we_splitterapp.h
+++ b/writeengine/splitter/we_splitterapp.h
@@ -32,15 +32,12 @@
 #include <boost/thread/condition.hpp>
 #include <boost/scoped_array.hpp>
 #include <boost/thread.hpp>
-using namespace boost;
 
 #include "bytestream.h"
-using namespace messageqcpp;
 
 #include "we_cmdargs.h"
 #include "we_sdhandler.h"
 #include "we_simplesyslog.h"
-using namespace WriteEngine;
 
 namespace WriteEngine
 {

From e5f2a710efe54af2a1992855b20684d53759fa24 Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Fri, 26 Apr 2019 08:21:47 -0500
Subject: [PATCH 13/33] Fully resolve potentially ambiguous symbols by removing
 using namespace statements from headers which have a cascading effect. This
 causes potential behavior changes when switching to c++11 since symbols can
 be exported from std and boost while both have been imported into the global
 namespace.

---
 exemgr/main.cpp | 178 ++++++++++++++++++++++++------------------------
 1 file changed, 89 insertions(+), 89 deletions(-)

diff --git a/exemgr/main.cpp b/exemgr/main.cpp
index 6790fafbb..a0cdbb0e0 100644
--- a/exemgr/main.cpp
+++ b/exemgr/main.cpp
@@ -121,25 +121,25 @@ joblist::DistributedEngineComm* ec;
 
 auto rm = joblist::ResourceManager::instance(true);
 
-int toInt(const std::string& val)
+int toInt(const string& val)
 {
     if (val.length() == 0) return -1;
 
     return static_cast<int>(config::Config::fromText(val));
 }
 
-const std::string ExeMgr("ExeMgr1");
+const string ExeMgr("ExeMgr1");
 
-const std::string prettyPrintMiniInfo(const std::string& in)
+const string prettyPrintMiniInfo(const string& in)
 {
-    //1. take the std::string and tok it by '\n'
+    //1. take the string and tok it by '\n'
     //2. for each part in each line calc the longest part
     //3. padding to each longest value, output a header and the lines
     typedef boost::tokenizer<boost::char_separator<char> > my_tokenizer;
     boost::char_separator<char> sep1("\n");
     my_tokenizer tok1(in, sep1);
-    std::vector<std::string> lines;
-    std::string header = "Desc Mode Table TableOID ReferencedColumns PIO LIO PBE Elapsed Rows";
+    vector<string> lines;
+    string header = "Desc Mode Table TableOID ReferencedColumns PIO LIO PBE Elapsed Rows";
     const int header_parts = 10;
     lines.push_back(header);
 
@@ -149,13 +149,13 @@ const std::string prettyPrintMiniInfo(const std::string& in)
             lines.push_back(*iter1);
     }
 
-    std::vector<unsigned> lens;
+    vector<unsigned> lens;
 
     for (int i = 0; i < header_parts; i++)
         lens.push_back(0);
 
-    std::vector<std::vector<std::string> > lineparts;
-    std::vector<std::string>::iterator iter2;
+    vector<vector<string> > lineparts;
+    vector<string>::iterator iter2;
     int j;
 
     for (iter2 = lines.begin(), j = 0; iter2 != lines.end(); ++iter2, j++)
@@ -163,14 +163,14 @@ const std::string prettyPrintMiniInfo(const std::string& in)
         boost::char_separator<char> sep2(" ");
         my_tokenizer tok2(*iter2, sep2);
         int i;
-        std::vector<std::string> parts;
+        vector<string> parts;
         my_tokenizer::iterator iter3;
 
         for (iter3 = tok2.begin(), i = 0; iter3 != tok2.end(); ++iter3, i++)
         {
             if (i >= header_parts) break;
 
-            std::string part(*iter3);
+            string part(*iter3);
 
             if (j != 0 && i == 8)
                 part.resize(part.size() - 3);
@@ -189,22 +189,22 @@ const std::string prettyPrintMiniInfo(const std::string& in)
 
     std::ostringstream oss;
 
-    std::vector<std::vector<std::string> >::iterator iter1 = lineparts.begin();
-    std::vector<std::vector<std::string> >::iterator end1 = lineparts.end();
+    vector<vector<string> >::iterator iter1 = lineparts.begin();
+    vector<vector<string> >::iterator end1 = lineparts.end();
 
     oss << "\n";
 
     while (iter1 != end1)
     {
-        std::vector<std::string>::iterator iter2 = iter1->begin();
-        std::vector<std::string>::iterator end2 = iter1->end();
+        vector<string>::iterator iter2 = iter1->begin();
+        vector<string>::iterator end2 = iter1->end();
         assert(distance(iter2, end2) == header_parts);
         int i = 0;
 
         while (iter2 != end2)
         {
             assert(i < header_parts);
-            oss << std::setw(lens[i]) << std::left << *iter2 << " ";
+            oss << setw(lens[i]) << left << *iter2 << " ";
             ++iter2;
             i++;
         }
@@ -216,7 +216,7 @@ const std::string prettyPrintMiniInfo(const std::string& in)
     return oss.str();
 }
 
-const std::string timeNow()
+const string timeNow()
 {
     time_t outputTime = time(0);
     struct tm ltm;
@@ -266,7 +266,7 @@ private:
     oam::OamCache* fOamCachePtr;	//this ptr is copyable...
 
     //...Reinitialize stats for start of a new query
-    void initStats ( uint32_t sessionId, std::string& sqlText )
+    void initStats ( uint32_t sessionId, string& sqlText )
     {
         initMaxMemPct ( sessionId );
 
@@ -316,10 +316,10 @@ private:
     }
 
     //...Get and log query stats to specified output stream
-    const std::string formatQueryStats (
+    const string formatQueryStats (
         joblist::SJLP&    jl,			// joblist associated with query
-        const    std::string& label, // header label to print in front of log output
-        bool     includeNewLine,//include line breaks in query stats std::string
+        const    string& label, // header label to print in front of log output
+        bool     includeNewLine,//include line breaks in query stats string
         bool     vtableModeOn,
         bool     wantExtendedStats,
         uint64_t rowsReturned)
@@ -348,7 +348,7 @@ private:
             fStatsRetrieved = true;
         }
 
-        std::string queryMode;
+        string queryMode;
         queryMode = (vtableModeOn ? "Distributed" : "Standard");
 
         // Log stats to specified output stream
@@ -361,7 +361,7 @@ private:
            "; BlocksTouched-" << fStats.fMsgRcvCnt;
 
         if ( includeNewLine )
-            os << std::endl << "      ";	// insert line break
+            os << endl << "      ";	// insert line break
         else
             os << "; ";				// continue without line break
 
@@ -417,7 +417,7 @@ private:
     {
         if ( sessionId < 0x80000000 )
         {
-            // std::cout << "Setting pct to 0 for session " << sessionId << std::endl;
+            // cout << "Setting pct to 0 for session " << sessionId << endl;
             std::lock_guard<std::mutex> lk(sessionMemMapMutex);
             SessionMemMap_t::iterator mapIter = sessionMemMap.find( sessionId );
 
@@ -433,7 +433,7 @@ private:
     }
 
     //... Round off to human readable format (KB, MB, or GB).
-    const std::string roundBytes(uint64_t value) const
+    const string roundBytes(uint64_t value) const
     {
         const char* units[] = {"B", "KB", "MB", "GB", "TB"};
         uint64_t i = 0, up = 0;
@@ -494,7 +494,7 @@ private:
     {
         const execplan::CalpontSelectExecutionPlan::ColumnMap& colMap = csep.columnMap();
         execplan::CalpontSelectExecutionPlan::ColumnMap::const_iterator it;
-        std::string schemaName;
+        string schemaName;
 
         for (it = colMap.begin(); it != colMap.end(); ++it)
         {
@@ -550,7 +550,7 @@ public:
                 if (bs.length() == 0)
                 {
                     if (gDebug > 1 || (gDebug && !csep.isInternal()))
-                        std::cout << "### Got a close(1) for session id " << csep.sessionID() << std::endl;
+                        cout << "### Got a close(1) for session id " << csep.sessionID() << endl;
 
                     // connection closed by client
                     fIos.close();
@@ -559,8 +559,8 @@ public:
                 else if (bs.length() < 4) //Not a CalpontSelectExecutionPlan
                 {
                     if (gDebug)
-                        std::cout << "### Got a not-a-plan for session id " << csep.sessionID()
-                             << " with length " << bs.length() <<  std::endl;
+                        cout << "### Got a not-a-plan for session id " << csep.sessionID()
+                             << " with length " << bs.length() <<  endl;
 
                     fIos.close();
                     break;
@@ -573,7 +573,7 @@ public:
                     if (qb == 4) //UM wants new tuple i/f
                     {
                         if (gDebug)
-                            std::cout << "### UM wants tuples" << std::endl;
+                            cout << "### UM wants tuples" << endl;
 
                         tryTuples = true;
                         // now wait for the CSEP...
@@ -593,7 +593,7 @@ public:
                     else
                     {
                         if (gDebug)
-                            std::cout << "### Got a not-a-plan value " << qb << std::endl;
+                            cout << "### Got a not-a-plan value " << qb << endl;
 
                         fIos.close();
                         break;
@@ -622,7 +622,7 @@ new_plan:
                 }
 
                 if (gDebug > 1 || (gDebug && !csep.isInternal()))
-                    std::cout << "### For session id " << csep.sessionID() << ", got a CSEP" << std::endl;
+                    cout << "### For session id " << csep.sessionID() << ", got a CSEP" << endl;
 
                 setRMParms(csep.rmParms());
 
@@ -646,7 +646,7 @@ new_plan:
 
                 bool needDbProfEndStatementMsg = false;
                 logging::Message::Args args;
-                std::string sqlText = csep.data();
+                string sqlText = csep.data();
                 logging::LoggingID li(16, csep.sessionID(), csep.txnID());
 
                 // Initialize stats for this query, including
@@ -686,7 +686,7 @@ new_plan:
                 {
                     try // @bug2244: try/catch around fIos.write() calls responding to makeTupleList
                     {
-                        std::string emsg("NOERROR");
+                        string emsg("NOERROR");
                         messageqcpp::ByteStream emsgBs;
                         messageqcpp::ByteStream::quadbyte tflg = 0;
                         jl = joblist::JobListFactory::makeJobList(&csep, fRm, true, true);
@@ -721,7 +721,7 @@ new_plan:
                             emsgBs.reset();
                             emsgBs << emsg;
                             fIos.write(emsgBs);
-                            std::cerr << "ExeMgr: could not build a tuple joblist: " << emsg << std::endl;
+                            cerr << "ExeMgr: could not build a tuple joblist: " << emsg << endl;
                             continue;
                         }
                     }
@@ -730,25 +730,25 @@ new_plan:
                         std::ostringstream errMsg;
                         errMsg << "ExeMgr: error writing makeJoblist "
                                "response; " <<  ex.what();
-                        throw std::runtime_error( errMsg.str() );
+                        throw runtime_error( errMsg.str() );
                     }
                     catch (...)
                     {
                         std::ostringstream errMsg;
                         errMsg << "ExeMgr: unknown error writing makeJoblist "
                                "response; ";
-                        throw std::runtime_error( errMsg.str() );
+                        throw runtime_error( errMsg.str() );
                     }
 
                     if (!usingTuples)
                     {
                         if (gDebug)
-                            std::cout << "### UM wanted tuples but it didn't work out :-(" << std::endl;
+                            cout << "### UM wanted tuples but it didn't work out :-(" << endl;
                     }
                     else
                     {
                         if (gDebug)
-                            std::cout << "### UM wanted tuples and we'll do our best;-)" << std::endl;
+                            cout << "### UM wanted tuples and we'll do our best;-)" << endl;
                     }
                 }
                 else
@@ -758,14 +758,14 @@ new_plan:
 
                     if (jl->status() == 0)
                     {
-                        std::string emsg;
+                        string emsg;
 
                         if (jl->putEngineComm(fEc) != 0)
-                            throw std::runtime_error(jl->errMsg());
+                            throw runtime_error(jl->errMsg());
                     }
                     else
                     {
-                        throw std::runtime_error("ExeMgr: could not build a JobList!");
+                        throw runtime_error("ExeMgr: could not build a JobList!");
                     }
                 }
 
@@ -786,14 +786,14 @@ new_plan:
                     if (bs.length() == 0)
                     {
                         if (gDebug > 1 || (gDebug && !csep.isInternal()))
-                            std::cout << "### Got a close(2) for session id " << csep.sessionID() << std::endl;
+                            cout << "### Got a close(2) for session id " << csep.sessionID() << endl;
 
                         break;
                     }
 
                     if (gDebug && bs.length() > 4)
-                        std::cout << "### For session id " << csep.sessionID() << ", got too many bytes = " <<
-                             bs.length() << std::endl;
+                        cout << "### For session id " << csep.sessionID() << ", got too many bytes = " <<
+                             bs.length() << endl;
 
                     //TODO: Holy crud! Can this be right?
                     //@bug 1444 Yes, if there is a self-join
@@ -813,7 +813,7 @@ new_plan:
                         bs >> qb;
 
                         if (gDebug > 1 || (gDebug && !csep.isInternal()))
-                            std::cout << "### For session id " << csep.sessionID() << ", got a command = " << qb << std::endl;
+                            cout << "### For session id " << csep.sessionID() << ", got a command = " << qb << endl;
 
                         if (qb == 0)
                         {
@@ -837,7 +837,7 @@ new_plan:
                             if (iter == tm.end())
                             {
                                 if (gDebug > 1 || (gDebug && !csep.isInternal()))
-                                    std::cout << "### For session id " << csep.sessionID() << ", returning end flag" << std::endl;
+                                    cout << "### For session id " << csep.sessionID() << ", returning end flag" << endl;
 
                                 bs.restart();
                                 bs << (messageqcpp::ByteStream::byte)1;
@@ -847,11 +847,11 @@ new_plan:
 
                             tableOID = iter->first;
                         }
-                        else if (qb == 3) //special option-UM wants job stats std::string
+                        else if (qb == 3) //special option-UM wants job stats string
                         {
-                            std::string statsString;
+                            string statsString;
 
-                            //Log stats std::string to be sent back to front end
+                            //Log stats string to be sent back to front end
                             statsString = formatQueryStats(
                                               jl,
                                               "Query Stats",
@@ -871,7 +871,7 @@ new_plan:
                             }
                             else
                             {
-                                std::string empty;
+                                string empty;
                                 bs << empty;
                                 bs << empty;
                             }
@@ -900,14 +900,14 @@ new_plan:
                         errMsg << "ExeMgr: error writing qb response "
                                "for qb cmd " << qb <<
                                "; " <<  ex.what();
-                        throw std::runtime_error( errMsg.str() );
+                        throw runtime_error( errMsg.str() );
                     }
                     catch (...)
                     {
                         std::ostringstream errMsg;
                         errMsg << "ExeMgr: unknown error writing qb response "
                                "for qb cmd " << qb;
-                        throw std::runtime_error( errMsg.str() );
+                        throw runtime_error( errMsg.str() );
                     }
 
                     if (swallowRows) tm.erase(tableOID);
@@ -975,8 +975,8 @@ new_plan:
                                 return;
                             }
 
-                            //std::cout << "connection drop\n";
-                            throw std::runtime_error( errMsg.str() );
+                            //cout << "connection drop\n";
+                            throw runtime_error( errMsg.str() );
                         }
                         catch (...)
                         {
@@ -991,7 +991,7 @@ new_plan:
                             while (rowCount)
                                 rowCount = jl->projectTable(tableOID, bs);
 
-                            throw std::runtime_error( errMsg.str() );
+                            throw runtime_error( errMsg.str() );
                         }
 
                         totalRowCount += rowCount;
@@ -1022,11 +1022,11 @@ new_plan:
 
                 if (needDbProfEndStatementMsg)
                 {
-                    std::string ss;
+                    string ss;
                     std::ostringstream prefix;
                     prefix << "ses:" << csep.sessionID() << " Query Totals";
 
-                    //Log stats std::string to standard out
+                    //Log stats string to standard out
                     ss = formatQueryStats(
                              jl,
                              prefix.str(),
@@ -1035,7 +1035,7 @@ new_plan:
                              (csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_LOG),
                              totalRowCount);
                     //@Bug 1306. Added timing info for real time tracking.
-                    std::cout << ss << " at " << timeNow() << std::endl;
+                    cout << ss << " at " << timeNow() << endl;
 
                     // log query status to debug log file
                     args.reset();
@@ -1072,13 +1072,13 @@ new_plan:
                     // delete sessionMemMap entry for this session's memory % use
                     deleteMaxMemPct( csep.sessionID() );
 
-                std::string endtime(timeNow());
+                string endtime(timeNow());
 
                 if ((csep.traceFlags() & flagsWantOutput) && (csep.sessionID() < 0x80000000))
                 {
-                    std::cout << "For session " << csep.sessionID() << ": " <<
+                    cout << "For session " << csep.sessionID() << ": " <<
                          totalBytesSent <<
-                         " bytes sent back at " << endtime << std::endl;
+                         " bytes sent back at " << endtime << endl;
 
                     // @bug 663 - Implemented caltraceon(16) to replace the
                     // $FIFO_SINK compiler definition in pColStep.
@@ -1086,19 +1086,19 @@ new_plan:
                     if (csep.traceFlags() &
                       execplan::CalpontSelectExecutionPlan::TRACE_NO_ROWS4)
                     {
-                        std::cout << std::endl;
-                        std::cout << "**** No data returned to DM.  Rows consumed "
+                        cout << endl;
+                        cout << "**** No data returned to DM.  Rows consumed "
                              "in ProjectSteps - caltrace(16) is on (FIFO_SINK)."
-                             " ****" << std::endl;
-                        std::cout << std::endl;
+                             " ****" << endl;
+                        cout << endl;
                     }
                     else if (csep.traceFlags() &
                       execplan::CalpontSelectExecutionPlan::TRACE_NO_ROWS3)
                     {
-                        std::cout << std::endl;
-                        std::cout << "**** No data returned to DM - caltrace(8) is "
-                             "on (SWALLOW_ROWS_EXEMGR). ****" << std::endl;
-                        std::cout << std::endl;
+                        cout << endl;
+                        cout << "**** No data returned to DM - caltrace(8) is "
+                             "on (SWALLOW_ROWS_EXEMGR). ****" << endl;
+                        cout << endl;
                     }
                 }
 
@@ -1139,7 +1139,7 @@ new_plan:
         {
             decThreadCntPerSession( csep.sessionID() | 0x80000000 );
             statementsRunningCount->decr(stmtCounted);
-            std::cerr << "### ExeMgr ses:" << csep.sessionID() << " caught: " << ex.what() << std::endl;
+            cerr << "### ExeMgr ses:" << csep.sessionID() << " caught: " << ex.what() << endl;
             logging::Message::Args args;
             logging::LoggingID li(16, csep.sessionID(), csep.txnID());
             args.add(ex.what());
@@ -1150,7 +1150,7 @@ new_plan:
         {
             decThreadCntPerSession( csep.sessionID() | 0x80000000 );
             statementsRunningCount->decr(stmtCounted);
-            std::cerr << "### Exception caught!" << std::endl;
+            cerr << "### Exception caught!" << endl;
             logging::Message::Args args;
             logging::LoggingID li(16, csep.sessionID(), csep.txnID());
             args.add("ExeMgr caught unknown exception");
@@ -1179,7 +1179,7 @@ public:
             {
                 if (fMaxPct >= 95)
                 {
-                    std::cerr << "Too much memory allocated!" << std::endl;
+                    cerr << "Too much memory allocated!" << endl;
                     logging::Message::Args args;
                     args.add((int)pct);
                     args.add((int)fMaxPct);
@@ -1189,7 +1189,7 @@ public:
 
                 if (statementsRunningCount->cur() == 0)
                 {
-                    std::cerr << "Too much memory allocated!" << std::endl;
+                    cerr << "Too much memory allocated!" << endl;
                     logging::Message::Args args;
                     args.add((int)pct);
                     args.add((int)fMaxPct);
@@ -1197,7 +1197,7 @@ public:
                     exit(1);
                 }
 
-                std::cerr << "Too much memory allocated, but stmts running" << std::endl;
+                cerr << "Too much memory allocated, but stmts running" << endl;
             }
 
             // Update sessionMemMap entries lower than current mem % use
@@ -1235,7 +1235,7 @@ void added_a_pm(int)
     logging::Message msg(1);
     args1.add("exeMgr caught SIGHUP. Resetting connections");
     msg.format( args1 );
-    std::cout << msg.msg().c_str() << std::endl;
+    cout << msg.msg().c_str() << endl;
     logging::Logger logger(logid.fSubsysID);
     logger.logMessage(logging::LOG_TYPE_DEBUG, msg, logid);
 
@@ -1299,7 +1299,7 @@ void setupSignalHandlers()
 
 void setupCwd(joblist::ResourceManager* rm)
 {
-    std::string workdir = rm->getScWorkingDir();
+    string workdir = rm->getScWorkingDir();
     (void)chdir(workdir.c_str());
 
     if (access(".", W_OK) != 0)
@@ -1349,8 +1349,8 @@ int setupResources()
 void cleanTempDir()
 {
     const auto config = config::Config::makeConfig();
-    std::string allowDJS = config->getConfig("HashJoin", "AllowDiskBasedJoin");
-    std::string tmpPrefix = config->getConfig("HashJoin", "TempFilePath");
+    string allowDJS = config->getConfig("HashJoin", "AllowDiskBasedJoin");
+    string tmpPrefix = config->getConfig("HashJoin", "TempFilePath");
 
     if (allowDJS == "N" || allowDJS == "n")
         return;
@@ -1370,7 +1370,7 @@ void cleanTempDir()
     }
     catch (const std::exception& ex)
     {
-        std::cerr << ex.what() << std::endl;
+        std::cerr << ex.what() << endl;
         logging::LoggingID logid(16, 0, 0);
         logging::Message::Args args;
         logging::Message message(8);
@@ -1382,7 +1382,7 @@ void cleanTempDir()
     }
     catch (...)
     {
-        std::cerr << "Caught unknown exception during tmpdir cleanup" << std::endl;
+        cerr << "Caught unknown exception during tmpdir cleanup" << endl;
         logging::LoggingID logid(16, 0, 0);
         logging::Message::Args args;
         logging::Message message(8);
@@ -1397,7 +1397,7 @@ void cleanTempDir()
 int main(int argc, char* argv[])
 {
     // get and set locale language
-    std::string systemLang = "C";
+    string systemLang = "C";
     systemLang = funcexp::utf8::idb_setlocale();
 
     // This is unset due to the way we start it
@@ -1451,7 +1451,7 @@ int main(int argc, char* argv[])
     int err = 0;
     if (!gDebug)
         err = setupResources();
-    std::string errMsg;
+    string errMsg;
 
     switch (err)
     {
@@ -1482,7 +1482,7 @@ int main(int argc, char* argv[])
         logging::LoggingID lid(16);
         logging::MessageLog ml(lid);
         ml.logCriticalMessage( message );
-        std::cerr << errMsg << std::endl;
+        cerr << errMsg << endl;
 
         try
         {
@@ -1527,15 +1527,15 @@ int main(int argc, char* argv[])
             mqs = new messageqcpp::MessageQueueServer(ExeMgr, rm->getConfig(), messageqcpp::ByteStream::BlockSize, 64);
             break;
         }
-        catch (std::runtime_error& re)
+        catch (runtime_error& re)
         {
-            std::string what = re.what();
+            string what = re.what();
 
-            if (what.find("Address already in use") != std::string::npos)
+            if (what.find("Address already in use") != string::npos)
             {
                 if (tellUser)
                 {
-                    std::cerr << "Address already in use, retrying..." << std::endl;
+                    cerr << "Address already in use, retrying..." << endl;
                     tellUser = false;
                 }
 
@@ -1592,7 +1592,7 @@ int main(int argc, char* argv[])
 
     std::cout << "Starting ExeMgr: st = " << serverThreads <<
          ", qs = " << rm->getEmExecQueueSize() << ", mx = " << maxPct << ", cf = " <<
-         rm->getConfig()->configFile() << std::endl;
+         rm->getConfig()->configFile() << endl;
 
     //set ACTIVE state
     {

From 515b93cc3d9768d422741e2a45b92fcb0a7aa0ec Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Fri, 26 Apr 2019 09:40:35 -0500
Subject: [PATCH 14/33] remove faulty test code

---
 CMakeLists.txt                                    | 14 +++++++-------
 ddlproc/ddlprocessor.cpp                          |  1 -
 dmlproc/dmlproc.cpp                               |  1 -
 oamapps/columnstoreDB/columnstoreDB.cpp           |  1 -
 oamapps/columnstoreSupport/columnstoreSupport.cpp |  1 -
 oamapps/mcsadmin/mcsadmin.cpp                     |  1 -
 oamapps/postConfigure/getMySQLpw.cpp              |  2 +-
 oamapps/postConfigure/installer.cpp               |  2 +-
 oamapps/postConfigure/mycnfUpgrade.cpp            |  2 +-
 oamapps/postConfigure/postConfigure.cpp           |  2 +-
 oamapps/serverMonitor/serverMonitor.cpp           |  2 +-
 primitives/primproc/primproc.cpp                  |  2 +-
 procmgr/main.cpp                                  |  2 +-
 procmon/main.cpp                                  |  2 +-
 tools/clearShm/main.cpp                           |  3 ++-
 tools/cleartablelock/cleartablelock.cpp           |  2 +-
 tools/configMgt/autoConfigure.cpp                 |  2 +-
 tools/configMgt/autoInstaller.cpp                 |  2 +-
 tools/configMgt/svnQuery.cpp                      |  2 +-
 tools/cplogger/main.cpp                           |  2 +-
 tools/dbbuilder/dbbuilder.cpp                     |  2 +-
 tools/dbloadxml/colxml.cpp                        |  2 +-
 tools/ddlcleanup/ddlcleanup.cpp                   |  2 +-
 tools/editem/editem.cpp                           |  2 +-
 tools/getConfig/main.cpp                          |  2 +-
 tools/idbmeminfo/idbmeminfo.cpp                   |  2 +-
 tools/setConfig/main.cpp                          |  2 +-
 tools/viewtablelock/viewtablelock.cpp             |  2 +-
 versioning/BRM/dbrmctl.cpp                        |  2 +-
 versioning/BRM/load_brm.cpp                       |  2 +-
 versioning/BRM/masternode.cpp                     |  2 +-
 versioning/BRM/reset_locks.cpp                    |  2 +-
 versioning/BRM/rollback.cpp                       |  2 +-
 versioning/BRM/save_brm.cpp                       |  2 +-
 versioning/BRM/slavenode.cpp                      |  2 +-
 35 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be85518bb..d0da43339 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,13 +26,13 @@ MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
 
 OPTION(USE_CCACHE "reduce compile time with ccache." FALSE)
 if(NOT USE_CCACHE)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "")
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "")
-else()
-  find_program(CCACHE_FOUND ccache)
-  if(CCACHE_FOUND)
-      set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-      set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "")
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "")
+else()
+  find_program(CCACHE_FOUND ccache)
+  if(CCACHE_FOUND)
+      set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+      set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
   endif(CCACHE_FOUND)
 endif()
 # Distinguish between community and non-community builds, with the
diff --git a/ddlproc/ddlprocessor.cpp b/ddlproc/ddlprocessor.cpp
index fb283f3a7..45bae8bac 100644
--- a/ddlproc/ddlprocessor.cpp
+++ b/ddlproc/ddlprocessor.cpp
@@ -20,7 +20,6 @@
  *
  *
  ***********************************************************************/
-#include <future> //cxx11test
 #include <map>
 #include <boost/scoped_ptr.hpp>
 using namespace std;
diff --git a/dmlproc/dmlproc.cpp b/dmlproc/dmlproc.cpp
index 7b1041b1e..f7fedbf18 100644
--- a/dmlproc/dmlproc.cpp
+++ b/dmlproc/dmlproc.cpp
@@ -20,7 +20,6 @@
 *
 *
 ***********************************************************************/
-#include <future> //cxx11test
 #include <unistd.h>
 #include <signal.h>
 #include <string>
diff --git a/oamapps/columnstoreDB/columnstoreDB.cpp b/oamapps/columnstoreDB/columnstoreDB.cpp
index 58a7e375f..25c06d140 100644
--- a/oamapps/columnstoreDB/columnstoreDB.cpp
+++ b/oamapps/columnstoreDB/columnstoreDB.cpp
@@ -23,7 +23,6 @@
 /**
  * @file
  */
-#include <future> //cxx11test
 
 #include <iostream>
 #include <fstream>
diff --git a/oamapps/columnstoreSupport/columnstoreSupport.cpp b/oamapps/columnstoreSupport/columnstoreSupport.cpp
index 87adb28f7..ccf7714c4 100644
--- a/oamapps/columnstoreSupport/columnstoreSupport.cpp
+++ b/oamapps/columnstoreSupport/columnstoreSupport.cpp
@@ -10,7 +10,6 @@
 /**
  * @file
  */
-#include <future> //cxx11test
 
 #include <iterator>
 #include <numeric>
diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp
index 6b951133b..d07c67ffb 100644
--- a/oamapps/mcsadmin/mcsadmin.cpp
+++ b/oamapps/mcsadmin/mcsadmin.cpp
@@ -21,7 +21,6 @@
  * $Id: mcsadmin.cpp 3110 2013-06-20 18:09:12Z dhill $
  *
  ******************************************************************************************/
-#include <future> //cxx11test
 
 #include <clocale>
 #include <netdb.h>
diff --git a/oamapps/postConfigure/getMySQLpw.cpp b/oamapps/postConfigure/getMySQLpw.cpp
index 0073175bf..815d1e7e1 100644
--- a/oamapps/postConfigure/getMySQLpw.cpp
+++ b/oamapps/postConfigure/getMySQLpw.cpp
@@ -24,7 +24,7 @@
 /**
  * @file
  */
-#include <future> //cxx11test
+
 
 #include <unistd.h>
 #include <iterator>
diff --git a/oamapps/postConfigure/installer.cpp b/oamapps/postConfigure/installer.cpp
index 075870275..50d9fb9fc 100644
--- a/oamapps/postConfigure/installer.cpp
+++ b/oamapps/postConfigure/installer.cpp
@@ -27,7 +27,7 @@
 /**
  * @file
  */
-#include <future> //cxx11test
+
 
 #include <iterator>
 #include <numeric>
diff --git a/oamapps/postConfigure/mycnfUpgrade.cpp b/oamapps/postConfigure/mycnfUpgrade.cpp
index e42a9b64f..745da6179 100644
--- a/oamapps/postConfigure/mycnfUpgrade.cpp
+++ b/oamapps/postConfigure/mycnfUpgrade.cpp
@@ -25,7 +25,7 @@
 /**
  * @file
  */
-#include <future> //cxx11test
+
 
 #include <unistd.h>
 #include <iterator>
diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp
index a115104e5..ad7d27d7a 100644
--- a/oamapps/postConfigure/postConfigure.cpp
+++ b/oamapps/postConfigure/postConfigure.cpp
@@ -29,7 +29,7 @@
 /**
  * @file
  */
-#include <future> //cxx11test
+
 
 #include <unistd.h>
 #include <iterator>
diff --git a/oamapps/serverMonitor/serverMonitor.cpp b/oamapps/serverMonitor/serverMonitor.cpp
index f9a468569..dc25aa871 100644
--- a/oamapps/serverMonitor/serverMonitor.cpp
+++ b/oamapps/serverMonitor/serverMonitor.cpp
@@ -21,7 +21,7 @@
  *
  *   Author: David Hill
  ***************************************************************************/
-#include <future> //cxx11test
+
 
 #include "serverMonitor.h"
 #include "installdir.h"
diff --git a/primitives/primproc/primproc.cpp b/primitives/primproc/primproc.cpp
index 3df972ac1..3fbd23d45 100644
--- a/primitives/primproc/primproc.cpp
+++ b/primitives/primproc/primproc.cpp
@@ -21,7 +21,7 @@
  *
  *
  ***********************************************************************/
-#include <future> //cxx11test
+
 
 #include <unistd.h>
 #include <string>
diff --git a/procmgr/main.cpp b/procmgr/main.cpp
index 54529ae0a..35f544a75 100644
--- a/procmgr/main.cpp
+++ b/procmgr/main.cpp
@@ -21,7 +21,7 @@
 * $Id: main.cpp 2203 2013-07-08 16:50:51Z bpaul $
 *
 *****************************************************************************************/
-#include <future> //cxx11test
+
 
 
 #include <clocale>
diff --git a/procmon/main.cpp b/procmon/main.cpp
index 37afe274c..41cbebefd 100644
--- a/procmon/main.cpp
+++ b/procmon/main.cpp
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
-#include <future> //cxx11test
+
 
 #include <boost/interprocess/shared_memory_object.hpp>
 #include <boost/interprocess/mapped_region.hpp>
diff --git a/tools/clearShm/main.cpp b/tools/clearShm/main.cpp
index e80a8c79d..4ab97c2d6 100644
--- a/tools/clearShm/main.cpp
+++ b/tools/clearShm/main.cpp
@@ -16,7 +16,7 @@
    MA 02110-1301, USA. */
 
 // $Id: main.cpp 2101 2013-01-21 14:12:52Z rdempsey $
-#include <future> //cxx11test
+
 
 #include "config.h"
 
@@ -30,6 +30,7 @@
 #include <sstream>
 #include <iomanip>
 #include <string>
+#include <mutex>
 using namespace std;
 
 #include <boost/interprocess/shared_memory_object.hpp>
diff --git a/tools/cleartablelock/cleartablelock.cpp b/tools/cleartablelock/cleartablelock.cpp
index cb22cb343..df660ec5d 100644
--- a/tools/cleartablelock/cleartablelock.cpp
+++ b/tools/cleartablelock/cleartablelock.cpp
@@ -18,7 +18,7 @@
 /*
 * $Id: cleartablelock.cpp 2336 2013-06-25 19:11:36Z rdempsey $
 */
-#include <future> //cxx11test
+
 
 #include <cstdlib>
 #include <iostream>
diff --git a/tools/configMgt/autoConfigure.cpp b/tools/configMgt/autoConfigure.cpp
index fbd5d739a..10d7318ee 100644
--- a/tools/configMgt/autoConfigure.cpp
+++ b/tools/configMgt/autoConfigure.cpp
@@ -28,7 +28,7 @@
 /**
  * @file
  */
-#include <future> //cxx11test
+
 
 #include <iterator>
 #include <numeric>
diff --git a/tools/configMgt/autoInstaller.cpp b/tools/configMgt/autoInstaller.cpp
index e3699449e..fa748056d 100644
--- a/tools/configMgt/autoInstaller.cpp
+++ b/tools/configMgt/autoInstaller.cpp
@@ -28,7 +28,7 @@
 /**
  * @file
  */
-#include <future> //cxx11test
+
 
 #include <iostream>
 #include <cstdlib>
diff --git a/tools/configMgt/svnQuery.cpp b/tools/configMgt/svnQuery.cpp
index c1de2c065..05aef02fb 100644
--- a/tools/configMgt/svnQuery.cpp
+++ b/tools/configMgt/svnQuery.cpp
@@ -24,7 +24,7 @@
 /**
  * @file
  */
-#include <future> //cxx11test
+
 
 #include <iterator>
 #include <numeric>
diff --git a/tools/cplogger/main.cpp b/tools/cplogger/main.cpp
index 4d45cd527..4bf673c57 100644
--- a/tools/cplogger/main.cpp
+++ b/tools/cplogger/main.cpp
@@ -16,7 +16,7 @@
    MA 02110-1301, USA. */
 
 // $Id: main.cpp 2336 2013-06-25 19:11:36Z rdempsey $
-#include <future> //cxx11test
+
 #include <unistd.h>
 #include <cstdio>
 #include <iostream>
diff --git a/tools/dbbuilder/dbbuilder.cpp b/tools/dbbuilder/dbbuilder.cpp
index 6f62eeb0a..31e33c7df 100644
--- a/tools/dbbuilder/dbbuilder.cpp
+++ b/tools/dbbuilder/dbbuilder.cpp
@@ -19,7 +19,7 @@
 * $Id: dbbuilder.cpp 2101 2013-01-21 14:12:52Z rdempsey $
 *
 *******************************************************************************/
-#include <future> //cxx11test
+
 #include <stdio.h>
 #include <unistd.h>
 #include <cerrno>
diff --git a/tools/dbloadxml/colxml.cpp b/tools/dbloadxml/colxml.cpp
index 4e359c599..87ef4b1a8 100644
--- a/tools/dbloadxml/colxml.cpp
+++ b/tools/dbloadxml/colxml.cpp
@@ -19,7 +19,7 @@
  * $Id: colxml.cpp 2237 2013-05-05 23:42:37Z dcathey $
  *
  ******************************************************************************/
-#include <future> //cxx11test
+
 
 #include <clocale>
 
diff --git a/tools/ddlcleanup/ddlcleanup.cpp b/tools/ddlcleanup/ddlcleanup.cpp
index 9924f91be..14e6334a2 100644
--- a/tools/ddlcleanup/ddlcleanup.cpp
+++ b/tools/ddlcleanup/ddlcleanup.cpp
@@ -18,7 +18,7 @@
 /*
 * $Id: ddlcleanup.cpp 967 2009-10-15 13:57:29Z rdempsey $
 */
-#include <future> //cxx11test
+
 
 #include <iostream>
 #include <fstream>
diff --git a/tools/editem/editem.cpp b/tools/editem/editem.cpp
index 81c34c407..15d4d2a5f 100644
--- a/tools/editem/editem.cpp
+++ b/tools/editem/editem.cpp
@@ -18,7 +18,7 @@
 /*
 * $Id: editem.cpp 2336 2013-06-25 19:11:36Z rdempsey $
 */
-#include <future> //cxx11test
+
 
 #include <iostream>
 #include <vector>
diff --git a/tools/getConfig/main.cpp b/tools/getConfig/main.cpp
index e895f603b..8c8171840 100644
--- a/tools/getConfig/main.cpp
+++ b/tools/getConfig/main.cpp
@@ -19,7 +19,7 @@
 * $Id: main.cpp 2101 2013-01-21 14:12:52Z rdempsey $
 *
 *****************************************************************************/
-#include <future> //cxx11test
+
 #include <iostream>
 #include <cassert>
 #include <unistd.h>
diff --git a/tools/idbmeminfo/idbmeminfo.cpp b/tools/idbmeminfo/idbmeminfo.cpp
index 4c84403a3..800385f61 100644
--- a/tools/idbmeminfo/idbmeminfo.cpp
+++ b/tools/idbmeminfo/idbmeminfo.cpp
@@ -14,7 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
-#include <future> //cxx11test
+
 
 #ifdef _MSC_VER
 #define WIN32_LEAN_AND_MEAN
diff --git a/tools/setConfig/main.cpp b/tools/setConfig/main.cpp
index fb66c9bc7..fa9cdc7ad 100644
--- a/tools/setConfig/main.cpp
+++ b/tools/setConfig/main.cpp
@@ -19,7 +19,7 @@
 * $Id: main.cpp 210 2007-06-08 17:08:26Z rdempsey $
 *
 *****************************************************************************/
-#include <future> //cxx11test
+
 #include <unistd.h>
 #include <iostream>
 #include <cassert>
diff --git a/tools/viewtablelock/viewtablelock.cpp b/tools/viewtablelock/viewtablelock.cpp
index 6d163e3e5..142c1ba8a 100644
--- a/tools/viewtablelock/viewtablelock.cpp
+++ b/tools/viewtablelock/viewtablelock.cpp
@@ -18,7 +18,7 @@
 /*
 * $Id: viewtablelock.cpp 2101 2013-01-21 14:12:52Z rdempsey $
 */
-#include <future> //cxx11test
+
 
 #include <ctime>
 #include <iostream>
diff --git a/versioning/BRM/dbrmctl.cpp b/versioning/BRM/dbrmctl.cpp
index 45bf68f36..f3942bc49 100644
--- a/versioning/BRM/dbrmctl.cpp
+++ b/versioning/BRM/dbrmctl.cpp
@@ -19,7 +19,7 @@
  * $Id: dbrmctl.cpp 1823 2013-01-21 14:13:09Z rdempsey $
  *
  ****************************************************************************/
-#include <future> //cxx11test
+
 
 #include <unistd.h>
 #include <iostream>
diff --git a/versioning/BRM/load_brm.cpp b/versioning/BRM/load_brm.cpp
index 871a51122..6eaebd2af 100644
--- a/versioning/BRM/load_brm.cpp
+++ b/versioning/BRM/load_brm.cpp
@@ -19,7 +19,7 @@
  * $Id: load_brm.cpp 1905 2013-06-14 18:42:28Z rdempsey $
  *
  ****************************************************************************/
-#include <future> //cxx11test
+
 #include <unistd.h>
 #include <iostream>
 #include <string>
diff --git a/versioning/BRM/masternode.cpp b/versioning/BRM/masternode.cpp
index ea4832dae..a43c41479 100644
--- a/versioning/BRM/masternode.cpp
+++ b/versioning/BRM/masternode.cpp
@@ -23,7 +23,7 @@
 /*
  * The executable source that runs a Master DBRM Node.
  */
-#include <future> //cxx11test
+
 
 #include "masterdbrmnode.h"
 #include "liboamcpp.h"
diff --git a/versioning/BRM/reset_locks.cpp b/versioning/BRM/reset_locks.cpp
index 47237aafa..390942ca3 100644
--- a/versioning/BRM/reset_locks.cpp
+++ b/versioning/BRM/reset_locks.cpp
@@ -17,7 +17,7 @@
 
 // $Id: reset_locks.cpp 1823 2013-01-21 14:13:09Z rdempsey $
 //
-#include <future> //cxx11test
+
 
 #include <unistd.h>
 #include <iostream>
diff --git a/versioning/BRM/rollback.cpp b/versioning/BRM/rollback.cpp
index 509635248..2db4720e0 100644
--- a/versioning/BRM/rollback.cpp
+++ b/versioning/BRM/rollback.cpp
@@ -28,7 +28,7 @@
  * 		rollback -p   (to get the transaction(s) that need to be rolled back)
  * 		rollback -r transID  	(for each one to roll them back)
  */
-#include <future> //cxx11test
+
 
 #include "dbrm.h"
 
diff --git a/versioning/BRM/save_brm.cpp b/versioning/BRM/save_brm.cpp
index 6993fd8fb..5eef1a9bf 100644
--- a/versioning/BRM/save_brm.cpp
+++ b/versioning/BRM/save_brm.cpp
@@ -25,7 +25,7 @@
  *
  * More detailed description
  */
-#include <future> //cxx11test
+
 
 #include <unistd.h>
 #include <iostream>
diff --git a/versioning/BRM/slavenode.cpp b/versioning/BRM/slavenode.cpp
index 26701504a..7c0bf2638 100644
--- a/versioning/BRM/slavenode.cpp
+++ b/versioning/BRM/slavenode.cpp
@@ -19,7 +19,7 @@
  * $Id: slavenode.cpp 1931 2013-07-08 16:53:02Z bpaul $
  *
  ****************************************************************************/
-#include <future> //cxx11test
+
 
 #include <iostream>
 #include <signal.h>

From 56767ae7933266c20ebe644cd21d4958ce0d937f Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Sun, 28 Apr 2019 16:56:55 -0500
Subject: [PATCH 15/33] Add a few missing qualifiers

---
 dbcon/joblist/subquerystep.h                           |  4 ++--
 dbcon/joblist/tupleaggregatestep.h                     |  2 +-
 dbcon/joblist/windowfunctionstep.h                     | 10 +++++-----
 primitives/primproc/primitiveserver.h                  |  2 +-
 .../redistribute/we_redistributecontrolthread.h        |  2 +-
 writeengine/splitter/we_xmlgetter.h                    | 10 +++++-----
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/dbcon/joblist/subquerystep.h b/dbcon/joblist/subquerystep.h
index d69863df5..e7c479ba2 100644
--- a/dbcon/joblist/subquerystep.h
+++ b/dbcon/joblist/subquerystep.h
@@ -227,11 +227,11 @@ public:
 
     /** @brief add function columns (returned columns)
      */
-    void addExpression(const vector<execplan::SRCP>&);
+    void addExpression(const std::vector<execplan::SRCP>&);
 
     /** @brief add function join expresssion
      */
-    void addFcnJoinExp(const vector<execplan::SRCP>&);
+    void addFcnJoinExp(const std::vector<execplan::SRCP>&);
 
 
 protected:
diff --git a/dbcon/joblist/tupleaggregatestep.h b/dbcon/joblist/tupleaggregatestep.h
index ae356e156..f137daf6f 100644
--- a/dbcon/joblist/tupleaggregatestep.h
+++ b/dbcon/joblist/tupleaggregatestep.h
@@ -199,7 +199,7 @@ private:
     std::vector<rowgroup::RGData > fRowGroupDatas;
     std::vector<rowgroup::SP_ROWAGG_UM_t> fAggregators;
     std::vector<rowgroup::RowGroup> fRowGroupIns;
-    vector<rowgroup::RowGroup> fRowGroupOuts;
+    std::vector<rowgroup::RowGroup> fRowGroupOuts;
     std::vector<std::vector<rowgroup::RGData> > fRowGroupsDeliveredData;
     bool fIsMultiThread;
     int fInputIter; // iterator
diff --git a/dbcon/joblist/windowfunctionstep.h b/dbcon/joblist/windowfunctionstep.h
index f483c6027..b57d06324 100644
--- a/dbcon/joblist/windowfunctionstep.h
+++ b/dbcon/joblist/windowfunctionstep.h
@@ -134,15 +134,15 @@ private:
     uint64_t nextFunctionIndex();
 
     boost::shared_ptr<windowfunction::FrameBound> parseFrameBound(const execplan::WF_Boundary&,
-            const map<uint64_t, uint64_t>&, const vector<execplan::SRCP>&,
+            const std::map<uint64_t, uint64_t>&, const std::vector<execplan::SRCP>&,
             const boost::shared_ptr<ordering::EqualCompData>&, JobInfo&, bool, bool);
     boost::shared_ptr<windowfunction::FrameBound> parseFrameBoundRows(
-        const execplan::WF_Boundary&, const map<uint64_t, uint64_t>&, JobInfo&);
+        const execplan::WF_Boundary&, const std::map<uint64_t, uint64_t>&, JobInfo&);
     boost::shared_ptr<windowfunction::FrameBound> parseFrameBoundRange(
-        const execplan::WF_Boundary&, const map<uint64_t, uint64_t>&, const vector<execplan::SRCP>&,
+        const execplan::WF_Boundary&, const std::map<uint64_t, uint64_t>&, const std::vector<execplan::SRCP>&,
         JobInfo&);
-    void updateWindowCols(execplan::ParseTree*, const map<uint64_t, uint64_t>&, JobInfo&);
-    void updateWindowCols(execplan::ReturnedColumn*, const map<uint64_t, uint64_t>&, JobInfo&);
+    void updateWindowCols(execplan::ParseTree*, const std::map<uint64_t, uint64_t>&, JobInfo&);
+    void updateWindowCols(execplan::ReturnedColumn*, const std::map<uint64_t, uint64_t>&, JobInfo&);
     void sort(std::vector<joblist::RowPosition>::iterator, uint64_t);
 
     void formatMiniStats();
diff --git a/primitives/primproc/primitiveserver.h b/primitives/primproc/primitiveserver.h
index d50edb3be..f212fd9fd 100644
--- a/primitives/primproc/primitiveserver.h
+++ b/primitives/primproc/primitiveserver.h
@@ -58,7 +58,7 @@ extern boost::mutex bppLock;
 extern uint32_t highPriorityThreads, medPriorityThreads, lowPriorityThreads;
 
 #ifdef PRIMPROC_STOPWATCH
-extern map<pthread_t, logging::StopWatch*> stopwatchMap;
+extern std::map<pthread_t, logging::StopWatch*> stopwatchMap;
 extern pthread_mutex_t stopwatchMapMutex;
 extern bool stopwatchThreadCreated;
 
diff --git a/writeengine/redistribute/we_redistributecontrolthread.h b/writeengine/redistribute/we_redistributecontrolthread.h
index 21b47b7da..9b28fe9d7 100644
--- a/writeengine/redistribute/we_redistributecontrolthread.h
+++ b/writeengine/redistribute/we_redistributecontrolthread.h
@@ -102,7 +102,7 @@ private:
     int  executeRedistributePlan();
 
     int  connectToWes(int);
-    void dumpPlanToFile(uint64_t, vector<PartitionInfo>&, int);
+    void dumpPlanToFile(uint64_t, std::vector<PartitionInfo>&, int);
     void displayPlan();
 
     uint32_t                      fAction;
diff --git a/writeengine/splitter/we_xmlgetter.h b/writeengine/splitter/we_xmlgetter.h
index 4f6e3dfbc..935cd4d27 100644
--- a/writeengine/splitter/we_xmlgetter.h
+++ b/writeengine/splitter/we_xmlgetter.h
@@ -43,15 +43,15 @@ public:
 
 public:
     //..Public methods
-    std::string getValue(const vector<string>& section) const;
-    std::string getAttribute(const std::vector<string>& sections,
+    std::string getValue(const std::vector<std::string>& section) const;
+    std::string getAttribute(const std::vector<std::string>& sections,
                              const std::string& Tag) const;
     void getConfig(const std::string& section,
                    const std::string& name, std::vector<std::string>& values ) const;
     void getAttributeListForAllChildren(
-        const vector<string>& sections,
-        const string& attributeTag,
-        vector<string>& attributeValues);
+        const std::vector<std::string>& sections,
+        const std::string& attributeTag,
+      std::vector<std::string>& attributeValues);
 
 private:
     //..Private methods

From 6bac032d5694bacfeb9cf12be28ca5d0bae3de5e Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Sun, 28 Apr 2019 21:26:20 -0500
Subject: [PATCH 16/33] break compile dependecy on ALARMManager.h

---
 utils/rowgroup/rowaggregation.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/utils/rowgroup/rowaggregation.cpp b/utils/rowgroup/rowaggregation.cpp
index bae0e8e27..2a1dd862e 100644
--- a/utils/rowgroup/rowaggregation.cpp
+++ b/utils/rowgroup/rowaggregation.cpp
@@ -47,7 +47,7 @@
 #include "funcexp.h"
 #include "rowaggregation.h"
 #include "calpontsystemcatalog.h"
-#include "utils_utf8.h"
+//#include "utils_utf8.h"
 
 //..comment out NDEBUG to enable assertions, uncomment NDEBUG to disable
 //#define NDEBUG
@@ -57,6 +57,15 @@ using namespace std;
 using namespace boost;
 using namespace dataconvert;
 
+namespace funcexp
+{
+  namespace utf8
+  {
+    int idb_strcoll(const char*, const char*);
+  }
+}
+
+
 // inlines of RowAggregation that used only in this file
 namespace
 {
@@ -379,6 +388,7 @@ inline void RowAggregation::updateFloatMinMax(float val1, float val2, int64_t co
 }
 
 
+
 #define STRCOLL_ENH__
 
 void RowAggregation::updateStringMinMax(string val1, string val2, int64_t col, int func)

From 53afd89bb1fb1f218c983c1c001b769ba3a83fde Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Mon, 29 Apr 2019 02:07:56 -0500
Subject: [PATCH 17/33] fully qualify identifiers

---
 exemgr/main.cpp                 | 178 ++++++++++++++++----------------
 utils/rowgroup/rowaggregation.h |   2 +-
 2 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/exemgr/main.cpp b/exemgr/main.cpp
index a0cdbb0e0..6790fafbb 100644
--- a/exemgr/main.cpp
+++ b/exemgr/main.cpp
@@ -121,25 +121,25 @@ joblist::DistributedEngineComm* ec;
 
 auto rm = joblist::ResourceManager::instance(true);
 
-int toInt(const string& val)
+int toInt(const std::string& val)
 {
     if (val.length() == 0) return -1;
 
     return static_cast<int>(config::Config::fromText(val));
 }
 
-const string ExeMgr("ExeMgr1");
+const std::string ExeMgr("ExeMgr1");
 
-const string prettyPrintMiniInfo(const string& in)
+const std::string prettyPrintMiniInfo(const std::string& in)
 {
-    //1. take the string and tok it by '\n'
+    //1. take the std::string and tok it by '\n'
     //2. for each part in each line calc the longest part
     //3. padding to each longest value, output a header and the lines
     typedef boost::tokenizer<boost::char_separator<char> > my_tokenizer;
     boost::char_separator<char> sep1("\n");
     my_tokenizer tok1(in, sep1);
-    vector<string> lines;
-    string header = "Desc Mode Table TableOID ReferencedColumns PIO LIO PBE Elapsed Rows";
+    std::vector<std::string> lines;
+    std::string header = "Desc Mode Table TableOID ReferencedColumns PIO LIO PBE Elapsed Rows";
     const int header_parts = 10;
     lines.push_back(header);
 
@@ -149,13 +149,13 @@ const string prettyPrintMiniInfo(const string& in)
             lines.push_back(*iter1);
     }
 
-    vector<unsigned> lens;
+    std::vector<unsigned> lens;
 
     for (int i = 0; i < header_parts; i++)
         lens.push_back(0);
 
-    vector<vector<string> > lineparts;
-    vector<string>::iterator iter2;
+    std::vector<std::vector<std::string> > lineparts;
+    std::vector<std::string>::iterator iter2;
     int j;
 
     for (iter2 = lines.begin(), j = 0; iter2 != lines.end(); ++iter2, j++)
@@ -163,14 +163,14 @@ const string prettyPrintMiniInfo(const string& in)
         boost::char_separator<char> sep2(" ");
         my_tokenizer tok2(*iter2, sep2);
         int i;
-        vector<string> parts;
+        std::vector<std::string> parts;
         my_tokenizer::iterator iter3;
 
         for (iter3 = tok2.begin(), i = 0; iter3 != tok2.end(); ++iter3, i++)
         {
             if (i >= header_parts) break;
 
-            string part(*iter3);
+            std::string part(*iter3);
 
             if (j != 0 && i == 8)
                 part.resize(part.size() - 3);
@@ -189,22 +189,22 @@ const string prettyPrintMiniInfo(const string& in)
 
     std::ostringstream oss;
 
-    vector<vector<string> >::iterator iter1 = lineparts.begin();
-    vector<vector<string> >::iterator end1 = lineparts.end();
+    std::vector<std::vector<std::string> >::iterator iter1 = lineparts.begin();
+    std::vector<std::vector<std::string> >::iterator end1 = lineparts.end();
 
     oss << "\n";
 
     while (iter1 != end1)
     {
-        vector<string>::iterator iter2 = iter1->begin();
-        vector<string>::iterator end2 = iter1->end();
+        std::vector<std::string>::iterator iter2 = iter1->begin();
+        std::vector<std::string>::iterator end2 = iter1->end();
         assert(distance(iter2, end2) == header_parts);
         int i = 0;
 
         while (iter2 != end2)
         {
             assert(i < header_parts);
-            oss << setw(lens[i]) << left << *iter2 << " ";
+            oss << std::setw(lens[i]) << std::left << *iter2 << " ";
             ++iter2;
             i++;
         }
@@ -216,7 +216,7 @@ const string prettyPrintMiniInfo(const string& in)
     return oss.str();
 }
 
-const string timeNow()
+const std::string timeNow()
 {
     time_t outputTime = time(0);
     struct tm ltm;
@@ -266,7 +266,7 @@ private:
     oam::OamCache* fOamCachePtr;	//this ptr is copyable...
 
     //...Reinitialize stats for start of a new query
-    void initStats ( uint32_t sessionId, string& sqlText )
+    void initStats ( uint32_t sessionId, std::string& sqlText )
     {
         initMaxMemPct ( sessionId );
 
@@ -316,10 +316,10 @@ private:
     }
 
     //...Get and log query stats to specified output stream
-    const string formatQueryStats (
+    const std::string formatQueryStats (
         joblist::SJLP&    jl,			// joblist associated with query
-        const    string& label, // header label to print in front of log output
-        bool     includeNewLine,//include line breaks in query stats string
+        const    std::string& label, // header label to print in front of log output
+        bool     includeNewLine,//include line breaks in query stats std::string
         bool     vtableModeOn,
         bool     wantExtendedStats,
         uint64_t rowsReturned)
@@ -348,7 +348,7 @@ private:
             fStatsRetrieved = true;
         }
 
-        string queryMode;
+        std::string queryMode;
         queryMode = (vtableModeOn ? "Distributed" : "Standard");
 
         // Log stats to specified output stream
@@ -361,7 +361,7 @@ private:
            "; BlocksTouched-" << fStats.fMsgRcvCnt;
 
         if ( includeNewLine )
-            os << endl << "      ";	// insert line break
+            os << std::endl << "      ";	// insert line break
         else
             os << "; ";				// continue without line break
 
@@ -417,7 +417,7 @@ private:
     {
         if ( sessionId < 0x80000000 )
         {
-            // cout << "Setting pct to 0 for session " << sessionId << endl;
+            // std::cout << "Setting pct to 0 for session " << sessionId << std::endl;
             std::lock_guard<std::mutex> lk(sessionMemMapMutex);
             SessionMemMap_t::iterator mapIter = sessionMemMap.find( sessionId );
 
@@ -433,7 +433,7 @@ private:
     }
 
     //... Round off to human readable format (KB, MB, or GB).
-    const string roundBytes(uint64_t value) const
+    const std::string roundBytes(uint64_t value) const
     {
         const char* units[] = {"B", "KB", "MB", "GB", "TB"};
         uint64_t i = 0, up = 0;
@@ -494,7 +494,7 @@ private:
     {
         const execplan::CalpontSelectExecutionPlan::ColumnMap& colMap = csep.columnMap();
         execplan::CalpontSelectExecutionPlan::ColumnMap::const_iterator it;
-        string schemaName;
+        std::string schemaName;
 
         for (it = colMap.begin(); it != colMap.end(); ++it)
         {
@@ -550,7 +550,7 @@ public:
                 if (bs.length() == 0)
                 {
                     if (gDebug > 1 || (gDebug && !csep.isInternal()))
-                        cout << "### Got a close(1) for session id " << csep.sessionID() << endl;
+                        std::cout << "### Got a close(1) for session id " << csep.sessionID() << std::endl;
 
                     // connection closed by client
                     fIos.close();
@@ -559,8 +559,8 @@ public:
                 else if (bs.length() < 4) //Not a CalpontSelectExecutionPlan
                 {
                     if (gDebug)
-                        cout << "### Got a not-a-plan for session id " << csep.sessionID()
-                             << " with length " << bs.length() <<  endl;
+                        std::cout << "### Got a not-a-plan for session id " << csep.sessionID()
+                             << " with length " << bs.length() <<  std::endl;
 
                     fIos.close();
                     break;
@@ -573,7 +573,7 @@ public:
                     if (qb == 4) //UM wants new tuple i/f
                     {
                         if (gDebug)
-                            cout << "### UM wants tuples" << endl;
+                            std::cout << "### UM wants tuples" << std::endl;
 
                         tryTuples = true;
                         // now wait for the CSEP...
@@ -593,7 +593,7 @@ public:
                     else
                     {
                         if (gDebug)
-                            cout << "### Got a not-a-plan value " << qb << endl;
+                            std::cout << "### Got a not-a-plan value " << qb << std::endl;
 
                         fIos.close();
                         break;
@@ -622,7 +622,7 @@ new_plan:
                 }
 
                 if (gDebug > 1 || (gDebug && !csep.isInternal()))
-                    cout << "### For session id " << csep.sessionID() << ", got a CSEP" << endl;
+                    std::cout << "### For session id " << csep.sessionID() << ", got a CSEP" << std::endl;
 
                 setRMParms(csep.rmParms());
 
@@ -646,7 +646,7 @@ new_plan:
 
                 bool needDbProfEndStatementMsg = false;
                 logging::Message::Args args;
-                string sqlText = csep.data();
+                std::string sqlText = csep.data();
                 logging::LoggingID li(16, csep.sessionID(), csep.txnID());
 
                 // Initialize stats for this query, including
@@ -686,7 +686,7 @@ new_plan:
                 {
                     try // @bug2244: try/catch around fIos.write() calls responding to makeTupleList
                     {
-                        string emsg("NOERROR");
+                        std::string emsg("NOERROR");
                         messageqcpp::ByteStream emsgBs;
                         messageqcpp::ByteStream::quadbyte tflg = 0;
                         jl = joblist::JobListFactory::makeJobList(&csep, fRm, true, true);
@@ -721,7 +721,7 @@ new_plan:
                             emsgBs.reset();
                             emsgBs << emsg;
                             fIos.write(emsgBs);
-                            cerr << "ExeMgr: could not build a tuple joblist: " << emsg << endl;
+                            std::cerr << "ExeMgr: could not build a tuple joblist: " << emsg << std::endl;
                             continue;
                         }
                     }
@@ -730,25 +730,25 @@ new_plan:
                         std::ostringstream errMsg;
                         errMsg << "ExeMgr: error writing makeJoblist "
                                "response; " <<  ex.what();
-                        throw runtime_error( errMsg.str() );
+                        throw std::runtime_error( errMsg.str() );
                     }
                     catch (...)
                     {
                         std::ostringstream errMsg;
                         errMsg << "ExeMgr: unknown error writing makeJoblist "
                                "response; ";
-                        throw runtime_error( errMsg.str() );
+                        throw std::runtime_error( errMsg.str() );
                     }
 
                     if (!usingTuples)
                     {
                         if (gDebug)
-                            cout << "### UM wanted tuples but it didn't work out :-(" << endl;
+                            std::cout << "### UM wanted tuples but it didn't work out :-(" << std::endl;
                     }
                     else
                     {
                         if (gDebug)
-                            cout << "### UM wanted tuples and we'll do our best;-)" << endl;
+                            std::cout << "### UM wanted tuples and we'll do our best;-)" << std::endl;
                     }
                 }
                 else
@@ -758,14 +758,14 @@ new_plan:
 
                     if (jl->status() == 0)
                     {
-                        string emsg;
+                        std::string emsg;
 
                         if (jl->putEngineComm(fEc) != 0)
-                            throw runtime_error(jl->errMsg());
+                            throw std::runtime_error(jl->errMsg());
                     }
                     else
                     {
-                        throw runtime_error("ExeMgr: could not build a JobList!");
+                        throw std::runtime_error("ExeMgr: could not build a JobList!");
                     }
                 }
 
@@ -786,14 +786,14 @@ new_plan:
                     if (bs.length() == 0)
                     {
                         if (gDebug > 1 || (gDebug && !csep.isInternal()))
-                            cout << "### Got a close(2) for session id " << csep.sessionID() << endl;
+                            std::cout << "### Got a close(2) for session id " << csep.sessionID() << std::endl;
 
                         break;
                     }
 
                     if (gDebug && bs.length() > 4)
-                        cout << "### For session id " << csep.sessionID() << ", got too many bytes = " <<
-                             bs.length() << endl;
+                        std::cout << "### For session id " << csep.sessionID() << ", got too many bytes = " <<
+                             bs.length() << std::endl;
 
                     //TODO: Holy crud! Can this be right?
                     //@bug 1444 Yes, if there is a self-join
@@ -813,7 +813,7 @@ new_plan:
                         bs >> qb;
 
                         if (gDebug > 1 || (gDebug && !csep.isInternal()))
-                            cout << "### For session id " << csep.sessionID() << ", got a command = " << qb << endl;
+                            std::cout << "### For session id " << csep.sessionID() << ", got a command = " << qb << std::endl;
 
                         if (qb == 0)
                         {
@@ -837,7 +837,7 @@ new_plan:
                             if (iter == tm.end())
                             {
                                 if (gDebug > 1 || (gDebug && !csep.isInternal()))
-                                    cout << "### For session id " << csep.sessionID() << ", returning end flag" << endl;
+                                    std::cout << "### For session id " << csep.sessionID() << ", returning end flag" << std::endl;
 
                                 bs.restart();
                                 bs << (messageqcpp::ByteStream::byte)1;
@@ -847,11 +847,11 @@ new_plan:
 
                             tableOID = iter->first;
                         }
-                        else if (qb == 3) //special option-UM wants job stats string
+                        else if (qb == 3) //special option-UM wants job stats std::string
                         {
-                            string statsString;
+                            std::string statsString;
 
-                            //Log stats string to be sent back to front end
+                            //Log stats std::string to be sent back to front end
                             statsString = formatQueryStats(
                                               jl,
                                               "Query Stats",
@@ -871,7 +871,7 @@ new_plan:
                             }
                             else
                             {
-                                string empty;
+                                std::string empty;
                                 bs << empty;
                                 bs << empty;
                             }
@@ -900,14 +900,14 @@ new_plan:
                         errMsg << "ExeMgr: error writing qb response "
                                "for qb cmd " << qb <<
                                "; " <<  ex.what();
-                        throw runtime_error( errMsg.str() );
+                        throw std::runtime_error( errMsg.str() );
                     }
                     catch (...)
                     {
                         std::ostringstream errMsg;
                         errMsg << "ExeMgr: unknown error writing qb response "
                                "for qb cmd " << qb;
-                        throw runtime_error( errMsg.str() );
+                        throw std::runtime_error( errMsg.str() );
                     }
 
                     if (swallowRows) tm.erase(tableOID);
@@ -975,8 +975,8 @@ new_plan:
                                 return;
                             }
 
-                            //cout << "connection drop\n";
-                            throw runtime_error( errMsg.str() );
+                            //std::cout << "connection drop\n";
+                            throw std::runtime_error( errMsg.str() );
                         }
                         catch (...)
                         {
@@ -991,7 +991,7 @@ new_plan:
                             while (rowCount)
                                 rowCount = jl->projectTable(tableOID, bs);
 
-                            throw runtime_error( errMsg.str() );
+                            throw std::runtime_error( errMsg.str() );
                         }
 
                         totalRowCount += rowCount;
@@ -1022,11 +1022,11 @@ new_plan:
 
                 if (needDbProfEndStatementMsg)
                 {
-                    string ss;
+                    std::string ss;
                     std::ostringstream prefix;
                     prefix << "ses:" << csep.sessionID() << " Query Totals";
 
-                    //Log stats string to standard out
+                    //Log stats std::string to standard out
                     ss = formatQueryStats(
                              jl,
                              prefix.str(),
@@ -1035,7 +1035,7 @@ new_plan:
                              (csep.traceFlags() & execplan::CalpontSelectExecutionPlan::TRACE_LOG),
                              totalRowCount);
                     //@Bug 1306. Added timing info for real time tracking.
-                    cout << ss << " at " << timeNow() << endl;
+                    std::cout << ss << " at " << timeNow() << std::endl;
 
                     // log query status to debug log file
                     args.reset();
@@ -1072,13 +1072,13 @@ new_plan:
                     // delete sessionMemMap entry for this session's memory % use
                     deleteMaxMemPct( csep.sessionID() );
 
-                string endtime(timeNow());
+                std::string endtime(timeNow());
 
                 if ((csep.traceFlags() & flagsWantOutput) && (csep.sessionID() < 0x80000000))
                 {
-                    cout << "For session " << csep.sessionID() << ": " <<
+                    std::cout << "For session " << csep.sessionID() << ": " <<
                          totalBytesSent <<
-                         " bytes sent back at " << endtime << endl;
+                         " bytes sent back at " << endtime << std::endl;
 
                     // @bug 663 - Implemented caltraceon(16) to replace the
                     // $FIFO_SINK compiler definition in pColStep.
@@ -1086,19 +1086,19 @@ new_plan:
                     if (csep.traceFlags() &
                       execplan::CalpontSelectExecutionPlan::TRACE_NO_ROWS4)
                     {
-                        cout << endl;
-                        cout << "**** No data returned to DM.  Rows consumed "
+                        std::cout << std::endl;
+                        std::cout << "**** No data returned to DM.  Rows consumed "
                              "in ProjectSteps - caltrace(16) is on (FIFO_SINK)."
-                             " ****" << endl;
-                        cout << endl;
+                             " ****" << std::endl;
+                        std::cout << std::endl;
                     }
                     else if (csep.traceFlags() &
                       execplan::CalpontSelectExecutionPlan::TRACE_NO_ROWS3)
                     {
-                        cout << endl;
-                        cout << "**** No data returned to DM - caltrace(8) is "
-                             "on (SWALLOW_ROWS_EXEMGR). ****" << endl;
-                        cout << endl;
+                        std::cout << std::endl;
+                        std::cout << "**** No data returned to DM - caltrace(8) is "
+                             "on (SWALLOW_ROWS_EXEMGR). ****" << std::endl;
+                        std::cout << std::endl;
                     }
                 }
 
@@ -1139,7 +1139,7 @@ new_plan:
         {
             decThreadCntPerSession( csep.sessionID() | 0x80000000 );
             statementsRunningCount->decr(stmtCounted);
-            cerr << "### ExeMgr ses:" << csep.sessionID() << " caught: " << ex.what() << endl;
+            std::cerr << "### ExeMgr ses:" << csep.sessionID() << " caught: " << ex.what() << std::endl;
             logging::Message::Args args;
             logging::LoggingID li(16, csep.sessionID(), csep.txnID());
             args.add(ex.what());
@@ -1150,7 +1150,7 @@ new_plan:
         {
             decThreadCntPerSession( csep.sessionID() | 0x80000000 );
             statementsRunningCount->decr(stmtCounted);
-            cerr << "### Exception caught!" << endl;
+            std::cerr << "### Exception caught!" << std::endl;
             logging::Message::Args args;
             logging::LoggingID li(16, csep.sessionID(), csep.txnID());
             args.add("ExeMgr caught unknown exception");
@@ -1179,7 +1179,7 @@ public:
             {
                 if (fMaxPct >= 95)
                 {
-                    cerr << "Too much memory allocated!" << endl;
+                    std::cerr << "Too much memory allocated!" << std::endl;
                     logging::Message::Args args;
                     args.add((int)pct);
                     args.add((int)fMaxPct);
@@ -1189,7 +1189,7 @@ public:
 
                 if (statementsRunningCount->cur() == 0)
                 {
-                    cerr << "Too much memory allocated!" << endl;
+                    std::cerr << "Too much memory allocated!" << std::endl;
                     logging::Message::Args args;
                     args.add((int)pct);
                     args.add((int)fMaxPct);
@@ -1197,7 +1197,7 @@ public:
                     exit(1);
                 }
 
-                cerr << "Too much memory allocated, but stmts running" << endl;
+                std::cerr << "Too much memory allocated, but stmts running" << std::endl;
             }
 
             // Update sessionMemMap entries lower than current mem % use
@@ -1235,7 +1235,7 @@ void added_a_pm(int)
     logging::Message msg(1);
     args1.add("exeMgr caught SIGHUP. Resetting connections");
     msg.format( args1 );
-    cout << msg.msg().c_str() << endl;
+    std::cout << msg.msg().c_str() << std::endl;
     logging::Logger logger(logid.fSubsysID);
     logger.logMessage(logging::LOG_TYPE_DEBUG, msg, logid);
 
@@ -1299,7 +1299,7 @@ void setupSignalHandlers()
 
 void setupCwd(joblist::ResourceManager* rm)
 {
-    string workdir = rm->getScWorkingDir();
+    std::string workdir = rm->getScWorkingDir();
     (void)chdir(workdir.c_str());
 
     if (access(".", W_OK) != 0)
@@ -1349,8 +1349,8 @@ int setupResources()
 void cleanTempDir()
 {
     const auto config = config::Config::makeConfig();
-    string allowDJS = config->getConfig("HashJoin", "AllowDiskBasedJoin");
-    string tmpPrefix = config->getConfig("HashJoin", "TempFilePath");
+    std::string allowDJS = config->getConfig("HashJoin", "AllowDiskBasedJoin");
+    std::string tmpPrefix = config->getConfig("HashJoin", "TempFilePath");
 
     if (allowDJS == "N" || allowDJS == "n")
         return;
@@ -1370,7 +1370,7 @@ void cleanTempDir()
     }
     catch (const std::exception& ex)
     {
-        std::cerr << ex.what() << endl;
+        std::cerr << ex.what() << std::endl;
         logging::LoggingID logid(16, 0, 0);
         logging::Message::Args args;
         logging::Message message(8);
@@ -1382,7 +1382,7 @@ void cleanTempDir()
     }
     catch (...)
     {
-        cerr << "Caught unknown exception during tmpdir cleanup" << endl;
+        std::cerr << "Caught unknown exception during tmpdir cleanup" << std::endl;
         logging::LoggingID logid(16, 0, 0);
         logging::Message::Args args;
         logging::Message message(8);
@@ -1397,7 +1397,7 @@ void cleanTempDir()
 int main(int argc, char* argv[])
 {
     // get and set locale language
-    string systemLang = "C";
+    std::string systemLang = "C";
     systemLang = funcexp::utf8::idb_setlocale();
 
     // This is unset due to the way we start it
@@ -1451,7 +1451,7 @@ int main(int argc, char* argv[])
     int err = 0;
     if (!gDebug)
         err = setupResources();
-    string errMsg;
+    std::string errMsg;
 
     switch (err)
     {
@@ -1482,7 +1482,7 @@ int main(int argc, char* argv[])
         logging::LoggingID lid(16);
         logging::MessageLog ml(lid);
         ml.logCriticalMessage( message );
-        cerr << errMsg << endl;
+        std::cerr << errMsg << std::endl;
 
         try
         {
@@ -1527,15 +1527,15 @@ int main(int argc, char* argv[])
             mqs = new messageqcpp::MessageQueueServer(ExeMgr, rm->getConfig(), messageqcpp::ByteStream::BlockSize, 64);
             break;
         }
-        catch (runtime_error& re)
+        catch (std::runtime_error& re)
         {
-            string what = re.what();
+            std::string what = re.what();
 
-            if (what.find("Address already in use") != string::npos)
+            if (what.find("Address already in use") != std::string::npos)
             {
                 if (tellUser)
                 {
-                    cerr << "Address already in use, retrying..." << endl;
+                    std::cerr << "Address already in use, retrying..." << std::endl;
                     tellUser = false;
                 }
 
@@ -1592,7 +1592,7 @@ int main(int argc, char* argv[])
 
     std::cout << "Starting ExeMgr: st = " << serverThreads <<
          ", qs = " << rm->getEmExecQueueSize() << ", mx = " << maxPct << ", cf = " <<
-         rm->getConfig()->configFile() << endl;
+         rm->getConfig()->configFile() << std::endl;
 
     //set ACTIVE state
     {
diff --git a/utils/rowgroup/rowaggregation.h b/utils/rowgroup/rowaggregation.h
index 7475a71b7..064775ba8 100644
--- a/utils/rowgroup/rowaggregation.h
+++ b/utils/rowgroup/rowaggregation.h
@@ -712,7 +712,7 @@ protected:
     static const static_any::any& strTypeId;
 
     // For UDAF along with with multiple distinct columns
-    vector<SP_ROWAGG_FUNC_t>* fOrigFunctionCols;
+    std::vector<SP_ROWAGG_FUNC_t>* fOrigFunctionCols;
 };
 
 //------------------------------------------------------------------------------

From cbbf267e88a2a8b1ef23f760899076248f89af46 Mon Sep 17 00:00:00 2001
From: Patrick LeBlanc <patrick.leblanc@mariadb.com>
Date: Mon, 19 Nov 2018 13:19:15 -0600
Subject: [PATCH 18/33] MCOL-537, cleanup compiler warnings.  Checkpointing a
 bunch of fixes.

Work in progress...
---
 dbcon/execplan/predicateoperator.cpp          | 16 ----
 dbcon/joblist/jlf_subquery.cpp                |  5 +-
 dbcon/joblist/joblistfactory.cpp              | 82 +------------------
 dbcon/joblist/windowfunctionstep.cpp          | 15 ----
 oam/oamcpp/liboamcpp.cpp                      |  7 +-
 oamapps/alarmmanager/alarmmanager.cpp         |  3 +-
 utils/compress/version1.cpp                   |  3 +
 utils/dataconvert/dataconvert.cpp             | 40 +++++----
 utils/funcexp/func_insert.cpp                 |  2 +-
 utils/funcexp/func_md5.cpp                    |  8 +-
 utils/funcexp/func_substring_index.cpp        |  3 +-
 .../hdfs-shared/HdfsRdwrFileBuffer.cpp        |  2 +-
 .../idbhdfs/hdfs-shared/HdfsRdwrFileBuffer.h  |  2 +-
 utils/loggingcpp/messagelog.cpp               | 10 +--
 utils/messageqcpp/inetstreamsocket.cpp        |  4 +-
 utils/querytele/queryteleprotoimpl.cpp        |  6 ++
 utils/rwlock/rwlock.cpp                       |  2 +
 utils/threadpool/prioritythreadpool.cpp       |  4 +-
 utils/threadpool/threadpool.h                 |  4 +-
 utils/udfsdk/mcsv1_udaf.h                     |  4 +
 writeengine/wrapper/we_colop.cpp              |  2 +-
 writeengine/xml/we_xmlgenproc.cpp             | 10 ++-
 writeengine/xml/we_xmlgenproc.h               |  2 +-
 writeengine/xml/we_xmljob.cpp                 |  8 +-
 24 files changed, 85 insertions(+), 159 deletions(-)

diff --git a/dbcon/execplan/predicateoperator.cpp b/dbcon/execplan/predicateoperator.cpp
index 704ab3a63..b32de94c2 100644
--- a/dbcon/execplan/predicateoperator.cpp
+++ b/dbcon/execplan/predicateoperator.cpp
@@ -46,22 +46,6 @@ struct to_lower
     }
 };
 
-//Trim any leading/trailing ws
-const string lrtrim(const string& in)
-{
-    string::size_type p1;
-    p1 = in.find_first_not_of(" \t\n");
-
-    if (p1 == string::npos) p1 = 0;
-
-    string::size_type p2;
-    p2 = in.find_last_not_of(" \t\n");
-
-    if (p2 == string::npos) p2 = in.size() - 1;
-
-    return string(in, p1, (p2 - p1 + 1));
-}
-
 }
 
 namespace execplan
diff --git a/dbcon/joblist/jlf_subquery.cpp b/dbcon/joblist/jlf_subquery.cpp
index 7f2544be8..56dba64d7 100644
--- a/dbcon/joblist/jlf_subquery.cpp
+++ b/dbcon/joblist/jlf_subquery.cpp
@@ -336,7 +336,8 @@ bool isNotInSubquery(JobStepVector& jsv)
     return notIn;
 }
 
-
+// This fcn is currently unused.  Will keep it in the code for now.
+#if 0
 void alterCsepInExistsFilter(CalpontSelectExecutionPlan* csep, JobInfo& jobInfo)
 {
     // This is for window function in IN/EXISTS sub-query.
@@ -364,7 +365,7 @@ void alterCsepInExistsFilter(CalpontSelectExecutionPlan* csep, JobInfo& jobInfo)
     if (wcs.size() > 1)
         retCols.insert(retCols.end(), wcs.begin() + 1, wcs.end());
 }
-
+#endif
 
 void doCorrelatedExists(const ExistsFilter* ef, JobInfo& jobInfo)
 {
diff --git a/dbcon/joblist/joblistfactory.cpp b/dbcon/joblist/joblistfactory.cpp
index b0c314364..32c7a0836 100644
--- a/dbcon/joblist/joblistfactory.cpp
+++ b/dbcon/joblist/joblistfactory.cpp
@@ -93,38 +93,6 @@ namespace
 {
 using namespace joblist;
 
-//Find the next step downstream from *in. Assumes only the first such step is needed.
-const JobStepVector::iterator getNextStep(JobStepVector::iterator& in, JobStepVector& list)
-{
-    JobStepVector::iterator end = list.end();
-
-    for (unsigned i = 0; i < in->get()->outputAssociation().outSize(); ++i)
-    {
-        JobStepVector::iterator iter = list.begin();
-        AnyDataListSPtr outAdl = in->get()->outputAssociation().outAt(i);
-
-        while (iter != end)
-        {
-            if (iter != in)
-            {
-                AnyDataListSPtr inAdl;
-
-                for (unsigned j = 0; j < iter->get()->inputAssociation().outSize(); j++)
-                {
-                    inAdl = iter->get()->inputAssociation().outAt(j);
-
-                    if (inAdl.get() == outAdl.get())
-                        return iter;
-                }
-            }
-
-            ++iter;
-        }
-    }
-
-    return end;
-}
-
 
 bool checkCombinable(JobStep* jobStepPtr)
 {
@@ -1446,54 +1414,6 @@ void changePcolStepToPcolScan(JobStepVector::iterator& it, JobStepVector::iterat
     }
 }
 
-uint32_t shouldSort(const JobStep* inJobStep, int colWidth)
-{
-    //only pColStep and pColScan have colType
-    const pColStep* inStep = dynamic_cast<const pColStep*>(inJobStep);
-
-    if (inStep && colWidth > inStep->colType().colWidth)
-    {
-        return 1;
-    }
-
-    const pColScanStep* inScan = dynamic_cast<const pColScanStep*>(inJobStep);
-
-    if (inScan && colWidth > inScan->colType().colWidth)
-    {
-        return 1;
-    }
-
-    return 0;
-}
-
-void convertPColStepInProjectToPassThru(JobStepVector& psv, JobInfo& jobInfo)
-{
-    for (JobStepVector::iterator iter = psv.begin(); iter != psv.end(); ++iter)
-    {
-        pColStep* colStep = dynamic_cast<pColStep*>(iter->get());
-
-        if (colStep != NULL)
-        {
-            JobStepAssociation ia = iter->get()->inputAssociation();
-            DataList_t* fifoDlp = ia.outAt(0).get()->dataList();
-
-            if (fifoDlp)
-            {
-                if (iter->get()->oid() >= 3000 && iter->get()->oid() == fifoDlp->OID())
-                {
-                    PassThruStep* pts = 0;
-                    pts = new PassThruStep(*colStep);
-                    pts->alias(colStep->alias());
-                    pts->view(colStep->view());
-                    pts->name(colStep->name());
-                    pts->tupleId(iter->get()->tupleId());
-                    iter->reset(pts);
-                }
-            }
-        }
-    }
-}
-
 // optimize filter order
 //   perform none string filters first because string filter joins the tokens.
 void optimizeFilterOrder(JobStepVector& qsv)
@@ -1818,7 +1738,7 @@ void makeVtableModeSteps(CalpontSelectExecutionPlan* csep, JobInfo& jobInfo,
             jobInfo.limitCount = (uint64_t) - 1;
         }
 
-        // support order by and limit in sub-query/union or 
+        // support order by and limit in sub-query/union or
         // GROUP BY handler processed outer query order
         else if (csep->orderByCols().size() > 0)
         {
diff --git a/dbcon/joblist/windowfunctionstep.cpp b/dbcon/joblist/windowfunctionstep.cpp
index 823b2bd04..fe43faa77 100644
--- a/dbcon/joblist/windowfunctionstep.cpp
+++ b/dbcon/joblist/windowfunctionstep.cpp
@@ -81,21 +81,6 @@ using namespace joblist;
 namespace
 {
 
-string keyName(uint64_t i, uint32_t key, const joblist::JobInfo& jobInfo)
-{
-    string name = jobInfo.projectionCols[i]->alias();
-
-    if (name.empty())
-    {
-        name = jobInfo.keyInfo->tupleKeyToName[key];
-
-        if (jobInfo.keyInfo->tupleKeyVec[key].fId < 100)
-            name = "Expression/Function";
-    }
-
-    return name = "'" + name + "'";
-}
-
 
 uint64_t getColumnIndex(const SRCP& c, const map<uint64_t, uint64_t>& m, JobInfo& jobInfo)
 {
diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp
index 805c7d5d0..3ce191a6e 100644
--- a/oam/oamcpp/liboamcpp.cpp
+++ b/oam/oamcpp/liboamcpp.cpp
@@ -154,12 +154,12 @@ Oam::Oam()
     char* p = getenv("USER");
 
     if (p && *p)
-	USER = p;
+	    USER = p;
 
     userDir = USER;
 
     if ( USER != "root")
-	userDir = "home/" + USER;
+	    userDir = "home/" + USER;
 
 	tmpdir = startup::StartUp::tmpDir();
 
@@ -8601,7 +8601,7 @@ bool Oam::attachEC2Volume(std::string volumeName, std::string deviceName, std::s
             	writeLog("attachEC2Volume: Attach failed, call detach:" + volumeName + " " + instanceName + " " + deviceName, LOG_TYPE_ERROR );
 
 				detachEC2Volume(volumeName);
-			}	
+			}
 			else
 				return true;
 		}
@@ -10470,7 +10470,6 @@ void Oam::sendStatusUpdate(ByteStream obs, ByteStream::byte returnRequestType)
             if (ibs.length() > 0)
             {
                 ibs >> returnRequestType;
-
                 if ( returnRequestType == returnRequestType )
                 {
                     processor.shutdown();
diff --git a/oamapps/alarmmanager/alarmmanager.cpp b/oamapps/alarmmanager/alarmmanager.cpp
index 10ca418d1..c6f008859 100644
--- a/oamapps/alarmmanager/alarmmanager.cpp
+++ b/oamapps/alarmmanager/alarmmanager.cpp
@@ -484,7 +484,6 @@ void ALARMManager::sendAlarmReport (const char* componentID, int alarmID, int st
     else
         processName = repProcessName;
 
-    int returnStatus = API_SUCCESS;           //default
     ByteStream msg1;
 
     // setup message
@@ -621,7 +620,7 @@ void ALARMManager::getActiveAlarm(AlarmList& alarmList) const
 *****************************************************************************************/
 void ALARMManager::getAlarm(std::string date, AlarmList& alarmList) const
 {
-	
+
     string alarmFile = startup::StartUp::tmpDir() + "/alarms";
 
     //make 1 alarm log file made up of archive and current alarm.log
diff --git a/utils/compress/version1.cpp b/utils/compress/version1.cpp
index 945e2617a..ab93bd325 100644
--- a/utils/compress/version1.cpp
+++ b/utils/compress/version1.cpp
@@ -90,6 +90,8 @@ namespace
 {
 short DSPort = 9199;
 
+// this isn't currently used but could be in the future.
+#if 0
 void log(const string& s)
 {
     logging::MessageLog logger((logging::LoggingID()));
@@ -100,6 +102,7 @@ void log(const string& s)
     message.format(args);
     logger.logErrorMessage(message);
 }
+#endif
 
 struct ScopedCleaner
 {
diff --git a/utils/dataconvert/dataconvert.cpp b/utils/dataconvert/dataconvert.cpp
index 9cd776130..343227430 100644
--- a/utils/dataconvert/dataconvert.cpp
+++ b/utils/dataconvert/dataconvert.cpp
@@ -83,19 +83,6 @@ bool from_string(T& t, const std::string& s, std::ios_base & (*f)(std::ios_base&
     return !(iss >> f >> t).fail();
 }
 
-uint64_t pow10_(int32_t scale)
-{
-    if (scale <= 0) return 1;
-
-    idbassert(scale < 20);
-    uint64_t res = 1;
-
-    for (int32_t i = 0; i < scale; i++)
-        res *= 10;
-
-    return res;
-}
-
 bool number_value ( const string& data )
 {
     for (unsigned int i = 0; i < strlen(data.c_str()); i++)
@@ -872,7 +859,6 @@ bool mysql_str_to_datetime( const string& input, DateTime& output, bool& isDate
 
 bool mysql_str_to_time( const string& input, Time& output, long decimals )
 {
-//    int32_t datesepct = 0;
     uint32_t dtend = 0;
     bool isNeg = false;
 
@@ -2157,7 +2143,8 @@ std::string DataConvert::datetimeToString1( long long  datetimevalue )
 {
     // @bug 4703 abandon multiple ostringstream's for conversion
     DateTime dt(datetimevalue);
-    const int DATETIMETOSTRING1_LEN = 22; // YYYYMMDDHHMMSSmmmmmm\0
+    // Interesting, gcc 7 says the sprintf below generates between 21 and 23 bytes of output.
+    const int DATETIMETOSTRING1_LEN = 23; // YYYYMMDDHHMMSSmmmmmm\0
     char buf[DATETIMETOSTRING1_LEN];
 
     sprintf(buf, "%04d%02d%02d%02d%02d%02d%06d", dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second, dt.msecond);
@@ -2422,11 +2409,10 @@ int64_t DataConvert::stringToDatetime(const string& data, bool* date)
         return -1;
 }
 
+/* This is really painful and expensive b/c it seems the input is not normalized or
+sanitized.  That should really be done on ingestion. */
 int64_t DataConvert::intToDate(int64_t data)
 {
-    //char buf[10] = {0};
-    //snprintf( buf, 10, "%llu", (long long unsigned int)data);
-    //string date = buf;
     char buf[21] = {0};
     Date aday;
 
@@ -2438,7 +2424,11 @@ int64_t DataConvert::intToDate(int64_t data)
         return *(reinterpret_cast<uint32_t*>(&aday));
     }
 
+    // this snprintf call causes a compiler warning b/c we're potentially copying a 20-digit #
+    // into 15 bytes, however, that appears to be intentional.
+    #pragma GCC diagnostic ignored "-Wformat-truncation="
     snprintf( buf, 15, "%llu", (long long unsigned int)data);
+    #pragma GCC diagnostic pop
 
     string year, month, day, hour, min, sec, msec;
     int64_t y = 0, m = 0, d = 0, h = 0, minute = 0, s = 0, ms = 0;
@@ -2541,6 +2531,8 @@ int64_t DataConvert::intToDate(int64_t data)
     return *(reinterpret_cast<uint32_t*>(&aday));
 }
 
+/* This is really painful and expensive b/c it seems the input is not normalized or
+sanitized.  That should really be done on ingestion. */
 int64_t DataConvert::intToDatetime(int64_t data, bool* date)
 {
     bool isDate = false;
@@ -2563,7 +2555,12 @@ int64_t DataConvert::intToDatetime(int64_t data, bool* date)
         return *(reinterpret_cast<uint64_t*>(&adaytime));
     }
 
+    // this snprintf call causes a compiler warning b/c we're potentially copying a 20-digit #
+    // into 15 bytes, however, that appears to be intentional.
+    #pragma GCC diagnostic ignored "-Wformat-truncation="
     snprintf( buf, 15, "%llu", (long long unsigned int)data);
+    #pragma GCC diagnostic pop
+
     //string date = buf;
     string year, month, day, hour, min, sec, msec;
     int64_t y = 0, m = 0, d = 0, h = 0, minute = 0, s = 0, ms = 0;
@@ -2671,6 +2668,8 @@ int64_t DataConvert::intToDatetime(int64_t data, bool* date)
     return *(reinterpret_cast<uint64_t*>(&adaytime));
 }
 
+/* This is really painful and expensive b/c it seems the input is not normalized or
+sanitized.  That should really be done on ingestion. */
 int64_t DataConvert::intToTime(int64_t data, bool fromString)
 {
     char buf[21] = {0};
@@ -2689,7 +2688,12 @@ int64_t DataConvert::intToTime(int64_t data, bool fromString)
         return *(reinterpret_cast<int64_t*>(&atime));
     }
 
+    // this snprintf call causes a compiler warning b/c we're potentially copying a 20-digit #
+    // into 15 bytes, however, that appears to be intentional.
+    #pragma GCC diagnostic ignored "-Wformat-truncation="
     snprintf( buf, 15, "%llu", (long long unsigned int)data);
+    #pragma GCC diagnostic pop
+
     //string date = buf;
     string hour, min, sec, msec;
     int64_t h = 0, minute = 0, s = 0, ms = 0;
diff --git a/utils/funcexp/func_insert.cpp b/utils/funcexp/func_insert.cpp
index 88d731eb4..5a54f0699 100644
--- a/utils/funcexp/func_insert.cpp
+++ b/utils/funcexp/func_insert.cpp
@@ -89,11 +89,11 @@ std::string Func_insert::getStrVal(rowgroup::Row& row,
                                    execplan::CalpontSystemCatalog::ColType&)
 {
 	string tstr;
+	string tnewstr;
     stringValue(fp[0], row, isNull, tstr);
     if (isNull)
         return "";
 
-	string tnewstr;
     stringValue(fp[3], row, isNull, tnewstr);
     if (isNull)
         return "";
diff --git a/utils/funcexp/func_md5.cpp b/utils/funcexp/func_md5.cpp
index 4023ec4a0..8ab05b346 100644
--- a/utils/funcexp/func_md5.cpp
+++ b/utils/funcexp/func_md5.cpp
@@ -82,7 +82,7 @@ typedef unsigned      char uchar;
 
 char* PrintMD5(uchar md5Digest[16]);
 char* MD5String(const char* szString);
-char* MD5File(char* szFilename);
+//char* MD5File(char* szFilename);
 
 class md5
 {
@@ -263,7 +263,9 @@ char* MD5String(const char* szString)
 
 }
 
-// MD5File: Performs the MD5 algorithm on a file (binar or text),
+// this fcn isn't used, so commenting it
+#if 0
+// MD5File: Performs the MD5 algorithm on a file (binary or text),
 // returning the results as a char*.  Returns NULL if it fails.
 char* MD5File(char* szFilename)
 {
@@ -295,7 +297,7 @@ char* MD5File(char* szFilename)
 
     return NULL; // failed
 }
-
+#endif
 
 // md5::Init
 // Initializes a new context.
diff --git a/utils/funcexp/func_substring_index.cpp b/utils/funcexp/func_substring_index.cpp
index f68679992..4c85f4182 100644
--- a/utils/funcexp/func_substring_index.cpp
+++ b/utils/funcexp/func_substring_index.cpp
@@ -99,8 +99,7 @@ std::string Func_substring_index::getStrVal(rowgroup::Row& row,
     }
     else
     {
-        count = count * -1;
-        size_t end = strlen(str.c_str());
+        count = -count;
         int pointer = end;
         int start = 0;
 
diff --git a/utils/idbhdfs/hdfs-shared/HdfsRdwrFileBuffer.cpp b/utils/idbhdfs/hdfs-shared/HdfsRdwrFileBuffer.cpp
index 7d934b3b9..a63f8e2e2 100644
--- a/utils/idbhdfs/hdfs-shared/HdfsRdwrFileBuffer.cpp
+++ b/utils/idbhdfs/hdfs-shared/HdfsRdwrFileBuffer.cpp
@@ -151,7 +151,7 @@ HdfsRdwrFileBuffer::HdfsRdwrFileBuffer(const char* fname, const char* mode, unsi
 
 // This constructor is for use by HdfsRdwrMemBuffer to create a file buffer when we
 // run out of memory.
-HdfsRdwrFileBuffer::HdfsRdwrFileBuffer(HdfsRdwrMemBuffer* pMemBuffer) throw (std::exception) :
+HdfsRdwrFileBuffer::HdfsRdwrFileBuffer(HdfsRdwrMemBuffer* pMemBuffer) :
     IDBDataFile(pMemBuffer->name().c_str()),
     m_buffer(NULL),
     m_dirty(false)
diff --git a/utils/idbhdfs/hdfs-shared/HdfsRdwrFileBuffer.h b/utils/idbhdfs/hdfs-shared/HdfsRdwrFileBuffer.h
index 74fdf7020..a12a30850 100644
--- a/utils/idbhdfs/hdfs-shared/HdfsRdwrFileBuffer.h
+++ b/utils/idbhdfs/hdfs-shared/HdfsRdwrFileBuffer.h
@@ -50,7 +50,7 @@ class HdfsRdwrFileBuffer: public IDBDataFile, boost::noncopyable
 {
 public:
     HdfsRdwrFileBuffer(const char* fname, const char* mode, unsigned opts);
-    HdfsRdwrFileBuffer(HdfsRdwrMemBuffer* pMemBuffer) throw (std::exception);
+    HdfsRdwrFileBuffer(HdfsRdwrMemBuffer* pMemBuffer);
     /* virtual */ ~HdfsRdwrFileBuffer();
 
     /* virtual */ ssize_t pread(void* ptr, off64_t offset, size_t count);
diff --git a/utils/loggingcpp/messagelog.cpp b/utils/loggingcpp/messagelog.cpp
index 603aec6a7..a1dd850e2 100644
--- a/utils/loggingcpp/messagelog.cpp
+++ b/utils/loggingcpp/messagelog.cpp
@@ -180,21 +180,21 @@ const string MessageLog::format(const Message& msg, const char prefix)
 void MessageLog::logDebugMessage(const Message& msg)
 {
     ::openlog(SubsystemID[fLogData.fSubsysID].c_str(), 0 | LOG_PID, fFacility);
-    ::syslog(LOG_DEBUG, format(msg, 'D').c_str());
+    ::syslog(LOG_DEBUG, "%s", format(msg, 'D').c_str());
     ::closelog();
 }
 
 void MessageLog::logInfoMessage(const Message& msg)
 {
     ::openlog(SubsystemID[fLogData.fSubsysID].c_str(), 0 | LOG_PID, fFacility);
-    ::syslog(LOG_INFO, format(msg, 'I').c_str());
+    ::syslog(LOG_INFO, "%s", format(msg, 'I').c_str());
     ::closelog();
 }
 
 void MessageLog::logWarningMessage(const Message& msg)
 {
     ::openlog(SubsystemID[fLogData.fSubsysID].c_str(), 0 | LOG_PID, fFacility);
-    ::syslog(LOG_WARNING, format(msg, 'W').c_str());
+    ::syslog(LOG_WARNING, "%s", format(msg, 'W').c_str());
     ::closelog();
 }
 
@@ -202,14 +202,14 @@ void MessageLog::logErrorMessage(const Message& msg)
 {
     // @bug 24 use 'E' instead of 'S'
     ::openlog(SubsystemID[fLogData.fSubsysID].c_str(), 0 | LOG_PID, fFacility);
-    ::syslog(LOG_ERR, format(msg, 'E').c_str());
+    ::syslog(LOG_ERR, "%s", format(msg, 'E').c_str());
     ::closelog();
 }
 
 void MessageLog::logCriticalMessage(const Message& msg)
 {
     ::openlog(SubsystemID[fLogData.fSubsysID].c_str(), 0 | LOG_PID, fFacility);
-    ::syslog(LOG_CRIT, format(msg, 'C').c_str());
+    ::syslog(LOG_CRIT, "%s", format(msg, 'C').c_str());
     ::closelog();
 }
 //Bug 5218. comment out the following functions to alleviate issue where dml messages show up in crit.log. This
diff --git a/utils/messageqcpp/inetstreamsocket.cpp b/utils/messageqcpp/inetstreamsocket.cpp
index 2f5f82bb7..8b4aa4b1e 100644
--- a/utils/messageqcpp/inetstreamsocket.cpp
+++ b/utils/messageqcpp/inetstreamsocket.cpp
@@ -966,7 +966,9 @@ void InetStreamSocket::connect(const sockaddr* serv_addr)
 #ifdef _MSC_VER
         (void)::recv(socketParms().sd(), &buf, 1, 0);
 #else
-        (void)::read(socketParms().sd(), &buf, 1);
+        #pragma GCC diagnostic ignored "-Wunused-result"
+        ::read(socketParms().sd(), &buf, 1);   // we know 1 byte is in the recv buffer
+        #pragma GCC diagnostic pop
 #endif
         return;
     }
diff --git a/utils/querytele/queryteleprotoimpl.cpp b/utils/querytele/queryteleprotoimpl.cpp
index 2364d39ef..e1ad7025a 100644
--- a/utils/querytele/queryteleprotoimpl.cpp
+++ b/utils/querytele/queryteleprotoimpl.cpp
@@ -94,6 +94,7 @@ string get_trace_file()
     return oss.str();
 }
 
+#ifdef QUERY_TELE_DEBUG
 void log_query(const querytele::QueryTele& qtdata)
 {
     ofstream trace(get_trace_file().c_str(), ios::out | ios::app);
@@ -125,7 +126,9 @@ void log_query(const querytele::QueryTele& qtdata)
     trace << endl;
     trace.close();
 }
+#endif
 
+#ifdef QUERY_TELE_DEBUG
 const string st2str(enum querytele::StepType::type t)
 {
     switch (t)
@@ -172,7 +175,9 @@ const string st2str(enum querytele::StepType::type t)
 
     return "INV";
 }
+#endif
 
+#ifdef QUERY_TELE_DEBUG
 void log_step(const querytele::StepTele& stdata)
 {
     ofstream trace(get_trace_file().c_str(), ios::out | ios::app);
@@ -207,6 +212,7 @@ void log_step(const querytele::StepTele& stdata)
     trace << endl;
     trace.close();
 }
+#endif
 
 void TeleConsumer()
 {
diff --git a/utils/rwlock/rwlock.cpp b/utils/rwlock/rwlock.cpp
index d042b905e..64d413c52 100644
--- a/utils/rwlock/rwlock.cpp
+++ b/utils/rwlock/rwlock.cpp
@@ -32,7 +32,9 @@
 #include <tr1/unordered_map>
 #endif
 
+#ifndef NDEBUG
 #define NDEBUG
+#endif
 #include <cassert>
 using namespace std;
 
diff --git a/utils/threadpool/prioritythreadpool.cpp b/utils/threadpool/prioritythreadpool.cpp
index 92fd0ad98..51c080a18 100644
--- a/utils/threadpool/prioritythreadpool.cpp
+++ b/utils/threadpool/prioritythreadpool.cpp
@@ -139,8 +139,8 @@ PriorityThreadPool::Priority PriorityThreadPool::pickAQueue(Priority preference)
 
 void PriorityThreadPool::threadFcn(const Priority preferredQueue) throw()
 {
-    Priority queue;
-    uint32_t weight, i;
+    Priority queue = LOW;
+    uint32_t weight, i = 0;
     vector<Job> runList;
     vector<bool> reschedule;
     uint32_t rescheduleCount;
diff --git a/utils/threadpool/threadpool.h b/utils/threadpool/threadpool.h
index 84c9aff7a..e0129bb44 100644
--- a/utils/threadpool/threadpool.h
+++ b/utils/threadpool/threadpool.h
@@ -75,7 +75,9 @@ public:
     boost::thread* create_thread(F threadfunc)
     {
         boost::lock_guard<boost::shared_mutex> guard(m);
-        std::auto_ptr<boost::thread> new_thread(new boost::thread(threadfunc));
+        std::unique_ptr<boost::thread> new_thread(new boost::thread(threadfunc));
+        // auto_ptr was deprecated
+        //std::auto_ptr<boost::thread> new_thread(new boost::thread(threadfunc));
         threads.push_back(new_thread.get());
         return new_thread.release();
     }
diff --git a/utils/udfsdk/mcsv1_udaf.h b/utils/udfsdk/mcsv1_udaf.h
index d6ba04483..edb0f3942 100644
--- a/utils/udfsdk/mcsv1_udaf.h
+++ b/utils/udfsdk/mcsv1_udaf.h
@@ -1029,6 +1029,10 @@ inline T mcsv1_UDAF::convertAnyTo(static_any::any& valIn)
     {
         val = valIn.cast<double>();
     }
+    else
+    {
+        throw runtime_error("mcsv1_UDAF::convertAnyTo(): input param has unrecognized type");
+    }
     return val;
 }
 
diff --git a/writeengine/wrapper/we_colop.cpp b/writeengine/wrapper/we_colop.cpp
index ffd01df2e..515e9f7b2 100644
--- a/writeengine/wrapper/we_colop.cpp
+++ b/writeengine/wrapper/we_colop.cpp
@@ -238,7 +238,7 @@ int ColumnOp::allocRowId(const TxnID& txnid, bool useStartingExtent,
 
                     for (i = 0; i < dbRootExtentTrackers.size(); i++)
                     {
-                        if (i != column.colNo)
+                        if (i != (int) column.colNo)
                             dbRootExtentTrackers[i]->nextSegFile(dbRoot, partition, segment, newHwm, startLbid);
 
                         // Round up HWM to the end of the current extent
diff --git a/writeengine/xml/we_xmlgenproc.cpp b/writeengine/xml/we_xmlgenproc.cpp
index e1763bdb1..d5a787769 100644
--- a/writeengine/xml/we_xmlgenproc.cpp
+++ b/writeengine/xml/we_xmlgenproc.cpp
@@ -442,6 +442,9 @@ void XMLGenProc::getColumnsForTable(
 //------------------------------------------------------------------------------
 // Generate Job XML File Name
 //------------------------------------------------------------------------------
+
+// This isn't used currently, commenting it out
+#if 0
 std::string XMLGenProc::genJobXMLFileName( ) const
 {
     std::string xmlFileName;
@@ -465,7 +468,10 @@ std::string XMLGenProc::genJobXMLFileName( ) const
     if (!p.has_root_path())
     {
         char cwdPath[4096];
-        getcwd(cwdPath, sizeof(cwdPath));
+        char *buf;
+        buf = getcwd(cwdPath, sizeof(cwdPath));
+        if (buf == NULL)
+            throw runtime_error("Failed to get the current working directory!");
         boost::filesystem::path p2(cwdPath);
         p2 /= p;
         xmlFileName = p2.string();
@@ -479,6 +485,8 @@ std::string XMLGenProc::genJobXMLFileName( ) const
 
     return xmlFileName;
 }
+#endif
+
 
 //------------------------------------------------------------------------------
 // writeXMLFile
diff --git a/writeengine/xml/we_xmlgenproc.h b/writeengine/xml/we_xmlgenproc.h
index 4b7ec4ed5..adce2d75f 100644
--- a/writeengine/xml/we_xmlgenproc.h
+++ b/writeengine/xml/we_xmlgenproc.h
@@ -90,7 +90,7 @@ public:
 
     /** @brief Generate Job XML file name
      */
-    EXPORT std::string genJobXMLFileName( ) const;
+    //EXPORT std::string genJobXMLFileName( ) const;
 
     /** @brief Write xml file document to the destination Job XML file.
      *
diff --git a/writeengine/xml/we_xmljob.cpp b/writeengine/xml/we_xmljob.cpp
index 8d755b824..5f409daa0 100644
--- a/writeengine/xml/we_xmljob.cpp
+++ b/writeengine/xml/we_xmljob.cpp
@@ -1301,7 +1301,13 @@ int XMLJob::genJobXMLFileName(
             // nothing else to do
 #else
             char cwdPath[4096];
-            getcwd(cwdPath, sizeof(cwdPath));
+            char *err;
+            err = getcwd(cwdPath, sizeof(cwdPath));
+            if (err == NULL)
+            {
+                errMsg = "Failed to get the current working directory.";
+                return -1;
+            }
             string trailingPath(xmlFilePath.string());
             xmlFilePath  = cwdPath;
             xmlFilePath /= trailingPath;

From 9dc33c4e8279628f424c8d5fef43f19ee4014610 Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <roman.nozdrin@mariadb.com>
Date: Fri, 30 Nov 2018 13:24:58 +0300
Subject: [PATCH 19/33] Another try to cope with warnings under gcc 8.2.

---
 dbcon/dmlpackage/dml-scan.sh                  |  4 +--
 dbcon/execplan/treenode.h                     |  6 +++--
 dbcon/joblist/pdictionaryscan.cpp             |  9 ++++---
 dbcon/mysql/ha_calpont_execplan.cpp           |  2 +-
 dbcon/mysql/ha_calpont_impl.cpp               |  4 +--
 dbcon/mysql/is_columnstore_files.cpp          |  9 ++++---
 oam/oamcpp/liboamcpp.cpp                      | 14 +++-------
 oamapps/alarmmanager/alarmmanager.cpp         |  6 ++---
 oamapps/mcsadmin/mcsadmin.cpp                 |  1 -
 oamapps/postConfigure/postConfigure.cpp       | 20 +++++++-------
 oamapps/serverMonitor/cpuMonitor.cpp          |  3 ++-
 oamapps/serverMonitor/msgProcessor.cpp        |  4 +--
 primitives/blockcache/filebuffer.cpp          |  5 +++-
 primitives/linux-port/column.cpp              |  3 ++-
 primitives/linux-port/dictionary.cpp          | 16 +++++++++---
 .../primproc/batchprimitiveprocessor.cpp      | 18 ++++++++-----
 procmgr/processmanager.cpp                    | 26 ++++++++++---------
 procmon/processmonitor.cpp                    |  4 +--
 tools/configMgt/autoInstaller.cpp             |  4 +--
 utils/cacheutils/cacheutils.cpp               |  6 +++--
 utils/dataconvert/dataconvert.cpp             |  9 ++++---
 utils/funcexp/func_insert.cpp                 |  2 ++
 utils/funcexp/func_lpad.cpp                   |  2 --
 utils/funcexp/func_md5.cpp                    |  4 ++-
 utils/funcexp/func_repeat.cpp                 |  2 +-
 utils/funcexp/func_substring_index.cpp        |  2 +-
 utils/idbdatafile/PosixFileSystem.cpp         |  2 +-
 utils/threadpool/threadpool.h                 |  4 +--
 versioning/BRM/extentmap.cpp                  |  6 +++--
 versioning/BRM/mastersegmenttable.cpp         |  3 ++-
 writeengine/dictionary/we_dctnry.cpp          | 10 ++++---
 writeengine/server/we_ddlcommandproc.cpp      |  6 +++--
 writeengine/shared/we_fileop.cpp              | 20 +++++++++-----
 writeengine/shared/we_index.h                 |  2 +-
 writeengine/shared/we_type.h                  |  2 +-
 writeengine/splitter/we_filereadthread.cpp    |  2 +-
 writeengine/wrapper/we_colop.cpp              |  3 ++-
 37 files changed, 145 insertions(+), 100 deletions(-)

diff --git a/dbcon/dmlpackage/dml-scan.sh b/dbcon/dmlpackage/dml-scan.sh
index 33299e477..1daa312cf 100755
--- a/dbcon/dmlpackage/dml-scan.sh
+++ b/dbcon/dmlpackage/dml-scan.sh
@@ -5,10 +5,10 @@
    set +e; \
    if [ -f dml-scan.cpp ]; \
        then diff -abBq dml-scan-temp.cpp dml-scan.cpp >/dev/null 2>&1; \
-       if [ $$? -ne 0 ]; \
+       if [ $? -ne 0 ]; \
            then mv -f dml-scan-temp.cpp dml-scan.cpp; \
            else touch dml-scan.cpp; \
        fi; \
        else mv -f dml-scan-temp.cpp dml-scan.cpp; \
    fi
-   rm -f dml-scan-temp.cpp
\ No newline at end of file
+   rm -f dml-scan-temp.cpp
diff --git a/dbcon/execplan/treenode.h b/dbcon/execplan/treenode.h
index 91ceb2a11..6a49fa16f 100644
--- a/dbcon/execplan/treenode.h
+++ b/dbcon/execplan/treenode.h
@@ -1139,7 +1139,9 @@ inline int64_t TreeNode::getDatetimeIntVal()
         dataconvert::Time tt;
         int day = 0;
 
-        memcpy(&tt, &fResult.intVal, 8);
+        void *ttp = static_cast<void*>(&tt);
+        
+        memcpy(ttp, &fResult.intVal, 8);
 
         // Note, this should probably be current date +/- time
         if ((tt.hour > 23) && (!tt.is_neg))
@@ -1169,7 +1171,7 @@ inline int64_t TreeNode::getTimeIntVal()
     {
         dataconvert::DateTime dt;
 
-        memcpy(&dt, &fResult.intVal, 8);
+        memcpy((int64_t*)(&dt), &fResult.intVal, 8);
         dataconvert::Time tt(0, dt.hour, dt.minute, dt.second, dt.msecond, false);
         memcpy(&fResult.intVal, &tt, 8);
         return fResult.intVal;
diff --git a/dbcon/joblist/pdictionaryscan.cpp b/dbcon/joblist/pdictionaryscan.cpp
index 6c1b7cecd..b8545b728 100644
--- a/dbcon/joblist/pdictionaryscan.cpp
+++ b/dbcon/joblist/pdictionaryscan.cpp
@@ -483,7 +483,8 @@ void pDictionaryScan::sendAPrimitiveMessage(
 )
 {
     DictTokenByScanRequestHeader hdr;
-    memset(&hdr, 0, sizeof(hdr));
+    void *hdrp = static_cast<void*>(&hdr);
+    memset(hdrp, 0, sizeof(hdr));
 
     hdr.ism.Interleave    = pm;
     hdr.ism.Flags         = planFlagsToPrimFlags(fTraceFlags);
@@ -913,7 +914,8 @@ void pDictionaryScan::serializeEqualityFilter()
     uint32_t i;
     vector<string> empty;
 
-    memset(&ism, 0, sizeof(ISMPacketHeader));
+    void *ismp = static_cast<void*>(&ism);
+    memset(ismp, 0, sizeof(ISMPacketHeader));
     ism.Command  = DICT_CREATE_EQUALITY_FILTER;
     msg.load((uint8_t*) &ism, sizeof(ISMPacketHeader));
     msg << uniqueID;
@@ -954,7 +956,8 @@ void pDictionaryScan::destroyEqualityFilter()
     ByteStream msg;
     ISMPacketHeader ism;
 
-    memset(&ism, 0, sizeof(ISMPacketHeader));
+    void *ismp = static_cast<void*>(&ism);
+    memset(ismp, 0, sizeof(ISMPacketHeader));
     ism.Command  = DICT_DESTROY_EQUALITY_FILTER;
     msg.load((uint8_t*) &ism, sizeof(ISMPacketHeader));
     msg << uniqueID;
diff --git a/dbcon/mysql/ha_calpont_execplan.cpp b/dbcon/mysql/ha_calpont_execplan.cpp
index 7b33f4318..65d0ac4a6 100644
--- a/dbcon/mysql/ha_calpont_execplan.cpp
+++ b/dbcon/mysql/ha_calpont_execplan.cpp
@@ -4684,7 +4684,7 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
             }
         }
     }
-    catch (std::logic_error e)
+    catch (std::logic_error &e)
     {
         gwi.fatalParseError = true;
         gwi.parseErrorText = "error building Aggregate Function: ";
diff --git a/dbcon/mysql/ha_calpont_impl.cpp b/dbcon/mysql/ha_calpont_impl.cpp
index 7dffcd36f..1d8f5b385 100644
--- a/dbcon/mysql/ha_calpont_impl.cpp
+++ b/dbcon/mysql/ha_calpont_impl.cpp
@@ -2856,7 +2856,7 @@ int ha_calpont_impl_rnd_init(TABLE* table)
     //check whether the system is ready to process statement.
 #ifndef _MSC_VER
     static DBRM dbrm(true);
-    bool bSystemQueryReady = dbrm.getSystemQueryReady();
+    int bSystemQueryReady = dbrm.getSystemQueryReady();
 
     if (bSystemQueryReady == 0)
     {
@@ -5140,7 +5140,7 @@ int ha_calpont_impl_group_by_init(ha_calpont_group_by_handler* group_hand, TABLE
     //check whether the system is ready to process statement.
 #ifndef _MSC_VER
     static DBRM dbrm(true);
-    bool bSystemQueryReady = dbrm.getSystemQueryReady();
+    int bSystemQueryReady = dbrm.getSystemQueryReady();
 
     if (bSystemQueryReady == 0)
     {
diff --git a/dbcon/mysql/is_columnstore_files.cpp b/dbcon/mysql/is_columnstore_files.cpp
index 2ce7b1996..9bca1de21 100644
--- a/dbcon/mysql/is_columnstore_files.cpp
+++ b/dbcon/mysql/is_columnstore_files.cpp
@@ -100,6 +100,7 @@ static int generate_result(BRM::OID_t oid, BRM::DBRM* emp, TABLE* table, THD* th
     messageqcpp::MessageQueueClient* msgQueueClient;
     oam::Oam oam_instance;
     int pmId = 0;
+    int rc;
 
     emp->getExtents(oid, entries, false, false, true);
 
@@ -121,7 +122,7 @@ static int generate_result(BRM::OID_t oid, BRM::DBRM* emp, TABLE* table, THD* th
         {
             oam_instance.getDbrootPmConfig(iter->dbRoot, pmId);
         }
-        catch (std::runtime_error)
+        catch (std::runtime_error&)
         {
             // MCOL-1116: If we are here a DBRoot is offline/missing
             iter++;
@@ -137,14 +138,16 @@ static int generate_result(BRM::OID_t oid, BRM::DBRM* emp, TABLE* table, THD* th
         DbRootName << "DBRoot" << iter->dbRoot;
         std::string DbRootPath = config->getConfig("SystemConfig", DbRootName.str());
         fileSize = compressedFileSize = 0;
-        snprintf(fullFileName, WriteEngine::FILE_NAME_SIZE, "%s/%s", DbRootPath.c_str(), oidDirName);
+        rc = snprintf(fullFileName, WriteEngine::FILE_NAME_SIZE, "%s/%s", DbRootPath.c_str(), oidDirName);
 
         std::ostringstream oss;
         oss << "pm" << pmId << "_WriteEngineServer";
         std::string client = oss.str();
         msgQueueClient = messageqcpp::MessageQueueClientPool::getInstance(oss.str());
 
-        if (!get_file_sizes(msgQueueClient, fullFileName, &fileSize, &compressedFileSize))
+        // snprintf output truncation check 
+        if (rc ==  WriteEngine::FILE_NAME_SIZE ||
+            !get_file_sizes(msgQueueClient, fullFileName, &fileSize, &compressedFileSize))
         {
             messageqcpp::MessageQueueClientPool::releaseInstance(msgQueueClient);
             delete emp;
diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp
index 3ce191a6e..927250cfc 100644
--- a/oam/oamcpp/liboamcpp.cpp
+++ b/oam/oamcpp/liboamcpp.cpp
@@ -159,7 +159,9 @@ Oam::Oam()
     userDir = USER;
 
     if ( USER != "root")
+    {
 	    userDir = "home/" + USER;
+    }
 
 	tmpdir = startup::StartUp::tmpDir();
 
@@ -2901,8 +2903,6 @@ oamModuleInfo_t Oam::getModuleInfo()
         // Get Server Type Install ID
 
         serverTypeInstall = atoi(sysConfig->getConfig("Installation", "ServerTypeInstall").c_str());
-
-        sysConfig;
     }
     catch (...) {}
 
@@ -8563,9 +8563,6 @@ std::string Oam::createEC2Volume(std::string size, std::string name)
 
     oldFile.close();
 
-    if ( volumeName == "unknown" )
-        return "failed";
-
     if ( volumeName == "unknown" )
         return "failed";
 
@@ -10470,11 +10467,8 @@ void Oam::sendStatusUpdate(ByteStream obs, ByteStream::byte returnRequestType)
             if (ibs.length() > 0)
             {
                 ibs >> returnRequestType;
-                if ( returnRequestType == returnRequestType )
-                {
-                    processor.shutdown();
-                    return;
-                }
+                processor.shutdown();
+                return;
             }
             else
             {
diff --git a/oamapps/alarmmanager/alarmmanager.cpp b/oamapps/alarmmanager/alarmmanager.cpp
index c6f008859..2d057944c 100644
--- a/oamapps/alarmmanager/alarmmanager.cpp
+++ b/oamapps/alarmmanager/alarmmanager.cpp
@@ -484,10 +484,10 @@ void ALARMManager::sendAlarmReport (const char* componentID, int alarmID, int st
     else
         processName = repProcessName;
 
-    ByteStream msg1;
+ByteStream msg1;
 
-    // setup message
-    msg1 << (ByteStream::byte) alarmID;
+// setup message
+msg1 << (ByteStream::byte) alarmID;
     msg1 << (std::string) componentID;
     msg1 << (ByteStream::byte) state;
     msg1 << (std::string) ModuleName;
diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp
index d07c67ffb..02a77f56a 100644
--- a/oamapps/mcsadmin/mcsadmin.cpp
+++ b/oamapps/mcsadmin/mcsadmin.cpp
@@ -5904,7 +5904,6 @@ int processCommand(string* arguments)
 
             int moduleID = 1;
             inputNames::const_iterator listPT1 = inputnames.begin();
-            umStorageNames::const_iterator listPT2 = umstoragenames.begin();
 
             for ( int i = 0 ; i < moduleCount ; i++ )
             {
diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp
index fdfc1482c..0cacf4cd4 100644
--- a/oamapps/postConfigure/postConfigure.cpp
+++ b/oamapps/postConfigure/postConfigure.cpp
@@ -272,9 +272,7 @@ int main(int argc, char* argv[])
 
     //check if root-user
     int user;
-    int usergroup;
     user = getuid();
-    usergroup = getgid();
 
 	string SUDO = "";
     if (user != 0)
@@ -1412,7 +1410,7 @@ int main(int argc, char* argv[])
 	{
 		string amazonLog = tmpDir + "/amazon.log";
 		string cmd = "aws --version > " + amazonLog + " 2>&1";
-		int rtnCode = system(cmd.c_str());
+		system(cmd.c_str());
 
 		ifstream in(amazonLog.c_str());
 
@@ -1973,7 +1971,7 @@ int main(int argc, char* argv[])
         }
     }
 
-    unsigned int maxPMNicCount = 1;
+    int maxPMNicCount = 1;
 
     //configure module type
     bool parentOAMmoduleConfig = false;
@@ -2110,7 +2108,7 @@ int main(int argc, char* argv[])
         //clear any Equipped Module IP addresses that aren't in current ID range
         for ( int j = 0 ; j < listSize ; j++ )
         {
-			for ( unsigned int k = 1 ; k < MaxNicID+1 ; k++)
+			for ( int k = 1 ; k < MaxNicID+1 ; k++)
             {
                 string ModuleIPAddr = "ModuleIPAddr" + oam.itoa(j + 1) + "-" + oam.itoa(k) + "-" + oam.itoa(i + 1);
 
@@ -2184,8 +2182,7 @@ int main(int argc, char* argv[])
 						}
 					}
 				}
-
-				unsigned int nicID=1;
+				int nicID=1;
 				for(  ; nicID < MaxNicID +1 ; nicID++ )
 				{
 					if ( !found )
@@ -3546,7 +3543,7 @@ int main(int argc, char* argv[])
 
         for ( int pmsID = 1; pmsID < pmPorts + 1 ; )
         {
-            for (unsigned int j = 1 ; j < maxPMNicCount + 1 ; j++)
+            for (int j = 1 ; j < maxPMNicCount + 1 ; j++)
             {
                 PerformanceModuleList::iterator list1 = performancemodulelist.begin();
 
@@ -4007,9 +4004,11 @@ int main(int argc, char* argv[])
                     break;
                 }
 
-                if ( pass1 == "exit")
+                if ( strncmp(pass1, "exit", 4) )
+                {
                     exit(0);
-
+                }
+                
                 string p1 = pass1;
                 pass2 = getpass("Confirm password > ");
                 string p2 = pass2;
@@ -6417,7 +6416,6 @@ bool glusterSetup(string password, bool doNotResolveHostNames)
     Oam oam;
     int dataRedundancyCopies = 0;
     int dataRedundancyNetwork = 0;
-    int dataRedundancyStorage = 0;
     int numberDBRootsPerPM = DBRootCount / pmNumber;
     int numberBricksPM = 0;
     std::vector<int> dbrootPms[DBRootCount];
diff --git a/oamapps/serverMonitor/cpuMonitor.cpp b/oamapps/serverMonitor/cpuMonitor.cpp
index c9d458a4f..1f1d6b3b3 100644
--- a/oamapps/serverMonitor/cpuMonitor.cpp
+++ b/oamapps/serverMonitor/cpuMonitor.cpp
@@ -569,7 +569,8 @@ void ServerMonitor::getCPUdata()
     while (oldFile.getline(line, 400))
     {
         string buf = line;
-        string::size_type pos = buf.find ('id,', 0);
+        // Questionable replacement
+        string::size_type pos = buf.find("id,", 0);
         if (pos == string::npos)
         {
             systemIdle = systemIdle + atol(buf.substr(0, pos - 1).c_str());
diff --git a/oamapps/serverMonitor/msgProcessor.cpp b/oamapps/serverMonitor/msgProcessor.cpp
index 48bfaa2f0..1c7b928ee 100644
--- a/oamapps/serverMonitor/msgProcessor.cpp
+++ b/oamapps/serverMonitor/msgProcessor.cpp
@@ -100,8 +100,8 @@ void msgProcessor()
         Config* sysConfig = Config::makeConfig();
         string port = sysConfig->getConfig(msgPort, "Port");
         string cmd = "fuser -k " + port + "/tcp >/dev/null 2>&1";
-        int user;
-        user = getuid();
+        //int user;
+        //user = getuid();
 
         system(cmd.c_str());
     }
diff --git a/primitives/blockcache/filebuffer.cpp b/primitives/blockcache/filebuffer.cpp
index 5ac6ee466..aa598c008 100644
--- a/primitives/blockcache/filebuffer.cpp
+++ b/primitives/blockcache/filebuffer.cpp
@@ -40,7 +40,10 @@ FileBuffer::FileBuffer() : fDataLen(0), fLbid(-1), fVerid(0)
 FileBuffer::FileBuffer(const FileBuffer& rhs)
 {
 
-    if (this == NULL || this == &rhs)
+    // Removed the check for gcc 8.2. The latest gcc version we 
+    // use ATM is 4.8.2 for centos 6 and it also doesn't need
+    // the check
+    if (this == &rhs)
         return;
 
     fLbid = rhs.fLbid;
diff --git a/primitives/linux-port/column.cpp b/primitives/linux-port/column.cpp
index 2b4450d2c..5722aef5d 100644
--- a/primitives/linux-port/column.cpp
+++ b/primitives/linux-port/column.cpp
@@ -1421,7 +1421,8 @@ namespace primitives
 void PrimitiveProcessor::p_Col(NewColRequestHeader* in, NewColResultHeader* out,
                                unsigned outSize, unsigned* written)
 {
-    memcpy(out, in, sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader));
+    void *outp = static_cast<void*>(out);
+    memcpy(outp, in, sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader));
     out->NVALS = 0;
     out->LBID = in->LBID;
     out->ism.Command = COL_RESULTS;
diff --git a/primitives/linux-port/dictionary.cpp b/primitives/linux-port/dictionary.cpp
index 2860ab571..e5a334436 100644
--- a/primitives/linux-port/dictionary.cpp
+++ b/primitives/linux-port/dictionary.cpp
@@ -127,7 +127,11 @@ void PrimitiveProcessor::p_TokenByScan(const TokenByScanRequestHeader* h,
 
     retTokens = reinterpret_cast<PrimToken*>(&niceRet[rdvOffset]);
     retDataValues = reinterpret_cast<DataValue*>(&niceRet[rdvOffset]);
-    memcpy(ret, h, sizeof(PrimitiveHeader) + sizeof(ISMPacketHeader));
+    
+    {
+        void *retp = static_cast<void*>(ret); 
+        memcpy(retp, h, sizeof(PrimitiveHeader) + sizeof(ISMPacketHeader));
+    }
     ret->NVALS = 0;
     ret->NBYTES = sizeof(TokenByScanResultHeader);
     ret->ism.Command = DICT_SCAN_COMPARE_RESULTS;
@@ -575,7 +579,10 @@ void PrimitiveProcessor::p_AggregateSignature(const AggregateSignatureRequestHea
     DataValue* min;
     DataValue* max;
 
-    memcpy(out, in, sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader));
+    {
+        void *outp = static_cast<void*>(out);
+        memcpy(outp, in, sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader));
+    }
     out->ism.Command = DICT_AGGREGATE_RESULTS;
     niceOutput = reinterpret_cast<uint8_t*>(out);
 
@@ -824,7 +831,10 @@ void PrimitiveProcessor::p_Dictionary(const DictInput* in, vector<uint8_t>* out,
 
     in8 = reinterpret_cast<const uint8_t*>(in);
 
-    memcpy(&header, in, sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader));
+    {
+        void *hp = static_cast<void*>(&header);
+        memcpy(hp, in, sizeof(ISMPacketHeader) + sizeof(PrimitiveHeader));
+    }
     header.ism.Command = DICT_RESULTS;
     header.NVALS = 0;
     header.LBID = in->LBID;
diff --git a/primitives/primproc/batchprimitiveprocessor.cpp b/primitives/primproc/batchprimitiveprocessor.cpp
index 752c94d9e..bf34e9cb4 100644
--- a/primitives/primproc/batchprimitiveprocessor.cpp
+++ b/primitives/primproc/batchprimitiveprocessor.cpp
@@ -1774,8 +1774,10 @@ void BatchPrimitiveProcessor::writeErrorMsg(const string& error, uint16_t errCod
 
     // we don't need every field of these headers.  Init'ing them anyway
     // makes memory checkers happy.
-    memset(&ism, 0, sizeof(ISMPacketHeader));
-    memset(&ph, 0, sizeof(PrimitiveHeader));
+    void *ismp = static_cast<void*>(&ism);
+    void *php = static_cast<void*>(&ph);
+    memset(ismp, 0, sizeof(ISMPacketHeader));
+    memset(php, 0, sizeof(PrimitiveHeader));
     ph.SessionID = sessionID;
     ph.StepID = stepID;
     ph.UniqueID = uniqueID;
@@ -1800,8 +1802,10 @@ void BatchPrimitiveProcessor::writeProjectionPreamble()
 
     // we don't need every field of these headers.  Init'ing them anyway
     // makes memory checkers happy.
-    memset(&ism, 0, sizeof(ISMPacketHeader));
-    memset(&ph, 0, sizeof(PrimitiveHeader));
+    void *ismp = static_cast<void*>(&ism);
+    void *php = static_cast<void*>(&ph);
+    memset(ismp, 0, sizeof(ISMPacketHeader));
+    memset(php, 0, sizeof(PrimitiveHeader));
     ph.SessionID = sessionID;
     ph.StepID = stepID;
     ph.UniqueID = uniqueID;
@@ -1899,8 +1903,10 @@ void BatchPrimitiveProcessor::makeResponse()
 
     // we don't need every field of these headers.  Init'ing them anyway
     // makes memory checkers happy.
-    memset(&ism, 0, sizeof(ISMPacketHeader));
-    memset(&ph, 0, sizeof(PrimitiveHeader));
+    void *ismp = static_cast<void*>(&ism);
+    void *php = static_cast<void*>(&ph);
+    memset(ismp, 0, sizeof(ISMPacketHeader));
+    memset(php, 0, sizeof(PrimitiveHeader));
     ph.SessionID = sessionID;
     ph.StepID = stepID;
     ph.UniqueID = uniqueID;
diff --git a/procmgr/processmanager.cpp b/procmgr/processmanager.cpp
index 686243f87..f05a7dcbf 100644
--- a/procmgr/processmanager.cpp
+++ b/procmgr/processmanager.cpp
@@ -1377,7 +1377,7 @@ void processMSG(messageqcpp::IOSocket* cfIos)
                     // all transactions to finish or rollback as commanded. This is only set if
                     // there are, in fact, transactions active (or cpimport).
 
-                    int retStatus = oam::API_SUCCESS;
+                    //int retStatus = oam::API_SUCCESS;
 
                     if (HDFS)
                     {
@@ -1458,7 +1458,7 @@ void processMSG(messageqcpp::IOSocket* cfIos)
                                 if (opState == oam::MAN_DISABLED || opState == oam::AUTO_DISABLED)
                                     continue;
 
-                                retStatus = processManager.shutdownModule((*pt).DeviceName, graceful, manualFlag, 0);
+                                processManager.shutdownModule((*pt).DeviceName, graceful, manualFlag, 0);
                             }
                         }
                     }
@@ -3735,8 +3735,9 @@ int ProcessManager::disableModule(string target, bool manualFlag)
 
     //Update DBRM section of Columnstore.xml
     if ( updateWorkerNodeconfig() != API_SUCCESS )
+    {
         return API_FAILURE;
-
+    }
 	processManager.recycleProcess(target);
 
 	//check for SIMPLEX Processes on mate might need to be started
@@ -5144,7 +5145,7 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
 
 					string loginTmp = tmpLogDir + "/login_test.log";
                     string cmd = installDir + "/bin/remote_command.sh " + IPAddr + " " + password + " 'ls' 1  > " + loginTmp;
-                    int rtnCode = system(cmd.c_str());
+                    system(cmd.c_str());
 
 					if (!oam.checkLogStatus(loginTmp, "README")) {
                         //check for RSA KEY ISSUE and fix
@@ -7728,7 +7729,8 @@ void startSystemThread(oam::DeviceNetworkList Devicenetworklist)
 				sleep(2);
 		}
 
-        if ( rtn = oam::ACTIVE )
+        // This was logical error and possible source of many problems. 
+        if ( rtn == oam::ACTIVE )
 			//set query system state not ready
 			processManager.setQuerySystemState(true);
 
@@ -7869,8 +7871,8 @@ void stopSystemThread(oam::DeviceNetworkList Devicenetworklist)
     SystemModuleTypeConfig systemmoduletypeconfig;
     ALARMManager aManager;
     int status = API_SUCCESS;
-    bool exitThread = false;
-    int exitThreadStatus = oam::API_SUCCESS;
+    //bool exitThread = false;
+    //int exitThreadStatus = oam::API_SUCCESS;
 
     pthread_t ThreadId;
     ThreadId = pthread_self();
@@ -7887,16 +7889,16 @@ void stopSystemThread(oam::DeviceNetworkList Devicenetworklist)
         log.writeLog(__LINE__, "EXCEPTION ERROR on getSystemConfig: " + error, LOG_TYPE_ERROR);
         stopsystemthreadStatus = oam::API_FAILURE;
         processManager.setSystemState(oam::FAILED);
-        exitThread = true;
-        exitThreadStatus = oam::API_FAILURE;
+        //exitThread = true;
+        //exitThreadStatus = oam::API_FAILURE;
     }
     catch (...)
     {
         log.writeLog(__LINE__, "EXCEPTION ERROR on getSystemConfig: Caught unknown exception!", LOG_TYPE_ERROR);
         stopsystemthreadStatus = oam::API_FAILURE;
         processManager.setSystemState(oam::FAILED);
-        exitThread = true;
-        exitThreadStatus = oam::API_FAILURE;
+        //exitThread = true;
+        //exitThreadStatus = oam::API_FAILURE;
     }
 
     if ( devicenetworklist.size() != 0 )
@@ -7920,7 +7922,7 @@ void stopSystemThread(oam::DeviceNetworkList Devicenetworklist)
             try
             {
                 int opState;
-                bool degraded = oam::ACTIVE;
+                bool degraded;
                 oam.getModuleStatus(moduleName, opState, degraded);
 
                 if (opState == oam::MAN_DISABLED || opState == oam::AUTO_DISABLED)
diff --git a/procmon/processmonitor.cpp b/procmon/processmonitor.cpp
index 9a8f4b8cd..f22be1b87 100644
--- a/procmon/processmonitor.cpp
+++ b/procmon/processmonitor.cpp
@@ -1497,7 +1497,6 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
             string configureModuleName;
             msg >> configureModuleName;
 
-            uint16_t rtnCode;
             int requestStatus = API_SUCCESS;
 
             configureModule(configureModuleName);
@@ -2220,7 +2219,8 @@ pid_t ProcessMonitor::startProcess(string processModuleType, string processName,
                                    string RunType, string DepProcessName[MAXDEPENDANCY],
                                    string DepModuleName[MAXDEPENDANCY], string LogFile, uint16_t initType,  uint16_t actIndicator)
 {
-    pid_t  newProcessID;
+    // Compiler complains about non-initialiased variable here.
+    pid_t  newProcessID = 0;
     char* argList[MAXARGUMENTS];
     unsigned int i = 0;
     MonitorLog log;
diff --git a/tools/configMgt/autoInstaller.cpp b/tools/configMgt/autoInstaller.cpp
index 15ac98c33..31623b73f 100644
--- a/tools/configMgt/autoInstaller.cpp
+++ b/tools/configMgt/autoInstaller.cpp
@@ -636,7 +636,7 @@ int main(int argc, char* argv[])
                             // Columnstore.xml found
 
                             //try to parse it
-                            Config* sysConfigOld;
+                            //Config* sysConfigOld;
 
                             ofstream file("/dev/null");
 
@@ -648,7 +648,7 @@ int main(int argc, char* argv[])
                                 // redirect cout to /dev/null
                                 cerr.rdbuf(file.rdbuf());
 
-                                sysConfigOld = Config::makeConfig( systemDir + "/Columnstore.xml");
+                                //sysConfigOld = Config::makeConfig( systemDir + "/Columnstore.xml");
 
                                 // restore cout stream buffer
                                 cerr.rdbuf (strm_buffer);
diff --git a/utils/cacheutils/cacheutils.cpp b/utils/cacheutils/cacheutils.cpp
index 99944ec7f..ca56e2da0 100644
--- a/utils/cacheutils/cacheutils.cpp
+++ b/utils/cacheutils/cacheutils.cpp
@@ -258,7 +258,8 @@ int flushOIDsFromCache(const vector<BRM::OID_t>& oids)
     ISMPacketHeader ism;
     uint32_t i;
 
-    memset(&ism, 0, sizeof(ISMPacketHeader));
+    void *ismp = static_cast<void*>(&ism);
+    memset(ismp, 0, sizeof(ISMPacketHeader));
     ism.Command = CACHE_FLUSH_BY_OID;
     bs.load((uint8_t*) &ism, sizeof(ISMPacketHeader));
     bs << (uint32_t) oids.size();
@@ -285,7 +286,8 @@ int flushPartition(const std::vector<BRM::OID_t>& oids, set<BRM::LogicalPartitio
     ByteStream bs;
     ISMPacketHeader ism;
 
-    memset(&ism, 0, sizeof(ISMPacketHeader));
+    void *ismp = static_cast<void*>(&ism);
+    memset(ismp, 0, sizeof(ISMPacketHeader));
     ism.Command = CACHE_FLUSH_PARTITION;
     bs.load((uint8_t*) &ism, sizeof(ISMPacketHeader));
     serializeSet<BRM::LogicalPartition>(bs, partitionNums);
diff --git a/utils/dataconvert/dataconvert.cpp b/utils/dataconvert/dataconvert.cpp
index 343227430..a2e3aaa47 100644
--- a/utils/dataconvert/dataconvert.cpp
+++ b/utils/dataconvert/dataconvert.cpp
@@ -1744,7 +1744,8 @@ int32_t DataConvert::convertColumnDate(
 bool DataConvert::isColumnDateValid( int32_t date )
 {
     Date d;
-    memcpy(&d, &date, sizeof(int32_t));
+    void* dp = static_cast<void*>(&d);
+    memcpy(dp, &date, sizeof(int32_t));
     return (isDateValid(d.day, d.month, d.year));
 }
 
@@ -2046,7 +2047,8 @@ int64_t DataConvert::convertColumnTime(
 bool DataConvert::isColumnDateTimeValid( int64_t dateTime )
 {
     DateTime dt;
-    memcpy(&dt, &dateTime, sizeof(uint64_t));
+    void* dtp = static_cast<void*>(&dt);
+    memcpy(dtp, &dateTime, sizeof(uint64_t));
 
     if (isDateValid(dt.day, dt.month, dt.year))
         return isDateTimeValid(dt.hour, dt.minute, dt.second, dt.msecond);
@@ -2057,7 +2059,8 @@ bool DataConvert::isColumnDateTimeValid( int64_t dateTime )
 bool DataConvert::isColumnTimeValid( int64_t time )
 {
     Time dt;
-    memcpy(&dt, &time, sizeof(uint64_t));
+    void* dtp = static_cast<void*>(&dt);
+    memcpy(dtp, &time, sizeof(uint64_t));
 
     return isTimeValid(dt.hour, dt.minute, dt.second, dt.msecond);
 }
diff --git a/utils/funcexp/func_insert.cpp b/utils/funcexp/func_insert.cpp
index 5a54f0699..20109c27b 100644
--- a/utils/funcexp/func_insert.cpp
+++ b/utils/funcexp/func_insert.cpp
@@ -92,7 +92,9 @@ std::string Func_insert::getStrVal(rowgroup::Row& row,
 	string tnewstr;
     stringValue(fp[0], row, isNull, tstr);
     if (isNull)
+    {
         return "";
+    }
 
     stringValue(fp[3], row, isNull, tnewstr);
     if (isNull)
diff --git a/utils/funcexp/func_lpad.cpp b/utils/funcexp/func_lpad.cpp
index b5acfd362..fbb5ceca2 100644
--- a/utils/funcexp/func_lpad.cpp
+++ b/utils/funcexp/func_lpad.cpp
@@ -103,8 +103,6 @@ std::string Func_lpad::getStrVal(rowgroup::Row& row,
                 value += 0.5;
             else if (value < 0)
                 value -= 0.5;
-            else if (value < 0)
-                value -= 0.5;
 
             int64_t ret = (int64_t) value;
 
diff --git a/utils/funcexp/func_md5.cpp b/utils/funcexp/func_md5.cpp
index 8ab05b346..9780c389d 100644
--- a/utils/funcexp/func_md5.cpp
+++ b/utils/funcexp/func_md5.cpp
@@ -236,6 +236,7 @@ char* PrintMD5(uchar md5Digest[16])
     char chBuffer[256];
     char chEach[10];
     int nCount;
+    size_t chEachSize = 0;
 
     memset(chBuffer, 0, 256);
     memset(chEach, 0, 10);
@@ -243,7 +244,8 @@ char* PrintMD5(uchar md5Digest[16])
     for (nCount = 0; nCount < 16; nCount++)
     {
         sprintf(chEach, "%02x", md5Digest[nCount]);
-        strncat(chBuffer, chEach, sizeof(chEach));
+        chEachSize = sizeof(chEach);
+        strncat(chBuffer, chEach, chEachSize);
     }
 
     return strdup(chBuffer);
diff --git a/utils/funcexp/func_repeat.cpp b/utils/funcexp/func_repeat.cpp
index b99114c5a..d79d16de1 100644
--- a/utils/funcexp/func_repeat.cpp
+++ b/utils/funcexp/func_repeat.cpp
@@ -93,7 +93,7 @@ std::string Func_repeat::getStrVal(rowgroup::Row& row,
 
     for ( int i = 0 ; i < count ; i ++ )
     {
-        if (strcat(result, str.c_str()) == NULL)
+        if (strcat(result, str.c_str()) == NULL) //questionable check
             return "";
     }
 
diff --git a/utils/funcexp/func_substring_index.cpp b/utils/funcexp/func_substring_index.cpp
index 4c85f4182..04d4d9b12 100644
--- a/utils/funcexp/func_substring_index.cpp
+++ b/utils/funcexp/func_substring_index.cpp
@@ -76,7 +76,7 @@ std::string Func_substring_index::getStrVal(rowgroup::Row& row,
     if ( count >  end )
         return str;
 
-    if (( count < 0 ) && ((count * -1) > end))
+    if (( count < 0 ) && ((count * -1) > (int64_t) end))
         return str;
 
     string value = str;
diff --git a/utils/idbdatafile/PosixFileSystem.cpp b/utils/idbdatafile/PosixFileSystem.cpp
index 48413b62a..f52bdc56a 100644
--- a/utils/idbdatafile/PosixFileSystem.cpp
+++ b/utils/idbdatafile/PosixFileSystem.cpp
@@ -261,7 +261,7 @@ int PosixFileSystem::listDirectory(const char* pathname, std::list<std::string>&
             contents.push_back( itr->path().filename().generic_string() );
         }
     }
-    catch (std::exception)
+    catch (std::exception &)
     {
         ret = -1;
     }
diff --git a/utils/threadpool/threadpool.h b/utils/threadpool/threadpool.h
index e0129bb44..e7ee9de82 100644
--- a/utils/threadpool/threadpool.h
+++ b/utils/threadpool/threadpool.h
@@ -44,6 +44,8 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 
+#include <memory>
+
 #if defined(_MSC_VER) && defined(xxxTHREADPOOL_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
 #else
@@ -76,8 +78,6 @@ public:
     {
         boost::lock_guard<boost::shared_mutex> guard(m);
         std::unique_ptr<boost::thread> new_thread(new boost::thread(threadfunc));
-        // auto_ptr was deprecated
-        //std::auto_ptr<boost::thread> new_thread(new boost::thread(threadfunc));
         threads.push_back(new_thread.get());
         return new_thread.release();
     }
diff --git a/versioning/BRM/extentmap.cpp b/versioning/BRM/extentmap.cpp
index 6070ab1f2..2c0334030 100644
--- a/versioning/BRM/extentmap.cpp
+++ b/versioning/BRM/extentmap.cpp
@@ -1141,7 +1141,8 @@ void ExtentMap::loadVersion4(ifstream& in)
     in.read((char*) &flNumElements, sizeof(int));
     idbassert(emNumElements > 0);
 
-    memset(fExtentMap, 0, fEMShminfo->allocdSize);
+    void *fExtentMapPtr = static_cast<void*>(fExtentMap);
+    memset(fExtentMapPtr, 0, fEMShminfo->allocdSize);
     fEMShminfo->currentSize = 0;
 
     // init the free list
@@ -1226,7 +1227,8 @@ void ExtentMap::loadVersion4(IDBDataFile* in)
         throw runtime_error("ExtentMap::loadVersion4(): read failed. Check the error log.");
     }
 
-    memset(fExtentMap, 0, fEMShminfo->allocdSize);
+    void *fExtentMapPtr = static_cast<void*>(fExtentMap);
+    memset(fExtentMapPtr, 0, fEMShminfo->allocdSize);
     fEMShminfo->currentSize = 0;
 
     // init the free list
diff --git a/versioning/BRM/mastersegmenttable.cpp b/versioning/BRM/mastersegmenttable.cpp
index 047c647f8..54921b644 100644
--- a/versioning/BRM/mastersegmenttable.cpp
+++ b/versioning/BRM/mastersegmenttable.cpp
@@ -189,7 +189,8 @@ void MasterSegmentTable::makeMSTSegment()
 
 void MasterSegmentTable::initMSTData()
 {
-    memset(fShmDescriptors, 0, MSTshmsize);
+    void *dp = static_cast<void*>(&fShmDescriptors);
+    memset(dp, 0, MSTshmsize);
 }
 
 MSTEntry* MasterSegmentTable::getTable_read(int num, bool block) const
diff --git a/writeengine/dictionary/we_dctnry.cpp b/writeengine/dictionary/we_dctnry.cpp
index d477349ad..6200cc248 100644
--- a/writeengine/dictionary/we_dctnry.cpp
+++ b/writeengine/dictionary/we_dctnry.cpp
@@ -803,7 +803,8 @@ int Dctnry::insertDctnry(const char* buf,
     while (startPos < totalRow)
     {
         found = false;
-        memset(&curSig, 0, sizeof(curSig));
+        void *curSigPtr = static_cast<void*>(&curSig);
+        memset(curSigPtr, 0, sizeof(curSig));
         curSig.size = pos[startPos][col].offset;
 
         // Strip trailing null bytes '\0' (by adjusting curSig.size) if import-
@@ -1317,7 +1318,8 @@ void  Dctnry::preLoadStringCache( const DataBlock& fileBlock )
 
     int op = 1; // ordinal position of the string within the block
     Signature aSig;
-    memset( &aSig, 0, sizeof(Signature));
+    void *aSigPtr = static_cast<void*>(&aSig);
+    memset(aSigPtr, 0, sizeof(aSig));
 
     while ((offBeg != DCTNRY_END_HEADER) &&
             (op     <= MAX_STRING_CACHE_SIZE))
@@ -1361,8 +1363,10 @@ void  Dctnry::preLoadStringCache( const DataBlock& fileBlock )
  ******************************************************************************/
 void  Dctnry::addToStringCache( const Signature& newSig )
 {
+    // We better add constructors that sets everything to 0;
     Signature asig;
-    memset(&asig, 0, sizeof(Signature));
+    void *aSigPtr = static_cast<void*>(&asig);
+    memset(aSigPtr, 0, sizeof(asig));
     asig.signature = new unsigned char[newSig.size];
     memcpy(asig.signature, newSig.signature, newSig.size );
     asig.size      = newSig.size;
diff --git a/writeengine/server/we_ddlcommandproc.cpp b/writeengine/server/we_ddlcommandproc.cpp
index 19475ccbe..f536c2430 100644
--- a/writeengine/server/we_ddlcommandproc.cpp
+++ b/writeengine/server/we_ddlcommandproc.cpp
@@ -2469,7 +2469,8 @@ uint8_t WE_DDLCommandProc::updateSyscolumnTablename(ByteStream& bs, std::string&
 
 
     //It's the same string for each column, so we just need one dictionary struct
-    memset(&dictTuple, 0, sizeof(dictTuple));
+    void *dictTuplePtr = static_cast<void*>(&dictTuple);
+    memset(dictTuplePtr, 0, sizeof(dictTuple));
     dictTuple.sigValue = (unsigned char*)newTablename.c_str();
     dictTuple.sigSize = newTablename.length();
     dictTuple.isNull = false;
@@ -3292,7 +3293,8 @@ uint8_t WE_DDLCommandProc::updateSystablesTablename(ByteStream& bs, std::string&
 
 
     //It's the same string for each column, so we just need one dictionary struct
-    memset(&dictTuple, 0, sizeof(dictTuple));
+    void *dictTuplePtr = static_cast<void*>(&dictTuple);
+    memset(dictTuplePtr, 0, sizeof(dictTuple));
     dictTuple.sigValue = (unsigned char*)newTablename.c_str();
     dictTuple.sigSize = newTablename.length();
     dictTuple.isNull = false;
diff --git a/writeengine/shared/we_fileop.cpp b/writeengine/shared/we_fileop.cpp
index 7a2a2456b..b5970abbb 100644
--- a/writeengine/shared/we_fileop.cpp
+++ b/writeengine/shared/we_fileop.cpp
@@ -332,12 +332,15 @@ int FileOp::deleteFile( FID fid ) const
     std::vector<std::string> dbRootPathList;
     Config::getDBRootPathList( dbRootPathList );
 
+    int rc;
+
     for (unsigned i = 0; i < dbRootPathList.size(); i++)
     {
         char rootOidDirName[FILE_NAME_SIZE];
-        sprintf(rootOidDirName, "%s/%s", dbRootPathList[i].c_str(), oidDirName);
+        rc = snprintf(rootOidDirName, FILE_NAME_SIZE, "%s/%s",
+            dbRootPathList[i].c_str(), oidDirName);
 
-        if ( IDBPolicy::remove( rootOidDirName ) != 0 )
+        if ( rc == FILE_NAME_SIZE || IDBPolicy::remove( rootOidDirName ) != 0 )
         {
             ostringstream oss;
             oss << "Unable to remove " << rootOidDirName;
@@ -365,6 +368,7 @@ int FileOp::deleteFiles( const std::vector<int32_t>& fids ) const
     char dbDir       [MAX_DB_DIR_LEVEL][MAX_DB_DIR_NAME_SIZE];
     std::vector<std::string> dbRootPathList;
     Config::getDBRootPathList( dbRootPathList );
+    int rc;
 
     for ( unsigned n = 0; n < fids.size(); n++ )
     {
@@ -378,10 +382,10 @@ int FileOp::deleteFiles( const std::vector<int32_t>& fids ) const
         for (unsigned i = 0; i < dbRootPathList.size(); i++)
         {
             char rootOidDirName[FILE_NAME_SIZE];
-            sprintf(rootOidDirName, "%s/%s", dbRootPathList[i].c_str(),
+            rc = snprintf(rootOidDirName, FILE_NAME_SIZE, "%s/%s", dbRootPathList[i].c_str(),
                     oidDirName);
 
-            if ( IDBPolicy::remove( rootOidDirName ) != 0 )
+            if ( rc == FILE_NAME_SIZE || IDBPolicy::remove( rootOidDirName ) != 0 )
             {
                 ostringstream oss;
                 oss << "Unable to remove " << rootOidDirName;
@@ -412,6 +416,7 @@ int FileOp::deletePartitions( const std::vector<OID>& fids,
     char dbDir       [MAX_DB_DIR_LEVEL][MAX_DB_DIR_NAME_SIZE];
     char rootOidDirName[FILE_NAME_SIZE];
     char partitionDirName[FILE_NAME_SIZE];
+    int rcd, rcp;
 
     for (uint32_t i = 0; i < partitions.size(); i++)
     {
@@ -422,12 +427,13 @@ int FileOp::deletePartitions( const std::vector<OID>& fids,
                 dbDir[0], dbDir[1], dbDir[2], dbDir[3], dbDir[4]);
         // config expects dbroot starting from 0
         std::string rt( Config::getDBRootByNum(partitions[i].lp.dbroot) );
-        sprintf(rootOidDirName, "%s/%s",
+        rcd = snprintf(rootOidDirName, FILE_NAME_SIZE, "%s/%s",
                 rt.c_str(), tempFileName);
-        sprintf(partitionDirName, "%s/%s",
+        rcp = snprintf(partitionDirName, FILE_NAME_SIZE, "%s/%s",
                 rt.c_str(), oidDirName);
 
-        if ( IDBPolicy::remove( rootOidDirName ) != 0 )
+        if ( rcd == FILE_NAME_SIZE || rcp == FILE_NAME_SIZE
+            || IDBPolicy::remove( rootOidDirName ) != 0 )
         {
             ostringstream oss;
             oss << "Unable to remove " << rootOidDirName;
diff --git a/writeengine/shared/we_index.h b/writeengine/shared/we_index.h
index d5438453d..bcd88e5e9 100644
--- a/writeengine/shared/we_index.h
+++ b/writeengine/shared/we_index.h
@@ -393,7 +393,7 @@ struct IdxMultiColKey
         curMask.reset();
         curLevel = maxLevel = 0;
         totalBit = 0;
-        memset( testbitArray, 0, IDX_MAX_MULTI_COL_IDX_LEVEL);
+        memset( testbitArray, 0, IDX_MAX_MULTI_COL_IDX_LEVEL * sizeof(testbitArray[0]));
         memset( keyBuf, 0, IDX_MAX_MULTI_COL_BIT / 8 );
         curMask = 0x1F;
         curMask = curMask << (IDX_MAX_MULTI_COL_BIT - 5);
diff --git a/writeengine/shared/we_type.h b/writeengine/shared/we_type.h
index 06a367ecb..08df6f10e 100644
--- a/writeengine/shared/we_type.h
+++ b/writeengine/shared/we_type.h
@@ -487,7 +487,7 @@ struct CacheControl                     /** @brief Cache control structure */
     int            checkInterval;       /** @brief A check point interval in seconds */
     CacheControl()
     {
-        totalBlock = pctFree = checkInterval;    /** @brief constructor */
+        totalBlock = pctFree = checkInterval = 0;    /** @brief constructor */
     }
 };
 
diff --git a/writeengine/splitter/we_filereadthread.cpp b/writeengine/splitter/we_filereadthread.cpp
index 6840d377d..e455ff518 100644
--- a/writeengine/splitter/we_filereadthread.cpp
+++ b/writeengine/splitter/we_filereadthread.cpp
@@ -356,7 +356,7 @@ unsigned int WEFileReadThread::readDataFile(messageqcpp::SBS& Sbs)
         //char aBuff[1024*1024];			// TODO May have to change it later
         //char*pStart = aBuff;
         unsigned int aIdx = 0;
-        unsigned int aLen = 0;
+        int aLen = 0;
         *Sbs << (ByteStream::byte)(WE_CLT_SRV_DATA);
 
         while ((!fInFile.eof()) && (aIdx < getBatchQty()))
diff --git a/writeengine/wrapper/we_colop.cpp b/writeengine/wrapper/we_colop.cpp
index 515e9f7b2..4e08bd742 100644
--- a/writeengine/wrapper/we_colop.cpp
+++ b/writeengine/wrapper/we_colop.cpp
@@ -238,7 +238,8 @@ int ColumnOp::allocRowId(const TxnID& txnid, bool useStartingExtent,
 
                     for (i = 0; i < dbRootExtentTrackers.size(); i++)
                     {
-                        if (i != (int) column.colNo)
+                        uint32_t colNo = column.colNo;
+                        if (i != colNo)
                             dbRootExtentTrackers[i]->nextSegFile(dbRoot, partition, segment, newHwm, startLbid);
 
                         // Round up HWM to the end of the current extent

From f0dd02499a1f8d43f35e562dd2f064bfea9b6ac7 Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Mon, 29 Apr 2019 05:19:11 -0500
Subject: [PATCH 20/33] Remove unneeded include

---
 utils/funcexp/utils_utf8.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/utils/funcexp/utils_utf8.h b/utils/funcexp/utils_utf8.h
index 442ca6297..e88772bc4 100644
--- a/utils/funcexp/utils_utf8.h
+++ b/utils/funcexp/utils_utf8.h
@@ -37,8 +37,6 @@
 
 #include <clocale>
 
-#include "ALARMManager.h"
-
 #include "liboamcpp.h"
 
 /** @file */

From e078a416ecde9bbc303274c970e1ae8b745e17e5 Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Mon, 29 Apr 2019 06:00:53 -0500
Subject: [PATCH 21/33] Fix build fail on buildbox

---
 utils/rowgroup/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/rowgroup/CMakeLists.txt b/utils/rowgroup/CMakeLists.txt
index 18e73e2fc..028fa2a67 100644
--- a/utils/rowgroup/CMakeLists.txt
+++ b/utils/rowgroup/CMakeLists.txt
@@ -10,7 +10,7 @@ set(rowgroup_LIB_SRCS rowaggregation.cpp rowgroup.cpp)
 
 add_library(rowgroup SHARED ${rowgroup_LIB_SRCS})
 
-target_link_libraries(rowgroup ${NETSNMP_LIBRARIES})
+target_link_libraries(rowgroup ${NETSNMP_LIBRARIES} funcexp)
 
 set_target_properties(rowgroup PROPERTIES VERSION 1.0.0 SOVERSION 1)
 

From a8adef8820e5270b95e5d9af3124383d36173925 Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <roman.nozdrin@mariadb.com>
Date: Wed, 1 May 2019 16:06:48 +0300
Subject: [PATCH 22/33] MCOL-1495 DML operations created two fCatalogMap
 entries per session.     These entries were never deleted so WE leaks about
 7MB per 100 DML     sessions. I add purge operations in the very end of four
 functions     involved in DML.

---
 writeengine/server/we_dmlcommandproc.cpp | 32 +++++++++++++-----------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/writeengine/server/we_dmlcommandproc.cpp b/writeengine/server/we_dmlcommandproc.cpp
index cbc84e26e..e5f552927 100644
--- a/writeengine/server/we_dmlcommandproc.cpp
+++ b/writeengine/server/we_dmlcommandproc.cpp
@@ -722,6 +722,10 @@ uint8_t WE_DMLCommandProc::processSingleInsert(messageqcpp::ByteStream& bs, std:
         }
     }
 
+    // MCOL-1495 Remove fCatalogMap entries CS won't use anymore.
+    CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId);
+    CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId | 0x80000000);
+
     return rc;
 }
 
@@ -1361,7 +1365,9 @@ uint8_t WE_DMLCommandProc::processBatchInsert(messageqcpp::ByteStream& bs, std::
         }
     }
 
-    //cout << "Batch insert return code " << rc << endl;
+    // MCOL-1495 Remove fCatalogMap entries CS won't use anymore.
+    CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId);
+    CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId | 0x80000000);
     return rc;
 }
 
@@ -2087,18 +2093,11 @@ uint8_t WE_DMLCommandProc::processBatchInsertBinary(messageqcpp::ByteStream& bs,
         args.add(cols);
         err = IDBErrorInfo::instance()->errorMsg(WARN_DATA_TRUNC, args);
 
-        // Strict mode enabled, so rollback on warning
-        // NOTE: This doesn't seem to be a possible code path yet
-        /*if (insertPkg.get_isWarnToError())
-        {
-        		string applName ("BatchInsert");
-        		fWEWrapper.bulkRollback(tblOid,txnid.id,tableName.toString(),
-        			applName, false, err);
-        		BulkRollbackMgr::deleteMetaFile( tblOid );
-        }*/
-    }
+   }
 
-    //cout << "Batch insert return code " << rc << endl;
+    // MCOL-1495 Remove fCatalogMap entries CS won't use anymore.
+    CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId);
+    CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId | 0x80000000);
     return rc;
 }
 
@@ -2240,6 +2239,9 @@ uint8_t WE_DMLCommandProc::commitBatchAutoOn(messageqcpp::ByteStream& bs, std::s
         fWEWrapper.getDictMap().erase(txnID);
     }
 
+    // MCOL-1495 Remove fCatalogMap entries CS won't use anymore.
+    CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId);
+    CalpontSystemCatalog::removeCalpontSystemCatalog(sessionId | 0x80000000);
     return rc;
 }
 
@@ -3774,7 +3776,6 @@ uint8_t WE_DMLCommandProc::processUpdate(messageqcpp::ByteStream& bs,
         err = IDBErrorInfo::instance()->errorMsg(WARN_DATA_TRUNC, args);
     }
 
-    //cout << "finished update" << endl;
     return rc;
 }
 
@@ -3957,6 +3958,10 @@ uint8_t WE_DMLCommandProc::processFlushFiles(messageqcpp::ByteStream& bs, std::s
     //if (idbdatafile::IDBPolicy::useHdfs())
     //		cacheutils::dropPrimProcFdCache();
     TableMetaData::removeTableMetaData(tableOid);
+
+    // MCOL-1495 Remove fCatalogMap entries CS won't use anymore.
+    CalpontSystemCatalog::removeCalpontSystemCatalog(txnId);
+    CalpontSystemCatalog::removeCalpontSystemCatalog(txnId | 0x80000000);
     return rc;
 }
 
@@ -4132,7 +4137,6 @@ uint8_t WE_DMLCommandProc::processDelete(messageqcpp::ByteStream& bs,
         }
     }
 
-    //cout << "WES return rc " << (int)rc << " with msg " << err << endl;
     return rc;
 }
 

From 9e7d852804d796b64e38d720ad2fef7b32c20945 Mon Sep 17 00:00:00 2001
From: Patrice Linel <patrice.linel@genusplc.com>
Date: Wed, 1 May 2019 10:29:57 -0500
Subject: [PATCH 23/33] unneeded  k for loop

---
 writeengine/server/we_dmlcommandproc.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/writeengine/server/we_dmlcommandproc.cpp b/writeengine/server/we_dmlcommandproc.cpp
index cbc84e26e..118363217 100644
--- a/writeengine/server/we_dmlcommandproc.cpp
+++ b/writeengine/server/we_dmlcommandproc.cpp
@@ -2847,16 +2847,14 @@ uint8_t WE_DMLCommandProc::processUpdate(messageqcpp::ByteStream& bs,
                 convertToRelativeRid (rid, extentNum, blockNum);
                 rowIDLists.push_back(rid);
                 uint32_t colWidth = (colTypes[j].colWidth > 8 ? 8 : colTypes[j].colWidth);
-
-                // populate stats.blocksChanged
-                for (unsigned int k = 0; k < columnsUpdated.size(); k++)
+		int rrid = (int) relativeRID / (BYTE_PER_BLOCK / colWidth)
+                // populate stats.blocksChanged 
+		if (rrid > preBlkNums[j])
                 {
-                    if ((int)(relativeRID / (BYTE_PER_BLOCK / colWidth)) > preBlkNums[j])
-                    {
+			preBlkNums[j] = rrid ;
                         blocksChanged++;
-                        preBlkNums[j] = relativeRID / (BYTE_PER_BLOCK / colWidth);
-                    }
-                }
+		}
+
             }
 
             ridsFetched = true;

From b2bf6dece586c735ee30cd078081b8e8c7729546 Mon Sep 17 00:00:00 2001
From: gscteam <49755341+gscteam@users.noreply.github.com>
Date: Wed, 1 May 2019 13:38:02 -0500
Subject: [PATCH 24/33] missing semicol

---
 writeengine/server/we_dmlcommandproc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/writeengine/server/we_dmlcommandproc.cpp b/writeengine/server/we_dmlcommandproc.cpp
index 118363217..1ca4d1d7c 100644
--- a/writeengine/server/we_dmlcommandproc.cpp
+++ b/writeengine/server/we_dmlcommandproc.cpp
@@ -2847,7 +2847,7 @@ uint8_t WE_DMLCommandProc::processUpdate(messageqcpp::ByteStream& bs,
                 convertToRelativeRid (rid, extentNum, blockNum);
                 rowIDLists.push_back(rid);
                 uint32_t colWidth = (colTypes[j].colWidth > 8 ? 8 : colTypes[j].colWidth);
-		int rrid = (int) relativeRID / (BYTE_PER_BLOCK / colWidth)
+		int rrid = (int) relativeRID / (BYTE_PER_BLOCK / colWidth);
                 // populate stats.blocksChanged 
 		if (rrid > preBlkNums[j])
                 {

From 9022fa426d7c587326950367606737aa8df37145 Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Sat, 4 May 2019 02:14:40 -0500
Subject: [PATCH 25/33] minor fixups

---
 CMakeLists.txt                    |  9 +++++++--
 exemgr/CMakeLists.txt             |  4 +++-
 exemgr/main.cpp                   |  8 ++++----
 utils/rowgroup/rowaggregation.cpp | 13 ++++---------
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0da43339..b931d30c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,6 +63,7 @@ if(SERVER_BUILD_DIR)
 endif()
 
 INCLUDE(ExternalProject)
+INCLUDE(CheckCXXSourceCompiles)
 
 SET(CMAKE_CXX_STANDARD 11)
 SET(CMAKE_CXX_STANDARD_REQUIRED TRUE)
@@ -76,8 +77,12 @@ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
 SET_PROPERTY(DIRECTORY PROPERTY EP_BASE ${CMAKE_CURRENT_BINARY_DIR}/external)
 LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
 
-find_package(Boost 1.53.0 REQUIRED COMPONENTS system filesystem thread regex date_time) 
-find_package(BISON REQUIRED)
+FIND_PACKAGE(Boost 1.53.0 REQUIRED COMPONENTS system filesystem thread regex date_time)
+FIND_PACKAGE(BISON REQUIRED)
+
+check_cxx_source_compiles("#include <filesystem>\n void main(){}" HAS_STD_FILESYSTEM)
+check_cxx_source_compiles("#include <experimental/filesystem>\n void main(){}" HAS_STD_EXPERIMENTAL_FILESYSTEM)
+
 INCLUDE(columnstore_version)
 
 SET (PACKAGE columnstore)
diff --git a/exemgr/CMakeLists.txt b/exemgr/CMakeLists.txt
index 5f77ed886..5ffdd1e44 100644
--- a/exemgr/CMakeLists.txt
+++ b/exemgr/CMakeLists.txt
@@ -8,9 +8,11 @@ set(ExeMgr_SRCS main.cpp activestatementcounter.cpp femsghandler.cpp ../utils/co
 
 add_executable(ExeMgr ${ExeMgr_SRCS})
 
-target_link_libraries(ExeMgr ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} cacheutils threadpool stdc++fs)
+target_link_libraries(ExeMgr ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} cacheutils threadpool)
 
+target_include_directories(ExeMgr PRIVATE ${Boost_INCLUDE_DIRS})
 
+target_compile_features(ExeMgr PRIVATE )
 
 install(TARGETS ExeMgr DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
 
diff --git a/exemgr/main.cpp b/exemgr/main.cpp
index 6790fafbb..36d8f639d 100644
--- a/exemgr/main.cpp
+++ b/exemgr/main.cpp
@@ -43,14 +43,14 @@
 
 
 #include <mutex>
-#include <experimental/filesystem>
 #include <iostream>
-
 #include <cstdint>
 #include <csignal>
 
 #include <sys/resource.h>
 
+#include <boost/filesystem.hpp>
+
 #include "calpontselectexecutionplan.h"
 #include "activestatementcounter.h"
 #include "distributedenginecomm.h"
@@ -1365,8 +1365,8 @@ void cleanTempDir()
     /* This is quite scary as ExeMgr usually runs as root */
     try
     {
-        std::experimental::filesystem::remove_all(tmpPrefix);
-        std::experimental::filesystem::create_directories(tmpPrefix);
+        boost::filesystem::remove_all(tmpPrefix);
+        boost::filesystem::create_directories(tmpPrefix);
     }
     catch (const std::exception& ex)
     {
diff --git a/utils/rowgroup/rowaggregation.cpp b/utils/rowgroup/rowaggregation.cpp
index 2a1dd862e..003d58281 100644
--- a/utils/rowgroup/rowaggregation.cpp
+++ b/utils/rowgroup/rowaggregation.cpp
@@ -29,6 +29,8 @@
 #include <stdexcept>
 #include <limits>
 #include <typeinfo>
+#include <cassert>
+
 #include "joblisttypes.h"
 #include "resourcemanager.h"
 #include "groupconcat.h"
@@ -51,20 +53,13 @@
 
 //..comment out NDEBUG to enable assertions, uncomment NDEBUG to disable
 //#define NDEBUG
-#include <cassert>
+#include "funcexp/utils_utf8.h"
+
 
 using namespace std;
 using namespace boost;
 using namespace dataconvert;
 
-namespace funcexp
-{
-  namespace utf8
-  {
-    int idb_strcoll(const char*, const char*);
-  }
-}
-
 
 // inlines of RowAggregation that used only in this file
 namespace

From 7e2cb0562472a2d05316889b5cf175d735da93a4 Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <roman.nozdrin@mariadb.com>
Date: Mon, 29 Apr 2019 12:26:12 +0300
Subject: [PATCH 26/33] MCOL-537 There are no CS-specific warnings building
 with gcc 8.2.

---
 dbcon/execplan/arithmeticoperator.cpp   | 16 ----
 dbcon/execplan/logicoperator.cpp        | 16 ----
 dbcon/joblist/joblistfactory.cpp        | 30 --------
 dbcon/mysql/ha_calpont_dml.cpp          | 97 -------------------------
 dbcon/mysql/ha_calpont_partition.cpp    | 15 ----
 ddlproc/ddlproc.cpp                     | 10 ++-
 exemgr/main.cpp                         | 16 ++--
 primitives/blockcache/iomanager.cpp     | 67 +----------------
 primitives/primproc/columncommand.cpp   | 11 ---
 primitives/primproc/primitiveserver.cpp | 27 -------
 primitives/primproc/primproc.cpp        | 18 +++--
 tools/dbbuilder/dbbuilder.cpp           | 40 +++++-----
 tools/dbloadxml/colxml.cpp              |  3 +
 utils/dataconvert/dataconvert.h         |  5 +-
 utils/querytele/queryteleprotoimpl.cpp  |  2 +-
 versioning/BRM/slavecomm.cpp            | 10 ++-
 writeengine/bulk/cpimport.cpp           |  7 +-
 writeengine/bulk/we_tableinfo.cpp       | 11 ++-
 writeengine/server/we_getfilesizes.cpp  |  4 +-
 writeengine/shared/we_chunkmanager.cpp  |  8 ++
 writeengine/splitter/we_splitterapp.cpp |  3 +
 writeengine/xml/we_xmlgenproc.cpp       | 10 +--
 writeengine/xml/we_xmlgenproc.h         |  2 +-
 23 files changed, 94 insertions(+), 334 deletions(-)

diff --git a/dbcon/execplan/arithmeticoperator.cpp b/dbcon/execplan/arithmeticoperator.cpp
index 71857a8fa..57b77381a 100644
--- a/dbcon/execplan/arithmeticoperator.cpp
+++ b/dbcon/execplan/arithmeticoperator.cpp
@@ -40,22 +40,6 @@ struct to_lower
     }
 };
 
-//Trim any leading/trailing ws
-const string lrtrim(const string& in)
-{
-    string::size_type p1;
-    p1 = in.find_first_not_of(" \t\n");
-
-    if (p1 == string::npos) p1 = 0;
-
-    string::size_type p2;
-    p2 = in.find_last_not_of(" \t\n");
-
-    if (p2 == string::npos) p2 = in.size() - 1;
-
-    return string(in, p1, (p2 - p1 + 1));
-}
-
 }
 
 namespace execplan
diff --git a/dbcon/execplan/logicoperator.cpp b/dbcon/execplan/logicoperator.cpp
index a5353e472..a466017da 100644
--- a/dbcon/execplan/logicoperator.cpp
+++ b/dbcon/execplan/logicoperator.cpp
@@ -40,22 +40,6 @@ struct to_lower
     }
 };
 
-//Trim any leading/trailing ws
-const string lrtrim(const string& in)
-{
-    string::size_type p1;
-    p1 = in.find_first_not_of(" \t\n");
-
-    if (p1 == string::npos) p1 = 0;
-
-    string::size_type p2;
-    p2 = in.find_last_not_of(" \t\n");
-
-    if (p2 == string::npos) p2 = in.size() - 1;
-
-    return string(in, p1, (p2 - p1 + 1));
-}
-
 }
 
 namespace execplan
diff --git a/dbcon/joblist/joblistfactory.cpp b/dbcon/joblist/joblistfactory.cpp
index 32c7a0836..21df156a7 100644
--- a/dbcon/joblist/joblistfactory.cpp
+++ b/dbcon/joblist/joblistfactory.cpp
@@ -94,36 +94,6 @@ namespace
 using namespace joblist;
 
 
-bool checkCombinable(JobStep* jobStepPtr)
-{
-    if (typeid(*(jobStepPtr)) == typeid(pColScanStep))
-    {
-        return true;
-    }
-    else if (typeid(*(jobStepPtr)) == typeid(PseudoColStep))
-    {
-        return true;
-    }
-    else if (typeid(*(jobStepPtr)) == typeid(pColStep))
-    {
-        return true;
-    }
-    else if (typeid(*(jobStepPtr)) == typeid(pDictionaryStep))
-    {
-        return true;
-    }
-    else if (typeid(*(jobStepPtr)) == typeid(PassThruStep))
-    {
-        return true;
-    }
-    else if (typeid(*(jobStepPtr)) == typeid(FilterStep))
-    {
-        return true;
-    }
-
-    return false;
-}
-
 void projectSimpleColumn(const SimpleColumn* sc, JobStepVector& jsv, JobInfo& jobInfo)
 {
     if (sc == NULL)
diff --git a/dbcon/mysql/ha_calpont_dml.cpp b/dbcon/mysql/ha_calpont_dml.cpp
index 0e2bce76c..f6393a09f 100644
--- a/dbcon/mysql/ha_calpont_dml.cpp
+++ b/dbcon/mysql/ha_calpont_dml.cpp
@@ -88,103 +88,6 @@ inline uint32_t tid2sid(const uint32_t tid)
 }
 
 //StopWatch timer;
-int buildBuffer(uchar* buf, string& buffer, int& columns, TABLE* table)
-{
-    char attribute_buffer[1024];
-    String attribute(attribute_buffer, sizeof(attribute_buffer),
-                     &my_charset_bin);
-
-    std::string cols = " (";
-    std::string vals = " values (";
-    columns = 0;
-
-    for (Field** field = table->field; *field; field++)
-    {
-        const char* ptr;
-        const char* end_ptr;
-
-        if ((*field)->is_null())
-            ptr = end_ptr = 0;
-        else
-        {
-            bitmap_set_bit(table->read_set, (*field)->field_index);
-            (*field)->val_str(&attribute, &attribute);
-            ptr = attribute.ptr();
-            end_ptr = attribute.length() + ptr;
-        }
-
-        if (columns > 0)
-        {
-            cols.append(",");
-            vals.append(",");
-        }
-
-        columns++;
-
-        cols.append((*field)->field_name.str);
-
-        if (ptr == end_ptr)
-        {
-            vals.append ("NULL");
-        }
-        else
-        {
-
-            if ( (*field)->type() == MYSQL_TYPE_VARCHAR ||
-                    /*FIXME: (*field)->type() == MYSQL_TYPE_VARBINARY || */
-                    (*field)->type() == MYSQL_TYPE_VAR_STRING ||
-                    (*field)->type() == MYSQL_TYPE_STRING ||
-                    (*field)->type() == MYSQL_TYPE_DATE ||
-                    (*field)->type() == MYSQL_TYPE_DATETIME ||
-                    (*field)->type() == MYSQL_TYPE_DATETIME2 ||
-                    (*field)->type() == MYSQL_TYPE_TIME )
-                vals.append("'");
-
-            while (ptr < end_ptr)
-            {
-
-                if (*ptr == '\r')
-                {
-                    ptr++;
-                }
-                else if (*ptr == '\n')
-                {
-                    ptr++;
-                }
-                else if (*ptr == '\'' )
-                {
-                    //@Bug 1820. Replace apostrophe with strange character to pass parser.
-                    vals += '\252';
-                    ptr++;
-                }
-                else
-                    vals += *ptr++;
-            }
-
-            if ( (*field)->type() == MYSQL_TYPE_VARCHAR ||
-                    /*FIXME: (*field)->type() == MYSQL_TYPE_VARBINARY || */
-                    (*field)->type() == MYSQL_TYPE_VAR_STRING ||
-                    (*field)->type() == MYSQL_TYPE_STRING ||
-                    (*field)->type() == MYSQL_TYPE_DATE ||
-                    (*field)->type() == MYSQL_TYPE_DATETIME ||
-                    (*field)->type() == MYSQL_TYPE_DATETIME2 ||
-                    (*field)->type() == MYSQL_TYPE_TIME )
-                vals.append("'");
-        }
-    }
-
-    if (columns)
-    {
-        cols.append(") ");
-        vals.append(") ");
-        buffer = "INSERT INTO ";
-        buffer.append(table->s->table_name.str);
-        buffer.append(cols);
-        buffer.append(vals);
-    }
-
-    return columns;
-}
 
 uint32_t buildValueList (TABLE* table, cal_connection_info& ci )
 {
diff --git a/dbcon/mysql/ha_calpont_partition.cpp b/dbcon/mysql/ha_calpont_partition.cpp
index 61063f2f6..7d2317661 100644
--- a/dbcon/mysql/ha_calpont_partition.cpp
+++ b/dbcon/mysql/ha_calpont_partition.cpp
@@ -239,21 +239,6 @@ struct PartitionInfo
 
 typedef map<LogicalPartition, PartitionInfo> PartitionMap;
 
-const string charcolToString(int64_t v)
-{
-    ostringstream oss;
-    char c;
-
-    for (int i = 0; i < 8; i++)
-    {
-        c = v & 0xff;
-        oss << c;
-        v >>= 8;
-    }
-
-    return oss.str();
-}
-
 const string format(int64_t v, CalpontSystemCatalog::ColType& ct)
 {
     ostringstream oss;
diff --git a/ddlproc/ddlproc.cpp b/ddlproc/ddlproc.cpp
index 6f827f8fd..bb3020deb 100644
--- a/ddlproc/ddlproc.cpp
+++ b/ddlproc/ddlproc.cpp
@@ -71,14 +71,15 @@ namespace
 {
 DistributedEngineComm* Dec;
 
-void setupCwd()
+int8_t setupCwd()
 {
     string workdir = startup::StartUp::tmpDir();
 
     if (workdir.length() == 0)
         workdir = ".";
 
-    (void)chdir(workdir.c_str());
+    int8_t rc = chdir(workdir.c_str());
+    return rc;
 }
 
 void added_a_pm(int)
@@ -103,7 +104,10 @@ int main(int argc, char* argv[])
     // This is unset due to the way we start it
     program_invocation_short_name = const_cast<char*>("DDLProc");
 
-    setupCwd();
+    if ( setupCwd() < 0 )
+    {
+        std::cerr << "Could not set working directory" << std::endl;
+    }
 
     WriteEngine::WriteEngineWrapper::init( WriteEngine::SUBSYSTEM_ID_DDLPROC );
 #ifdef _MSC_VER
diff --git a/exemgr/main.cpp b/exemgr/main.cpp
index 259d1443e..252f8fbf5 100644
--- a/exemgr/main.cpp
+++ b/exemgr/main.cpp
@@ -1325,13 +1325,15 @@ void setupSignalHandlers()
 #endif
 }
 
-void setupCwd(ResourceManager* rm)
+int8_t setupCwd(ResourceManager* rm)
 {
     string workdir = rm->getScWorkingDir();
-    (void)chdir(workdir.c_str());
+    int8_t rc = chdir(workdir.c_str());
 
-    if (access(".", W_OK) != 0)
-        (void)chdir("/tmp");
+    if (rc < 0 || access(".", W_OK) != 0)
+        rc = chdir("/tmp");
+    
+    return (rc < 0) ? -5 : rc;
 }
 
 void startRssMon(size_t maxPct, int pauseSeconds)
@@ -1497,9 +1499,12 @@ int main(int argc, char* argv[])
             break;
 
         default:
+            errMsg = "Couldn't change working directory or unknown error";
             break;
     }
 
+    err = setupCwd(rm);
+
     if (err < 0)
     {
         Oam oam;
@@ -1523,9 +1528,6 @@ int main(int argc, char* argv[])
         return 2;
     }
 
-
-    setupCwd(rm);
-
     cleanTempDir();
 
     MsgMap msgMap;
diff --git a/primitives/blockcache/iomanager.cpp b/primitives/blockcache/iomanager.cpp
index 8e5e063cd..2bf4526e5 100644
--- a/primitives/blockcache/iomanager.cpp
+++ b/primitives/blockcache/iomanager.cpp
@@ -283,71 +283,6 @@ FdCacheType_t fdcache;
 boost::mutex fdMapMutex;
 rwlock::RWLock_local localLock;
 
-void pause_(unsigned secs)
-{
-    struct timespec req;
-    struct timespec rem;
-
-    req.tv_sec = secs;
-    req.tv_nsec = 0;
-
-    rem.tv_sec = 0;
-    rem.tv_nsec = 0;
-
-#ifdef _MSC_VER
-    Sleep(req.tv_sec * 1000);
-#else
-again:
-
-    if (nanosleep(&req, &rem) != 0)
-        if (rem.tv_sec > 0 || rem.tv_nsec > 0)
-        {
-            req = rem;
-            goto again;
-        }
-
-#endif
-}
-
-const vector<pair<string, string> > getDBRootList()
-{
-    vector<pair<string, string> > ret;
-    Config* config;
-    uint32_t dbrootCount, i;
-    string stmp, devname, mountpoint;
-    char devkey[80], mountkey[80];
-
-    config = Config::makeConfig();
-
-    stmp = config->getConfig("SystemConfig", "DBRootCount");
-
-    if (stmp.empty())
-    {
-        Message::Args args;
-        args.add("getDBRootList: Configuration error. No DBRootCount");
-        primitiveprocessor::mlp->logMessage(logging::M0006, args, true);
-        throw runtime_error("getDBRootList: Configuration error. No DBRootCount");
-    }
-
-    dbrootCount = config->uFromText(stmp);
-
-    for (i = 1; i <= dbrootCount; i++)
-    {
-        snprintf(mountkey, 80, "DBRoot%d", i);
-        snprintf(devkey, 80, "DBRootStorageLoc%d", i);
-        mountpoint = config->getConfig("SystemConfig", string(mountkey));
-        devname = config->getConfig("Installation", string(devkey));
-
-        if (mountpoint == "" || devname == "")
-            throw runtime_error("getDBRootList: Configuration error. Don't know where DBRoots are mounted");
-
-        ret.push_back(pair<string, string>(devname, mountpoint));
-// 		cout << "I see " << devname << " should be mounted at " << mountpoint << endl;
-    }
-
-    return ret;
-}
-
 char* alignTo(const char* in, int av)
 {
     ptrdiff_t inx = reinterpret_cast<ptrdiff_t>(in);
@@ -769,7 +704,7 @@ void* thr_popper(ioManager* arg)
             int opts = primitiveprocessor::directIOFlag ? IDBDataFile::USE_ODIRECT : 0;
             fp = NULL;
             uint32_t openRetries = 0;
-            int saveErrno;
+            int saveErrno = 0;
 
             while (fp == NULL && openRetries++ < 5)
             {
diff --git a/primitives/primproc/columncommand.cpp b/primitives/primproc/columncommand.cpp
index ed4b26a44..f5db52a2d 100644
--- a/primitives/primproc/columncommand.cpp
+++ b/primitives/primproc/columncommand.cpp
@@ -51,17 +51,6 @@ using namespace logging;
 #define llabs labs
 #endif
 
-namespace
-{
-using namespace primitiveprocessor;
-
-double cotangent(double in)
-{
-    return (1.0 / tan(in));
-}
-
-}
-
 namespace primitiveprocessor
 {
 
diff --git a/primitives/primproc/primitiveserver.cpp b/primitives/primproc/primitiveserver.cpp
index 9359556e9..54f4b7fb6 100644
--- a/primitives/primproc/primitiveserver.cpp
+++ b/primitives/primproc/primitiveserver.cpp
@@ -1097,33 +1097,6 @@ namespace
 {
 using namespace primitiveprocessor;
 
-void pause_(unsigned delay)
-{
-    struct timespec req;
-    struct timespec rem;
-
-    req.tv_sec = delay;
-    req.tv_nsec = 0;
-
-    rem.tv_sec = 0;
-    rem.tv_nsec = 0;
-#ifdef _MSC_VER
-    Sleep(req.tv_sec * 1000);
-#else
-again:
-
-    if (nanosleep(&req, &rem) != 0)
-    {
-        if (rem.tv_sec > 0 || rem.tv_nsec > 0)
-        {
-            req = rem;
-            goto again;
-        }
-    }
-
-#endif
-}
-
 /** @brief The job type to process a dictionary scan (pDictionaryScan class on the UM)
  * TODO: Move this & the impl into different files
  */
diff --git a/primitives/primproc/primproc.cpp b/primitives/primproc/primproc.cpp
index 2e88493a0..a8ceb1451 100644
--- a/primitives/primproc/primproc.cpp
+++ b/primitives/primproc/primproc.cpp
@@ -146,17 +146,19 @@ void setupSignalHandlers()
 #endif
 }
 
-void setupCwd(Config* cf)
+int8_t setupCwd(Config* cf)
 {
     string workdir = startup::StartUp::tmpDir();
 
     if (workdir.length() == 0)
         workdir = ".";
 
-    (void)chdir(workdir.c_str());
+    int8_t rc = chdir(workdir.c_str());
 
-    if (access(".", W_OK) != 0)
-        (void)chdir("/tmp");
+    if (rc < 0 || access(".", W_OK) != 0)
+        rc = chdir("/tmp");
+    
+    return rc;
 }
 
 int setupResources()
@@ -342,11 +344,11 @@ int main(int argc, char* argv[])
 
     setupSignalHandlers();
 
-    setupCwd(cf);
+    int err = 0;
+    err = setupCwd(cf);
 
     mlp = new primitiveprocessor::Logger();
 
-    int err = 0;
     if (!gDebug)
         err = setupResources();
     string errMsg;
@@ -366,6 +368,10 @@ int main(int argc, char* argv[])
             errMsg = "Could not install file limits to required value, please see non-root install documentation";
             break;
 
+        case -5:
+            errMsg = "Could not change into working directory";
+            break;
+
         default:
             break;
     }
diff --git a/tools/dbbuilder/dbbuilder.cpp b/tools/dbbuilder/dbbuilder.cpp
index aec094b89..634a78ebd 100644
--- a/tools/dbbuilder/dbbuilder.cpp
+++ b/tools/dbbuilder/dbbuilder.cpp
@@ -58,11 +58,11 @@ int setUp()
 {
 #ifndef _MSC_VER
 	string cmd = "/bin/rm -f " + logFile + " >/dev/null 2>&1";
-    (void)system(cmd.c_str());
+    int rc = system(cmd.c_str());
     cmd = "/bin/touch -f " + logFile + " >/dev/null 2>&1";
-    (void)system(cmd.c_str());
+    rc = system(cmd.c_str());
 #endif
-    return 0;
+    return rc;
 }
 
 int checkNotThere(WriteEngine::FID fid)
@@ -72,12 +72,6 @@ int checkNotThere(WriteEngine::FID fid)
     return (fileOp.existsOIDDir(fid) ? -1 : 0);
 }
 
-void tearDown()
-{
-	string file = tmpDir + "/oidbitmap";
-    unlink(file.c_str());
-}
-
 void usage()
 {
     cerr << "Usage: dbbuilder [-h|f] function" << endl
@@ -130,6 +124,7 @@ int main(int argc, char* argv[])
     std::string schema("tpch");
     Oam oam;
     bool fFlg = false;
+    int rc = 0;
 
     opterr = 0;
 
@@ -193,7 +188,10 @@ int main(int argc, char* argv[])
 
     if ( buildOption == SYSCATALOG_ONLY )
     {
-        setUp();
+        if ( setUp() )
+        {
+            cerr << "setUp() call error " << endl;
+        }
 
         bool canWrite = true;
 
@@ -209,9 +207,13 @@ int main(int argc, char* argv[])
                              "' > " + logFile;
 
                 if (canWrite)
-                    (void)system(cmd.c_str());
+                {
+                    rc = system(cmd.c_str());
+                }
                 else
+                {
                     cerr << cmd << endl;
+                }
 
                 errorHandler(sysCatalogErr,
                              "Build system catalog",
@@ -243,7 +245,7 @@ int main(int argc, char* argv[])
                 string cmd(string("echo 'FAILED: ") + ex.what() + "' > " + logFile);
 
                 if (canWrite)
-                    (void)system(cmd.c_str());
+                    rc = system(cmd.c_str());
                 else
                     cerr << cmd << endl;
 
@@ -255,7 +257,7 @@ int main(int argc, char* argv[])
                 string cmd = "echo 'FAILED:  HDFS checking.' > " + logFile;
 
                 if (canWrite)
-                    (void)system(cmd.c_str());
+                    rc = system(cmd.c_str());
                 else
                     cerr << cmd << endl;
 
@@ -274,7 +276,7 @@ int main(int argc, char* argv[])
             std::string cmd = "echo 'OK: buildOption=" + oam.itoa(buildOption) + "' > " + logFile;
 
             if (canWrite)
-                (void)system(cmd.c_str());
+                rc = system(cmd.c_str());
             else
 #ifdef _MSC_VER
                 (void)0;
@@ -287,11 +289,9 @@ int main(int argc, char* argv[])
 
             if (canWrite)
             {
-                int err;
+                rc = system(cmd.c_str());
 
-                err = system(cmd.c_str());
-
-                if (err != 0)
+                if (rc != 0)
                 {
                     ostringstream os;
                     os << "Warning: running " << cmd << " failed.  This is usually non-fatal.";
@@ -309,7 +309,7 @@ int main(int argc, char* argv[])
             string cmd = "echo 'FAILED: buildOption=" + oam.itoa(buildOption) + "' > " + logFile;
 
             if (canWrite)
-                (void)system(cmd.c_str());
+                rc = system(cmd.c_str());
             else
                 cerr << cmd << endl;
 
@@ -320,7 +320,7 @@ int main(int argc, char* argv[])
             string cmd = "echo 'FAILED: buildOption=" + oam.itoa(buildOption) + "' > " + logFile;
 
             if (canWrite)
-                (void)system(cmd.c_str());
+                rc = system(cmd.c_str());
             else
                 cerr << cmd << endl;
 
diff --git a/tools/dbloadxml/colxml.cpp b/tools/dbloadxml/colxml.cpp
index 00171ffc0..9c28b232d 100644
--- a/tools/dbloadxml/colxml.cpp
+++ b/tools/dbloadxml/colxml.cpp
@@ -46,7 +46,10 @@ int main(int argc, char** argv)
 #ifdef _MSC_VER
     //FIXME
 #else
+#pragma GCC diagnostic ignored "-Wunused-result"
     setuid( 0 ); // set effective ID to root; ignore return status
+    // Why should we raise privileges if we don't care?
+#pragma GCC diagnostic pop
 #endif
     setlocale(LC_ALL, "");
     WriteEngine::Config::initConfigCache(); // load Columnstore.xml config settings
diff --git a/utils/dataconvert/dataconvert.h b/utils/dataconvert/dataconvert.h
index a6ce20198..2e0d225fe 100644
--- a/utils/dataconvert/dataconvert.h
+++ b/utils/dataconvert/dataconvert.h
@@ -673,12 +673,15 @@ inline void DataConvert::timeToString1( long long timevalue, char* buf, unsigned
         buf++;
         buflen--;
     }
-
+    // this snprintf call causes a compiler warning b/c buffer size is less
+    // then maximum string size.
+#pragma GCC diagnostic ignored "-Wformat-truncation="
     snprintf( buf, buflen, "%02d%02d%02d",
               hour,
               (unsigned)((timevalue >> 32) & 0xff),
               (unsigned)((timevalue >> 14) & 0xff)
             );
+#pragma GCC diagnostic pop
 }
 
 inline std::string DataConvert::decimalToString(int64_t value, uint8_t scale, execplan::CalpontSystemCatalog::ColDataType colDataType)
diff --git a/utils/querytele/queryteleprotoimpl.cpp b/utils/querytele/queryteleprotoimpl.cpp
index e1ad7025a..fa54a0adf 100644
--- a/utils/querytele/queryteleprotoimpl.cpp
+++ b/utils/querytele/queryteleprotoimpl.cpp
@@ -80,6 +80,7 @@ struct QStats
 
 QStats fQStats;
 
+#ifdef QUERY_TELE_DEBUG
 string get_trace_file()
 {
     ostringstream oss;
@@ -94,7 +95,6 @@ string get_trace_file()
     return oss.str();
 }
 
-#ifdef QUERY_TELE_DEBUG
 void log_query(const querytele::QueryTele& qtdata)
 {
     ofstream trace(get_trace_file().c_str(), ios::out | ios::app);
diff --git a/versioning/BRM/slavecomm.cpp b/versioning/BRM/slavecomm.cpp
index 55fe3a15b..d72138e49 100644
--- a/versioning/BRM/slavecomm.cpp
+++ b/versioning/BRM/slavecomm.cpp
@@ -51,12 +51,14 @@ using namespace idbdatafile;
 
 namespace
 {
+#ifdef USE_VERY_COMPLEX_DROP_CACHES
 void timespec_sub(const struct timespec& tv1,
                   const struct timespec& tv2,
                   double& tm)
 {
     tm = (double)(tv2.tv_sec - tv1.tv_sec) + 1.e-9 * (tv2.tv_nsec - tv1.tv_nsec);
 }
+#endif
 }
 
 namespace BRM
@@ -2176,8 +2178,12 @@ void SlaveComm::do_flushInodeCache()
 
     if ((fd = open("/proc/sys/vm/drop_caches", O_WRONLY)) >= 0)
     {
-        write(fd, "3\n", 2);
-        close(fd);
+        ssize_t written = write(fd, "3\n", 2);
+        int rc = close(fd);
+        if ( !written || rc )
+        {
+            std::cerr << "Could not write into or close /proc/sys/vm/drop_caches" << std::endl;
+        }
     }
 
 #endif
diff --git a/writeengine/bulk/cpimport.cpp b/writeengine/bulk/cpimport.cpp
index 94dc5ae1d..c23b3170d 100644
--- a/writeengine/bulk/cpimport.cpp
+++ b/writeengine/bulk/cpimport.cpp
@@ -830,10 +830,11 @@ void printInputSource(
         if (alternateImportDir == IMPORT_PATH_CWD)
         {
             char cwdBuf[4096];
-            ::getcwd(cwdBuf, sizeof(cwdBuf));
+            char *bufPtr = &cwdBuf[0];
+            bufPtr = ::getcwd(cwdBuf, sizeof(cwdBuf));
 
             if (!(BulkLoad::disableConsoleOutput()))
-                cout << "Input file(s) will be read from : " << cwdBuf << endl;
+                cout << "Input file(s) will be read from : " << bufPtr << endl;
         }
         else
         {
@@ -1021,7 +1022,9 @@ int main(int argc, char** argv)
 #ifdef _MSC_VER
     _setmaxstdio(2048);
 #else
+#pragma GCC diagnostic ignored "-Wunused-result"
     setuid( 0 ); // set effective ID to root; ignore return status
+#pragma GCC diagnostic pop
 #endif
     setupSignalHandlers();
 
diff --git a/writeengine/bulk/we_tableinfo.cpp b/writeengine/bulk/we_tableinfo.cpp
index 2885d1462..593b68647 100644
--- a/writeengine/bulk/we_tableinfo.cpp
+++ b/writeengine/bulk/we_tableinfo.cpp
@@ -1462,9 +1462,11 @@ void TableInfo::writeBadRows( const std::vector<std::string>* errorDatRows,
 
             if (!p.has_root_path())
             {
+                // We could fail here having fixed size buffer
                 char cwdPath[4096];
-                getcwd(cwdPath, sizeof(cwdPath));
-                boost::filesystem::path rejectFileName2( cwdPath );
+                char* buffPtr = &cwdPath[0];
+                buffPtr = getcwd(cwdPath, sizeof(cwdPath));
+                boost::filesystem::path rejectFileName2( buffPtr );
                 rejectFileName2 /= fRejectDataFileName;
                 fBadFiles.push_back( rejectFileName2.string() );
 
@@ -1569,8 +1571,9 @@ void  TableInfo::writeErrReason( const std::vector< std::pair<RID,
             if (!p.has_root_path())
             {
                 char cwdPath[4096];
-                getcwd(cwdPath, sizeof(cwdPath));
-                boost::filesystem::path errFileName2( cwdPath );
+                char* buffPtr = &cwdPath[0];
+                buffPtr = getcwd(cwdPath, sizeof(cwdPath));
+                boost::filesystem::path errFileName2( buffPtr );
                 errFileName2 /= fRejectErrFileName;
                 fErrFiles.push_back( errFileName2.string() );
 
diff --git a/writeengine/server/we_getfilesizes.cpp b/writeengine/server/we_getfilesizes.cpp
index 4a76bd598..5e408d4e5 100644
--- a/writeengine/server/we_getfilesizes.cpp
+++ b/writeengine/server/we_getfilesizes.cpp
@@ -269,8 +269,8 @@ int WE_GetFileSizes::processFileName(
     std::string& errMsg, int key)
 {
     uint8_t rc = 0;
-    off_t fileSize;
-    off_t compressedFileSize;
+    off_t fileSize = 0;
+    off_t compressedFileSize = 0;
     errMsg.clear();
 
     try
diff --git a/writeengine/shared/we_chunkmanager.cpp b/writeengine/shared/we_chunkmanager.cpp
index e2759d186..f701f94ee 100644
--- a/writeengine/shared/we_chunkmanager.cpp
+++ b/writeengine/shared/we_chunkmanager.cpp
@@ -1923,10 +1923,14 @@ int ChunkManager::reallocateChunks(CompFileData* fileData)
         struct tm ltm;
         localtime_r(reinterpret_cast<time_t*>(&tv.tv_sec), &ltm);
         char tmText[24];
+    // this snprintf call causes a compiler warning b/c buffer size is less
+    // then maximum string size.
+#pragma GCC diagnostic ignored "-Wformat-truncation="
         snprintf(tmText, sizeof(tmText), ".%04d%02d%02d%02d%02d%02d%06ld",
                  ltm.tm_year + 1900, ltm.tm_mon + 1,
                  ltm.tm_mday, ltm.tm_hour, ltm.tm_min,
                  ltm.tm_sec, tv.tv_usec);
+#pragma GCC diagnostic pop
         string dbgFileName(rlcFileName + tmText);
 
         ostringstream oss;
@@ -2106,10 +2110,14 @@ int ChunkManager::reallocateChunks(CompFileData* fileData)
             struct tm ltm;
             localtime_r(reinterpret_cast<time_t*>(&tv.tv_sec), &ltm);
             char tmText[24];
+    // this snprintf call causes a compiler warning b/c buffer size is less
+    // then maximum string size.
+#pragma GCC diagnostic ignored "-Wformat-truncation="
             snprintf(tmText, sizeof(tmText), ".%04d%02d%02d%02d%02d%02d%06ld",
                      ltm.tm_year + 1900, ltm.tm_mon + 1,
                      ltm.tm_mday, ltm.tm_hour, ltm.tm_min,
                      ltm.tm_sec, tv.tv_usec);
+#pragma GCC diagnostic pop
             string dbgFileName(rlcFileName + tmText);
 
             ostringstream oss;
diff --git a/writeengine/splitter/we_splitterapp.cpp b/writeengine/splitter/we_splitterapp.cpp
index dac0c7387..12e3f2389 100644
--- a/writeengine/splitter/we_splitterapp.cpp
+++ b/writeengine/splitter/we_splitterapp.cpp
@@ -604,7 +604,10 @@ void WESplitterApp::updateWithJobFile(int aIdx)
 int main(int argc, char** argv)
 {
     std::string err;
+#pragma GCC diagnostic ignored "-Wunused-result"
+    // Why do we need this if we don't care about f()'s rc ?
     setuid(0);		//@BUG 4343 set effective userid to root.
+#pragma GCC diagnostic pop
     std::cin.sync_with_stdio(false);
 
     try
diff --git a/writeengine/xml/we_xmlgenproc.cpp b/writeengine/xml/we_xmlgenproc.cpp
index d5a787769..5789dca15 100644
--- a/writeengine/xml/we_xmlgenproc.cpp
+++ b/writeengine/xml/we_xmlgenproc.cpp
@@ -38,9 +38,9 @@ namespace
 {
 const char*  DICT_TYPE("D");
 const char*  ENCODING("UTF-8");
-const char*  JOBNAME("Job_");
 const char*  LOGNAME("Jobxml_");
 const std::string LOGDIR("/log/");
+const char*  JOBNAME("Job_");
 }
 
 namespace WriteEngine
@@ -438,13 +438,11 @@ void XMLGenProc::getColumnsForTable(
         throw std::runtime_error( oss.str() );
     }
 }
-
+
 //------------------------------------------------------------------------------
 // Generate Job XML File Name
 //------------------------------------------------------------------------------
 
-// This isn't used currently, commenting it out
-#if 0
 std::string XMLGenProc::genJobXMLFileName( ) const
 {
     std::string xmlFileName;
@@ -471,7 +469,7 @@ std::string XMLGenProc::genJobXMLFileName( ) const
         char *buf;
         buf = getcwd(cwdPath, sizeof(cwdPath));
         if (buf == NULL)
-            throw runtime_error("Failed to get the current working directory!");
+            throw std::runtime_error("Failed to get the current working directory!");
         boost::filesystem::path p2(cwdPath);
         p2 /= p;
         xmlFileName = p2.string();
@@ -485,9 +483,7 @@ std::string XMLGenProc::genJobXMLFileName( ) const
 
     return xmlFileName;
 }
-#endif
 
-
 //------------------------------------------------------------------------------
 // writeXMLFile
 //------------------------------------------------------------------------------
diff --git a/writeengine/xml/we_xmlgenproc.h b/writeengine/xml/we_xmlgenproc.h
index adce2d75f..4b7ec4ed5 100644
--- a/writeengine/xml/we_xmlgenproc.h
+++ b/writeengine/xml/we_xmlgenproc.h
@@ -90,7 +90,7 @@ public:
 
     /** @brief Generate Job XML file name
      */
-    //EXPORT std::string genJobXMLFileName( ) const;
+    EXPORT std::string genJobXMLFileName( ) const;
 
     /** @brief Write xml file document to the destination Job XML file.
      *

From 4a7c46180808da827c8fc03899278a837aac059c Mon Sep 17 00:00:00 2001
From: Ben Thompson <ben.thompson@mariadb.com>
Date: Tue, 7 May 2019 14:08:14 -0500
Subject: [PATCH 27/33] Fix for newer version of CMake/CPack

---
 cmake/cpackEngineRPM.cmake | 229 +------------------------------------
 1 file changed, 3 insertions(+), 226 deletions(-)

diff --git a/cmake/cpackEngineRPM.cmake b/cmake/cpackEngineRPM.cmake
index 83a707dbd..35d09b73a 100644
--- a/cmake/cpackEngineRPM.cmake
+++ b/cmake/cpackEngineRPM.cmake
@@ -119,234 +119,11 @@ SET(ignored
 #%define _prefix ${CMAKE_INSTALL_PREFIX}
 #")
 
-SET(CPACK_RPM_platform_USER_FILELIST
-"/usr/local/mariadb/columnstore/bin/DDLProc"
-"/usr/local/mariadb/columnstore/bin/ExeMgr"
-"/usr/local/mariadb/columnstore/bin/ProcMgr"
-"/usr/local/mariadb/columnstore/bin/ProcMon"
-"/usr/local/mariadb/columnstore/bin/DMLProc"
-"/usr/local/mariadb/columnstore/bin/WriteEngineServer"
-"/usr/local/mariadb/columnstore/bin/cpimport"
-"/usr/local/mariadb/columnstore/bin/post-install"
-"/usr/local/mariadb/columnstore/bin/post-mysql-install"
-"/usr/local/mariadb/columnstore/bin/post-mysqld-install"
-"/usr/local/mariadb/columnstore/bin/pre-uninstall"
-"/usr/local/mariadb/columnstore/bin/PrimProc"
-"/usr/local/mariadb/columnstore/bin/run.sh"
-"/usr/local/mariadb/columnstore/bin/columnstore"
-"/usr/local/mariadb/columnstore/bin/columnstoreSyslog"
-"/usr/local/mariadb/columnstore/bin/columnstoreSyslog7"
-"/usr/local/mariadb/columnstore/bin/columnstoreSyslog-ng" 
-"/usr/local/mariadb/columnstore/bin/syslogSetup.sh"
-"/usr/local/mariadb/columnstore/bin/cplogger"
-"/usr/local/mariadb/columnstore/bin/columnstore.def"
-"/usr/local/mariadb/columnstore/bin/dbbuilder"
-"/usr/local/mariadb/columnstore/bin/cpimport.bin"
-"/usr/local/mariadb/columnstore/bin/load_brm"
-"/usr/local/mariadb/columnstore/bin/save_brm"
-"/usr/local/mariadb/columnstore/bin/dbrmctl"
-"/usr/local/mariadb/columnstore/bin/controllernode"
-"/usr/local/mariadb/columnstore/bin/reset_locks"
-"/usr/local/mariadb/columnstore/bin/workernode"
-"/usr/local/mariadb/columnstore/bin/colxml"
-"/usr/local/mariadb/columnstore/bin/clearShm"
-"/usr/local/mariadb/columnstore/bin/viewtablelock"
-"/usr/local/mariadb/columnstore/bin/cleartablelock"
-"/usr/local/mariadb/columnstore/bin/mcsadmin"
-"/usr/local/mariadb/columnstore/bin/remote_command.sh"
-"/usr/local/mariadb/columnstore/bin/postConfigure"
-"/usr/local/mariadb/columnstore/bin/columnstoreLogRotate"
-"/usr/local/mariadb/columnstore/bin/transactionLog"
-"/usr/local/mariadb/columnstore/bin/columnstoreDBWrite"
-"/usr/local/mariadb/columnstore/bin/transactionLogArchiver.sh"
-"/usr/local/mariadb/columnstore/bin/installer"
-"/usr/local/mariadb/columnstore/bin/module_installer.sh"
-"/usr/local/mariadb/columnstore/bin/package_installer.sh"
-"/usr/local/mariadb/columnstore/bin/startupTests.sh"
-"/usr/local/mariadb/columnstore/bin/os_check.sh"
-"/usr/local/mariadb/columnstore/bin/remote_scp_put.sh"
-"/usr/local/mariadb/columnstore/bin/remotessh.exp"
-"/usr/local/mariadb/columnstore/bin/ServerMonitor"
-"/usr/local/mariadb/columnstore/bin/master-rep-columnstore.sh" 
-"/usr/local/mariadb/columnstore/bin/slave-rep-columnstore.sh"
-"/usr/local/mariadb/columnstore/bin/rsync.sh"
-"/usr/local/mariadb/columnstore/bin/columnstoreSupport"
-"/usr/local/mariadb/columnstore/bin/hardwareReport.sh"
-"/usr/local/mariadb/columnstore/bin/softwareReport.sh"
-"/usr/local/mariadb/columnstore/bin/configReport.sh"
-"/usr/local/mariadb/columnstore/bin/logReport.sh"
-"/usr/local/mariadb/columnstore/bin/bulklogReport.sh"
-"/usr/local/mariadb/columnstore/bin/resourceReport.sh"
-"/usr/local/mariadb/columnstore/bin/hadoopReport.sh"
-"/usr/local/mariadb/columnstore/bin/alarmReport.sh"
-"/usr/local/mariadb/columnstore/bin/remote_command_verify.sh"
-"/usr/local/mariadb/columnstore/bin/disable-rep-columnstore.sh"
-"/usr/local/mariadb/columnstore/bin/columnstore.service"
-"/usr/local/mariadb/columnstore/etc/MessageFile.txt"
-"/usr/local/mariadb/columnstore/etc/ErrorMessage.txt"
-"/usr/local/mariadb/columnstore/local/module"
-"/usr/local/mariadb/columnstore/releasenum"
-"/usr/local/mariadb/columnstore/bin/rollback"
-"/usr/local/mariadb/columnstore/bin/editem"
-"/usr/local/mariadb/columnstore/bin/getConfig"
-"/usr/local/mariadb/columnstore/bin/setConfig"
-"/usr/local/mariadb/columnstore/bin/setenv-hdfs-12"
-"/usr/local/mariadb/columnstore/bin/setenv-hdfs-20"
-"/usr/local/mariadb/columnstore/bin/configxml.sh"
-"/usr/local/mariadb/columnstore/bin/remote_scp_get.sh"
-"/usr/local/mariadb/columnstore/bin/columnstoreAlias"
-"/usr/local/mariadb/columnstore/bin/autoConfigure"
-"/usr/local/mariadb/columnstore/bin/ddlcleanup"
-"/usr/local/mariadb/columnstore/bin/idbmeminfo"
-"/usr/local/mariadb/columnstore/bin/MCSInstanceCmds.sh"
-"/usr/local/mariadb/columnstore/bin/MCSVolumeCmds.sh"
-"/usr/local/mariadb/columnstore/bin/binary_installer.sh" 
-"/usr/local/mariadb/columnstore/bin/myCnf-include-args.text" 
-"/usr/local/mariadb/columnstore/bin/myCnf-exclude-args.text"
-"/usr/local/mariadb/columnstore/bin/mycnfUpgrade"
-"/usr/local/mariadb/columnstore/bin/getMySQLpw"
-"/usr/local/mariadb/columnstore/bin/columnstore.conf"
-"/usr/local/mariadb/columnstore/post/functions"
-"/usr/local/mariadb/columnstore/post/test-001.sh"
-"/usr/local/mariadb/columnstore/post/test-002.sh"
-"/usr/local/mariadb/columnstore/post/test-003.sh"
-"/usr/local/mariadb/columnstore/post/test-004.sh"
-"/usr/local/mariadb/columnstore/bin/os_detect.sh"
-"/usr/local/mariadb/columnstore/bin/columnstoreClusterTester.sh"
-"/usr/local/mariadb/columnstore/bin/mariadb-command-line.sh"
-"/usr/local/mariadb/columnstore/bin/quick_installer_single_server.sh"
-"/usr/local/mariadb/columnstore/bin/quick_installer_multi_server.sh"
-"/usr/local/mariadb/columnstore/bin/quick_installer_amazon.sh"
-${ignored})
+SET(CPACK_RPM_platform_USER_FILELIST ${ignored})
 
-SET(CPACK_RPM_libs_USER_FILELIST 
-"/usr/local/mariadb/columnstore/lib/libconfigcpp.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libconfigcpp.so.1"
-"/usr/local/mariadb/columnstore/lib/libconfigcpp.so"
-"/usr/local/mariadb/columnstore/lib/libddlpackageproc.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libddlpackageproc.so.1"
-"/usr/local/mariadb/columnstore/lib/libddlpackageproc.so"
-"/usr/local/mariadb/columnstore/lib/libddlpackage.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libddlpackage.so.1"
-"/usr/local/mariadb/columnstore/lib/libddlpackage.so"
-"/usr/local/mariadb/columnstore/lib/libdmlpackageproc.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libdmlpackageproc.so.1"
-"/usr/local/mariadb/columnstore/lib/libdmlpackageproc.so"
-"/usr/local/mariadb/columnstore/lib/libdmlpackage.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libdmlpackage.so.1"
-"/usr/local/mariadb/columnstore/lib/libdmlpackage.so"
-"/usr/local/mariadb/columnstore/lib/libexecplan.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libexecplan.so.1"
-"/usr/local/mariadb/columnstore/lib/libexecplan.so"
-"/usr/local/mariadb/columnstore/lib/libfuncexp.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libfuncexp.so.1"
-"/usr/local/mariadb/columnstore/lib/libfuncexp.so"
-"/usr/local/mariadb/columnstore/lib/libudfsdk.so.1.1.0"
-"/usr/local/mariadb/columnstore/lib/libudfsdk.so.1"
-"/usr/local/mariadb/columnstore/lib/libudfsdk.so"
-"/usr/local/mariadb/columnstore/lib/libjoblist.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libjoblist.so.1"
-"/usr/local/mariadb/columnstore/lib/libjoblist.so"
-"/usr/local/mariadb/columnstore/lib/libjoiner.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libjoiner.so.1"
-"/usr/local/mariadb/columnstore/lib/libjoiner.so"
-"/usr/local/mariadb/columnstore/lib/libloggingcpp.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libloggingcpp.so.1"
-"/usr/local/mariadb/columnstore/lib/libloggingcpp.so"
-"/usr/local/mariadb/columnstore/lib/libmessageqcpp.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libmessageqcpp.so.1"
-"/usr/local/mariadb/columnstore/lib/libmessageqcpp.so"
-"/usr/local/mariadb/columnstore/lib/liboamcpp.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/liboamcpp.so.1"
-"/usr/local/mariadb/columnstore/lib/liboamcpp.so"
-"/usr/local/mariadb/columnstore/lib/libalarmmanager.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libalarmmanager.so.1"
-"/usr/local/mariadb/columnstore/lib/libalarmmanager.so"
-"/usr/local/mariadb/columnstore/lib/libthreadpool.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libthreadpool.so.1"
-"/usr/local/mariadb/columnstore/lib/libthreadpool.so"
-"/usr/local/mariadb/columnstore/lib/libwindowfunction.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libwindowfunction.so.1"
-"/usr/local/mariadb/columnstore/lib/libwindowfunction.so"
-"/usr/local/mariadb/columnstore/lib/libwriteengine.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libwriteengine.so.1"
-"/usr/local/mariadb/columnstore/lib/libwriteengine.so"
-"/usr/local/mariadb/columnstore/lib/libwriteengineclient.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libwriteengineclient.so.1"
-"/usr/local/mariadb/columnstore/lib/libwriteengineclient.so"
-"/usr/local/mariadb/columnstore/lib/libbrm.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libbrm.so.1"
-"/usr/local/mariadb/columnstore/lib/libbrm.so"
-"/usr/local/mariadb/columnstore/lib/librwlock.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/librwlock.so.1"
-"/usr/local/mariadb/columnstore/lib/librwlock.so"
-"/usr/local/mariadb/columnstore/lib/libdataconvert.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libdataconvert.so.1"
-"/usr/local/mariadb/columnstore/lib/libdataconvert.so"
-"/usr/local/mariadb/columnstore/lib/librowgroup.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/librowgroup.so.1"
-"/usr/local/mariadb/columnstore/lib/librowgroup.so"
-"/usr/local/mariadb/columnstore/lib/libcacheutils.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libcacheutils.so.1"
-"/usr/local/mariadb/columnstore/lib/libcacheutils.so"
-"/usr/local/mariadb/columnstore/lib/libcommon.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libcommon.so.1"
-"/usr/local/mariadb/columnstore/lib/libcommon.so"
-"/usr/local/mariadb/columnstore/lib/libcompress.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libcompress.so.1"
-"/usr/local/mariadb/columnstore/lib/libcompress.so"
-"/usr/local/mariadb/columnstore/lib/libddlcleanuputil.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libddlcleanuputil.so.1"
-"/usr/local/mariadb/columnstore/lib/libddlcleanuputil.so"
-"/usr/local/mariadb/columnstore/lib/libbatchloader.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libbatchloader.so.1"
-"/usr/local/mariadb/columnstore/lib/libbatchloader.so"
-"/usr/local/mariadb/columnstore/lib/libquerystats.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libquerystats.so.1"
-"/usr/local/mariadb/columnstore/lib/libquerystats.so"
-"/usr/local/mariadb/columnstore/lib/libwriteengineredistribute.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libwriteengineredistribute.so.1"
-"/usr/local/mariadb/columnstore/lib/libwriteengineredistribute.so"
-"/usr/local/mariadb/columnstore/lib/libidbdatafile.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libidbdatafile.so.1"
-"/usr/local/mariadb/columnstore/lib/libidbdatafile.so"
-"/usr/local/mariadb/columnstore/lib/libthrift.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libthrift.so.1"
-"/usr/local/mariadb/columnstore/lib/libthrift.so"
-"/usr/local/mariadb/columnstore/lib/libquerytele.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libquerytele.so.1"
-"/usr/local/mariadb/columnstore/lib/libquerytele.so"
-${ignored})
-
-SET(CPACK_RPM_storage-engine_USER_FILELIST
-"/usr/local/mariadb/columnstore/lib/libcalmysql.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libcalmysql.so.1"
-"/usr/local/mariadb/columnstore/lib/libcalmysql.so"
-"/usr/local/mariadb/columnstore/lib/libudf_mysql.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libudf_mysql.so.1"
-"/usr/local/mariadb/columnstore/lib/libudf_mysql.so"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_columns.so"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_columns.so.1"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_columns.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_extents.so"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_extents.so.1"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_extents.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_tables.so"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_tables.so.1"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_tables.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_files.so"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_files.so.1"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_files.so.1.0.0"
-"/usr/local/mariadb/columnstore/mysql/mysql-Columnstore"
-"/usr/local/mariadb/columnstore/mysql/install_calpont_mysql.sh"
-"/usr/local/mariadb/columnstore/mysql/syscatalog_mysql.sql"
-"/usr/local/mariadb/columnstore/mysql/dumpcat_mysql.sql"
-"/usr/local/mariadb/columnstore/mysql/calsetuserpriority.sql"
-"/usr/local/mariadb/columnstore/mysql/calremoveuserpriority.sql"
-"/usr/local/mariadb/columnstore/mysql/calshowprocesslist.sql"
-"/usr/local/mariadb/columnstore/mysql/columnstore_info.sql"
-${ignored})
+SET(CPACK_RPM_libs_USER_FILELIST ${ignored})
 
+SET(CPACK_RPM_storage-engine_USER_FILELIST ${ignored})
 
 INCLUDE (CPack)
 

From b2436502cbfd683990966e9c312894ac8ab39d25 Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <roman.nozdrin@mariadb.com>
Date: Wed, 8 May 2019 11:41:26 +0300
Subject: [PATCH 28/33] MCOL-537 Enabled -Wno-unused-result for OAM code.

    Fixed pragmas that disables compilation checks.

    DDLProc now returns an error if it couldn't cwd.

    Use either auto_ptr or unique_ptr depending on GCC version.
---
 ddlproc/ddlproc.cpp                       | 10 +++++++++-
 oam/oamcpp/CMakeLists.txt                 |  2 ++
 oamapps/alarmmanager/alarmmanager.cpp     |  4 ++--
 oamapps/columnstoreSupport/CMakeLists.txt |  2 ++
 oamapps/mcsadmin/CMakeLists.txt           |  2 ++
 oamapps/postConfigure/CMakeLists.txt      |  6 ++++++
 oamapps/serverMonitor/CMakeLists.txt      |  2 ++
 procmgr/CMakeLists.txt                    |  2 ++
 procmon/CMakeLists.txt                    |  2 ++
 tools/configMgt/CMakeLists.txt            | 14 ++------------
 tools/dbloadxml/colxml.cpp                | 13 +++++--------
 utils/dataconvert/dataconvert.cpp         | 21 +++++++++++++++------
 utils/dataconvert/dataconvert.h           |  3 +++
 utils/messageqcpp/inetstreamsocket.cpp    | 12 ++++++++----
 utils/threadpool/threadpool.h             |  4 ++++
 writeengine/bulk/cpimport.cpp             |  8 +++++---
 writeengine/shared/we_chunkmanager.cpp    |  7 +++++++
 writeengine/splitter/we_splitterapp.cpp   | 10 +++++++---
 18 files changed, 85 insertions(+), 39 deletions(-)

diff --git a/ddlproc/ddlproc.cpp b/ddlproc/ddlproc.cpp
index bb3020deb..5cc663fc2 100644
--- a/ddlproc/ddlproc.cpp
+++ b/ddlproc/ddlproc.cpp
@@ -106,9 +106,17 @@ int main(int argc, char* argv[])
 
     if ( setupCwd() < 0 )
     {
-        std::cerr << "Could not set working directory" << std::endl;
+        LoggingID logid(23, 0, 0);
+        logging::Message::Args args1;
+        logging::Message msg(9);
+        args1.add("DDLProc could not set working directory ");
+        msg.format( args1 );
+        logging::Logger logger(logid.fSubsysID);
+        logger.logMessage(LOG_TYPE_CRITICAL, msg, logid);
+        return 1;
     }
 
+
     WriteEngine::WriteEngineWrapper::init( WriteEngine::SUBSYSTEM_ID_DDLPROC );
 #ifdef _MSC_VER
     // In windows, initializing the wrapper (A dll) does not set the static variables
diff --git a/oam/oamcpp/CMakeLists.txt b/oam/oamcpp/CMakeLists.txt
index 10f98a7cc..72d6cdae2 100644
--- a/oam/oamcpp/CMakeLists.txt
+++ b/oam/oamcpp/CMakeLists.txt
@@ -10,6 +10,8 @@ add_library(oamcpp SHARED ${oamcpp_LIB_SRCS})
 
 target_link_libraries(oamcpp )
 
+target_compile_options(oamcpp PRIVATE -Wno-unused-result)
+
 set_target_properties(oamcpp PROPERTIES VERSION 1.0.0 SOVERSION 1)
 
 install(TARGETS oamcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
diff --git a/oamapps/alarmmanager/alarmmanager.cpp b/oamapps/alarmmanager/alarmmanager.cpp
index 2d057944c..f07130c7b 100644
--- a/oamapps/alarmmanager/alarmmanager.cpp
+++ b/oamapps/alarmmanager/alarmmanager.cpp
@@ -486,8 +486,8 @@ void ALARMManager::sendAlarmReport (const char* componentID, int alarmID, int st
 
 ByteStream msg1;
 
-// setup message
-msg1 << (ByteStream::byte) alarmID;
+    // setup message
+    msg1 << (ByteStream::byte) alarmID;
     msg1 << (std::string) componentID;
     msg1 << (ByteStream::byte) state;
     msg1 << (std::string) ModuleName;
diff --git a/oamapps/columnstoreSupport/CMakeLists.txt b/oamapps/columnstoreSupport/CMakeLists.txt
index 6b612c8d3..9274b936c 100644
--- a/oamapps/columnstoreSupport/CMakeLists.txt
+++ b/oamapps/columnstoreSupport/CMakeLists.txt
@@ -8,6 +8,8 @@ set(columnstoreSupport_SRCS columnstoreSupport.cpp)
 
 add_executable(columnstoreSupport ${columnstoreSupport_SRCS})
 
+target_compile_options(columnstoreSupport PRIVATE -Wno-unused-result)
+
 target_link_libraries(columnstoreSupport ${ENGINE_LDFLAGS} readline ncurses  ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
 
 install(TARGETS columnstoreSupport DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
diff --git a/oamapps/mcsadmin/CMakeLists.txt b/oamapps/mcsadmin/CMakeLists.txt
index 8181c2aec..1052d77f8 100644
--- a/oamapps/mcsadmin/CMakeLists.txt
+++ b/oamapps/mcsadmin/CMakeLists.txt
@@ -8,6 +8,8 @@ set(mcsadmin_SRCS mcsadmin.cpp)
 
 add_executable(mcsadmin ${mcsadmin_SRCS})
 
+target_compile_options(mcsadmin PRIVATE -Wno-unused-result)
+
 target_link_libraries(mcsadmin ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS} ${ENGINE_WRITE_LIBS})
 
 install(TARGETS mcsadmin DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
diff --git a/oamapps/postConfigure/CMakeLists.txt b/oamapps/postConfigure/CMakeLists.txt
index 4bdbadd1a..fc6ded9b3 100644
--- a/oamapps/postConfigure/CMakeLists.txt
+++ b/oamapps/postConfigure/CMakeLists.txt
@@ -8,6 +8,8 @@ set(postConfigure_SRCS postConfigure.cpp helpers.cpp)
 
 add_executable(postConfigure ${postConfigure_SRCS})
 
+target_compile_options(postConfigure PRIVATE -Wno-unused-result)
+
 target_link_libraries(postConfigure ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
 
 install(TARGETS postConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
@@ -19,6 +21,8 @@ set(installer_SRCS installer.cpp helpers.cpp)
 
 add_executable(installer ${installer_SRCS})
 
+target_compile_options(installer PRIVATE -Wno-unused-result)
+
 target_link_libraries(installer ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
 
 install(TARGETS installer DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
@@ -52,6 +56,8 @@ set(mycnfUpgrade_SRCS mycnfUpgrade.cpp)
 
 add_executable(mycnfUpgrade ${mycnfUpgrade_SRCS})
 
+target_compile_options(mycnfUpgrade PRIVATE -Wno-unused-result)
+
 target_link_libraries(mycnfUpgrade ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
 
 install(TARGETS mycnfUpgrade DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
diff --git a/oamapps/serverMonitor/CMakeLists.txt b/oamapps/serverMonitor/CMakeLists.txt
index 91d13bbd0..59fbad662 100644
--- a/oamapps/serverMonitor/CMakeLists.txt
+++ b/oamapps/serverMonitor/CMakeLists.txt
@@ -18,6 +18,8 @@ set(ServerMonitor_SRCS
 
 add_executable(ServerMonitor ${ServerMonitor_SRCS})
 
+target_compile_options(ServerMonitor PRIVATE -Wno-unused-result)
+
 target_link_libraries(ServerMonitor ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
 
 install(TARGETS ServerMonitor DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
diff --git a/procmgr/CMakeLists.txt b/procmgr/CMakeLists.txt
index 642890e13..99320901d 100644
--- a/procmgr/CMakeLists.txt
+++ b/procmgr/CMakeLists.txt
@@ -8,6 +8,8 @@ set(ProcMgr_SRCS main.cpp processmanager.cpp ../utils/common/crashtrace.cpp)
 
 add_executable(ProcMgr ${ProcMgr_SRCS})
 
+target_compile_options(ProcMgr PRIVATE -Wno-unused-result)
+
 target_link_libraries(ProcMgr ${ENGINE_LDFLAGS} cacheutils ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
 
 install(TARGETS ProcMgr DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
diff --git a/procmon/CMakeLists.txt b/procmon/CMakeLists.txt
index 8bfff3c5a..bd6efcceb 100644
--- a/procmon/CMakeLists.txt
+++ b/procmon/CMakeLists.txt
@@ -8,6 +8,8 @@ set(ProcMon_SRCS main.cpp processmonitor.cpp ../utils/common/crashtrace.cpp)
 
 add_executable(ProcMon ${ProcMon_SRCS})
 
+target_compile_options(ProcMon PRIVATE -Wno-unused-result)
+
 target_link_libraries(ProcMon ${ENGINE_LDFLAGS} cacheutils ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
 
 install(TARGETS ProcMon DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
diff --git a/tools/configMgt/CMakeLists.txt b/tools/configMgt/CMakeLists.txt
index 0a2f88808..88a9667bc 100644
--- a/tools/configMgt/CMakeLists.txt
+++ b/tools/configMgt/CMakeLists.txt
@@ -8,6 +8,8 @@ set(autoInstaller_SRCS autoInstaller.cpp)
 
 add_executable(autoInstaller ${autoInstaller_SRCS})
 
+target_compile_options(autoInstaller PRIVATE -Wno-unused-result)
+
 target_link_libraries(autoInstaller ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS} readline ncurses)
 
 install(TARGETS autoInstaller DESTINATION ${ENGINE_BINDIR})
@@ -22,15 +24,3 @@ add_executable(autoConfigure ${autoConfigure_SRCS})
 target_link_libraries(autoConfigure ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
 
 install(TARGETS autoConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
-
-
-########### next target ###############
-
-set(svnQuery_SRCS svnQuery.cpp)
-
-add_executable(svnQuery ${svnQuery_SRCS})
-
-target_link_libraries(svnQuery ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
-
-install(TARGETS svnQuery DESTINATION ${ENGINE_BINDIR})
-
diff --git a/tools/dbloadxml/colxml.cpp b/tools/dbloadxml/colxml.cpp
index 9c28b232d..2e2d192c9 100644
--- a/tools/dbloadxml/colxml.cpp
+++ b/tools/dbloadxml/colxml.cpp
@@ -43,14 +43,11 @@ using namespace bulkloadxml;
 int main(int argc, char** argv)
 {
     const int DEBUG_LVL_TO_DUMP_SYSCAT_RPT = 4;
-#ifdef _MSC_VER
-    //FIXME
-#else
-#pragma GCC diagnostic ignored "-Wunused-result"
-    setuid( 0 ); // set effective ID to root; ignore return status
-    // Why should we raise privileges if we don't care?
-#pragma GCC diagnostic pop
-#endif
+    // set effective ID to root
+    if( setuid( 0 ) < 0 )
+    {
+        std::cerr << " colxml: setuid failed " << std::endl;
+    }
     setlocale(LC_ALL, "");
     WriteEngine::Config::initConfigCache(); // load Columnstore.xml config settings
 
diff --git a/utils/dataconvert/dataconvert.cpp b/utils/dataconvert/dataconvert.cpp
index a2e3aaa47..311d82e08 100644
--- a/utils/dataconvert/dataconvert.cpp
+++ b/utils/dataconvert/dataconvert.cpp
@@ -2429,9 +2429,12 @@ int64_t DataConvert::intToDate(int64_t data)
 
     // this snprintf call causes a compiler warning b/c we're potentially copying a 20-digit #
     // into 15 bytes, however, that appears to be intentional.
-    #pragma GCC diagnostic ignored "-Wformat-truncation="
+#if defined(__GNUC__) && __GNUC__ >= 5
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-truncation="
     snprintf( buf, 15, "%llu", (long long unsigned int)data);
-    #pragma GCC diagnostic pop
+#pragma GCC diagnostic pop
+#endif
 
     string year, month, day, hour, min, sec, msec;
     int64_t y = 0, m = 0, d = 0, h = 0, minute = 0, s = 0, ms = 0;
@@ -2560,9 +2563,12 @@ int64_t DataConvert::intToDatetime(int64_t data, bool* date)
 
     // this snprintf call causes a compiler warning b/c we're potentially copying a 20-digit #
     // into 15 bytes, however, that appears to be intentional.
-    #pragma GCC diagnostic ignored "-Wformat-truncation="
+#if defined(__GNUC__) && __GNUC__ >= 5
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-truncation="
     snprintf( buf, 15, "%llu", (long long unsigned int)data);
-    #pragma GCC diagnostic pop
+#pragma GCC diagnostic pop
+#endif
 
     //string date = buf;
     string year, month, day, hour, min, sec, msec;
@@ -2693,9 +2699,12 @@ int64_t DataConvert::intToTime(int64_t data, bool fromString)
 
     // this snprintf call causes a compiler warning b/c we're potentially copying a 20-digit #
     // into 15 bytes, however, that appears to be intentional.
-    #pragma GCC diagnostic ignored "-Wformat-truncation="
+#if defined(__GNUC__) && __GNUC__ >= 5
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-truncation="
     snprintf( buf, 15, "%llu", (long long unsigned int)data);
-    #pragma GCC diagnostic pop
+#pragma GCC diagnostic pop
+#endif
 
     //string date = buf;
     string hour, min, sec, msec;
diff --git a/utils/dataconvert/dataconvert.h b/utils/dataconvert/dataconvert.h
index 2e0d225fe..b81634639 100644
--- a/utils/dataconvert/dataconvert.h
+++ b/utils/dataconvert/dataconvert.h
@@ -675,6 +675,8 @@ inline void DataConvert::timeToString1( long long timevalue, char* buf, unsigned
     }
     // this snprintf call causes a compiler warning b/c buffer size is less
     // then maximum string size.
+#if defined(__GNUC__) && __GNUC__ >= 5
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-truncation="
     snprintf( buf, buflen, "%02d%02d%02d",
               hour,
@@ -682,6 +684,7 @@ inline void DataConvert::timeToString1( long long timevalue, char* buf, unsigned
               (unsigned)((timevalue >> 14) & 0xff)
             );
 #pragma GCC diagnostic pop
+#endif
 }
 
 inline std::string DataConvert::decimalToString(int64_t value, uint8_t scale, execplan::CalpontSystemCatalog::ColDataType colDataType)
diff --git a/utils/messageqcpp/inetstreamsocket.cpp b/utils/messageqcpp/inetstreamsocket.cpp
index 8b4aa4b1e..1e09c38cf 100644
--- a/utils/messageqcpp/inetstreamsocket.cpp
+++ b/utils/messageqcpp/inetstreamsocket.cpp
@@ -945,7 +945,6 @@ void InetStreamSocket::connect(const sockaddr* serv_addr)
     /* read a byte to artificially synchronize with accept() on the remote */
     int ret = -1;
     int e = EBADF;
-    char buf = '\0';
     struct pollfd pfd;
 
     long msecs = fConnectionTimeout.tv_sec * 1000 + fConnectionTimeout.tv_nsec / 1000000;
@@ -964,11 +963,16 @@ void InetStreamSocket::connect(const sockaddr* serv_addr)
     if (ret == 1)
     {
 #ifdef _MSC_VER
+        char buf = '\0';
         (void)::recv(socketParms().sd(), &buf, 1, 0);
 #else
-        #pragma GCC diagnostic ignored "-Wunused-result"
-        ::read(socketParms().sd(), &buf, 1);   // we know 1 byte is in the recv buffer
-        #pragma GCC diagnostic pop
+#if defined(__GNUC__) && __GNUC__ >= 5
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-result"
+        char buf = '\0';
+        ssize_t bytes = ::read(socketParms().sd(), &buf, 1);   // we know 1 byte is in the recv buffer
+#pragma GCC diagnostic pop
+#endif // pragma
 #endif
         return;
     }
diff --git a/utils/threadpool/threadpool.h b/utils/threadpool/threadpool.h
index e7ee9de82..fa6921900 100644
--- a/utils/threadpool/threadpool.h
+++ b/utils/threadpool/threadpool.h
@@ -77,7 +77,11 @@ public:
     boost::thread* create_thread(F threadfunc)
     {
         boost::lock_guard<boost::shared_mutex> guard(m);
+#if defined(__GNUC__) && __GNUC__ >= 5
         std::unique_ptr<boost::thread> new_thread(new boost::thread(threadfunc));
+#else
+        std::auto_ptr<boost::thread> new_thread(new boost::thread(threadfunc));
+#endif
         threads.push_back(new_thread.get());
         return new_thread.release();
     }
diff --git a/writeengine/bulk/cpimport.cpp b/writeengine/bulk/cpimport.cpp
index c23b3170d..54b688d0b 100644
--- a/writeengine/bulk/cpimport.cpp
+++ b/writeengine/bulk/cpimport.cpp
@@ -1022,9 +1022,11 @@ int main(int argc, char** argv)
 #ifdef _MSC_VER
     _setmaxstdio(2048);
 #else
-#pragma GCC diagnostic ignored "-Wunused-result"
-    setuid( 0 ); // set effective ID to root; ignore return status
-#pragma GCC diagnostic pop
+    // set effective ID to root
+    if( setuid( 0 ) < 0 )
+    {
+        std::cerr << " cpimport: setuid failed " << std::endl;
+    } 
 #endif
     setupSignalHandlers();
 
diff --git a/writeengine/shared/we_chunkmanager.cpp b/writeengine/shared/we_chunkmanager.cpp
index f701f94ee..e6fa43db1 100644
--- a/writeengine/shared/we_chunkmanager.cpp
+++ b/writeengine/shared/we_chunkmanager.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2019 MariaDB Corporation.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -1925,12 +1926,15 @@ int ChunkManager::reallocateChunks(CompFileData* fileData)
         char tmText[24];
     // this snprintf call causes a compiler warning b/c buffer size is less
     // then maximum string size.
+#if defined(__GNUC__) && __GNUC__ >= 5
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-truncation="
         snprintf(tmText, sizeof(tmText), ".%04d%02d%02d%02d%02d%02d%06ld",
                  ltm.tm_year + 1900, ltm.tm_mon + 1,
                  ltm.tm_mday, ltm.tm_hour, ltm.tm_min,
                  ltm.tm_sec, tv.tv_usec);
 #pragma GCC diagnostic pop
+#endif
         string dbgFileName(rlcFileName + tmText);
 
         ostringstream oss;
@@ -2112,12 +2116,15 @@ int ChunkManager::reallocateChunks(CompFileData* fileData)
             char tmText[24];
     // this snprintf call causes a compiler warning b/c buffer size is less
     // then maximum string size.
+#if defined(__GNUC__) && __GNUC__ >= 5
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-truncation="
             snprintf(tmText, sizeof(tmText), ".%04d%02d%02d%02d%02d%02d%06ld",
                      ltm.tm_year + 1900, ltm.tm_mon + 1,
                      ltm.tm_mday, ltm.tm_hour, ltm.tm_min,
                      ltm.tm_sec, tv.tv_usec);
 #pragma GCC diagnostic pop
+#endif
             string dbgFileName(rlcFileName + tmText);
 
             ostringstream oss;
diff --git a/writeengine/splitter/we_splitterapp.cpp b/writeengine/splitter/we_splitterapp.cpp
index 12e3f2389..af4f6b294 100644
--- a/writeengine/splitter/we_splitterapp.cpp
+++ b/writeengine/splitter/we_splitterapp.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2019 MariaDB Corporation.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -604,10 +605,13 @@ void WESplitterApp::updateWithJobFile(int aIdx)
 int main(int argc, char** argv)
 {
     std::string err;
-#pragma GCC diagnostic ignored "-Wunused-result"
     // Why do we need this if we don't care about f()'s rc ?
-    setuid(0);		//@BUG 4343 set effective userid to root.
-#pragma GCC diagnostic pop
+    // @BUG4343
+    if( setuid( 0 ) < 0 )
+    {
+        std::cerr << " we_splitterapp: setuid failed " << std::endl;
+    }
+
     std::cin.sync_with_stdio(false);
 
     try

From 99d172372d0e7d205fe2afb4748f0adbbde6a6f1 Mon Sep 17 00:00:00 2001
From: Ben Thompson <ben.thompson@mariadb.com>
Date: Wed, 8 May 2019 12:01:30 -0500
Subject: [PATCH 29/33] Fix for newer version of CMake/CPack

---
 cpackEngineRPM.cmake | 228 +------------------------------------------
 1 file changed, 3 insertions(+), 225 deletions(-)

diff --git a/cpackEngineRPM.cmake b/cpackEngineRPM.cmake
index 83a707dbd..2ae976911 100644
--- a/cpackEngineRPM.cmake
+++ b/cpackEngineRPM.cmake
@@ -119,233 +119,11 @@ SET(ignored
 #%define _prefix ${CMAKE_INSTALL_PREFIX}
 #")
 
-SET(CPACK_RPM_platform_USER_FILELIST
-"/usr/local/mariadb/columnstore/bin/DDLProc"
-"/usr/local/mariadb/columnstore/bin/ExeMgr"
-"/usr/local/mariadb/columnstore/bin/ProcMgr"
-"/usr/local/mariadb/columnstore/bin/ProcMon"
-"/usr/local/mariadb/columnstore/bin/DMLProc"
-"/usr/local/mariadb/columnstore/bin/WriteEngineServer"
-"/usr/local/mariadb/columnstore/bin/cpimport"
-"/usr/local/mariadb/columnstore/bin/post-install"
-"/usr/local/mariadb/columnstore/bin/post-mysql-install"
-"/usr/local/mariadb/columnstore/bin/post-mysqld-install"
-"/usr/local/mariadb/columnstore/bin/pre-uninstall"
-"/usr/local/mariadb/columnstore/bin/PrimProc"
-"/usr/local/mariadb/columnstore/bin/run.sh"
-"/usr/local/mariadb/columnstore/bin/columnstore"
-"/usr/local/mariadb/columnstore/bin/columnstoreSyslog"
-"/usr/local/mariadb/columnstore/bin/columnstoreSyslog7"
-"/usr/local/mariadb/columnstore/bin/columnstoreSyslog-ng" 
-"/usr/local/mariadb/columnstore/bin/syslogSetup.sh"
-"/usr/local/mariadb/columnstore/bin/cplogger"
-"/usr/local/mariadb/columnstore/bin/columnstore.def"
-"/usr/local/mariadb/columnstore/bin/dbbuilder"
-"/usr/local/mariadb/columnstore/bin/cpimport.bin"
-"/usr/local/mariadb/columnstore/bin/load_brm"
-"/usr/local/mariadb/columnstore/bin/save_brm"
-"/usr/local/mariadb/columnstore/bin/dbrmctl"
-"/usr/local/mariadb/columnstore/bin/controllernode"
-"/usr/local/mariadb/columnstore/bin/reset_locks"
-"/usr/local/mariadb/columnstore/bin/workernode"
-"/usr/local/mariadb/columnstore/bin/colxml"
-"/usr/local/mariadb/columnstore/bin/clearShm"
-"/usr/local/mariadb/columnstore/bin/viewtablelock"
-"/usr/local/mariadb/columnstore/bin/cleartablelock"
-"/usr/local/mariadb/columnstore/bin/mcsadmin"
-"/usr/local/mariadb/columnstore/bin/remote_command.sh"
-"/usr/local/mariadb/columnstore/bin/postConfigure"
-"/usr/local/mariadb/columnstore/bin/columnstoreLogRotate"
-"/usr/local/mariadb/columnstore/bin/transactionLog"
-"/usr/local/mariadb/columnstore/bin/columnstoreDBWrite"
-"/usr/local/mariadb/columnstore/bin/transactionLogArchiver.sh"
-"/usr/local/mariadb/columnstore/bin/installer"
-"/usr/local/mariadb/columnstore/bin/module_installer.sh"
-"/usr/local/mariadb/columnstore/bin/package_installer.sh"
-"/usr/local/mariadb/columnstore/bin/startupTests.sh"
-"/usr/local/mariadb/columnstore/bin/os_check.sh"
-"/usr/local/mariadb/columnstore/bin/remote_scp_put.sh"
-"/usr/local/mariadb/columnstore/bin/remotessh.exp"
-"/usr/local/mariadb/columnstore/bin/ServerMonitor"
-"/usr/local/mariadb/columnstore/bin/master-rep-columnstore.sh" 
-"/usr/local/mariadb/columnstore/bin/slave-rep-columnstore.sh"
-"/usr/local/mariadb/columnstore/bin/rsync.sh"
-"/usr/local/mariadb/columnstore/bin/columnstoreSupport"
-"/usr/local/mariadb/columnstore/bin/hardwareReport.sh"
-"/usr/local/mariadb/columnstore/bin/softwareReport.sh"
-"/usr/local/mariadb/columnstore/bin/configReport.sh"
-"/usr/local/mariadb/columnstore/bin/logReport.sh"
-"/usr/local/mariadb/columnstore/bin/bulklogReport.sh"
-"/usr/local/mariadb/columnstore/bin/resourceReport.sh"
-"/usr/local/mariadb/columnstore/bin/hadoopReport.sh"
-"/usr/local/mariadb/columnstore/bin/alarmReport.sh"
-"/usr/local/mariadb/columnstore/bin/remote_command_verify.sh"
-"/usr/local/mariadb/columnstore/bin/disable-rep-columnstore.sh"
-"/usr/local/mariadb/columnstore/bin/columnstore.service"
-"/usr/local/mariadb/columnstore/etc/MessageFile.txt"
-"/usr/local/mariadb/columnstore/etc/ErrorMessage.txt"
-"/usr/local/mariadb/columnstore/local/module"
-"/usr/local/mariadb/columnstore/releasenum"
-"/usr/local/mariadb/columnstore/bin/rollback"
-"/usr/local/mariadb/columnstore/bin/editem"
-"/usr/local/mariadb/columnstore/bin/getConfig"
-"/usr/local/mariadb/columnstore/bin/setConfig"
-"/usr/local/mariadb/columnstore/bin/setenv-hdfs-12"
-"/usr/local/mariadb/columnstore/bin/setenv-hdfs-20"
-"/usr/local/mariadb/columnstore/bin/configxml.sh"
-"/usr/local/mariadb/columnstore/bin/remote_scp_get.sh"
-"/usr/local/mariadb/columnstore/bin/columnstoreAlias"
-"/usr/local/mariadb/columnstore/bin/autoConfigure"
-"/usr/local/mariadb/columnstore/bin/ddlcleanup"
-"/usr/local/mariadb/columnstore/bin/idbmeminfo"
-"/usr/local/mariadb/columnstore/bin/MCSInstanceCmds.sh"
-"/usr/local/mariadb/columnstore/bin/MCSVolumeCmds.sh"
-"/usr/local/mariadb/columnstore/bin/binary_installer.sh" 
-"/usr/local/mariadb/columnstore/bin/myCnf-include-args.text" 
-"/usr/local/mariadb/columnstore/bin/myCnf-exclude-args.text"
-"/usr/local/mariadb/columnstore/bin/mycnfUpgrade"
-"/usr/local/mariadb/columnstore/bin/getMySQLpw"
-"/usr/local/mariadb/columnstore/bin/columnstore.conf"
-"/usr/local/mariadb/columnstore/post/functions"
-"/usr/local/mariadb/columnstore/post/test-001.sh"
-"/usr/local/mariadb/columnstore/post/test-002.sh"
-"/usr/local/mariadb/columnstore/post/test-003.sh"
-"/usr/local/mariadb/columnstore/post/test-004.sh"
-"/usr/local/mariadb/columnstore/bin/os_detect.sh"
-"/usr/local/mariadb/columnstore/bin/columnstoreClusterTester.sh"
-"/usr/local/mariadb/columnstore/bin/mariadb-command-line.sh"
-"/usr/local/mariadb/columnstore/bin/quick_installer_single_server.sh"
-"/usr/local/mariadb/columnstore/bin/quick_installer_multi_server.sh"
-"/usr/local/mariadb/columnstore/bin/quick_installer_amazon.sh"
-${ignored})
+SET(CPACK_RPM_platform_USER_FILELIST ${ignored})
 
-SET(CPACK_RPM_libs_USER_FILELIST 
-"/usr/local/mariadb/columnstore/lib/libconfigcpp.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libconfigcpp.so.1"
-"/usr/local/mariadb/columnstore/lib/libconfigcpp.so"
-"/usr/local/mariadb/columnstore/lib/libddlpackageproc.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libddlpackageproc.so.1"
-"/usr/local/mariadb/columnstore/lib/libddlpackageproc.so"
-"/usr/local/mariadb/columnstore/lib/libddlpackage.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libddlpackage.so.1"
-"/usr/local/mariadb/columnstore/lib/libddlpackage.so"
-"/usr/local/mariadb/columnstore/lib/libdmlpackageproc.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libdmlpackageproc.so.1"
-"/usr/local/mariadb/columnstore/lib/libdmlpackageproc.so"
-"/usr/local/mariadb/columnstore/lib/libdmlpackage.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libdmlpackage.so.1"
-"/usr/local/mariadb/columnstore/lib/libdmlpackage.so"
-"/usr/local/mariadb/columnstore/lib/libexecplan.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libexecplan.so.1"
-"/usr/local/mariadb/columnstore/lib/libexecplan.so"
-"/usr/local/mariadb/columnstore/lib/libfuncexp.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libfuncexp.so.1"
-"/usr/local/mariadb/columnstore/lib/libfuncexp.so"
-"/usr/local/mariadb/columnstore/lib/libudfsdk.so.1.1.0"
-"/usr/local/mariadb/columnstore/lib/libudfsdk.so.1"
-"/usr/local/mariadb/columnstore/lib/libudfsdk.so"
-"/usr/local/mariadb/columnstore/lib/libjoblist.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libjoblist.so.1"
-"/usr/local/mariadb/columnstore/lib/libjoblist.so"
-"/usr/local/mariadb/columnstore/lib/libjoiner.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libjoiner.so.1"
-"/usr/local/mariadb/columnstore/lib/libjoiner.so"
-"/usr/local/mariadb/columnstore/lib/libloggingcpp.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libloggingcpp.so.1"
-"/usr/local/mariadb/columnstore/lib/libloggingcpp.so"
-"/usr/local/mariadb/columnstore/lib/libmessageqcpp.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libmessageqcpp.so.1"
-"/usr/local/mariadb/columnstore/lib/libmessageqcpp.so"
-"/usr/local/mariadb/columnstore/lib/liboamcpp.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/liboamcpp.so.1"
-"/usr/local/mariadb/columnstore/lib/liboamcpp.so"
-"/usr/local/mariadb/columnstore/lib/libalarmmanager.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libalarmmanager.so.1"
-"/usr/local/mariadb/columnstore/lib/libalarmmanager.so"
-"/usr/local/mariadb/columnstore/lib/libthreadpool.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libthreadpool.so.1"
-"/usr/local/mariadb/columnstore/lib/libthreadpool.so"
-"/usr/local/mariadb/columnstore/lib/libwindowfunction.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libwindowfunction.so.1"
-"/usr/local/mariadb/columnstore/lib/libwindowfunction.so"
-"/usr/local/mariadb/columnstore/lib/libwriteengine.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libwriteengine.so.1"
-"/usr/local/mariadb/columnstore/lib/libwriteengine.so"
-"/usr/local/mariadb/columnstore/lib/libwriteengineclient.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libwriteengineclient.so.1"
-"/usr/local/mariadb/columnstore/lib/libwriteengineclient.so"
-"/usr/local/mariadb/columnstore/lib/libbrm.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libbrm.so.1"
-"/usr/local/mariadb/columnstore/lib/libbrm.so"
-"/usr/local/mariadb/columnstore/lib/librwlock.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/librwlock.so.1"
-"/usr/local/mariadb/columnstore/lib/librwlock.so"
-"/usr/local/mariadb/columnstore/lib/libdataconvert.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libdataconvert.so.1"
-"/usr/local/mariadb/columnstore/lib/libdataconvert.so"
-"/usr/local/mariadb/columnstore/lib/librowgroup.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/librowgroup.so.1"
-"/usr/local/mariadb/columnstore/lib/librowgroup.so"
-"/usr/local/mariadb/columnstore/lib/libcacheutils.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libcacheutils.so.1"
-"/usr/local/mariadb/columnstore/lib/libcacheutils.so"
-"/usr/local/mariadb/columnstore/lib/libcommon.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libcommon.so.1"
-"/usr/local/mariadb/columnstore/lib/libcommon.so"
-"/usr/local/mariadb/columnstore/lib/libcompress.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libcompress.so.1"
-"/usr/local/mariadb/columnstore/lib/libcompress.so"
-"/usr/local/mariadb/columnstore/lib/libddlcleanuputil.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libddlcleanuputil.so.1"
-"/usr/local/mariadb/columnstore/lib/libddlcleanuputil.so"
-"/usr/local/mariadb/columnstore/lib/libbatchloader.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libbatchloader.so.1"
-"/usr/local/mariadb/columnstore/lib/libbatchloader.so"
-"/usr/local/mariadb/columnstore/lib/libquerystats.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libquerystats.so.1"
-"/usr/local/mariadb/columnstore/lib/libquerystats.so"
-"/usr/local/mariadb/columnstore/lib/libwriteengineredistribute.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libwriteengineredistribute.so.1"
-"/usr/local/mariadb/columnstore/lib/libwriteengineredistribute.so"
-"/usr/local/mariadb/columnstore/lib/libidbdatafile.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libidbdatafile.so.1"
-"/usr/local/mariadb/columnstore/lib/libidbdatafile.so"
-"/usr/local/mariadb/columnstore/lib/libthrift.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libthrift.so.1"
-"/usr/local/mariadb/columnstore/lib/libthrift.so"
-"/usr/local/mariadb/columnstore/lib/libquerytele.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libquerytele.so.1"
-"/usr/local/mariadb/columnstore/lib/libquerytele.so"
-${ignored})
+SET(CPACK_RPM_libs_USER_FILELIST ${ignored})
 
-SET(CPACK_RPM_storage-engine_USER_FILELIST
-"/usr/local/mariadb/columnstore/lib/libcalmysql.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libcalmysql.so.1"
-"/usr/local/mariadb/columnstore/lib/libcalmysql.so"
-"/usr/local/mariadb/columnstore/lib/libudf_mysql.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/libudf_mysql.so.1"
-"/usr/local/mariadb/columnstore/lib/libudf_mysql.so"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_columns.so"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_columns.so.1"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_columns.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_extents.so"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_extents.so.1"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_extents.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_tables.so"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_tables.so.1"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_tables.so.1.0.0"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_files.so"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_files.so.1"
-"/usr/local/mariadb/columnstore/lib/is_columnstore_files.so.1.0.0"
-"/usr/local/mariadb/columnstore/mysql/mysql-Columnstore"
-"/usr/local/mariadb/columnstore/mysql/install_calpont_mysql.sh"
-"/usr/local/mariadb/columnstore/mysql/syscatalog_mysql.sql"
-"/usr/local/mariadb/columnstore/mysql/dumpcat_mysql.sql"
-"/usr/local/mariadb/columnstore/mysql/calsetuserpriority.sql"
-"/usr/local/mariadb/columnstore/mysql/calremoveuserpriority.sql"
-"/usr/local/mariadb/columnstore/mysql/calshowprocesslist.sql"
-"/usr/local/mariadb/columnstore/mysql/columnstore_info.sql"
-${ignored})
+SET(CPACK_RPM_storage-engine_USER_FILELIST ${ignored})
 
 
 INCLUDE (CPack)

From d96eef014735dd41b85a5400df61988e1754e617 Mon Sep 17 00:00:00 2001
From: David Mott <david.mott@mariadb.com>
Date: Wed, 8 May 2019 20:14:45 -0500
Subject: [PATCH 30/33] Permit build with older cmake

---
 exemgr/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/exemgr/CMakeLists.txt b/exemgr/CMakeLists.txt
index 5ffdd1e44..4c8e7b65c 100644
--- a/exemgr/CMakeLists.txt
+++ b/exemgr/CMakeLists.txt
@@ -12,8 +12,6 @@ target_link_libraries(ExeMgr ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIB
 
 target_include_directories(ExeMgr PRIVATE ${Boost_INCLUDE_DIRS})
 
-target_compile_features(ExeMgr PRIVATE )
-
 install(TARGETS ExeMgr DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
 
 

From 3c89a4bba467cfb5494c1a2dbdf6594679bd909f Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <roman.nozdrin@mariadb.com>
Date: Thu, 9 May 2019 20:25:21 +0300
Subject: [PATCH 31/33] MCOL-537 Preprocessor if blocks with pragmas now have
 else branch.

    DMLProc exits on setupCwd failure.
---
 dmlproc/dmlproc.cpp                    | 36 +++++++++++++++++++++-----
 oamapps/alarmmanager/CMakeLists.txt    |  2 ++
 oamapps/mcsadmin/mcsadmin.cpp          | 15 +++++------
 utils/dataconvert/dataconvert.cpp      | 12 ++++++---
 utils/dataconvert/dataconvert.h        |  8 +++++-
 utils/messageqcpp/inetstreamsocket.cpp |  7 +++--
 utils/threadpool/threadpool.h          |  2 +-
 writeengine/shared/we_chunkmanager.cpp | 16 ++++++++++--
 writeengine/shared/we_chunkmanager.h   |  1 -
 9 files changed, 75 insertions(+), 24 deletions(-)

diff --git a/dmlproc/dmlproc.cpp b/dmlproc/dmlproc.cpp
index deb936422..3845ef37a 100644
--- a/dmlproc/dmlproc.cpp
+++ b/dmlproc/dmlproc.cpp
@@ -492,17 +492,19 @@ void rollbackAll(DBRM* dbrm)
     dbrm->setSystemReady(true);
 }
 
-void setupCwd()
+int8_t setupCwd()
 {
     string workdir = startup::StartUp::tmpDir();
 
     if (workdir.length() == 0)
         workdir = ".";
 
-    (void)chdir(workdir.c_str());
+    int8_t rc = chdir(workdir.c_str());
 
-    if (access(".", W_OK) != 0)
-        (void)chdir("/tmp");
+    if (rc < 0 || access(".", W_OK) != 0)
+        rc = chdir("/tmp");
+
+    return rc;
 }
 }	// Namewspace
 
@@ -521,7 +523,18 @@ int main(int argc, char* argv[])
 
     Config* cf = Config::makeConfig();
 
-    setupCwd();
+    if ( setupCwd() )
+    {
+        LoggingID logid(21, 0, 0);
+        logging::Message::Args args1;
+        logging::Message msg(1);
+        args1.add("DMLProc couldn't cwd.");
+        msg.format( args1 );
+        logging::Logger logger(logid.fSubsysID);
+        logger.logMessage(LOG_TYPE_CRITICAL, msg, logid);
+        return 1;
+    }
+
 
     WriteEngine::WriteEngineWrapper::init( WriteEngine::SUBSYSTEM_ID_DMLPROC );
 #ifdef _MSC_VER
@@ -610,9 +623,20 @@ int main(int argc, char* argv[])
     try
     {
         string port = cf->getConfig(DMLProc, "Port");
-	string cmd = "fuser -k " + port + "/tcp >/dev/null 2>&1";
+        string cmd = "fuser -k " + port + "/tcp >/dev/null 2>&1";
 
+    // Couldn't check the return code b/c
+    // fuser returns 1 for unused port.
+#if defined(__GNUC__) && __GNUC__ >= 5
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-result"
         (void)::system(cmd.c_str());
+#pragma GCC diagnostic pop
+#else
+        (void)::system(cmd.c_str());
+#endif
+  
+  
     }
     catch (...)
     {
diff --git a/oamapps/alarmmanager/CMakeLists.txt b/oamapps/alarmmanager/CMakeLists.txt
index 73c069153..a6b12ab75 100644
--- a/oamapps/alarmmanager/CMakeLists.txt
+++ b/oamapps/alarmmanager/CMakeLists.txt
@@ -8,6 +8,8 @@ set(alarmmanager_LIB_SRCS alarmmanager.cpp alarm.cpp)
 
 add_library(alarmmanager SHARED ${alarmmanager_LIB_SRCS})
 
+target_compile_options(alarmmanager PRIVATE -Wno-unused-result)
+
 set_target_properties(alarmmanager PROPERTIES VERSION 1.0.0 SOVERSION 1)
 
 install(TARGETS alarmmanager DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp
index 02a77f56a..c0507aadd 100644
--- a/oamapps/mcsadmin/mcsadmin.cpp
+++ b/oamapps/mcsadmin/mcsadmin.cpp
@@ -3348,15 +3348,14 @@ int processCommand(string* arguments)
 
             for (i = alarmList.begin(); i != alarmList.end(); ++i)
             {
-                switch (i->second.getState())
+                // SET = 1, CLEAR = 0
+                if (i->second.getState() == true)
                 {
-                    case SET:
-                        cout << "SET" << endl;
-                        break;
-
-                    case CLEAR:
-                        cout << "CLEAR" << endl;
-                        break;
+                    cout << "SET" << endl;
+                }
+                else
+                {
+                    cout << "CLEAR" << endl;
                 }
 
                 cout << "AlarmID           = " << i->second.getAlarmID() << endl;
diff --git a/utils/dataconvert/dataconvert.cpp b/utils/dataconvert/dataconvert.cpp
index 311d82e08..0121b57c4 100644
--- a/utils/dataconvert/dataconvert.cpp
+++ b/utils/dataconvert/dataconvert.cpp
@@ -2429,11 +2429,13 @@ int64_t DataConvert::intToDate(int64_t data)
 
     // this snprintf call causes a compiler warning b/c we're potentially copying a 20-digit #
     // into 15 bytes, however, that appears to be intentional.
-#if defined(__GNUC__) && __GNUC__ >= 5
+#if defined(__GNUC__) && __GNUC__ >= 6
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-truncation="
     snprintf( buf, 15, "%llu", (long long unsigned int)data);
 #pragma GCC diagnostic pop
+#else
+    snprintf( buf, 15, "%llu", (long long unsigned int)data);
 #endif
 
     string year, month, day, hour, min, sec, msec;
@@ -2563,11 +2565,13 @@ int64_t DataConvert::intToDatetime(int64_t data, bool* date)
 
     // this snprintf call causes a compiler warning b/c we're potentially copying a 20-digit #
     // into 15 bytes, however, that appears to be intentional.
-#if defined(__GNUC__) && __GNUC__ >= 5
+#if defined(__GNUC__) && __GNUC__ >= 6
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-truncation="
     snprintf( buf, 15, "%llu", (long long unsigned int)data);
 #pragma GCC diagnostic pop
+#else
+    snprintf( buf, 15, "%llu", (long long unsigned int)data);
 #endif
 
     //string date = buf;
@@ -2699,11 +2703,13 @@ int64_t DataConvert::intToTime(int64_t data, bool fromString)
 
     // this snprintf call causes a compiler warning b/c we're potentially copying a 20-digit #
     // into 15 bytes, however, that appears to be intentional.
-#if defined(__GNUC__) && __GNUC__ >= 5
+#if defined(__GNUC__) && __GNUC__ >= 6
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-truncation="
     snprintf( buf, 15, "%llu", (long long unsigned int)data);
 #pragma GCC diagnostic pop
+#else
+    snprintf( buf, 15, "%llu", (long long unsigned int)data);
 #endif
 
     //string date = buf;
diff --git a/utils/dataconvert/dataconvert.h b/utils/dataconvert/dataconvert.h
index b81634639..d563f5fea 100644
--- a/utils/dataconvert/dataconvert.h
+++ b/utils/dataconvert/dataconvert.h
@@ -675,7 +675,7 @@ inline void DataConvert::timeToString1( long long timevalue, char* buf, unsigned
     }
     // this snprintf call causes a compiler warning b/c buffer size is less
     // then maximum string size.
-#if defined(__GNUC__) && __GNUC__ >= 5
+#if defined(__GNUC__) && __GNUC__ >= 6
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-truncation="
     snprintf( buf, buflen, "%02d%02d%02d",
@@ -684,6 +684,12 @@ inline void DataConvert::timeToString1( long long timevalue, char* buf, unsigned
               (unsigned)((timevalue >> 14) & 0xff)
             );
 #pragma GCC diagnostic pop
+#else
+    snprintf( buf, buflen, "%02d%02d%02d",
+              hour,
+              (unsigned)((timevalue >> 32) & 0xff),
+              (unsigned)((timevalue >> 14) & 0xff)
+            );
 #endif
 }
 
diff --git a/utils/messageqcpp/inetstreamsocket.cpp b/utils/messageqcpp/inetstreamsocket.cpp
index 1e09c38cf..d94a3eb94 100644
--- a/utils/messageqcpp/inetstreamsocket.cpp
+++ b/utils/messageqcpp/inetstreamsocket.cpp
@@ -966,12 +966,15 @@ void InetStreamSocket::connect(const sockaddr* serv_addr)
         char buf = '\0';
         (void)::recv(socketParms().sd(), &buf, 1, 0);
 #else
-#if defined(__GNUC__) && __GNUC__ >= 5
+#if defined(__GNUC__) && __GNUC__ >= 6
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-result"
         char buf = '\0';
-        ssize_t bytes = ::read(socketParms().sd(), &buf, 1);   // we know 1 byte is in the recv buffer
+        ::read(socketParms().sd(), &buf, 1);   // we know 1 byte is in the recv buffer
 #pragma GCC diagnostic pop
+#else
+        char buf = '\0';
+        ::read(socketParms().sd(), &buf, 1);   // we know 1 byte is in the recv buffer
 #endif // pragma
 #endif
         return;
diff --git a/utils/threadpool/threadpool.h b/utils/threadpool/threadpool.h
index fa6921900..27d87fd12 100644
--- a/utils/threadpool/threadpool.h
+++ b/utils/threadpool/threadpool.h
@@ -77,7 +77,7 @@ public:
     boost::thread* create_thread(F threadfunc)
     {
         boost::lock_guard<boost::shared_mutex> guard(m);
-#if defined(__GNUC__) && __GNUC__ >= 5
+#if defined(__GNUC__) && __GNUC__ >= 7
         std::unique_ptr<boost::thread> new_thread(new boost::thread(threadfunc));
 #else
         std::auto_ptr<boost::thread> new_thread(new boost::thread(threadfunc));
diff --git a/writeengine/shared/we_chunkmanager.cpp b/writeengine/shared/we_chunkmanager.cpp
index e6fa43db1..abe61ab11 100644
--- a/writeengine/shared/we_chunkmanager.cpp
+++ b/writeengine/shared/we_chunkmanager.cpp
@@ -66,6 +66,8 @@ namespace WriteEngine
 extern int NUM_BLOCKS_PER_INITIAL_EXTENT; // defined in we_dctnry.cpp
 extern WErrorCodes ec;                    // defined in we_log.cpp
 
+const int COMPRESSED_CHUNK_SIZE = compress::IDBCompressInterface::maxCompressedSize(UNCOMPRESSED_CHUNK_SIZE) + 64 + 3 + 8 * 1024;
+
 //------------------------------------------------------------------------------
 // Search for the specified chunk in fChunkList.
 //------------------------------------------------------------------------------
@@ -1926,7 +1928,7 @@ int ChunkManager::reallocateChunks(CompFileData* fileData)
         char tmText[24];
     // this snprintf call causes a compiler warning b/c buffer size is less
     // then maximum string size.
-#if defined(__GNUC__) && __GNUC__ >= 5
+#if defined(__GNUC__) && __GNUC__ >= 6
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-truncation="
         snprintf(tmText, sizeof(tmText), ".%04d%02d%02d%02d%02d%02d%06ld",
@@ -1934,6 +1936,11 @@ int ChunkManager::reallocateChunks(CompFileData* fileData)
                  ltm.tm_mday, ltm.tm_hour, ltm.tm_min,
                  ltm.tm_sec, tv.tv_usec);
 #pragma GCC diagnostic pop
+#else
+       snprintf(tmText, sizeof(tmText), ".%04d%02d%02d%02d%02d%02d%06ld",
+                 ltm.tm_year + 1900, ltm.tm_mon + 1,
+                 ltm.tm_mday, ltm.tm_hour, ltm.tm_min,
+                 ltm.tm_sec, tv.tv_usec);
 #endif
         string dbgFileName(rlcFileName + tmText);
 
@@ -2116,7 +2123,7 @@ int ChunkManager::reallocateChunks(CompFileData* fileData)
             char tmText[24];
     // this snprintf call causes a compiler warning b/c buffer size is less
     // then maximum string size.
-#if defined(__GNUC__) && __GNUC__ >= 5
+#if defined(__GNUC__) && __GNUC__ >= 6
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-truncation="
             snprintf(tmText, sizeof(tmText), ".%04d%02d%02d%02d%02d%02d%06ld",
@@ -2124,6 +2131,11 @@ int ChunkManager::reallocateChunks(CompFileData* fileData)
                      ltm.tm_mday, ltm.tm_hour, ltm.tm_min,
                      ltm.tm_sec, tv.tv_usec);
 #pragma GCC diagnostic pop
+#else
+           snprintf(tmText, sizeof(tmText), ".%04d%02d%02d%02d%02d%02d%06ld",
+                     ltm.tm_year + 1900, ltm.tm_mon + 1,
+                     ltm.tm_mday, ltm.tm_hour, ltm.tm_min,
+                     ltm.tm_sec, tv.tv_usec);
 #endif
             string dbgFileName(rlcFileName + tmText);
 
diff --git a/writeengine/shared/we_chunkmanager.h b/writeengine/shared/we_chunkmanager.h
index 0d4d013d8..edf9b232f 100644
--- a/writeengine/shared/we_chunkmanager.h
+++ b/writeengine/shared/we_chunkmanager.h
@@ -68,7 +68,6 @@ const int UNCOMPRESSED_CHUNK_SIZE = compress::IDBCompressInterface::UNCOMPRESSED
 const int COMPRESSED_FILE_HEADER_UNIT = compress::IDBCompressInterface::HDR_BUF_LEN;
 
 // assume UNCOMPRESSED_CHUNK_SIZE > 0xBFFF (49151), 8 * 1024 bytes padding
-const int COMPRESSED_CHUNK_SIZE = compress::IDBCompressInterface::maxCompressedSize(UNCOMPRESSED_CHUNK_SIZE) + 64 + 3 + 8 * 1024;
 
 const int BLOCKS_IN_CHUNK = UNCOMPRESSED_CHUNK_SIZE / BYTE_PER_BLOCK;
 const int MAXOFFSET_PER_CHUNK = 511 * BYTE_PER_BLOCK;

From cdc570bf429e464ae66f762d7a6363c4ff6d39a0 Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <roman.nozdrin@mariadb.com>
Date: Mon, 13 May 2019 18:32:35 +0300
Subject: [PATCH 32/33] Repairs develop build mode w OAM disabled. Now one can
 use -DSKIP_OAM_INIT=1 instead of using environmental variable.

---
 cmake/configureEngine.cmake | 2 +-
 exemgr/main.cpp             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmake/configureEngine.cmake b/cmake/configureEngine.cmake
index a3ac9d3c1..0814ca454 100644
--- a/cmake/configureEngine.cmake
+++ b/cmake/configureEngine.cmake
@@ -717,7 +717,7 @@ SET (inline "")
 ENDIF()
 
 IF($ENV{SKIP_OAM_INIT})
-    SET(SKIP_OAM_INIT 1)
+    set(SKIP_OAM_INIT 1 CACHE BOOL "Skip OAM initialization" FORCE)
 ENDIF()
 
 EXECUTE_PROCESS(
diff --git a/exemgr/main.cpp b/exemgr/main.cpp
index 36d8f639d..8c6d8b475 100644
--- a/exemgr/main.cpp
+++ b/exemgr/main.cpp
@@ -73,6 +73,7 @@
 #include "liboamcpp.h"
 #include "crashtrace.h"
 #include "utils_utf8.h"
+#include "config.h"
 
 #if defined(SKIP_OAM_INIT)
 #include "dbrm.h"

From e3fe883a9c8c9643e39eff4a7349faf2993f5899 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Tue, 14 May 2019 14:18:11 +0100
Subject: [PATCH 33/33] Fix merge issues

---
 exemgr/main.cpp           | 2 +-
 utils/udfsdk/mcsv1_udaf.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/exemgr/main.cpp b/exemgr/main.cpp
index e972c40ad..e66d7783e 100644
--- a/exemgr/main.cpp
+++ b/exemgr/main.cpp
@@ -1298,7 +1298,7 @@ void setupSignalHandlers()
 #endif
 }
 
-void setupCwd(joblist::ResourceManager* rm)
+int8_t setupCwd(joblist::ResourceManager* rm)
 {
     std::string workdir = rm->getScWorkingDir();
     int8_t rc = chdir(workdir.c_str());
diff --git a/utils/udfsdk/mcsv1_udaf.h b/utils/udfsdk/mcsv1_udaf.h
index afcbb362f..d55002c49 100644
--- a/utils/udfsdk/mcsv1_udaf.h
+++ b/utils/udfsdk/mcsv1_udaf.h
@@ -1029,7 +1029,7 @@ inline T mcsv1_UDAF::convertAnyTo(static_any::any& valIn)
     }
     else
     {
-        throw runtime_error("mcsv1_UDAF::convertAnyTo(): input param has unrecognized type");
+        throw std::runtime_error("mcsv1_UDAF::convertAnyTo(): input param has unrecognized type");
     }
     return val;
 }