diff --git a/src/archive_exception.cpp b/src/archive_exception.cpp
index 5ff4b5f3..8fcc6eeb 100644
--- a/src/archive_exception.cpp
+++ b/src/archive_exception.cpp
@@ -17,6 +17,7 @@
 #include <cstring>
 
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/archive_exception.hpp>
 
 namespace boost {
diff --git a/src/basic_archive.cpp b/src/basic_archive.cpp
index 52566fa6..5391021a 100644
--- a/src/basic_archive.cpp
+++ b/src/basic_archive.cpp
@@ -32,6 +32,7 @@
 //  * required only for pointers - optional for objects
 
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/basic_archive.hpp>
 
 namespace boost {
diff --git a/src/basic_iarchive.cpp b/src/basic_iarchive.cpp
index aa11ea3f..841fefdd 100644
--- a/src/basic_iarchive.cpp
+++ b/src/basic_iarchive.cpp
@@ -24,18 +24,18 @@ namespace std{
 #endif
 
 #include <boost/integer_traits.hpp>
-#include <boost/serialization/state_saver.hpp>
-#include <boost/serialization/throw_exception.hpp>
-#include <boost/serialization/tracking.hpp>
 
-#include <boost/serialization/config.hpp>
 #define BOOST_ARCHIVE_SOURCE
 // include this to prevent linker errors when the
 // same modules are marked export and import.
 #define BOOST_SERIALIZATION_SOURCE
+#include <boost/serialization/config.hpp>
+
+#include <boost/serialization/state_saver.hpp>
+#include <boost/serialization/throw_exception.hpp>
+#include <boost/serialization/tracking.hpp>
 
 #include <boost/archive/archive_exception.hpp>
-
 #include <boost/archive/detail/decl.hpp>
 #include <boost/archive/basic_archive.hpp>
 #include <boost/archive/detail/basic_iserializer.hpp>
diff --git a/src/basic_iserializer.cpp b/src/basic_iserializer.cpp
index 2b273927..3898a6a7 100644
--- a/src/basic_iserializer.cpp
+++ b/src/basic_iserializer.cpp
@@ -11,6 +11,7 @@
 #include <cstddef> // NULL
 
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/detail/basic_iserializer.hpp>
 
 namespace boost {
diff --git a/src/basic_oarchive.cpp b/src/basic_oarchive.cpp
index b7e48598..538be310 100644
--- a/src/basic_oarchive.cpp
+++ b/src/basic_oarchive.cpp
@@ -15,16 +15,17 @@
 #include <cstddef> // NULL
 
 #include <boost/limits.hpp>
-#include <boost/serialization/state_saver.hpp>
-#include <boost/serialization/throw_exception.hpp>
 
-#include <boost/serialization/config.hpp>
 // including this here to work around an ICC in intel 7.0
 // normally this would be part of basic_oarchive.hpp below.
 #define BOOST_ARCHIVE_SOURCE
 // include this to prevent linker errors when the
 // same modules are marked export and import.
 #define BOOST_SERIALIZATION_SOURCE
+#include <boost/serialization/config.hpp>
+#include <boost/serialization/state_saver.hpp>
+#include <boost/serialization/throw_exception.hpp>
+#include <boost/serialization/extended_type_info.hpp>
 
 #include <boost/archive/detail/decl.hpp>
 #include <boost/archive/basic_archive.hpp>
@@ -32,7 +33,6 @@
 #include <boost/archive/detail/basic_pointer_oserializer.hpp>
 #include <boost/archive/detail/basic_oarchive.hpp>
 #include <boost/archive/archive_exception.hpp>
-#include <boost/serialization/extended_type_info.hpp>
 
 #ifdef BOOST_MSVC
 #  pragma warning(push)
diff --git a/src/basic_oserializer.cpp b/src/basic_oserializer.cpp
index 70b1106b..afe08c4b 100644
--- a/src/basic_oserializer.cpp
+++ b/src/basic_oserializer.cpp
@@ -11,6 +11,7 @@
 #include <cstddef> // NULL
 
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/detail/basic_oserializer.hpp>
 
 namespace boost {
diff --git a/src/basic_pointer_iserializer.cpp b/src/basic_pointer_iserializer.cpp
index 6edf4510..7cf63f30 100644
--- a/src/basic_pointer_iserializer.cpp
+++ b/src/basic_pointer_iserializer.cpp
@@ -9,6 +9,7 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/detail/basic_pointer_iserializer.hpp>
 
 namespace boost {
diff --git a/src/basic_pointer_oserializer.cpp b/src/basic_pointer_oserializer.cpp
index a5fc65c1..e86f7b78 100644
--- a/src/basic_pointer_oserializer.cpp
+++ b/src/basic_pointer_oserializer.cpp
@@ -9,6 +9,7 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/detail/basic_pointer_oserializer.hpp>
 
 namespace boost {
diff --git a/src/basic_serializer_map.cpp b/src/basic_serializer_map.cpp
index 543564cc..5b791077 100644
--- a/src/basic_serializer_map.cpp
+++ b/src/basic_serializer_map.cpp
@@ -15,15 +15,14 @@
 #include <set>
 #include <utility>
 
-#include <boost/serialization/config.hpp>
 #define BOOST_ARCHIVE_SOURCE
 // include this to prevent linker errors when the
 // same modules are marked export and import.
 #define BOOST_SERIALIZATION_SOURCE
-
-#include <boost/archive/archive_exception.hpp>
+#include <boost/serialization/config.hpp>
 #include <boost/serialization/throw_exception.hpp>
 
+#include <boost/archive/archive_exception.hpp>
 #include <boost/archive/detail/basic_serializer.hpp>
 #include <boost/archive/detail/basic_serializer_map.hpp>
 
diff --git a/src/basic_text_iprimitive.cpp b/src/basic_text_iprimitive.cpp
index c67a9420..c0b7f766 100644
--- a/src/basic_text_iprimitive.cpp
+++ b/src/basic_text_iprimitive.cpp
@@ -15,6 +15,7 @@
 #include <istream>
 
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/impl/basic_text_iprimitive.ipp>
 
diff --git a/src/basic_text_oprimitive.cpp b/src/basic_text_oprimitive.cpp
index d8d98d69..60166229 100644
--- a/src/basic_text_oprimitive.cpp
+++ b/src/basic_text_oprimitive.cpp
@@ -15,6 +15,7 @@
 #include <ostream>
 
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/impl/basic_text_oprimitive.ipp>
 
diff --git a/src/basic_text_wiprimitive.cpp b/src/basic_text_wiprimitive.cpp
index 4797485b..28250007 100644
--- a/src/basic_text_wiprimitive.cpp
+++ b/src/basic_text_wiprimitive.cpp
@@ -8,6 +8,8 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <istream>
+
 #include <boost/config.hpp>
 
 #ifdef BOOST_NO_STD_WSTREAMBUF
@@ -18,9 +20,8 @@
 #  pragma warning (disable : 4786) // too long name, harmless warning
 #endif
 
-#include <istream>
-
 #define BOOST_WARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/detail/auto_link_warchive.hpp>
 #include <boost/archive/impl/basic_text_iprimitive.ipp>
 
diff --git a/src/basic_text_woprimitive.cpp b/src/basic_text_woprimitive.cpp
index e13294e7..6c0caa97 100644
--- a/src/basic_text_woprimitive.cpp
+++ b/src/basic_text_woprimitive.cpp
@@ -8,6 +8,8 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <ostream>
+
 #include <boost/config.hpp>
 
 #ifdef BOOST_NO_STD_WSTREAMBUF
@@ -18,9 +20,8 @@
 #  pragma warning (disable : 4786) // too long name, harmless warning
 #endif
 
-#include <ostream>
-
 #define BOOST_WARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/detail/auto_link_warchive.hpp>
 #include <boost/archive/impl/basic_text_oprimitive.ipp>
 
diff --git a/src/basic_xml_archive.cpp b/src/basic_xml_archive.cpp
index 3d846633..23ab1819 100644
--- a/src/basic_xml_archive.cpp
+++ b/src/basic_xml_archive.cpp
@@ -9,6 +9,7 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/basic_xml_archive.hpp>
 
 namespace boost {
diff --git a/src/binary_iarchive.cpp b/src/binary_iarchive.cpp
index c1117e9e..41aad841 100644
--- a/src/binary_iarchive.cpp
+++ b/src/binary_iarchive.cpp
@@ -11,6 +11,7 @@
 #include <istream>
 
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/binary_iarchive.hpp>
 #include <boost/archive/detail/archive_serializer_map.hpp>
 
diff --git a/src/binary_oarchive.cpp b/src/binary_oarchive.cpp
index e7ab9040..8b86d2cb 100644
--- a/src/binary_oarchive.cpp
+++ b/src/binary_oarchive.cpp
@@ -11,6 +11,7 @@
 #include <ostream>
 
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/binary_oarchive.hpp>
 #include <boost/archive/detail/archive_serializer_map.hpp>
 
diff --git a/src/codecvt_null.cpp b/src/codecvt_null.cpp
index ea891f6c..3b8f540f 100644
--- a/src/codecvt_null.cpp
+++ b/src/codecvt_null.cpp
@@ -8,6 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/codecvt_null.hpp>
 
 // codecvt implementation for passing wchar_t objects to char output
diff --git a/src/extended_type_info.cpp b/src/extended_type_info.cpp
index 46800922..13a60c3e 100644
--- a/src/extended_type_info.cpp
+++ b/src/extended_type_info.cpp
@@ -18,13 +18,13 @@
 #include <boost/assert.hpp>
 #include <cstddef> // NULL
 
-#include <boost/config.hpp> // msvc needs this to suppress warning
-
 #include <cstring>
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ using ::strcmp; }
 #endif
 
+#include <boost/config.hpp> // msvc needs this to suppress warning
+
 #include <boost/core/no_exceptions_support.hpp>
 
 // it marks our code with proper attributes as being exported when
diff --git a/src/polymorphic_iarchive.cpp b/src/polymorphic_iarchive.cpp
index 5e8c9867..249363b8 100644
--- a/src/polymorphic_iarchive.cpp
+++ b/src/polymorphic_iarchive.cpp
@@ -13,6 +13,7 @@
 #endif
 
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/detail/archive_serializer_map.hpp>
 
 #include <boost/archive/impl/archive_serializer_map.ipp>
diff --git a/src/polymorphic_oarchive.cpp b/src/polymorphic_oarchive.cpp
index b85895e2..f63296be 100644
--- a/src/polymorphic_oarchive.cpp
+++ b/src/polymorphic_oarchive.cpp
@@ -13,6 +13,7 @@
 #endif
 
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/detail/archive_serializer_map.hpp>
 
 #include <boost/archive/impl/archive_serializer_map.ipp>
diff --git a/src/singleton.cpp b/src/singleton.cpp
index bdef0a00..b8078c1b 100644
--- a/src/singleton.cpp
+++ b/src/singleton.cpp
@@ -10,8 +10,8 @@
 // it marks our code with proper attributes as being exported when
 // we're compiling it while marking it import when just the headers
 // is being included.
-#include <boost/serialization/config.hpp>
 #define BOOST_SERIALIZATION_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/serialization/singleton.hpp>
 
 namespace boost { 
diff --git a/src/text_iarchive.cpp b/src/text_iarchive.cpp
index 9520ca25..dfcff4e1 100644
--- a/src/text_iarchive.cpp
+++ b/src/text_iarchive.cpp
@@ -13,6 +13,7 @@
 #endif
 
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/text_iarchive.hpp>
 #include <boost/archive/detail/archive_serializer_map.hpp>
 
diff --git a/src/text_oarchive.cpp b/src/text_oarchive.cpp
index 19165d62..ae24a0bf 100644
--- a/src/text_oarchive.cpp
+++ b/src/text_oarchive.cpp
@@ -13,6 +13,7 @@
 #endif
 
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/text_oarchive.hpp>
 #include <boost/archive/detail/archive_serializer_map.hpp>
 
diff --git a/src/text_wiarchive.cpp b/src/text_wiarchive.cpp
index a0c68a8e..6b6e592f 100644
--- a/src/text_wiarchive.cpp
+++ b/src/text_wiarchive.cpp
@@ -15,6 +15,7 @@
 #else
 
 #define BOOST_WARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/text_wiarchive.hpp>
 #include <boost/archive/detail/archive_serializer_map.hpp>
 
diff --git a/src/text_woarchive.cpp b/src/text_woarchive.cpp
index 54b4a0df..46441694 100644
--- a/src/text_woarchive.cpp
+++ b/src/text_woarchive.cpp
@@ -14,6 +14,7 @@
 #else
 
 #define BOOST_WARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/text_woarchive.hpp>
 #include <boost/archive/detail/archive_serializer_map.hpp>
 
diff --git a/src/void_cast.cpp b/src/void_cast.cpp
index a625bd8c..90099933 100644
--- a/src/void_cast.cpp
+++ b/src/void_cast.cpp
@@ -13,24 +13,24 @@
 # pragma warning (disable : 4786) // too long name, harmless warning
 #endif
 
-#include <boost/assert.hpp>
+// STL
+#include <set>
+#include <functional>
+#include <algorithm>
 #include <cstddef> // NULL
 #ifdef BOOST_SERIALIZATION_LOG
 #include <iostream>
 #endif
 
-// STL
-#include <set>
-#include <functional>
-#include <algorithm>
+// BOOST
+#include <boost/config.hpp>
 #include <boost/assert.hpp>
 
-// BOOST
+#define BOOST_SERIALIZATION_SOURCE
 #include <boost/serialization/config.hpp>
 // it marks our code with proper attributes as being exported when
 // we're compiling it while marking it import when just the headers
 // is being included.
-#define BOOST_SERIALIZATION_SOURCE
 #include <boost/serialization/singleton.hpp>
 #include <boost/serialization/extended_type_info.hpp>
 #include <boost/serialization/void_cast.hpp>
diff --git a/src/xml_archive_exception.cpp b/src/xml_archive_exception.cpp
index f4bf8960..375217b0 100644
--- a/src/xml_archive_exception.cpp
+++ b/src/xml_archive_exception.cpp
@@ -14,10 +14,12 @@
 
 
 #include <exception>
-#include <boost/assert.hpp>
 #include <string>
 
+#include <boost/assert.hpp>
+
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/xml_archive_exception.hpp>
 
 namespace boost {
diff --git a/src/xml_grammar.cpp b/src/xml_grammar.cpp
index 05904f42..ae48f70d 100644
--- a/src/xml_grammar.cpp
+++ b/src/xml_grammar.cpp
@@ -12,13 +12,14 @@
 #  pragma warning (disable : 4786) // too long name, harmless warning
 #endif
 
+#include <boost/config.hpp>
+
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/impl/basic_xml_grammar.hpp>
 
 using namespace boost::spirit::classic;
 
-#include <boost/config.hpp>
-
 // fixup for borland
 // The following code will be put into Boost.Config in a later revision
 #if ! defined(__SGI_STL_PORT) \
diff --git a/src/xml_iarchive.cpp b/src/xml_iarchive.cpp
index 4fe65bad..9e5fae56 100644
--- a/src/xml_iarchive.cpp
+++ b/src/xml_iarchive.cpp
@@ -12,11 +12,12 @@
 #  pragma warning (disable : 4786) // too long name, harmless warning
 #endif
 
-#define BOOST_ARCHIVE_SOURCE
-
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
 
+#define BOOST_ARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
+
 #include <boost/archive/xml_iarchive.hpp>
 #include <boost/archive/detail/archive_serializer_map.hpp>
 
diff --git a/src/xml_oarchive.cpp b/src/xml_oarchive.cpp
index 88bcdd65..e9d7cc19 100644
--- a/src/xml_oarchive.cpp
+++ b/src/xml_oarchive.cpp
@@ -13,6 +13,8 @@
 #endif
 
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
+
 #include <boost/archive/xml_oarchive.hpp>
 #include <boost/archive/detail/archive_serializer_map.hpp>
 
diff --git a/src/xml_wgrammar.cpp b/src/xml_wgrammar.cpp
index d3dd844d..7c053e80 100644
--- a/src/xml_wgrammar.cpp
+++ b/src/xml_wgrammar.cpp
@@ -15,12 +15,12 @@
 #else
 
 #define BOOST_WARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/impl/basic_xml_grammar.hpp>
 
 using namespace boost::spirit::classic;
 
 // fixup for RogueWave
-#include <boost/config.hpp>
 #if ! defined(__SGI_STL_PORT) \
 && defined(BOOST_RWSTD_VER) && BOOST_RWSTD_VER<=0x020101
 #include <string>
diff --git a/src/xml_wiarchive.cpp b/src/xml_wiarchive.cpp
index 704ddb07..a87146c8 100644
--- a/src/xml_wiarchive.cpp
+++ b/src/xml_wiarchive.cpp
@@ -20,6 +20,7 @@
 #endif
 
 #define BOOST_WARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 
 #include <boost/archive/xml_wiarchive.hpp>
 #include <boost/archive/detail/archive_serializer_map.hpp>
diff --git a/src/xml_woarchive.cpp b/src/xml_woarchive.cpp
index e71daaf6..795eb913 100644
--- a/src/xml_woarchive.cpp
+++ b/src/xml_woarchive.cpp
@@ -14,6 +14,7 @@
 #else
 
 #define BOOST_WARCHIVE_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/archive/xml_woarchive.hpp>
 #include <boost/archive/detail/archive_serializer_map.hpp>
 
diff --git a/test/test_primitive.cpp b/test/test_primitive.cpp
index aa94bd44..d9585458 100644
--- a/test/test_primitive.cpp
+++ b/test/test_primitive.cpp
@@ -11,6 +11,8 @@
 #include <cstddef> // NULL
 #include <fstream>
 
+#include <boost/config.hpp>
+
 #include "test_tools.hpp"
 
 #include <boost/serialization/level.hpp>