diff --git a/example/demo.cpp b/example/demo.cpp
index f5aa7ae8..38e9f493 100644
--- a/example/demo.cpp
+++ b/example/demo.cpp
@@ -7,6 +7,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
+#include <cstddef> // NULL
 #include <iomanip>
 #include <iostream>
 #include <fstream>
diff --git a/example/demo_dll.cpp b/example/demo_dll.cpp
index 41544a2f..31556e7c 100644
--- a/example/demo_dll.cpp
+++ b/example/demo_dll.cpp
@@ -8,6 +8,7 @@
 
 // should pass compilation and execution
 
+#include <cstddef> // NULL
 #include <fstream>
 
 #include <cstdio> // remove
diff --git a/example/demo_exception.cpp b/example/demo_exception.cpp
index 17a2e97b..122a05a0 100644
--- a/example/demo_exception.cpp
+++ b/example/demo_exception.cpp
@@ -19,6 +19,7 @@
 
 #include <algorithm>
 #include <iostream>
+#include <cstddef> // NULL
 #include <fstream>
 #include <string>
 
diff --git a/example/demo_shared_ptr.cpp b/example/demo_shared_ptr.cpp
index 6f5a6857..c4645169 100644
--- a/example/demo_shared_ptr.cpp
+++ b/example/demo_shared_ptr.cpp
@@ -11,6 +11,7 @@
 
 #include <iomanip>
 #include <iostream>
+#include <cstddef> // NULL
 #include <fstream>
 #include <string>
 
diff --git a/src/basic_iarchive.cpp b/src/basic_iarchive.cpp
index 8f2fc103..82042784 100644
--- a/src/basic_iarchive.cpp
+++ b/src/basic_iarchive.cpp
@@ -14,7 +14,7 @@
 #include <set>
 #include <list>
 #include <vector>
-#include <cstddef> // size_t
+#include <cstddef> // size_t, NULL
 
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
diff --git a/src/basic_iserializer.cpp b/src/basic_iserializer.cpp
index 016d97c5..e18e16fe 100644
--- a/src/basic_iserializer.cpp
+++ b/src/basic_iserializer.cpp
@@ -8,6 +8,8 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <cstddef> // NULL
+
 #define BOOST_ARCHIVE_SOURCE
 #include <boost/archive/detail/basic_iserializer.hpp>
 
diff --git a/src/basic_oarchive.cpp b/src/basic_oarchive.cpp
index 8e5c3e88..6a2cfee6 100644
--- a/src/basic_oarchive.cpp
+++ b/src/basic_oarchive.cpp
@@ -12,6 +12,7 @@
 
 #include <cassert>
 #include <set>
+#include <cstddef> // NULL
 
 #include <boost/limits.hpp>
 #include <boost/state_saver.hpp>
diff --git a/src/basic_oserializer.cpp b/src/basic_oserializer.cpp
index c96e26d8..0e218064 100644
--- a/src/basic_oserializer.cpp
+++ b/src/basic_oserializer.cpp
@@ -8,6 +8,8 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <cstddef> // NULL
+
 #define BOOST_ARCHIVE_SOURCE
 #include <boost/archive/detail/basic_oserializer.hpp>
 
diff --git a/src/extended_type_info.cpp b/src/extended_type_info.cpp
index c52cb6af..70007d56 100644
--- a/src/extended_type_info.cpp
+++ b/src/extended_type_info.cpp
@@ -16,6 +16,7 @@
 #include <set>
 #include <utility>
 #include <cassert>
+#include <cstddef> // NULL
 
 #include <boost/config.hpp> // msvc needs this to suppress warning
 
diff --git a/src/extended_type_info_no_rtti.cpp b/src/extended_type_info_no_rtti.cpp
index a20006b4..78384d72 100644
--- a/src/extended_type_info_no_rtti.cpp
+++ b/src/extended_type_info_no_rtti.cpp
@@ -9,8 +9,10 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
-#include <boost/config.hpp>
 #include <cstring>
+#include <cstddef> // NULL
+
+#include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ using ::strcmp; }
 #endif
diff --git a/src/extended_type_info_typeid.cpp b/src/extended_type_info_typeid.cpp
index 8c152595..a38700cc 100644
--- a/src/extended_type_info_typeid.cpp
+++ b/src/extended_type_info_typeid.cpp
@@ -13,6 +13,7 @@
 #include <set>
 #include <cassert>
 #include <typeinfo>
+#include <cstddef> // NULL
 
 #include <boost/detail/no_exceptions_support.hpp>
 
diff --git a/src/void_cast.cpp b/src/void_cast.cpp
index de1065d5..12b80df7 100644
--- a/src/void_cast.cpp
+++ b/src/void_cast.cpp
@@ -14,6 +14,7 @@
 #endif
 
 #include <cassert>
+#include <cstddef> // NULL
 
 // STL
 #include <vector>
diff --git a/test/D.hpp b/test/D.hpp
index 1627f600..a0e86701 100644
--- a/test/D.hpp
+++ b/test/D.hpp
@@ -16,6 +16,8 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <cstddef> // NULL
+
 #include "test_tools.hpp"
 #include <boost/detail/no_exceptions_support.hpp>
 #include <boost/throw_exception.hpp>
diff --git a/test/test_array.cpp b/test/test_array.cpp
index 4f1f5376..bcf0eabe 100644
--- a/test/test_array.cpp
+++ b/test/test_array.cpp
@@ -8,7 +8,9 @@
 
 // should pass compilation and execution
 
+#include <cstddef>
 #include <fstream>
+
 #include <cstdio> // remove
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
diff --git a/test/test_binary.cpp b/test/test_binary.cpp
index 4637ff31..f60b0257 100644
--- a/test/test_binary.cpp
+++ b/test/test_binary.cpp
@@ -8,11 +8,12 @@
 
 // should pass compilation and execution
 
-#include <fstream>
+#include <cstdlib> // for rand(), NULL
 
-#include <cstdlib> // for rand()
-#include <cstdio> // remove
+#include <fstream>
 #include <boost/config.hpp>
+
+#include <cstdio> // remove
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
     using ::rand; 
diff --git a/test/test_codecvt_null.cpp b/test/test_codecvt_null.cpp
index 70dd573e..77f6b673 100644
--- a/test/test_codecvt_null.cpp
+++ b/test/test_codecvt_null.cpp
@@ -16,7 +16,7 @@
 #include <iterator>
 #include <locale>
 #include <vector>
-#include <cstddef>
+#include <cstddef> // NULL
 
 #include <cstdio> // remove
 #include <boost/config.hpp>
diff --git a/test/test_complex.cpp b/test/test_complex.cpp
index 82f320a4..18354636 100644
--- a/test/test_complex.cpp
+++ b/test/test_complex.cpp
@@ -10,10 +10,12 @@
 
 #include <fstream>
 
-#include <cstdio> // remove
+#include <cstddef> // NULL
 #include <cstdlib> // rand
 #include <limits> 
 #include <boost/config.hpp>
+
+#include <cstdio> // remove
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
     using ::remove;
diff --git a/test/test_contained_class.cpp b/test/test_contained_class.cpp
index d08014d2..5dc15e2f 100644
--- a/test/test_contained_class.cpp
+++ b/test/test_contained_class.cpp
@@ -8,6 +8,7 @@
 
 // should pass compilation and execution
 
+#include <cstddef>
 #include <fstream>
 
 #include <cstdio> // remove
diff --git a/test/test_cyclic_ptrs.cpp b/test/test_cyclic_ptrs.cpp
index b08f2c31..cecd0d1e 100644
--- a/test/test_cyclic_ptrs.cpp
+++ b/test/test_cyclic_ptrs.cpp
@@ -8,6 +8,7 @@
 
 // should pass compilation and execution
 
+#include <cstddef> // NULL
 #include <fstream>
 
 #include <cstdio> // remove
diff --git a/test/test_delete_pointer.cpp b/test/test_delete_pointer.cpp
index 8b5e2d97..c1e5f08a 100644
--- a/test/test_delete_pointer.cpp
+++ b/test/test_delete_pointer.cpp
@@ -7,6 +7,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
+#include <cstddef> // NULL
 #include <fstream>
 
 #include <cstdio> // remove
diff --git a/test/test_deque.cpp b/test/test_deque.cpp
index 81436e31..ba8bc54c 100644
--- a/test/test_deque.cpp
+++ b/test/test_deque.cpp
@@ -8,6 +8,7 @@
 
 // should pass compilation and execution
 
+#include <cstddef>
 #include <fstream>
 
 #include <cstdio> // remove
diff --git a/test/test_derived.cpp b/test/test_derived.cpp
index e65ba613..01538c8b 100644
--- a/test/test_derived.cpp
+++ b/test/test_derived.cpp
@@ -8,6 +8,7 @@
 
 // should pass compilation and execution
 
+#include <cstddef> // NULL
 #include <fstream>
 
 #include <cstdio> // remove
diff --git a/test/test_derived_class_ptr.cpp b/test/test_derived_class_ptr.cpp
index b8604d51..07cf4385 100644
--- a/test/test_derived_class_ptr.cpp
+++ b/test/test_derived_class_ptr.cpp
@@ -8,6 +8,7 @@
 
 // should pass compilation and execution
 
+#include <cstddef> // NULL
 #include <fstream>
 
 #include <cstdio> // remove
diff --git a/test/test_diamond.cpp b/test/test_diamond.cpp
index ca92ef8f..4da08d68 100644
--- a/test/test_diamond.cpp
+++ b/test/test_diamond.cpp
@@ -8,11 +8,12 @@
 
 // test of serialization library for diamond intheritence situations
 
+#include <cstddef> // NULL
 #include <fstream>
 #include <iostream>
 
-#include <cstdio> // remove
 #include <boost/config.hpp>
+#include <cstdio> // remove
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
     using ::remove;
diff --git a/test/test_dll_exported.cpp b/test/test_dll_exported.cpp
index c494c17c..ec9c472a 100644
--- a/test/test_dll_exported.cpp
+++ b/test/test_dll_exported.cpp
@@ -8,6 +8,7 @@
 
 // should pass compilation and execution
 
+#include <cstddef> // NULL
 #include <fstream>
 
 #include <cstdio> // remove
diff --git a/test/test_dll_simple.cpp b/test/test_dll_simple.cpp
index e81fcedd..8407c578 100644
--- a/test/test_dll_simple.cpp
+++ b/test/test_dll_simple.cpp
@@ -10,6 +10,7 @@
 
 // invoke header for a custom archive test.
 
+#include <cstddef> // NULL
 #include <fstream>
 
 #include <cstdio> // remove
diff --git a/test/test_exported.cpp b/test/test_exported.cpp
index 13b1e033..cd757919 100644
--- a/test/test_exported.cpp
+++ b/test/test_exported.cpp
@@ -8,10 +8,11 @@
 
 // should pass compilation and execution
 
+#include <cstddef>
 #include <fstream>
 
-#include <cstdio> // remove
 #include <boost/config.hpp>
+#include <cstdio> // remove
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
     using ::remove;
diff --git a/test/test_list.cpp b/test/test_list.cpp
index 9fad4178..861f8eea 100644
--- a/test/test_list.cpp
+++ b/test/test_list.cpp
@@ -8,10 +8,11 @@
 
 // should pass compilation and execution
 
+#include <cstddef> // NULL
 #include <fstream>
 
-#include <cstdio> // remove
 #include <boost/config.hpp>
+#include <cstdio> // remove
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
     using ::remove;
diff --git a/test/test_list_ptrs.cpp b/test/test_list_ptrs.cpp
index 3f213a51..9a36a39f 100644
--- a/test/test_list_ptrs.cpp
+++ b/test/test_list_ptrs.cpp
@@ -8,10 +8,11 @@
 
 // should pass compilation and execution
 
+#include <cstddef>
 #include <fstream>
 
-#include <cstdio> // remove
 #include <boost/config.hpp>
+#include <cstdio> // remove
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
     using ::remove;
diff --git a/test/test_map.cpp b/test/test_map.cpp
index 30aa47cb..7ae44269 100644
--- a/test/test_map.cpp
+++ b/test/test_map.cpp
@@ -11,7 +11,7 @@
 #include <algorithm>
 #include <vector>
 #include <fstream>
-#include <cstddef> // size_t
+#include <cstddef> // size_t, NULL
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
diff --git a/test/test_mi.cpp b/test/test_mi.cpp
index ec4ca9f2..22e6454d 100644
--- a/test/test_mi.cpp
+++ b/test/test_mi.cpp
@@ -9,11 +9,12 @@
 // test of serialization of base classes with multiple inheritance
 // contributed by Peter Dimov
 
+#include <cstddef>
 #include <iostream>
 #include <fstream>
 
-#include <cstdio> // remove
 #include <boost/config.hpp>
+#include <cstdio> // remove
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
     using ::remove;
diff --git a/test/test_mult_archive_types.cpp b/test/test_mult_archive_types.cpp
index d7bb272e..b3985ebd 100644
--- a/test/test_mult_archive_types.cpp
+++ b/test/test_mult_archive_types.cpp
@@ -6,10 +6,11 @@
 // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#include <cstddef>
 #include <fstream>
 
-#include <cstdio> // remove
 #include <boost/config.hpp>
+#include <cstdio> // remove
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
     using ::remove;
diff --git a/test/test_multiple_ptrs.cpp b/test/test_multiple_ptrs.cpp
index ba573c93..df1e5fba 100644
--- a/test/test_multiple_ptrs.cpp
+++ b/test/test_multiple_ptrs.cpp
@@ -8,10 +8,11 @@
 
 // should pass compilation and execution
 
+#include <cstddef>
 #include <fstream>
 
-#include <cstdio> // remove
 #include <boost/config.hpp>
+#include <cstdio> // remove
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
     using ::remove;
diff --git a/test/test_no_rtti.cpp b/test/test_no_rtti.cpp
index 1a1e9214..2338fa68 100644
--- a/test/test_no_rtti.cpp
+++ b/test/test_no_rtti.cpp
@@ -14,10 +14,11 @@
 // As this program uses RTTI for one of the types, the test will fail
 // on a system for which RTTI is not enabled or not existent.
 
+#include <cstddef>
 #include <fstream>
 
-#include <cstdio> // remove
 #include <boost/config.hpp>
+#include <cstdio> // remove
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
     using ::remove;
diff --git a/test/test_non_default_ctor.cpp b/test/test_non_default_ctor.cpp
index e4f500a7..550a75c0 100644
--- a/test/test_non_default_ctor.cpp
+++ b/test/test_non_default_ctor.cpp
@@ -12,9 +12,10 @@
 // a) non-intrusive method of implementing serialization
 // b) usage of a non-default constructor
 
+#include <cstddef> // NULL
+#include <cstdio>  // remove()
 #include <fstream>
 #include <cstdlib> // for rand()
-#include <cstdio>  // remove()
 #include <cmath> // for fabs()
 #include <limits> 
 
diff --git a/test/test_null_ptr.cpp b/test/test_null_ptr.cpp
index 511d0ecd..18344dd9 100644
--- a/test/test_null_ptr.cpp
+++ b/test/test_null_ptr.cpp
@@ -8,9 +8,10 @@
 
 // should pass compilation and execution
 
+#include <cstddef> // NULL
+#include <cstdio> // remove
 #include <fstream>
 
-#include <cstdio> // remove
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
diff --git a/test/test_nvp.cpp b/test/test_nvp.cpp
index bef9a5fa..210e2a89 100644
--- a/test/test_nvp.cpp
+++ b/test/test_nvp.cpp
@@ -8,9 +8,10 @@
 
 // should pass compilation and execution
 
+#include <cstddef> // NULL
+#include <cstdio> // remove
 #include <fstream>
 
-#include <cstdio> // remove
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
diff --git a/test/test_object.cpp b/test/test_object.cpp
index 512d5ad5..acf44e8c 100644
--- a/test/test_object.cpp
+++ b/test/test_object.cpp
@@ -9,9 +9,10 @@
 // test implementation level "object_serializable"
 // should pass compilation and execution
 
+#include <cstddef> // NULL
+#include <cstdio> // remove
 #include <fstream>
 
-#include <cstdio> // remove
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
diff --git a/test/test_optional.cpp b/test/test_optional.cpp
index 552ec6ec..0beb750d 100644
--- a/test/test_optional.cpp
+++ b/test/test_optional.cpp
@@ -8,10 +8,12 @@
 
 // should pass compilation and execution
 
+#include <cstddef> // NULL
+#include <cstdio> // remove
 #include <fstream>
+
 #include <boost/config.hpp>
 
-#include <cstdio> // remove
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
     using ::remove;
diff --git a/test/test_polymorphic.cpp b/test/test_polymorphic.cpp
index b875c001..1e501c68 100644
--- a/test/test_polymorphic.cpp
+++ b/test/test_polymorphic.cpp
@@ -8,9 +8,10 @@
 
 // should pass compilation and execution
 
+#include <cstddef> // NULL
+#include <cstdio> // remove
 #include <fstream>
 
-#include <cstdio> // remove
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
diff --git a/test/test_primitive.cpp b/test/test_primitive.cpp
index f65a231b..aa94bd44 100644
--- a/test/test_primitive.cpp
+++ b/test/test_primitive.cpp
@@ -8,6 +8,7 @@
 
 // test implementation level "primitive_type"
 
+#include <cstddef> // NULL
 #include <fstream>
 
 #include "test_tools.hpp"
diff --git a/test/test_recursion.cpp b/test/test_recursion.cpp
index 0f41eef7..a44f293c 100644
--- a/test/test_recursion.cpp
+++ b/test/test_recursion.cpp
@@ -8,9 +8,10 @@
 
 // should pass compilation and execution
 
+#include <cstddef> // NULL
+#include <cstdio> // remove
 #include <fstream>
 
-#include <cstdio> // remove
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
diff --git a/test/test_registered.cpp b/test/test_registered.cpp
index 861a5d44..5a5ccdda 100644
--- a/test/test_registered.cpp
+++ b/test/test_registered.cpp
@@ -8,9 +8,10 @@
 
 // should pass compilation and execution
 
+#include <cstddef> // NULL
+#include <cstdio> // remove
 #include <fstream>
 
-#include <cstdio> // remove
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
diff --git a/test/test_set.cpp b/test/test_set.cpp
index 41362913..861039f8 100644
--- a/test/test_set.cpp
+++ b/test/test_set.cpp
@@ -8,11 +8,13 @@
 
 // should pass compilation and execution
 
-#include <algorithm>
-#include <vector>
+#include <cstddef> // NULL
+#include <cstdio> // remove
 #include <fstream>
 
-#include <cstdio> // remove
+#include <algorithm>
+#include <vector>
+
 #include <boost/config.hpp>
 
 #include <boost/detail/workaround.hpp>
diff --git a/test/test_shared_ptr.cpp b/test/test_shared_ptr.cpp
index 82b87cd0..6c001693 100644
--- a/test/test_shared_ptr.cpp
+++ b/test/test_shared_ptr.cpp
@@ -8,9 +8,10 @@
 //
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <cstddef> // NULL
+#include <cstdio> // remove
 #include <fstream>
 
-#include <cstdio> // remove
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
diff --git a/test/test_shared_ptr_132.cpp b/test/test_shared_ptr_132.cpp
index c5a28eaa..76921fe4 100644
--- a/test/test_shared_ptr_132.cpp
+++ b/test/test_shared_ptr_132.cpp
@@ -8,6 +8,7 @@
 //
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#include <cstddef> // NULL
 #include <fstream>
 
 #include <cstdio> // remove
diff --git a/test/test_simple_class.cpp b/test/test_simple_class.cpp
index 59a4a915..bddc3edd 100644
--- a/test/test_simple_class.cpp
+++ b/test/test_simple_class.cpp
@@ -10,9 +10,10 @@
 
 // invoke header for a custom archive test.
 
+#include <cstddef> // NULL
+#include <cstdio> // remove
 #include <fstream>
 
-#include <cstdio> // remove
 #include <boost/config.hpp>
 
 #if defined(BOOST_NO_STDC_NAMESPACE)
diff --git a/test/test_simple_class_ptr.cpp b/test/test_simple_class_ptr.cpp
index ac0bef20..dd469032 100644
--- a/test/test_simple_class_ptr.cpp
+++ b/test/test_simple_class_ptr.cpp
@@ -8,9 +8,10 @@
 
 // should pass compilation and execution
 
+#include <cstddef> // NULL
+#include <cstdio> // remove
 #include <fstream>
 
-#include <cstdio> // remove
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
diff --git a/test/test_split.cpp b/test/test_split.cpp
index 9bdcedd3..98015053 100644
--- a/test/test_split.cpp
+++ b/test/test_split.cpp
@@ -8,9 +8,10 @@
 
 // should pass compilation and execution
 
+#include <cstddef> // NULL
+#include <cstdio> // remove
 #include <fstream>
 
-#include <cstdio> // remove
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
diff --git a/test/test_tracking.cpp b/test/test_tracking.cpp
index 75e40560..d220956c 100644
--- a/test/test_tracking.cpp
+++ b/test/test_tracking.cpp
@@ -8,10 +8,11 @@
 
 // should pass compilation and execution
 
+#include <cstddef> // NULL
 #include <fstream>
 
-#include <cstdio> // remove
 #include <boost/config.hpp>
+#include <cstdio> // remove
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
     using ::remove;
diff --git a/test/test_unregistered.cpp b/test/test_unregistered.cpp
index 69c6c787..60a2a620 100644
--- a/test/test_unregistered.cpp
+++ b/test/test_unregistered.cpp
@@ -10,6 +10,7 @@
 
 #include <fstream>
 
+#include <cstddef> // NULL
 #include <cstdio> // remove
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
diff --git a/test/test_valarray.cpp b/test/test_valarray.cpp
index 334bdc1f..391f59f5 100644
--- a/test/test_valarray.cpp
+++ b/test/test_valarray.cpp
@@ -8,6 +8,7 @@
 
 // should pass compilation and execution
 
+#include <cstddef> // NULL
 #include <fstream>
 
 #include <cstdio> // remove
diff --git a/test/test_variant.cpp b/test/test_variant.cpp
index 0e5e4b2a..278c7bea 100644
--- a/test/test_variant.cpp
+++ b/test/test_variant.cpp
@@ -15,8 +15,9 @@
 // thanks to Robert Ramey and Peter Dimov.
 //
 
-#include <fstream>
+#include <cstddef> // NULL
 #include <cstdio> // remove
+#include <fstream>
 #include <cmath> // for fabs()
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
diff --git a/test/test_vector.cpp b/test/test_vector.cpp
index 8f140b6a..59cd9d27 100644
--- a/test/test_vector.cpp
+++ b/test/test_vector.cpp
@@ -8,6 +8,7 @@
 
 // should pass compilation and execution
 
+#include <cstddef> // NULL
 #include <fstream>
 
 #include <cstdio> // remove
diff --git a/test/test_void_cast.cpp b/test/test_void_cast.cpp
index 3c06c194..cb692969 100644
--- a/test/test_void_cast.cpp
+++ b/test/test_void_cast.cpp
@@ -7,6 +7,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // <gennadiy.rozental@tfn.com>
 
+#include <cstddef> // NULL
 #include "test_tools.hpp"
 #include <boost/serialization/extended_type_info_typeid.hpp>
 #include <boost/serialization/void_cast.hpp>