diff --git a/gtsam/base/DSFVector.cpp b/gtsam/base/DSFVector.cpp
index 25f794b4e..bdf0543ff 100644
--- a/gtsam/base/DSFVector.cpp
+++ b/gtsam/base/DSFVector.cpp
@@ -18,7 +18,6 @@
 
 #include <gtsam/base/DSFVector.h>
 #include <boost/make_shared.hpp>
-#include <boost/foreach.hpp>
 #include <algorithm>
 
 using namespace std;
diff --git a/gtsam/base/Matrix.cpp b/gtsam/base/Matrix.cpp
index 7768a48d3..d74e1c122 100644
--- a/gtsam/base/Matrix.cpp
+++ b/gtsam/base/Matrix.cpp
@@ -23,7 +23,6 @@
 #include <Eigen/SVD>
 #include <Eigen/LU>
 
-#include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/tokenizer.hpp>
 
diff --git a/gtsam/base/tests/testDSFVector.cpp b/gtsam/base/tests/testDSFVector.cpp
index 66d6889c4..cf32f1c3b 100644
--- a/gtsam/base/tests/testDSFVector.cpp
+++ b/gtsam/base/tests/testDSFVector.cpp
@@ -20,7 +20,6 @@
 
 #include <CppUnitLite/TestHarness.h>
 
-#include <boost/foreach.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/assign/std/list.hpp>
 #include <boost/assign/std/set.hpp>
diff --git a/gtsam/base/tests/testGroup.cpp b/gtsam/base/tests/testGroup.cpp
index bce9a6036..f405bdaf1 100644
--- a/gtsam/base/tests/testGroup.cpp
+++ b/gtsam/base/tests/testGroup.cpp
@@ -19,7 +19,6 @@
 #include <gtsam/base/Testable.h>
 #include <Eigen/Core>
 #include <iostream>
-#include <boost/foreach.hpp>
 
 namespace gtsam {
 
diff --git a/gtsam/base/treeTraversal/parallelTraversalTasks.h b/gtsam/base/treeTraversal/parallelTraversalTasks.h
index 70a9b1cf1..ccdd269c3 100644
--- a/gtsam/base/treeTraversal/parallelTraversalTasks.h
+++ b/gtsam/base/treeTraversal/parallelTraversalTasks.h
@@ -20,7 +20,6 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
-#include <boost/foreach.hpp>
 
 #ifdef GTSAM_USE_TBB
 #  include <tbb/tbb.h>
diff --git a/gtsam/discrete/DecisionTreeFactor.cpp b/gtsam/discrete/DecisionTreeFactor.cpp
index dd26cbfa9..f83349436 100644
--- a/gtsam/discrete/DecisionTreeFactor.cpp
+++ b/gtsam/discrete/DecisionTreeFactor.cpp
@@ -21,7 +21,6 @@
 #include <gtsam/discrete/DiscreteConditional.h>
 #include <gtsam/base/FastSet.h>
 
-#include <boost/foreach.hpp>
 #include <boost/make_shared.hpp>
 
 using namespace std;
diff --git a/gtsam/discrete/DecisionTreeFactor.h b/gtsam/discrete/DecisionTreeFactor.h
index f7253ec24..54cce56be 100644
--- a/gtsam/discrete/DecisionTreeFactor.h
+++ b/gtsam/discrete/DecisionTreeFactor.h
@@ -22,7 +22,6 @@
 #include <gtsam/discrete/Potentials.h>
 #include <gtsam/inference/Ordering.h>
 
-#include <boost/foreach.hpp>
 #include <boost/shared_ptr.hpp>
 
 #include <vector>
diff --git a/gtsam/discrete/DiscreteFactor.cpp b/gtsam/discrete/DiscreteFactor.cpp
index e9f57c30d..c101653d2 100644
--- a/gtsam/discrete/DiscreteFactor.cpp
+++ b/gtsam/discrete/DiscreteFactor.cpp
@@ -18,7 +18,6 @@
  */
 
 #include <gtsam/discrete/DiscreteFactor.h>
-#include <boost/foreach.hpp>
 
 using namespace std;
 
diff --git a/gtsam/geometry/PinholeSet.h b/gtsam/geometry/PinholeSet.h
index 5101e9fc8..65047df41 100644
--- a/gtsam/geometry/PinholeSet.h
+++ b/gtsam/geometry/PinholeSet.h
@@ -20,7 +20,6 @@
 #include <gtsam/geometry/CameraSet.h>
 #include <gtsam/geometry/triangulation.h>
 #include <boost/optional.hpp>
-#include <boost/foreach.hpp>
 
 namespace gtsam {
 
diff --git a/gtsam/geometry/Point2.cpp b/gtsam/geometry/Point2.cpp
index 7066e527b..bc6132812 100644
--- a/gtsam/geometry/Point2.cpp
+++ b/gtsam/geometry/Point2.cpp
@@ -16,7 +16,6 @@
  */
 
 #include <gtsam/geometry/Point2.h>
-#include <boost/foreach.hpp>
 #include <cmath>
 
 using namespace std;
diff --git a/gtsam/geometry/tests/testPose2.cpp b/gtsam/geometry/tests/testPose2.cpp
index d1f68fe28..bccfdc1c7 100644
--- a/gtsam/geometry/tests/testPose2.cpp
+++ b/gtsam/geometry/tests/testPose2.cpp
@@ -22,7 +22,6 @@
 #include <gtsam/base/lieProxies.h>
 
 #include <CppUnitLite/TestHarness.h>
-#include <boost/foreach.hpp>
 #include <boost/optional.hpp>
 #include <boost/assign/std/vector.hpp> // for operator +=
 #include <cmath>
diff --git a/gtsam/inference/VariableIndex-inl.h b/gtsam/inference/VariableIndex-inl.h
index b9f143a0f..352ea166f 100644
--- a/gtsam/inference/VariableIndex-inl.h
+++ b/gtsam/inference/VariableIndex-inl.h
@@ -19,7 +19,6 @@
 
 #include <gtsam/inference/VariableIndex.h>
 #include <gtsam/base/timing.h>
-#include <boost/foreach.hpp>
 
 namespace gtsam {
 
diff --git a/gtsam/linear/RegularJacobianFactor.h b/gtsam/linear/RegularJacobianFactor.h
index bbc34d482..2b5cf85ff 100644
--- a/gtsam/linear/RegularJacobianFactor.h
+++ b/gtsam/linear/RegularJacobianFactor.h
@@ -20,7 +20,6 @@
 
 #include <gtsam/linear/JacobianFactor.h>
 #include <gtsam/linear/VectorValues.h>
-#include <boost/foreach.hpp>
 
 namespace gtsam {
 
diff --git a/gtsam/linear/tests/testGaussianBayesNet.cpp b/gtsam/linear/tests/testGaussianBayesNet.cpp
index 26f975296..2a1dc088f 100644
--- a/gtsam/linear/tests/testGaussianBayesNet.cpp
+++ b/gtsam/linear/tests/testGaussianBayesNet.cpp
@@ -30,7 +30,6 @@ using namespace boost::assign;
 #include <sstream>
 #include <CppUnitLite/TestHarness.h>
 #include <boost/tuple/tuple.hpp>
-#include <boost/foreach.hpp>
 
 using namespace std;
 using namespace gtsam;
diff --git a/gtsam/nonlinear/ISAM2.cpp b/gtsam/nonlinear/ISAM2.cpp
index 47ebbd7af..a0244ce14 100644
--- a/gtsam/nonlinear/ISAM2.cpp
+++ b/gtsam/nonlinear/ISAM2.cpp
@@ -15,7 +15,6 @@
  * @author  Michael Kaess, Richard Roberts
  */
 
-#include <boost/foreach.hpp>
 #include <boost/assign/std/list.hpp> // for operator +=
 using namespace boost::assign;
 #include <boost/range/adaptors.hpp>
diff --git a/gtsam/nonlinear/NonlinearISAM.cpp b/gtsam/nonlinear/NonlinearISAM.cpp
index 2405ca222..512069a8a 100644
--- a/gtsam/nonlinear/NonlinearISAM.cpp
+++ b/gtsam/nonlinear/NonlinearISAM.cpp
@@ -16,12 +16,9 @@
  */
 
 #include <gtsam/nonlinear/NonlinearISAM.h>
-
 #include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/inference/Ordering.h>
 
-#include <boost/foreach.hpp>
-
 #include <iostream>
 
 using namespace std;
diff --git a/gtsam/nonlinear/factorTesting.h b/gtsam/nonlinear/factorTesting.h
index e7e24de5a..c0eccbd08 100644
--- a/gtsam/nonlinear/factorTesting.h
+++ b/gtsam/nonlinear/factorTesting.h
@@ -22,8 +22,6 @@
 #include <gtsam/nonlinear/NonlinearFactor.h>
 #include <gtsam/base/numericalDerivative.h>
 
-#include <boost/foreach.hpp>
-
 namespace gtsam {
 
 /**
diff --git a/gtsam/slam/RegularImplicitSchurFactor.h b/gtsam/slam/RegularImplicitSchurFactor.h
index c713eff72..973798a64 100644
--- a/gtsam/slam/RegularImplicitSchurFactor.h
+++ b/gtsam/slam/RegularImplicitSchurFactor.h
@@ -10,7 +10,6 @@
 #include <gtsam/geometry/CameraSet.h>
 #include <gtsam/linear/JacobianFactor.h>
 #include <gtsam/linear/VectorValues.h>
-#include <boost/foreach.hpp>
 #include <iosfwd>
 
 namespace gtsam {
diff --git a/gtsam/slam/tests/testOrientedPlane3Factor.cpp b/gtsam/slam/tests/testOrientedPlane3Factor.cpp
index f1e830d03..ea42a1ecd 100644
--- a/gtsam/slam/tests/testOrientedPlane3Factor.cpp
+++ b/gtsam/slam/tests/testOrientedPlane3Factor.cpp
@@ -24,7 +24,6 @@
 
 #include <CppUnitLite/TestHarness.h>
 #include <boost/bind.hpp>
-#include <boost/foreach.hpp>
 #include <boost/assign/std/vector.hpp>
 
 using namespace boost::assign;
diff --git a/gtsam/symbolic/SymbolicBayesTree.cpp b/gtsam/symbolic/SymbolicBayesTree.cpp
index 8797ba363..aab626837 100644
--- a/gtsam/symbolic/SymbolicBayesTree.cpp
+++ b/gtsam/symbolic/SymbolicBayesTree.cpp
@@ -16,8 +16,6 @@
  * @author Richard Roberts
  */
 
-#include <boost/foreach.hpp>
-
 #include <gtsam/symbolic/SymbolicBayesTree.h>
 #include <gtsam/symbolic/SymbolicFactorGraph.h>
 #include <gtsam/symbolic/SymbolicBayesNet.h>
diff --git a/gtsam/symbolic/tests/testSymbolicISAM.cpp b/gtsam/symbolic/tests/testSymbolicISAM.cpp
index d192a6064..994e9b107 100644
--- a/gtsam/symbolic/tests/testSymbolicISAM.cpp
+++ b/gtsam/symbolic/tests/testSymbolicISAM.cpp
@@ -15,14 +15,13 @@
  * @author  Michael Kaess
  */
 
-#include <boost/foreach.hpp>
-#include <boost/assign/std/list.hpp> // for operator +=
-using namespace boost::assign;
+#include <gtsam/symbolic/SymbolicISAM.h>
+#include <gtsam/symbolic/tests/symbolicExampleGraphs.h>
 
 #include <CppUnitLite/TestHarness.h>
 
-#include <gtsam/symbolic/SymbolicISAM.h>
-#include <gtsam/symbolic/tests/symbolicExampleGraphs.h>
+#include <boost/assign/std/list.hpp> // for operator +=
+using namespace boost::assign;
 
 using namespace std;
 using namespace gtsam;
diff --git a/gtsam_unstable/discrete/examples/schedulingQuals12.cpp b/gtsam_unstable/discrete/examples/schedulingQuals12.cpp
index 3a7ea4d2a..1fc4a1459 100644
--- a/gtsam_unstable/discrete/examples/schedulingQuals12.cpp
+++ b/gtsam_unstable/discrete/examples/schedulingQuals12.cpp
@@ -15,7 +15,6 @@
 #include <boost/assign/std/vector.hpp>
 #include <boost/assign/std/map.hpp>
 #include <boost/optional.hpp>
-#include <boost/foreach.hpp>
 #include <boost/format.hpp>
 
 #include <algorithm>
diff --git a/gtsam_unstable/discrete/examples/schedulingQuals13.cpp b/gtsam_unstable/discrete/examples/schedulingQuals13.cpp
index 0b5238783..95b64f289 100644
--- a/gtsam_unstable/discrete/examples/schedulingQuals13.cpp
+++ b/gtsam_unstable/discrete/examples/schedulingQuals13.cpp
@@ -15,7 +15,6 @@
 #include <boost/assign/std/vector.hpp>
 #include <boost/assign/std/map.hpp>
 #include <boost/optional.hpp>
-#include <boost/foreach.hpp>
 #include <boost/format.hpp>
 
 #include <algorithm>
diff --git a/gtsam_unstable/discrete/tests/testScheduler.cpp b/gtsam_unstable/discrete/tests/testScheduler.cpp
index fa68f04ea..0be4e4b1f 100644
--- a/gtsam_unstable/discrete/tests/testScheduler.cpp
+++ b/gtsam_unstable/discrete/tests/testScheduler.cpp
@@ -14,7 +14,6 @@
 #include <boost/assign/std/vector.hpp>
 #include <boost/assign/std/map.hpp>
 #include <boost/optional.hpp>
-#include <boost/foreach.hpp>
 
 using namespace boost::assign;
 using namespace std;
diff --git a/gtsam_unstable/nonlinear/LinearizedFactor.cpp b/gtsam_unstable/nonlinear/LinearizedFactor.cpp
index 0f7830cf2..a18c24256 100644
--- a/gtsam_unstable/nonlinear/LinearizedFactor.cpp
+++ b/gtsam_unstable/nonlinear/LinearizedFactor.cpp
@@ -16,7 +16,6 @@
  */
 
 #include <gtsam_unstable/nonlinear/LinearizedFactor.h>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 namespace gtsam {
diff --git a/gtsam_unstable/partition/tests/testGenericGraph.cpp b/gtsam_unstable/partition/tests/testGenericGraph.cpp
index c6e432902..8a32837f4 100644
--- a/gtsam_unstable/partition/tests/testGenericGraph.cpp
+++ b/gtsam_unstable/partition/tests/testGenericGraph.cpp
@@ -6,16 +6,17 @@
  *  Description: unit tests for generic graph
  */
 
-#include <map>
+#include <gtsam_unstable/partition/GenericGraph.h>
+
+#include <CppUnitLite/TestHarness.h>
+
 #include <boost/assign/std/list.hpp> // for operator +=
 #include <boost/assign/std/set.hpp> // for operator +=
 #include <boost/assign/std/vector.hpp> // for operator +=
 using namespace boost::assign;
-#include <boost/foreach.hpp>
 #include <boost/make_shared.hpp>
-#include <CppUnitLite/TestHarness.h>
 
-#include <gtsam_unstable/partition/GenericGraph.h>
+#include <map>
 
 using namespace std;
 using namespace gtsam;
diff --git a/gtsam_unstable/partition/tests/testNestedDissection.cpp b/gtsam_unstable/partition/tests/testNestedDissection.cpp
index d7035c2d8..acaa5557e 100644
--- a/gtsam_unstable/partition/tests/testNestedDissection.cpp
+++ b/gtsam_unstable/partition/tests/testNestedDissection.cpp
@@ -10,7 +10,6 @@
 #include <boost/assign/std/set.hpp> // for operator +=
 #include <boost/assign/std/vector.hpp> // for operator +=
 using namespace boost::assign;
-#include <boost/foreach.hpp>
 #include <boost/make_shared.hpp>
 #include <CppUnitLite/TestHarness.h>
 
diff --git a/gtsam_unstable/slam/Mechanization_bRn2.cpp b/gtsam_unstable/slam/Mechanization_bRn2.cpp
index 94126a68c..6112a398f 100644
--- a/gtsam_unstable/slam/Mechanization_bRn2.cpp
+++ b/gtsam_unstable/slam/Mechanization_bRn2.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Mechanization_bRn2.h"
-#include <boost/foreach.hpp>
 
 namespace gtsam {
 
diff --git a/tests/testSubgraphPreconditioner.cpp b/tests/testSubgraphPreconditioner.cpp
index a43137126..accf9a65e 100644
--- a/tests/testSubgraphPreconditioner.cpp
+++ b/tests/testSubgraphPreconditioner.cpp
@@ -27,7 +27,6 @@
 #include <gtsam/inference/Ordering.h>
 #include <gtsam/base/numericalDerivative.h>
 
-#include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/assign/std/list.hpp>
 using namespace boost::assign;
diff --git a/timing/timeGaussianFactorGraph.cpp b/timing/timeGaussianFactorGraph.cpp
index b49d2f82b..cd11f6360 100644
--- a/timing/timeGaussianFactorGraph.cpp
+++ b/timing/timeGaussianFactorGraph.cpp
@@ -16,7 +16,6 @@
  */
 
 #include <time.h>
-#include <boost/foreach.hpp>
 #include <boost/assign/std/list.hpp> // for operator += in Ordering
 #include <CppUnitLite/TestHarness.h>
 #include <tests/smallExample.h>
diff --git a/wrap/Constructor.cpp b/wrap/Constructor.cpp
index 35cc0fa53..77d831e0a 100644
--- a/wrap/Constructor.cpp
+++ b/wrap/Constructor.cpp
@@ -20,7 +20,6 @@
 #include <fstream>
 #include <algorithm>
 
-#include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
 
 #include "utilities.h"
diff --git a/wrap/Deconstructor.cpp b/wrap/Deconstructor.cpp
index 9fe9aecc2..9e6495602 100644
--- a/wrap/Deconstructor.cpp
+++ b/wrap/Deconstructor.cpp
@@ -19,7 +19,6 @@
 #include <iostream>
 #include <fstream>
 
-#include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
 
 #include "utilities.h"
diff --git a/wrap/Function.cpp b/wrap/Function.cpp
index 7e4ded040..8da667fae 100644
--- a/wrap/Function.cpp
+++ b/wrap/Function.cpp
@@ -18,7 +18,6 @@
 #include "Function.h"
 #include "utilities.h"
 
-#include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 
diff --git a/wrap/Method.cpp b/wrap/Method.cpp
index 2ad6e8259..f8c03b0c6 100644
--- a/wrap/Method.cpp
+++ b/wrap/Method.cpp
@@ -18,7 +18,6 @@
 #include "Method.h"
 #include "utilities.h"
 
-#include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 
diff --git a/wrap/MethodBase.cpp b/wrap/MethodBase.cpp
index 9b5f7135f..84e6c67d9 100644
--- a/wrap/MethodBase.cpp
+++ b/wrap/MethodBase.cpp
@@ -19,7 +19,6 @@
 #include "Method.h"
 #include "utilities.h"
 
-#include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 
diff --git a/wrap/Module.cpp b/wrap/Module.cpp
index abf9a2a02..a115c5e10 100644
--- a/wrap/Module.cpp
+++ b/wrap/Module.cpp
@@ -223,7 +223,6 @@ void Module::matlab_code(const string& toolboxPath) const {
   FileWriter wrapperFile(wrapperFileName, verbose, "//");
   wrapperFile.oss << "#include <wrap/matlab.h>\n";
   wrapperFile.oss << "#include <map>\n";
-  wrapperFile.oss << "#include <boost/foreach.hpp>\n";
   wrapperFile.oss << "\n";
 
   // Include boost.serialization archive headers before other class headers
diff --git a/wrap/ReturnType.cpp b/wrap/ReturnType.cpp
index 41fd51680..1a1f1bc26 100644
--- a/wrap/ReturnType.cpp
+++ b/wrap/ReturnType.cpp
@@ -6,7 +6,6 @@
 
 #include "ReturnType.h"
 #include "utilities.h"
-#include <boost/foreach.hpp>
 #include <iostream>
 
 using namespace std;
diff --git a/wrap/ReturnValue.cpp b/wrap/ReturnValue.cpp
index 596acb2c3..1405e8e2b 100644
--- a/wrap/ReturnValue.cpp
+++ b/wrap/ReturnValue.cpp
@@ -8,7 +8,6 @@
 
 #include "ReturnValue.h"
 #include "utilities.h"
-#include <boost/foreach.hpp>
 #include <iostream>
 
 using namespace std;
diff --git a/wrap/StaticMethod.cpp b/wrap/StaticMethod.cpp
index e4e7c89ae..23dc93d72 100644
--- a/wrap/StaticMethod.cpp
+++ b/wrap/StaticMethod.cpp
@@ -19,7 +19,6 @@
 #include "StaticMethod.h"
 #include "utilities.h"
 
-#include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 
diff --git a/wrap/matlab.h b/wrap/matlab.h
index 1639876cc..162aaa0e2 100644
--- a/wrap/matlab.h
+++ b/wrap/matlab.h
@@ -34,7 +34,6 @@ extern "C" {
 
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
-#include <boost/foreach.hpp>
 
 #include <list>
 #include <string>
diff --git a/wrap/tests/expected/geometry_wrapper.cpp b/wrap/tests/expected/geometry_wrapper.cpp
index 53ca880a9..ef9051d14 100644
--- a/wrap/tests/expected/geometry_wrapper.cpp
+++ b/wrap/tests/expected/geometry_wrapper.cpp
@@ -1,6 +1,5 @@
 #include <wrap/matlab.h>
 #include <map>
-#include <boost/foreach.hpp>
 
 #include <boost/serialization/export.hpp>
 #include <boost/archive/text_iarchive.hpp>
diff --git a/wrap/tests/expected2/geometry_wrapper.cpp b/wrap/tests/expected2/geometry_wrapper.cpp
index 618a4dc38..8526900a7 100644
--- a/wrap/tests/expected2/geometry_wrapper.cpp
+++ b/wrap/tests/expected2/geometry_wrapper.cpp
@@ -1,6 +1,5 @@
 #include <wrap/matlab.h>
 #include <map>
-#include <boost/foreach.hpp>
 
 #include <folder/path/to/Test.h>
 
diff --git a/wrap/tests/expected_namespaces/testNamespaces_wrapper.cpp b/wrap/tests/expected_namespaces/testNamespaces_wrapper.cpp
index 16041a3f5..0f5c70348 100644
--- a/wrap/tests/expected_namespaces/testNamespaces_wrapper.cpp
+++ b/wrap/tests/expected_namespaces/testNamespaces_wrapper.cpp
@@ -1,6 +1,5 @@
 #include <wrap/matlab.h>
 #include <map>
-#include <boost/foreach.hpp>
 
 #include <path/to/ns1.h>
 #include <path/to/ns1/ClassB.h>
diff --git a/wrap/utilities.h b/wrap/utilities.h
index fbc8dc7a2..d8108d6a5 100644
--- a/wrap/utilities.h
+++ b/wrap/utilities.h
@@ -21,7 +21,6 @@
 #include "FileWriter.h"
 
 #include <boost/format.hpp>
-#include <boost/foreach.hpp>
 
 #include <string>
 #include <vector>