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>