diff --git a/examples/SolverComparer.cpp b/examples/SolverComparer.cpp
index 0393affe1..f8f1411a3 100644
--- a/examples/SolverComparer.cpp
+++ b/examples/SolverComparer.cpp
@@ -44,6 +44,7 @@
 #include <gtsam/inference/Symbol.h>
 #include <gtsam/base/timing.h>
 #include <gtsam/base/treeTraversal-inst.h>
+#include <gtsam/config.h> // for GTSAM_USE_TBB
 
 #include <boost/archive/binary_iarchive.hpp>
 #include <boost/archive/binary_oarchive.hpp>
diff --git a/examples/TimeTBB.cpp b/examples/TimeTBB.cpp
index a35980836..de472b10c 100644
--- a/examples/TimeTBB.cpp
+++ b/examples/TimeTBB.cpp
@@ -17,6 +17,8 @@
 
 #include <gtsam/global_includes.h>
 #include <gtsam/base/Matrix.h>
+#include <gtsam/config.h> // for GTSAM_USE_TBB
+
 #include <boost/assign/list_of.hpp>
 #include <boost/foreach.hpp>
 #include <map>
diff --git a/gtsam/base/ThreadsafeException.h b/gtsam/base/ThreadsafeException.h
index 3bdd42608..d464e9f21 100644
--- a/gtsam/base/ThreadsafeException.h
+++ b/gtsam/base/ThreadsafeException.h
@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include <gtsam/config.h> // for GTSAM_USE_TBB
+
 #include <boost/optional/optional.hpp>
 #include <tbb/scalable_allocator.h>
 #include <string>
@@ -27,6 +29,7 @@
 #ifdef GTSAM_USE_TBB
 #include <tbb/tbb_allocator.h>
 #include <tbb/tbb_exception.h>
+#include <iostream>
 #endif
 
 namespace gtsam {
diff --git a/gtsam/base/debug.cpp b/gtsam/base/debug.cpp
index 6abc98642..1c4d08dcd 100644
--- a/gtsam/base/debug.cpp
+++ b/gtsam/base/debug.cpp
@@ -17,6 +17,8 @@
  */
 
 #include <gtsam/base/debug.h>
+#include <gtsam/config.h> // for GTSAM_USE_TBB
+
 #ifdef GTSAM_USE_TBB
 #include <tbb/mutex.h>
 #endif
diff --git a/gtsam/base/timing.h b/gtsam/base/timing.h
index a904c5f08..d0bca4a9d 100644
--- a/gtsam/base/timing.h
+++ b/gtsam/base/timing.h
@@ -19,6 +19,7 @@
 
 #include <gtsam/base/FastMap.h>
 #include <gtsam/dllexport.h>
+#include <gtsam/config.h> // for GTSAM_USE_TBB
 
 #include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/smart_ptr/weak_ptr.hpp>
diff --git a/gtsam/base/treeTraversal-inst.h b/gtsam/base/treeTraversal-inst.h
index 3edd7d076..ab2792a89 100644
--- a/gtsam/base/treeTraversal-inst.h
+++ b/gtsam/base/treeTraversal-inst.h
@@ -22,6 +22,7 @@
 #include <gtsam/base/FastList.h>
 #include <gtsam/base/FastVector.h>
 #include <gtsam/inference/Key.h>
+#include <gtsam/config.h> // for GTSAM_USE_TBB
 
 #include <stack>
 #include <vector>
diff --git a/gtsam/base/types.h b/gtsam/base/types.h
index 69e4e4192..84c94e73d 100644
--- a/gtsam/base/types.h
+++ b/gtsam/base/types.h
@@ -22,6 +22,8 @@
 #include <gtsam/dllexport.h>
 #include <boost/concept/assert.hpp>
 #include <boost/range/concepts.hpp>
+#include <gtsam/config.h> // for GTSAM_USE_TBB
+
 #include <cstddef>
 
 #ifdef GTSAM_USE_TBB
diff --git a/gtsam/geometry/Unit3.cpp b/gtsam/geometry/Unit3.cpp
index cc3865b8e..a74e39f47 100644
--- a/gtsam/geometry/Unit3.cpp
+++ b/gtsam/geometry/Unit3.cpp
@@ -21,6 +21,7 @@
 #include <gtsam/geometry/Unit3.h>
 #include <gtsam/geometry/Point2.h>
 #include <boost/random/mersenne_twister.hpp>
+#include <gtsam/config.h> // for GTSAM_USE_TBB
 
 #ifdef __clang__
 #  pragma clang diagnostic push
diff --git a/gtsam/nonlinear/ISAM2-impl.cpp b/gtsam/nonlinear/ISAM2-impl.cpp
index 6df1c8b10..4e8c0e303 100644
--- a/gtsam/nonlinear/ISAM2-impl.cpp
+++ b/gtsam/nonlinear/ISAM2-impl.cpp
@@ -19,6 +19,8 @@
 #include <gtsam/nonlinear/ISAM2-impl.h>
 #include <gtsam/inference/Symbol.h> // for selective linearization thresholds
 #include <gtsam/base/debug.h>
+#include <gtsam/config.h> // for GTSAM_USE_TBB
+
 #include <functional>
 #include <boost/range/adaptors.hpp>
 
diff --git a/gtsam/nonlinear/NonlinearFactorGraph.cpp b/gtsam/nonlinear/NonlinearFactorGraph.cpp
index 298ccf4b7..827aaa7d8 100644
--- a/gtsam/nonlinear/NonlinearFactorGraph.cpp
+++ b/gtsam/nonlinear/NonlinearFactorGraph.cpp
@@ -17,22 +17,24 @@
  * @author  Christian Potthast
  */
 
-#include <cmath>
-#include <limits>
-#include <boost/foreach.hpp>
 #include <gtsam/geometry/Pose2.h>
 #include <gtsam/geometry/Pose3.h>
-#include <gtsam/inference/Ordering.h>
-#include <gtsam/inference/FactorGraph-inst.h>
 #include <gtsam/symbolic/SymbolicFactorGraph.h>
-#include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/nonlinear/Values.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
+#include <gtsam/linear/GaussianFactorGraph.h>
+#include <gtsam/inference/Ordering.h>
+#include <gtsam/inference/FactorGraph-inst.h>
+#include <gtsam/config.h> // for GTSAM_USE_TBB
 
 #ifdef GTSAM_USE_TBB
 #  include <tbb/parallel_for.h>
 #endif
 
+#include <boost/foreach.hpp>
+#include <cmath>
+#include <limits>
+
 using namespace std;
 
 namespace gtsam {