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 {
 
diff --git a/gtsam/base/timing.cpp b/gtsam/base/timing.cpp
index 36f1c2f5f..8df669227 100644
--- a/gtsam/base/timing.cpp
+++ b/gtsam/base/timing.cpp
@@ -16,18 +16,22 @@
  * @date     Oct 5, 2010
  */
 
-#include <math.h>
-#include <stdio.h>
-#include <iostream>
-#include <iomanip>
-#include <stdlib.h>
-#include <boost/foreach.hpp>
-#include <boost/format.hpp>
-#include <boost/algorithm/string.hpp>
-
 #include <gtsam/base/debug.h>
 #include <gtsam/base/timing.h>
 
+#include <boost/algorithm/string/replace.hpp>
+#include <boost/foreach.hpp>
+#include <boost/format.hpp>
+
+#include <cmath>
+#include <cstddef>
+#include <cassert>
+#include <iomanip>
+#include <iostream>
+#include <map>
+#include <stdexcept>
+#include <utility>
+
 namespace gtsam {
 namespace internal {
 
diff --git a/gtsam/base/timing.h b/gtsam/base/timing.h
index 7a43ef884..49c43712a 100644
--- a/gtsam/base/timing.h
+++ b/gtsam/base/timing.h
@@ -17,12 +17,15 @@
  */
 #pragma once
 
-#include <string>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-#include <boost/version.hpp>
-#include <gtsam/global_includes.h>
 #include <gtsam/base/FastMap.h>
+#include <gtsam/dllexport.h>
+
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/weak_ptr.hpp>
+#include <boost/version.hpp>
+
+#include <cstddef>
+#include <string>
 
 // This file contains the GTSAM timing instrumentation library, a low-overhead method for
 // learning at a medium-fine level how much time various components of an algorithm take