diff --git a/include/boost/smart_ptr/detail/sp_counted_base_w32.hpp b/include/boost/smart_ptr/detail/sp_counted_base_w32.hpp
index 9ab71ef..15853f9 100644
--- a/include/boost/smart_ptr/detail/sp_counted_base_w32.hpp
+++ b/include/boost/smart_ptr/detail/sp_counted_base_w32.hpp
@@ -26,7 +26,7 @@
 
 #include <boost/smart_ptr/detail/sp_interlocked.hpp>
 #include <boost/smart_ptr/detail/sp_typeinfo_.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 #include <boost/config.hpp>
 
 namespace boost
diff --git a/include/boost/smart_ptr/enable_shared_from_raw.hpp b/include/boost/smart_ptr/enable_shared_from_raw.hpp
index d1c47e7..3b2da3e 100644
--- a/include/boost/smart_ptr/enable_shared_from_raw.hpp
+++ b/include/boost/smart_ptr/enable_shared_from_raw.hpp
@@ -16,7 +16,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/assert.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 namespace boost
 {
diff --git a/include/boost/smart_ptr/intrusive_ptr.hpp b/include/boost/smart_ptr/intrusive_ptr.hpp
index eddbb42..ba23e5a 100644
--- a/include/boost/smart_ptr/intrusive_ptr.hpp
+++ b/include/boost/smart_ptr/intrusive_ptr.hpp
@@ -16,7 +16,7 @@
 #include <boost/config.hpp>
 
 #include <boost/assert.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 #include <boost/smart_ptr/detail/sp_convertible.hpp>
 #include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
 #include <boost/smart_ptr/detail/sp_noexcept.hpp>
diff --git a/include/boost/smart_ptr/scoped_array.hpp b/include/boost/smart_ptr/scoped_array.hpp
index 05dd05a..d56112c 100644
--- a/include/boost/smart_ptr/scoped_array.hpp
+++ b/include/boost/smart_ptr/scoped_array.hpp
@@ -16,7 +16,7 @@
 #include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
 #include <boost/smart_ptr/detail/sp_noexcept.hpp>
 
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 #include <cstddef>            // for std::ptrdiff_t
 
diff --git a/include/boost/smart_ptr/scoped_ptr.hpp b/include/boost/smart_ptr/scoped_ptr.hpp
index 5325eba..9cf9566 100644
--- a/include/boost/smart_ptr/scoped_ptr.hpp
+++ b/include/boost/smart_ptr/scoped_ptr.hpp
@@ -16,7 +16,7 @@
 #include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
 #include <boost/smart_ptr/detail/sp_disable_deprecated.hpp>
 #include <boost/smart_ptr/detail/sp_noexcept.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 #ifndef BOOST_NO_AUTO_PTR
 # include <memory>          // for std::auto_ptr
diff --git a/include/boost/smart_ptr/shared_array.hpp b/include/boost/smart_ptr/shared_array.hpp
index a785f8e..c91b71f 100644
--- a/include/boost/smart_ptr/shared_array.hpp
+++ b/include/boost/smart_ptr/shared_array.hpp
@@ -25,7 +25,7 @@
 #include <boost/smart_ptr/detail/shared_count.hpp>
 #include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
 #include <boost/smart_ptr/detail/sp_noexcept.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 #include <cstddef>            // for std::ptrdiff_t
 #include <algorithm>          // for std::swap
diff --git a/include/boost/smart_ptr/shared_ptr.hpp b/include/boost/smart_ptr/shared_ptr.hpp
index 5ac02be..7237a7d 100644
--- a/include/boost/smart_ptr/shared_ptr.hpp
+++ b/include/boost/smart_ptr/shared_ptr.hpp
@@ -26,7 +26,7 @@
 #include <boost/checked_delete.hpp>
 #include <boost/throw_exception.hpp>
 #include <boost/smart_ptr/detail/shared_count.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 #include <boost/smart_ptr/detail/sp_convertible.hpp>
 #include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
 #include <boost/smart_ptr/detail/sp_disable_deprecated.hpp>
diff --git a/test/allocate_shared_alloc11_test.cpp b/test/allocate_shared_alloc11_test.cpp
index bf2a402..db63b95 100644
--- a/test/allocate_shared_alloc11_test.cpp
+++ b/test/allocate_shared_alloc11_test.cpp
@@ -8,7 +8,7 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
diff --git a/test/allocate_shared_construct11_test.cpp b/test/allocate_shared_construct11_test.cpp
index 131b4cb..6a93fbe 100644
--- a/test/allocate_shared_construct11_test.cpp
+++ b/test/allocate_shared_construct11_test.cpp
@@ -8,7 +8,7 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
diff --git a/test/allocate_shared_esft_test.cpp b/test/allocate_shared_esft_test.cpp
index 7902313..2546438 100644
--- a/test/allocate_shared_esft_test.cpp
+++ b/test/allocate_shared_esft_test.cpp
@@ -6,7 +6,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
diff --git a/test/allocate_shared_test.cpp b/test/allocate_shared_test.cpp
index 31dcc7b..6ea5182 100644
--- a/test/allocate_shared_test.cpp
+++ b/test/allocate_shared_test.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
diff --git a/test/atomic_count_test.cpp b/test/atomic_count_test.cpp
index ecc24c0..7a2f067 100644
--- a/test/atomic_count_test.cpp
+++ b/test/atomic_count_test.cpp
@@ -9,7 +9,7 @@
 //
 
 #include <boost/detail/atomic_count.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/atomic_count_test2.cpp b/test/atomic_count_test2.cpp
index 7e6dd97..d7077cc 100644
--- a/test/atomic_count_test2.cpp
+++ b/test/atomic_count_test2.cpp
@@ -9,7 +9,7 @@
 //
 
 #include <boost/detail/atomic_count.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/auto_ptr_rv_test.cpp b/test/auto_ptr_rv_test.cpp
index 5123439..1fee6db 100644
--- a/test/auto_ptr_rv_test.cpp
+++ b/test/auto_ptr_rv_test.cpp
@@ -19,7 +19,7 @@ int main()
 #else
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <memory>
 
 struct X
diff --git a/test/cpp11_pointer_cast_test.cpp b/test/cpp11_pointer_cast_test.cpp
index a9361c3..759c4c6 100644
--- a/test/cpp11_pointer_cast_test.cpp
+++ b/test/cpp11_pointer_cast_test.cpp
@@ -11,7 +11,7 @@
 #include <boost/pointer_cast.hpp>
 
 #include <boost/config.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/get_pointer.hpp>
 #include <boost/shared_ptr.hpp>
 
diff --git a/test/esft_regtest.cpp b/test/esft_regtest.cpp
index baa5ef2..63f5a51 100644
--- a/test/esft_regtest.cpp
+++ b/test/esft_regtest.cpp
@@ -14,7 +14,7 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/config.hpp>
 #include <memory>
 #include <string>
diff --git a/test/esft_second_ptr_test.cpp b/test/esft_second_ptr_test.cpp
index 0600667..97c64a3 100644
--- a/test/esft_second_ptr_test.cpp
+++ b/test/esft_second_ptr_test.cpp
@@ -14,7 +14,7 @@
 
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 
diff --git a/test/esft_void_test.cpp b/test/esft_void_test.cpp
index b28c669..e96837f 100644
--- a/test/esft_void_test.cpp
+++ b/test/esft_void_test.cpp
@@ -11,7 +11,7 @@
 
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 
diff --git a/test/get_deleter_array_test.cpp b/test/get_deleter_array_test.cpp
index f6d2500..d374c0f 100644
--- a/test/get_deleter_array_test.cpp
+++ b/test/get_deleter_array_test.cpp
@@ -9,7 +9,7 @@
 //
 
 #include <boost/shared_array.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct deleter
 {
diff --git a/test/get_deleter_test.cpp b/test/get_deleter_test.cpp
index 8bed379..717ab1c 100644
--- a/test/get_deleter_test.cpp
+++ b/test/get_deleter_test.cpp
@@ -9,7 +9,7 @@
 //
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct deleter
 {
diff --git a/test/intrusive_ptr_move_test.cpp b/test/intrusive_ptr_move_test.cpp
index 9079c88..d6b3601 100644
--- a/test/intrusive_ptr_move_test.cpp
+++ b/test/intrusive_ptr_move_test.cpp
@@ -26,7 +26,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/detail/atomic_count.hpp>
 #include <boost/config.hpp>
diff --git a/test/intrusive_ptr_test.cpp b/test/intrusive_ptr_test.cpp
index 475428f..cbc7299 100644
--- a/test/intrusive_ptr_test.cpp
+++ b/test/intrusive_ptr_test.cpp
@@ -26,7 +26,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/detail/atomic_count.hpp>
 #include <boost/config.hpp>
diff --git a/test/intrusive_ref_counter_test.cpp b/test/intrusive_ref_counter_test.cpp
index 53d0bd3..71c1cc9 100644
--- a/test/intrusive_ref_counter_test.cpp
+++ b/test/intrusive_ref_counter_test.cpp
@@ -33,7 +33,7 @@
 #include <cstddef>
 #include <boost/smart_ptr/intrusive_ref_counter.hpp>
 #include <boost/intrusive_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 namespace N1 {
 
diff --git a/test/ip_convertible_test.cpp b/test/ip_convertible_test.cpp
index 081f7b0..8af3819 100644
--- a/test/ip_convertible_test.cpp
+++ b/test/ip_convertible_test.cpp
@@ -8,7 +8,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/intrusive_ptr.hpp>
 
 //
diff --git a/test/ip_hash_test.cpp b/test/ip_hash_test.cpp
index be38b3d..b0f98f8 100644
--- a/test/ip_hash_test.cpp
+++ b/test/ip_hash_test.cpp
@@ -10,7 +10,7 @@
 
 #include <boost/intrusive_ptr.hpp>
 #include <boost/functional/hash.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class base
 {
diff --git a/test/lsp_array_cast_test.cpp b/test/lsp_array_cast_test.cpp
index 183cddc..f35c7d6 100644
--- a/test/lsp_array_cast_test.cpp
+++ b/test/lsp_array_cast_test.cpp
@@ -9,7 +9,7 @@
 //
 
 #include <boost/smart_ptr/local_shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct X
 {
diff --git a/test/lsp_array_n_test.cpp b/test/lsp_array_n_test.cpp
index a31e264..1a8e6ae 100644
--- a/test/lsp_array_n_test.cpp
+++ b/test/lsp_array_n_test.cpp
@@ -11,7 +11,7 @@
 #include <boost/smart_ptr/local_shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <memory>
 #include <utility>
 
diff --git a/test/lsp_array_test.cpp b/test/lsp_array_test.cpp
index 77728ea..eac0715 100644
--- a/test/lsp_array_test.cpp
+++ b/test/lsp_array_test.cpp
@@ -11,7 +11,7 @@
 #include <boost/smart_ptr/local_shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <memory>
 #include <utility>
 
diff --git a/test/lw_thread_test.cpp b/test/lw_thread_test.cpp
index 1fe2274..a43dffd 100644
--- a/test/lw_thread_test.cpp
+++ b/test/lw_thread_test.cpp
@@ -5,7 +5,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 
 #include <boost/detail/lightweight_thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/detail/atomic_count.hpp>
 
 boost::detail::atomic_count count( 0 );
diff --git a/test/make_local_shared_array_throws_test.cpp b/test/make_local_shared_array_throws_test.cpp
index e1841df..3956063 100644
--- a/test/make_local_shared_array_throws_test.cpp
+++ b/test/make_local_shared_array_throws_test.cpp
@@ -8,7 +8,7 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/config.hpp>
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && \
     !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_local_shared.hpp>
 
 class type {
diff --git a/test/make_local_shared_array_value_test.cpp b/test/make_local_shared_array_value_test.cpp
index ab07460..08b436c 100644
--- a/test/make_local_shared_array_value_test.cpp
+++ b/test/make_local_shared_array_value_test.cpp
@@ -8,7 +8,7 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/config.hpp>
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && \
     !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_local_shared.hpp>
 
 int main()
diff --git a/test/make_shared_array_throws_test.cpp b/test/make_shared_array_throws_test.cpp
index a754360..f3bac21 100644
--- a/test/make_shared_array_throws_test.cpp
+++ b/test/make_shared_array_throws_test.cpp
@@ -5,7 +5,7 @@ Copyright 2012-2015 Glen Joseph Fernandes
 Distributed under the Boost Software License, Version 1.0.
 (http://www.boost.org/LICENSE_1_0.txt)
 */
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
 class type {
diff --git a/test/make_shared_array_value_test.cpp b/test/make_shared_array_value_test.cpp
index 44d12d3..2237bb5 100644
--- a/test/make_shared_array_value_test.cpp
+++ b/test/make_shared_array_value_test.cpp
@@ -5,7 +5,7 @@ Copyright 2012-2015 Glen Joseph Fernandes
 Distributed under the Boost Software License, Version 1.0.
 (http://www.boost.org/LICENSE_1_0.txt)
 */
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
 int main()
diff --git a/test/make_shared_esft_test.cpp b/test/make_shared_esft_test.cpp
index 71b2912..b865072 100644
--- a/test/make_shared_esft_test.cpp
+++ b/test/make_shared_esft_test.cpp
@@ -6,7 +6,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
diff --git a/test/make_shared_move_emulation_test.cpp b/test/make_shared_move_emulation_test.cpp
index c607e05..48b98fc 100644
--- a/test/make_shared_move_emulation_test.cpp
+++ b/test/make_shared_move_emulation_test.cpp
@@ -9,7 +9,7 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/move/core.hpp>
 #include <boost/move/utility_core.hpp>
diff --git a/test/make_shared_perfect_forwarding_test.cpp b/test/make_shared_perfect_forwarding_test.cpp
index b7ad05d..06d5e00 100644
--- a/test/make_shared_perfect_forwarding_test.cpp
+++ b/test/make_shared_perfect_forwarding_test.cpp
@@ -8,7 +8,7 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
 
diff --git a/test/make_shared_test.cpp b/test/make_shared_test.cpp
index 9e3cdd3..44ee5c6 100644
--- a/test/make_shared_test.cpp
+++ b/test/make_shared_test.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
diff --git a/test/make_unique_array_noinit_test.cpp b/test/make_unique_array_noinit_test.cpp
index 44ac66e..b0ae926 100644
--- a/test/make_unique_array_noinit_test.cpp
+++ b/test/make_unique_array_noinit_test.cpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 */
 #include <boost/config.hpp>
 #if !defined(BOOST_NO_CXX11_SMART_PTR)
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_unique.hpp>
 
 class type {
diff --git a/test/make_unique_array_test.cpp b/test/make_unique_array_test.cpp
index 447f79d..06073c5 100644
--- a/test/make_unique_array_test.cpp
+++ b/test/make_unique_array_test.cpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 */
 #include <boost/config.hpp>
 #if !defined(BOOST_NO_CXX11_SMART_PTR)
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_unique.hpp>
 
 class type {
diff --git a/test/make_unique_array_throws_test.cpp b/test/make_unique_array_throws_test.cpp
index df4ab26..3d1e53c 100644
--- a/test/make_unique_array_throws_test.cpp
+++ b/test/make_unique_array_throws_test.cpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 */
 #include <boost/config.hpp>
 #if !defined(BOOST_NO_CXX11_SMART_PTR)
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_unique.hpp>
 
 class type {
diff --git a/test/make_unique_noinit_test.cpp b/test/make_unique_noinit_test.cpp
index a7cd828..381e0cb 100644
--- a/test/make_unique_noinit_test.cpp
+++ b/test/make_unique_noinit_test.cpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 */
 #include <boost/config.hpp>
 #if !defined(BOOST_NO_CXX11_SMART_PTR)
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_unique.hpp>
 
 class type {
diff --git a/test/make_unique_test.cpp b/test/make_unique_test.cpp
index 74c6033..9abd8b3 100644
--- a/test/make_unique_test.cpp
+++ b/test/make_unique_test.cpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 */
 #include <boost/config.hpp>
 #if !defined(BOOST_NO_CXX11_SMART_PTR)
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_unique.hpp>
 
 class type {
diff --git a/test/make_unique_throws_test.cpp b/test/make_unique_throws_test.cpp
index 2032a2e..3f4fe86 100644
--- a/test/make_unique_throws_test.cpp
+++ b/test/make_unique_throws_test.cpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 */
 #include <boost/config.hpp>
 #if !defined(BOOST_NO_CXX11_SMART_PTR)
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_unique.hpp>
 
 class type {
diff --git a/test/make_unique_value_test.cpp b/test/make_unique_value_test.cpp
index c7af67f..3b68c55 100644
--- a/test/make_unique_value_test.cpp
+++ b/test/make_unique_value_test.cpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 */
 #include <boost/config.hpp>
 #if !defined(BOOST_NO_CXX11_SMART_PTR)
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_unique.hpp>
 
 struct type {
diff --git a/test/owner_less_test.cpp b/test/owner_less_test.cpp
index 572b72b..87a91ea 100644
--- a/test/owner_less_test.cpp
+++ b/test/owner_less_test.cpp
@@ -11,7 +11,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/owner_less.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
diff --git a/test/pointer_cast_test.cpp b/test/pointer_cast_test.cpp
index ae036fb..6311b7d 100644
--- a/test/pointer_cast_test.cpp
+++ b/test/pointer_cast_test.cpp
@@ -17,7 +17,7 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/get_pointer.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 namespace
 {
diff --git a/test/sa_nullptr_test.cpp b/test/sa_nullptr_test.cpp
index a051d32..bec0161 100644
--- a/test/sa_nullptr_test.cpp
+++ b/test/sa_nullptr_test.cpp
@@ -9,7 +9,7 @@
 //
 
 #include <boost/shared_array.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <cstddef>
 #include <memory>
 
diff --git a/test/shared_from_raw_test.cpp b/test/shared_from_raw_test.cpp
index d6688c3..e6100d4 100644
--- a/test/shared_from_raw_test.cpp
+++ b/test/shared_from_raw_test.cpp
@@ -16,7 +16,7 @@
 #include <boost/smart_ptr/enable_shared_from_raw.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 
diff --git a/test/shared_from_raw_test2.cpp b/test/shared_from_raw_test2.cpp
index 2a33637..00d4a6a 100644
--- a/test/shared_from_raw_test2.cpp
+++ b/test/shared_from_raw_test2.cpp
@@ -12,7 +12,7 @@
 #include <boost/smart_ptr/enable_shared_from_raw.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/config.hpp>
 #include <memory>
 #include <string>
diff --git a/test/shared_from_raw_test3.cpp b/test/shared_from_raw_test3.cpp
index 8c3adaf..1f5f426 100644
--- a/test/shared_from_raw_test3.cpp
+++ b/test/shared_from_raw_test3.cpp
@@ -15,7 +15,7 @@
 
 #include <boost/smart_ptr/enable_shared_from_raw.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 
diff --git a/test/shared_from_raw_test4.cpp b/test/shared_from_raw_test4.cpp
index ab0658e..5bcb07a 100644
--- a/test/shared_from_raw_test4.cpp
+++ b/test/shared_from_raw_test4.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/smart_ptr/enable_shared_from_raw.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 
diff --git a/test/shared_from_raw_test5.cpp b/test/shared_from_raw_test5.cpp
index fcf4e81..903d315 100644
--- a/test/shared_from_raw_test5.cpp
+++ b/test/shared_from_raw_test5.cpp
@@ -17,7 +17,7 @@
 #include <boost/smart_ptr/enable_shared_from_raw.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <memory>
 
 class X: public boost::enable_shared_from_raw
diff --git a/test/shared_from_this_test.cpp b/test/shared_from_this_test.cpp
index 52c8b98..2a2725a 100644
--- a/test/shared_from_this_test.cpp
+++ b/test/shared_from_this_test.cpp
@@ -25,7 +25,7 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 
diff --git a/test/shared_ptr_alias_move_test.cpp b/test/shared_ptr_alias_move_test.cpp
index 972f24b..9b670db 100644
--- a/test/shared_ptr_alias_move_test.cpp
+++ b/test/shared_ptr_alias_move_test.cpp
@@ -9,7 +9,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/shared_ptr.hpp>
 #include <utility>
 
diff --git a/test/shared_ptr_alias_test.cpp b/test/shared_ptr_alias_test.cpp
index 83d866f..5f5540e 100644
--- a/test/shared_ptr_alias_test.cpp
+++ b/test/shared_ptr_alias_test.cpp
@@ -9,7 +9,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/shared_ptr.hpp>
 #include <memory>
 #include <cstddef>
diff --git a/test/shared_ptr_alloc11_test.cpp b/test/shared_ptr_alloc11_test.cpp
index c2b7d6a..dca8c96 100644
--- a/test/shared_ptr_alloc11_test.cpp
+++ b/test/shared_ptr_alloc11_test.cpp
@@ -11,7 +11,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/shared_ptr.hpp>
 #include <memory>
 #include <cstddef>
diff --git a/test/shared_ptr_alloc2_test.cpp b/test/shared_ptr_alloc2_test.cpp
index 89a44bb..c539f05 100644
--- a/test/shared_ptr_alloc2_test.cpp
+++ b/test/shared_ptr_alloc2_test.cpp
@@ -9,7 +9,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/shared_ptr.hpp>
 #include <memory>
 #include <cstddef>
diff --git a/test/shared_ptr_alloc3_test.cpp b/test/shared_ptr_alloc3_test.cpp
index 011e9cf..0859647 100644
--- a/test/shared_ptr_alloc3_test.cpp
+++ b/test/shared_ptr_alloc3_test.cpp
@@ -9,7 +9,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/shared_ptr.hpp>
 #include <memory>
 #include <cstddef>
diff --git a/test/shared_ptr_basic_test.cpp b/test/shared_ptr_basic_test.cpp
index 3fc636a..19c2ac9 100644
--- a/test/shared_ptr_basic_test.cpp
+++ b/test/shared_ptr_basic_test.cpp
@@ -28,7 +28,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
diff --git a/test/shared_ptr_convertible_test.cpp b/test/shared_ptr_convertible_test.cpp
index 7f49e1f..3433686 100644
--- a/test/shared_ptr_convertible_test.cpp
+++ b/test/shared_ptr_convertible_test.cpp
@@ -8,7 +8,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/shared_ptr.hpp>
 
 //
diff --git a/test/shared_ptr_move_test.cpp b/test/shared_ptr_move_test.cpp
index e659b24..9e1f9e6 100644
--- a/test/shared_ptr_move_test.cpp
+++ b/test/shared_ptr_move_test.cpp
@@ -9,7 +9,7 @@
 //
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <utility>
 
 #if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
diff --git a/test/shared_ptr_reinterpret_pointer_cast_test.cpp b/test/shared_ptr_reinterpret_pointer_cast_test.cpp
index e7076df..a2b5cf8 100644
--- a/test/shared_ptr_reinterpret_pointer_cast_test.cpp
+++ b/test/shared_ptr_reinterpret_pointer_cast_test.cpp
@@ -9,7 +9,7 @@
 //
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct X
 {};
diff --git a/test/shared_ptr_rv_pointer_cast_test.cpp b/test/shared_ptr_rv_pointer_cast_test.cpp
index c471bda..ddfaf73 100644
--- a/test/shared_ptr_rv_pointer_cast_test.cpp
+++ b/test/shared_ptr_rv_pointer_cast_test.cpp
@@ -9,7 +9,7 @@
 //
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
 
diff --git a/test/shared_ptr_rv_test.cpp b/test/shared_ptr_rv_test.cpp
index fe77259..3fa59e8 100644
--- a/test/shared_ptr_rv_test.cpp
+++ b/test/shared_ptr_rv_test.cpp
@@ -9,7 +9,7 @@
 //
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct X
 {
diff --git a/test/shared_ptr_test.cpp b/test/shared_ptr_test.cpp
index b76f954..0b0de8e 100644
--- a/test/shared_ptr_test.cpp
+++ b/test/shared_ptr_test.cpp
@@ -28,7 +28,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
diff --git a/test/smart_ptr_test.cpp b/test/smart_ptr_test.cpp
index 12120ed..3e46851 100644
--- a/test/smart_ptr_test.cpp
+++ b/test/smart_ptr_test.cpp
@@ -37,7 +37,7 @@
 
 #include <boost/smart_ptr.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #include <iostream>
 #include <set>
diff --git a/test/sp_array_cast_test.cpp b/test/sp_array_cast_test.cpp
index 5af7eb5..db40321 100644
--- a/test/sp_array_cast_test.cpp
+++ b/test/sp_array_cast_test.cpp
@@ -9,7 +9,7 @@
 //
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct X
 {
diff --git a/test/sp_array_n_test.cpp b/test/sp_array_n_test.cpp
index ccbcc26..290dafb 100644
--- a/test/sp_array_n_test.cpp
+++ b/test/sp_array_n_test.cpp
@@ -11,7 +11,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <memory>
 #include <utility>
 
diff --git a/test/sp_array_test.cpp b/test/sp_array_test.cpp
index d508d53..5cc68e3 100644
--- a/test/sp_array_test.cpp
+++ b/test/sp_array_test.cpp
@@ -11,7 +11,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <memory>
 #include <utility>
 
diff --git a/test/sp_atomic_test.cpp b/test/sp_atomic_test.cpp
index 3201c49..d9f3f65 100644
--- a/test/sp_atomic_test.cpp
+++ b/test/sp_atomic_test.cpp
@@ -9,7 +9,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/memory_order.hpp>
 
diff --git a/test/sp_bml_unique_ptr_test.cpp b/test/sp_bml_unique_ptr_test.cpp
index e414552..966461c 100644
--- a/test/sp_bml_unique_ptr_test.cpp
+++ b/test/sp_bml_unique_ptr_test.cpp
@@ -10,7 +10,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/move/unique_ptr.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 #include <memory>
diff --git a/test/sp_constexpr_test.cpp b/test/sp_constexpr_test.cpp
index 4de43dd..67d6b37 100644
--- a/test/sp_constexpr_test.cpp
+++ b/test/sp_constexpr_test.cpp
@@ -9,7 +9,7 @@
 //
 
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 #define HAVE_CONSTEXPR_INIT
 
diff --git a/test/sp_constexpr_test2.cpp b/test/sp_constexpr_test2.cpp
index d4926a8..06ea6a1 100644
--- a/test/sp_constexpr_test2.cpp
+++ b/test/sp_constexpr_test2.cpp
@@ -9,7 +9,7 @@
 //
 
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 #define HAVE_CONSTEXPR_INIT
 
diff --git a/test/sp_convertible_test.cpp b/test/sp_convertible_test.cpp
index 05b15c1..d06af75 100644
--- a/test/sp_convertible_test.cpp
+++ b/test/sp_convertible_test.cpp
@@ -8,7 +8,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/detail/sp_convertible.hpp>
 
 //
diff --git a/test/sp_hash_test.cpp b/test/sp_hash_test.cpp
index b67f547..2e3da17 100644
--- a/test/sp_hash_test.cpp
+++ b/test/sp_hash_test.cpp
@@ -10,7 +10,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/functional/hash.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sp_hash_test2.cpp b/test/sp_hash_test2.cpp
index c1cbf70..7ce4c80 100644
--- a/test/sp_hash_test2.cpp
+++ b/test/sp_hash_test2.cpp
@@ -10,7 +10,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/functional/hash.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sp_hash_test3.cpp b/test/sp_hash_test3.cpp
index 4d4acad..0662839 100644
--- a/test/sp_hash_test3.cpp
+++ b/test/sp_hash_test3.cpp
@@ -10,7 +10,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/functional/hash.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sp_interlocked_test.cpp b/test/sp_interlocked_test.cpp
index 73a57f6..8e22884 100644
--- a/test/sp_interlocked_test.cpp
+++ b/test/sp_interlocked_test.cpp
@@ -11,7 +11,7 @@
 #if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ )
 
 #include <boost/smart_ptr/detail/sp_interlocked.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #ifndef __LP64__
 
diff --git a/test/sp_nullptr_test.cpp b/test/sp_nullptr_test.cpp
index 1b3965c..eadf527 100644
--- a/test/sp_nullptr_test.cpp
+++ b/test/sp_nullptr_test.cpp
@@ -10,7 +10,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <cstddef>
 #include <memory>
 
diff --git a/test/sp_recursive_assign2_rv_test.cpp b/test/sp_recursive_assign2_rv_test.cpp
index e450c72..06864ad 100644
--- a/test/sp_recursive_assign2_rv_test.cpp
+++ b/test/sp_recursive_assign2_rv_test.cpp
@@ -10,7 +10,7 @@
 
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 
diff --git a/test/sp_recursive_assign2_test.cpp b/test/sp_recursive_assign2_test.cpp
index ef6fa52..9484b55 100644
--- a/test/sp_recursive_assign2_test.cpp
+++ b/test/sp_recursive_assign2_test.cpp
@@ -10,7 +10,7 @@
 
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 
diff --git a/test/sp_recursive_assign_rv_test.cpp b/test/sp_recursive_assign_rv_test.cpp
index 8d80e72..66282c9 100644
--- a/test/sp_recursive_assign_rv_test.cpp
+++ b/test/sp_recursive_assign_rv_test.cpp
@@ -10,7 +10,7 @@
 
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 
diff --git a/test/sp_recursive_assign_test.cpp b/test/sp_recursive_assign_test.cpp
index 0f36891..94ac18c 100644
--- a/test/sp_recursive_assign_test.cpp
+++ b/test/sp_recursive_assign_test.cpp
@@ -10,7 +10,7 @@
 
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 
diff --git a/test/sp_typeinfo_test.cpp b/test/sp_typeinfo_test.cpp
index 120c5bf..9113b43 100644
--- a/test/sp_typeinfo_test.cpp
+++ b/test/sp_typeinfo_test.cpp
@@ -9,7 +9,7 @@
 //
 
 #include <boost/smart_ptr/detail/sp_typeinfo_.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <iostream>
 
 int main()
diff --git a/test/sp_unary_addr_test.cpp b/test/sp_unary_addr_test.cpp
index a4007a2..f9c4012 100644
--- a/test/sp_unary_addr_test.cpp
+++ b/test/sp_unary_addr_test.cpp
@@ -9,7 +9,7 @@
 //
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <memory>
 
 struct deleter
diff --git a/test/sp_unique_ptr_test.cpp b/test/sp_unique_ptr_test.cpp
index 8e82959..3bb2203 100644
--- a/test/sp_unique_ptr_test.cpp
+++ b/test/sp_unique_ptr_test.cpp
@@ -10,7 +10,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 #include <memory>
 #include <utility>
diff --git a/test/sp_zero_compare_test.cpp b/test/sp_zero_compare_test.cpp
index e326d34..7950904 100644
--- a/test/sp_zero_compare_test.cpp
+++ b/test/sp_zero_compare_test.cpp
@@ -13,7 +13,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/shared_array.hpp>
 #include <boost/intrusive_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct W
 {
diff --git a/test/spinlock_try_test.cpp b/test/spinlock_try_test.cpp
index 008b60e..4718b50 100644
--- a/test/spinlock_try_test.cpp
+++ b/test/spinlock_try_test.cpp
@@ -9,7 +9,7 @@
 //
 
 #include <boost/smart_ptr/detail/spinlock.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 // Sanity check only
 
diff --git a/test/weak_from_raw_test.cpp b/test/weak_from_raw_test.cpp
index 34d21eb..3e9a634 100644
--- a/test/weak_from_raw_test.cpp
+++ b/test/weak_from_raw_test.cpp
@@ -12,7 +12,7 @@
 
 
 #include <boost/smart_ptr/enable_shared_from_raw.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 
 struct X: public boost::enable_shared_from_raw
diff --git a/test/weak_from_this_test.cpp b/test/weak_from_this_test.cpp
index b090cbc..2f7337d 100644
--- a/test/weak_from_this_test.cpp
+++ b/test/weak_from_this_test.cpp
@@ -15,7 +15,7 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class V: public boost::enable_shared_from_this<V>
 {
diff --git a/test/weak_ptr_move_test.cpp b/test/weak_ptr_move_test.cpp
index dbf2629..9b3bf92 100644
--- a/test/weak_ptr_move_test.cpp
+++ b/test/weak_ptr_move_test.cpp
@@ -9,7 +9,7 @@
 //
 
 #include <boost/weak_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <utility>
 
 #if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
diff --git a/test/weak_ptr_test.cpp b/test/weak_ptr_test.cpp
index a4ad766..f659868 100644
--- a/test/weak_ptr_test.cpp
+++ b/test/weak_ptr_test.cpp
@@ -24,7 +24,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
diff --git a/test/wp_convertible_test.cpp b/test/wp_convertible_test.cpp
index cceacda..465b8d9 100644
--- a/test/wp_convertible_test.cpp
+++ b/test/wp_convertible_test.cpp
@@ -8,7 +8,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/weak_ptr.hpp>
 
 //