diff --git a/doc/src_code/dictionary.cpp b/doc/src_code/dictionary.cpp
index dece3089..4e080003 100644
--- a/doc/src_code/dictionary.cpp
+++ b/doc/src_code/dictionary.cpp
@@ -4,7 +4,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/unordered_map.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include "../../examples/fnv1.hpp"
 
diff --git a/doc/src_code/point1.cpp b/doc/src_code/point1.cpp
index dd562264..23ed0a58 100644
--- a/doc/src_code/point1.cpp
+++ b/doc/src_code/point1.cpp
@@ -4,7 +4,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/unordered_set.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //[point_example1
     struct point {
diff --git a/doc/src_code/point2.cpp b/doc/src_code/point2.cpp
index 359984cb..b012ca3c 100644
--- a/doc/src_code/point2.cpp
+++ b/doc/src_code/point2.cpp
@@ -5,7 +5,7 @@
 
 #include <boost/unordered_set.hpp>
 #include <boost/functional/hash.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //[point_example2
     struct point {
diff --git a/examples/case_insensitive_test.cpp b/examples/case_insensitive_test.cpp
index ee1ed8da..b717c130 100644
--- a/examples/case_insensitive_test.cpp
+++ b/examples/case_insensitive_test.cpp
@@ -4,7 +4,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./case_insensitive.hpp"
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/unordered_map.hpp>
 
 struct word_info {
diff --git a/include/boost/unordered/detail/implementation.hpp b/include/boost/unordered/detail/implementation.hpp
index d25026fe..7a9e4761 100644
--- a/include/boost/unordered/detail/implementation.hpp
+++ b/include/boost/unordered/detail/implementation.hpp
@@ -13,7 +13,7 @@
 #endif
 
 #include <boost/assert.hpp>
-#include <boost/detail/no_exceptions_support.hpp>
+#include <boost/core/no_exceptions_support.hpp>
 #include <boost/detail/select_type.hpp>
 #include <boost/iterator/iterator_categories.hpp>
 #include <boost/limits.hpp>
diff --git a/test/helpers/count.hpp b/test/helpers/count.hpp
index 3ed49ed6..90372dca 100644
--- a/test/helpers/count.hpp
+++ b/test/helpers/count.hpp
@@ -6,7 +6,7 @@
 #if !defined(BOOST_UNORDERED_TEST_HELPERS_COUNT_HEAD)
 #define BOOST_UNORDERED_TEST_HELPERS_COUNT_HEAD
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 namespace test {
   struct object_count
diff --git a/test/helpers/equivalent.hpp b/test/helpers/equivalent.hpp
index 6d05f204..5c1bfa82 100644
--- a/test/helpers/equivalent.hpp
+++ b/test/helpers/equivalent.hpp
@@ -10,7 +10,7 @@
 #include "./list.hpp"
 #include "./metafunctions.hpp"
 #include <algorithm>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/unordered_map.hpp>
 #include <boost/unordered_set.hpp>
 
diff --git a/test/helpers/test.hpp b/test/helpers/test.hpp
index 1acd6d77..5534f811 100644
--- a/test/helpers/test.hpp
+++ b/test/helpers/test.hpp
@@ -6,7 +6,7 @@
 #if !defined(BOOST_UNORDERED_TEST_TEST_HEADER)
 #define BOOST_UNORDERED_TEST_TEST_HEADER
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/stringize.hpp>
 
diff --git a/test/unordered/allocator_traits.cpp b/test/unordered/allocator_traits.cpp
index 9b8738c2..f59fc876 100644
--- a/test/unordered/allocator_traits.cpp
+++ b/test/unordered/allocator_traits.cpp
@@ -3,7 +3,7 @@
 // Distributed under the Boost Software License, Version 1.0. (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/limits.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/type_traits/is_same.hpp>
diff --git a/test/unordered/extract_tests.cpp b/test/unordered/extract_tests.cpp
index 3bbe51d2..aef7fb4e 100644
--- a/test/unordered/extract_tests.cpp
+++ b/test/unordered/extract_tests.cpp
@@ -104,8 +104,7 @@ namespace extract_tests {
         BOOST_TEST(n);
         --size;
         if (size > 0)
-          BOOST_TEST(
-            index == 0 ? next == x.begin() : next == test::next(prev));
+          BOOST_TEST(index == 0 ? next == x.begin() : next == test::next(prev));
         BOOST_TEST(x.count(key) == count - 1);
         BOOST_TEST(x.size() == size);
         if (++iterations % 20 == 0)
diff --git a/test/unordered/minimal_allocator.cpp b/test/unordered/minimal_allocator.cpp
index f80002ca..a692443e 100644
--- a/test/unordered/minimal_allocator.cpp
+++ b/test/unordered/minimal_allocator.cpp
@@ -4,7 +4,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "../objects/test.hpp"
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/unordered/detail/implementation.hpp>