diff --git a/src/basic_iarchive.cpp b/src/basic_iarchive.cpp
index 197cf676..aa11ea3f 100644
--- a/src/basic_iarchive.cpp
+++ b/src/basic_iarchive.cpp
@@ -28,6 +28,7 @@ namespace std{
 #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.
diff --git a/src/basic_oarchive.cpp b/src/basic_oarchive.cpp
index 18522afa..b7e48598 100644
--- a/src/basic_oarchive.cpp
+++ b/src/basic_oarchive.cpp
@@ -18,6 +18,7 @@
 #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
diff --git a/src/basic_serializer_map.cpp b/src/basic_serializer_map.cpp
index fea50a6d..543564cc 100644
--- a/src/basic_serializer_map.cpp
+++ b/src/basic_serializer_map.cpp
@@ -15,6 +15,7 @@
 #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.
diff --git a/src/extended_type_info.cpp b/src/extended_type_info.cpp
index 1c6aa317..92e7ffbf 100644
--- a/src/extended_type_info.cpp
+++ b/src/extended_type_info.cpp
@@ -26,10 +26,14 @@ namespace std{ using ::strcmp; }
 #endif
 
 #include <boost/core/no_exceptions_support.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.
+#include <boost/serialization/config.hpp>
+#define BOOST_SERIALIZATION_SOURCE
 #include <boost/serialization/singleton.hpp>
 #include <boost/serialization/force_include.hpp>
-
-#define BOOST_SERIALIZATION_SOURCE
 #include <boost/serialization/extended_type_info.hpp>
 
 #ifdef BOOST_MSVC
diff --git a/src/extended_type_info_no_rtti.cpp b/src/extended_type_info_no_rtti.cpp
index 32d0437e..04a18875 100644
--- a/src/extended_type_info_no_rtti.cpp
+++ b/src/extended_type_info_no_rtti.cpp
@@ -18,6 +18,10 @@
 namespace std{ using ::strcmp; }
 #endif
 
+// 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/extended_type_info_no_rtti.hpp>
 
diff --git a/src/extended_type_info_typeid.cpp b/src/extended_type_info_typeid.cpp
index 36be277b..edb4bf94 100644
--- a/src/extended_type_info_typeid.cpp
+++ b/src/extended_type_info_typeid.cpp
@@ -17,9 +17,12 @@
 
 #include <boost/core/no_exceptions_support.hpp>
 
-#include <boost/serialization/singleton.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.
+#include <boost/serialization/config.hpp>
 #define BOOST_SERIALIZATION_SOURCE
+#include <boost/serialization/singleton.hpp>
 #include <boost/serialization/extended_type_info_typeid.hpp>
 
 namespace boost { 
diff --git a/src/singleton.cpp b/src/singleton.cpp
index 019008dc..bdef0a00 100644
--- a/src/singleton.cpp
+++ b/src/singleton.cpp
@@ -7,6 +7,10 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
+// 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/singleton.hpp>
 
diff --git a/src/void_cast.cpp b/src/void_cast.cpp
index 8ea5595e..a625bd8c 100644
--- a/src/void_cast.cpp
+++ b/src/void_cast.cpp
@@ -26,8 +26,11 @@
 #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/test/Jamfile.v2 b/test/Jamfile.v2
index 52dba6e4..dc1ac0f6 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -60,6 +60,8 @@ lib dll_polymorphic_derived2_lib
 
 test-suite "serialization" :
      [ test-bsl-run_files test_array : A : :  [ requires cxx11_hdr_array ] ] # BOOST_NO_CXX11_HDR_ARRAY
+     [ test-bsl-run_files test_boost_array : A ]
+     [ test-bsl-run_files test_native_array : A ]
      [ test-bsl-run_files test_binary ]
      [ test-bsl-run_files test_class_info_save ]
      [ test-bsl-run_files test_class_info_load ]
@@ -137,6 +139,11 @@ if ! $(BOOST_ARCHIVE_LIST) {
         [ test-bsl-run test_iterators ]
         [ test-bsl-run test_iterators_base64 ]
         [ test-bsl-run test_smart_cast ]
+        [ test-bsl-run test_codecvt_null 
+            : ../src/codecvt_null
+            :
+            : <dependency>../../config/test/all//BOOST_NO_STD_WSTREAMBUF
+        ]
         
         #[ test-bsl-run test_z ]