diff --git a/gtsam/base/Matrix.h b/gtsam/base/Matrix.h
index caee2071c..41ffa27b5 100644
--- a/gtsam/base/Matrix.h
+++ b/gtsam/base/Matrix.h
@@ -22,6 +22,8 @@
 
 #pragma once
 #include <gtsam/base/Vector.h>
+#include <gtsam/config.h>      // Configuration from CMake
+
 #include <boost/math/special_functions/fpclassify.hpp>
 #include <Eigen/Core>
 #include <Eigen/Cholesky>
diff --git a/gtsam/base/OptionalJacobian.h b/gtsam/base/OptionalJacobian.h
index 7055a287a..d0e2297ef 100644
--- a/gtsam/base/OptionalJacobian.h
+++ b/gtsam/base/OptionalJacobian.h
@@ -18,7 +18,7 @@
  */
 
 #pragma once
-
+#include <gtsam/config.h>      // Configuration from CMake
 #include <Eigen/Dense>
 
 #ifndef OPTIONALJACOBIAN_NOBOOST
diff --git a/gtsam/nonlinear/internal/ExecutionTrace.h b/gtsam/nonlinear/internal/ExecutionTrace.h
index 37ce4dfd5..45817a3f9 100644
--- a/gtsam/nonlinear/internal/ExecutionTrace.h
+++ b/gtsam/nonlinear/internal/ExecutionTrace.h
@@ -17,7 +17,7 @@
  */
 
 #pragma once
-
+#include <gtsam/config.h>      // Configuration from CMake
 #include <gtsam/nonlinear/internal/JacobianMap.h>
 #include <gtsam/inference/Key.h>
 #include <gtsam/base/Manifold.h>