diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 05ffd002a..4b4a81c59 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,11 +1,11 @@
 set (excluded_examples
-    elaboratePoint2KalmanFilter.cpp
+    "elaboratePoint2KalmanFilter.cpp"
 )
 
 # if GTSAM_ENABLE_BOOST_SERIALIZATION is not set then SolverComparer.cpp will not compile
 if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
     list (APPEND excluded_examples
-    SolverComparer.cpp
+    "SolverComparer.cpp"
   )
 endif()
 
@@ -13,10 +13,10 @@ endif()
 if (NOT GTSAM_USE_BOOST_FEATURES) 
   # add to excluded examples
   list (APPEND excluded_examples
-      CombinedImuFactorsExample.run
-      ImuFactorsExample.run
-      ShonanAveragingCLI.cpp
-      SolverComparer.cpp
+      "CombinedImuFactorsExample.cpp"
+      "ImuFactorsExample.cpp"
+      "ShonanAveragingCLI.cpp"
+      "SolverComparer.cpp"
       )
 endif()
 
diff --git a/gtsam_unstable/examples/CMakeLists.txt b/gtsam_unstable/examples/CMakeLists.txt
index 483b0fa6c..967937b22 100644
--- a/gtsam_unstable/examples/CMakeLists.txt
+++ b/gtsam_unstable/examples/CMakeLists.txt
@@ -1,3 +1,12 @@
 set (excluded_examples "")
 
+# Add examples to exclude if GTSAM_USE_BOOST_FEATURES is not set
+if (NOT GTSAM_USE_BOOST_FEATURES) 
+  # add to excluded examples
+  list (APPEND excluded_examples
+      "GncPoseAveragingExample.cpp"
+      )
+endif()
+
+
 gtsamAddExamplesGlob("*.cpp" "${excluded_examples}" "gtsam_unstable")
diff --git a/timing/CMakeLists.txt b/timing/CMakeLists.txt
index cd486ab79..2ebfeb9d8 100644
--- a/timing/CMakeLists.txt
+++ b/timing/CMakeLists.txt
@@ -1,15 +1,22 @@
 set (excluded_scripts
     elaboratePoint2KalmanFilter.cpp
 )
+# Add scripts to exclude if GTSAM_ENABLE_BOOST_SERIALIZATION is not set
+if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION) 
+  # add to excluded scripts
+  list (APPEND excluded_scripts
+      "timeIncremental.cpp"
+      )
+endif()
+
 # Add scripts to exclude if GTSAM_USE_BOOST_FEATURES is not set
 if (NOT GTSAM_USE_BOOST_FEATURES) 
   # add to excluded scripts
   list (APPEND excluded_scripts
-      timeISAM2Chain.cpp
+      "timeISAM2Chain.cpp"
       )
 endif()
 
-
-gtsamAddTimingGlob("*.cpp" excluded_scripts "gtsam")
+gtsamAddTimingGlob("*.cpp" "${excluded_scripts}" "gtsam")
 
 target_link_libraries(timeGaussianFactorGraph CppUnitLite)
diff --git a/timing/timeVirtual.cpp b/timing/timeVirtual.cpp
index e23f1ae0d..62133761a 100644
--- a/timing/timeVirtual.cpp
+++ b/timing/timeVirtual.cpp
@@ -23,7 +23,6 @@
 #include <iostream>
 
 using namespace std;
-using namespace boost;
 using namespace gtsam;
 
 struct Plain {
diff --git a/timing/timeVirtual2.cpp b/timing/timeVirtual2.cpp
index 3d6e02288..dd6c8e268 100644
--- a/timing/timeVirtual2.cpp
+++ b/timing/timeVirtual2.cpp
@@ -21,7 +21,6 @@
 #include <iostream>
 
 using namespace std;
-using namespace boost;
 using namespace gtsam;
 
 struct DtorTestBase {