diff --git a/include/boost/python/detail/config.hpp b/include/boost/python/detail/config.hpp
index 4e2b85ab..d6f0a737 100644
--- a/include/boost/python/detail/config.hpp
+++ b/include/boost/python/detail/config.hpp
@@ -12,6 +12,7 @@
 #ifndef CONFIG_DWA052200_H_
 # define CONFIG_DWA052200_H_
 
+# include <pyconfig.h>
 # include <boost/config.hpp>
 
 # ifdef BOOST_NO_OPERATORS_IN_NAMESPACE
diff --git a/include/boost/python/detail/wrap_python.hpp b/include/boost/python/detail/wrap_python.hpp
index 6cb8dee2..82d85fde 100644
--- a/include/boost/python/detail/wrap_python.hpp
+++ b/include/boost/python/detail/wrap_python.hpp
@@ -24,6 +24,7 @@
 // Python's LongObject.h helpfully #defines ULONGLONG_MAX for us,
 // which confuses Boost's config
 //
+#include <pyconfig.h>
 #include <limits.h>
 #ifndef ULONG_MAX
 # define BOOST_PYTHON_ULONG_MAX_UNDEFINED
diff --git a/include/boost/python/has_back_reference.hpp b/include/boost/python/has_back_reference.hpp
index 95a3ae9a..b40ef29c 100644
--- a/include/boost/python/has_back_reference.hpp
+++ b/include/boost/python/has_back_reference.hpp
@@ -6,6 +6,9 @@
 #ifndef HAS_BACK_REFERENCE_DWA2002323_HPP
 # define HAS_BACK_REFERENCE_DWA2002323_HPP
 
+#include <pyconfig.h>
+#include <boost/config.hpp>
+
 namespace boost { namespace python { 
 
 // traits class which users can specialize to indicate that a class
diff --git a/include/boost/python/object_core.hpp b/include/boost/python/object_core.hpp
index 4727edba..8a4ead32 100755
--- a/include/boost/python/object_core.hpp
+++ b/include/boost/python/object_core.hpp
@@ -6,6 +6,7 @@
 #ifndef OBJECT_CORE_DWA2002615_HPP
 # define OBJECT_CORE_DWA2002615_HPP
 
+# include <pyconfig.h>
 # include <boost/type.hpp>
 
 # include <boost/python/call.hpp>
diff --git a/include/boost/python/ptr.hpp b/include/boost/python/ptr.hpp
index dd37f58b..fbdacb1d 100644
--- a/include/boost/python/ptr.hpp
+++ b/include/boost/python/ptr.hpp
@@ -14,6 +14,7 @@
 #  pragma once
 # endif
 
+# include <pyconfig.h>
 # include <boost/config.hpp>
 # include <boost/mpl/bool.hpp>
 
diff --git a/test/docstring.cpp b/test/docstring.cpp
index 65893d02..3bda4c96 100644
--- a/test/docstring.cpp
+++ b/test/docstring.cpp
@@ -3,13 +3,13 @@
 // copyright notice appears in all copies. This software is provided
 // "as is" without express or implied warranty, and with no claim as
 // to its suitability for any purpose.
-#include <string>
 #include <boost/python/operators.hpp>
 #include <boost/python/class.hpp>
 #include <boost/python/module.hpp>
 #include <boost/python/def.hpp>
 #include <boost/python/scope.hpp>
 #include <boost/python/manage_new_object.hpp>
+#include <string>
 #include "test_class.hpp"
 
 // Just use math.h here; trying to use std::pow() causes too much
diff --git a/test/embedding.cpp b/test/embedding.cpp
index 5a86f2cf..e3940c50 100644
--- a/test/embedding.cpp
+++ b/test/embedding.cpp
@@ -7,10 +7,10 @@
 // embedded_hello -- A simple Boost.Python embedding example -- by
 // Dirk Gerrits
 
-#include <iostream>
-#include <stdexcept>
 #include <boost/python.hpp>
 #include <boost/scoped_ptr.hpp>
+#include <iostream>
+#include <stdexcept>
 
 namespace python = boost::python;
 
diff --git a/test/extract.cpp b/test/extract.cpp
index a7749043..4fd7353a 100644
--- a/test/extract.cpp
+++ b/test/extract.cpp
@@ -4,7 +4,6 @@
 // "as is" without express or implied warranty, and with no claim as
 // to its suitability for any purpose.
 
-#include "test_class.hpp"
 #include <boost/python/extract.hpp>
 #include <boost/python/list.hpp>
 #include <boost/python/module.hpp>
@@ -15,6 +14,7 @@
 #include <boost/python/implicit.hpp>
 #include <string>
 #include <boost/lexical_cast.hpp>
+#include "test_class.hpp"
 #include <cassert>
 
 using namespace boost::python;
diff --git a/test/m1.cpp b/test/m1.cpp
index 8811bac4..45dbf58b 100644
--- a/test/m1.cpp
+++ b/test/m1.cpp
@@ -5,8 +5,6 @@
 // to its suitability for any purpose.
 
 
-#include "simple_type.hpp"
-#include "complicated.hpp"
 #include <boost/python/def.hpp>
 #include <boost/python/module.hpp>
 #include <boost/python/class.hpp>
@@ -17,6 +15,8 @@
 #include <boost/python/errors.hpp>
 #include <boost/python/manage_new_object.hpp>
 #include <string.h>
+#include "simple_type.hpp"
+#include "complicated.hpp"
 
 // Declare some straightforward extension types
 extern "C" void
diff --git a/test/operators.cpp b/test/operators.cpp
index 9096cb68..98d5212e 100755
--- a/test/operators.cpp
+++ b/test/operators.cpp
@@ -3,11 +3,11 @@
 // copyright notice appears in all copies. This software is provided
 // "as is" without express or implied warranty, and with no claim as
 // to its suitability for any purpose.
-#include <string>
 #include <boost/python/operators.hpp>
 #include <boost/python/class.hpp>
 #include <boost/python/module.hpp>
 #include <boost/python/def.hpp>
+#include <string>
 #include "test_class.hpp"
 #if __GNUC__ != 2
 # include <ostream>
diff --git a/test/pickle2.cpp b/test/pickle2.cpp
index 99401973..3d15f1d0 100644
--- a/test/pickle2.cpp
+++ b/test/pickle2.cpp
@@ -20,8 +20,6 @@
     For more information refer to boost/libs/python/doc/pickle.html.
  */
 
-#include <string>
-
 #include <boost/python/module.hpp>
 #include <boost/python/def.hpp>
 #include <boost/python/class.hpp>
@@ -29,6 +27,8 @@
 #include <boost/python/extract.hpp>
 #include <boost/python/detail/api_placeholder.hpp>
 
+#include <string>
+
 namespace { // Avoid cluttering the global namespace.
 
   // A friendly class.
diff --git a/test/pickle3.cpp b/test/pickle3.cpp
index 8f243d39..9deadc3d 100644
--- a/test/pickle3.cpp
+++ b/test/pickle3.cpp
@@ -15,8 +15,6 @@
     For more information refer to boost/libs/python/doc/pickle.html.
  */
 
-#include <string>
-
 #include <boost/python/module.hpp>
 #include <boost/python/def.hpp>
 #include <boost/python/class.hpp>
@@ -26,6 +24,8 @@
 #include <boost/python/detail/api_placeholder.hpp>
 #include <boost/python/back_reference.hpp>
 
+#include <string>
+
 namespace { // Avoid cluttering the global namespace.
 
   // A friendly class.
diff --git a/test/select_holder.cpp b/test/select_holder.cpp
index c373af0a..0bf5ac15 100644
--- a/test/select_holder.cpp
+++ b/test/select_holder.cpp
@@ -3,11 +3,11 @@
 // copyright notice appears in all copies. This software is provided
 // "as is" without express or implied warranty, and with no claim as
 // to its suitability for any purpose.
-#include <boost/static_assert.hpp>
-#include <boost/type_traits/same_traits.hpp>
 #include <boost/python/object/select_holder.hpp>
 #include <boost/python/has_back_reference.hpp>
 #include <boost/python/detail/not_specified.hpp>
+#include <boost/static_assert.hpp>
+#include <boost/type_traits/same_traits.hpp>
 #include <boost/function/function0.hpp>
 #include <memory>
 
diff --git a/test/test_builtin_converters.cpp b/test/test_builtin_converters.cpp
index 4f08c534..384cccbe 100644
--- a/test/test_builtin_converters.cpp
+++ b/test/test_builtin_converters.cpp
@@ -3,9 +3,9 @@
 // copyright notice appears in all copies. This software is provided
 // "as is" without express or implied warranty, and with no claim as
 // to its suitability for any purpose.
-#include <string>
 #include <boost/python/module.hpp>
 #include <boost/python/def.hpp>
+#include <string>
 #include <complex>
 #include <boost/python/handle.hpp>
 #include <boost/python/cast.hpp>