diff --git a/gtsam/base/FastDefaultAllocator.h b/gtsam/base/FastDefaultAllocator.h
index 156a87f55..bf5cfc498 100644
--- a/gtsam/base/FastDefaultAllocator.h
+++ b/gtsam/base/FastDefaultAllocator.h
@@ -17,8 +17,7 @@
  */
 
 #pragma once
-
-#include <gtsam/global_includes.h>
+#include <gtsam/config.h>      // Configuration from CMake
 
 #if !defined GTSAM_ALLOCATOR_BOOSTPOOL && !defined GTSAM_ALLOCATOR_TBB && !defined GTSAM_ALLOCATOR_STL
 #  ifdef GTSAM_USE_TBB
@@ -85,4 +84,4 @@ namespace gtsam
     };
   }
 
-}
\ No newline at end of file
+}
diff --git a/gtsam/base/FastMap.h b/gtsam/base/FastMap.h
index 7cd6e28b8..65d532191 100644
--- a/gtsam/base/FastMap.h
+++ b/gtsam/base/FastMap.h
@@ -19,9 +19,9 @@
 #pragma once
 
 #include <gtsam/base/FastDefaultAllocator.h>
-#include <map>
 #include <boost/serialization/nvp.hpp>
 #include <boost/serialization/map.hpp>
+#include <map>
 
 namespace gtsam {