diff --git a/include/boost/thread/concurrent_queues/detail/sync_deque_base.hpp b/include/boost/thread/concurrent_queues/detail/sync_deque_base.hpp
index 089768192..bcabaa38a 100644
--- a/include/boost/thread/concurrent_queues/detail/sync_deque_base.hpp
+++ b/include/boost/thread/concurrent_queues/detail/sync_deque_base.hpp
@@ -12,6 +12,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include <boost/bind/bind.hpp>
+#include <boost/core/ref.hpp>
 
 #include <boost/thread/detail/config.hpp>
 #include <boost/thread/condition_variable.hpp>
@@ -187,7 +188,7 @@ namespace detail
   template <class ValueType, class Queue>
   bool sync_deque_base<ValueType, Queue>::wait_until_not_empty_or_closed(unique_lock<mutex>& lk)
   {
-    cond_.wait(lk, boost::bind(&sync_deque_base<ValueType, Queue>::not_empty_or_closed, boost::ref(*this), boost::ref(lk)));
+    cond_.wait(lk, boost::bind(&sync_deque_base<ValueType, Queue>::not_empty_or_closed, this, boost::ref(lk)));
     if (! empty(lk)) return false; // success
     return true; // closed
   }
@@ -196,7 +197,7 @@ namespace detail
   template <class WClock, class Duration>
   queue_op_status sync_deque_base<ValueType, Queue>::wait_until_not_empty_or_closed_until(unique_lock<mutex>& lk, chrono::time_point<WClock,Duration> const&tp)
   {
-    if (! cond_.wait_until(lk, tp, boost::bind(&sync_deque_base<ValueType, Queue>::not_empty_or_closed, boost::ref(*this), boost::ref(lk))))
+    if (! cond_.wait_until(lk, tp, boost::bind(&sync_deque_base<ValueType, Queue>::not_empty_or_closed, this, boost::ref(lk))))
       return queue_op_status::timeout;
     if (! empty(lk)) return queue_op_status::success;
     return queue_op_status::closed;
diff --git a/include/boost/thread/concurrent_queues/detail/sync_queue_base.hpp b/include/boost/thread/concurrent_queues/detail/sync_queue_base.hpp
index 2b3d27b72..71379e712 100644
--- a/include/boost/thread/concurrent_queues/detail/sync_queue_base.hpp
+++ b/include/boost/thread/concurrent_queues/detail/sync_queue_base.hpp
@@ -12,6 +12,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include <boost/bind/bind.hpp>
+#include <boost/core/ref.hpp>
 
 #include <boost/thread/detail/config.hpp>
 #include <boost/thread/condition_variable.hpp>
@@ -187,7 +188,7 @@ namespace detail
   template <class ValueType, class Queue>
   bool sync_queue_base<ValueType, Queue>::wait_until_not_empty_or_closed(unique_lock<mutex>& lk)
   {
-    cond_.wait(lk, boost::bind(&sync_queue_base<ValueType, Queue>::not_empty_or_closed, boost::ref(*this), boost::ref(lk)));
+    cond_.wait(lk, boost::bind(&sync_queue_base<ValueType, Queue>::not_empty_or_closed, this, boost::ref(lk)));
     if (! empty(lk)) return false; // success
     return true; // closed
   }
@@ -196,7 +197,7 @@ namespace detail
   template <class WClock, class Duration>
   queue_op_status sync_queue_base<ValueType, Queue>::wait_until_not_empty_or_closed_until(unique_lock<mutex>& lk, chrono::time_point<WClock,Duration> const&tp)
   {
-    if (! cond_.wait_until(lk, tp, boost::bind(&sync_queue_base<ValueType, Queue>::not_empty_or_closed, boost::ref(*this), boost::ref(lk))))
+    if (! cond_.wait_until(lk, tp, boost::bind(&sync_queue_base<ValueType, Queue>::not_empty_or_closed, this, boost::ref(lk))))
       return queue_op_status::timeout;
     if (! empty(lk)) return queue_op_status::success;
     return queue_op_status::closed;
diff --git a/include/boost/thread/detail/thread.hpp b/include/boost/thread/detail/thread.hpp
index 6618bbd0d..57c637f34 100644
--- a/include/boost/thread/detail/thread.hpp
+++ b/include/boost/thread/detail/thread.hpp
@@ -30,7 +30,6 @@
 #include <algorithm>
 #include <boost/core/ref.hpp>
 #include <boost/cstdint.hpp>
-#include <boost/bind/bind.hpp>
 #include <stdlib.h>
 #include <memory>
 #include <boost/core/enable_if.hpp>
@@ -47,6 +46,8 @@
 
 #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
 #include <tuple>
+#else
+#include <boost/bind/bind.hpp>
 #endif
 #include <boost/config/abi_prefix.hpp>
 
diff --git a/include/boost/thread/future.hpp b/include/boost/thread/future.hpp
index bbf0ffc80..ea1c97ba9 100644
--- a/include/boost/thread/future.hpp
+++ b/include/boost/thread/future.hpp
@@ -393,7 +393,7 @@ namespace boost
                 is_deferred_=false;
                 execute(lk);
               }
-              waiters.wait(lk, boost::bind(&shared_state_base::is_done, boost::ref(*this)));
+              waiters.wait(lk, boost::bind(&shared_state_base::is_done, this));
               if(rethrow && exception)
               {
                   boost::rethrow_exception(exception);
@@ -420,7 +420,7 @@ namespace boost
                     return false;
 
                 do_callback(lock);
-                return waiters.timed_wait(lock, rel_time, boost::bind(&shared_state_base::is_done, boost::ref(*this)));
+                return waiters.timed_wait(lock, rel_time, boost::bind(&shared_state_base::is_done, this));
             }
 
             bool timed_wait_until(boost::system_time const& target_time)
@@ -430,7 +430,7 @@ namespace boost
                     return false;
 
                 do_callback(lock);
-                return waiters.timed_wait(lock, target_time, boost::bind(&shared_state_base::is_done, boost::ref(*this)));
+                return waiters.timed_wait(lock, target_time, boost::bind(&shared_state_base::is_done, this));
             }
 #endif
 #ifdef BOOST_THREAD_USES_CHRONO
@@ -443,7 +443,7 @@ namespace boost
               if (is_deferred_)
                   return future_status::deferred;
               do_callback(lock);
-              if(!waiters.wait_until(lock, abs_time, boost::bind(&shared_state_base::is_done, boost::ref(*this))))
+              if(!waiters.wait_until(lock, abs_time, boost::bind(&shared_state_base::is_done, this)))
               {
                   return future_status::timeout;
               }
@@ -940,7 +940,7 @@ namespace boost
             join();
 #elif defined BOOST_THREAD_ASYNC_FUTURE_WAITS
             unique_lock<boost::mutex> lk(this->mutex);
-            this->waiters.wait(lk, boost::bind(&shared_state_base::is_done, boost::ref(*this)));
+            this->waiters.wait(lk, boost::bind(&shared_state_base::is_done, this));
 #endif
           }
 
diff --git a/include/boost/thread/pthread/once.hpp b/include/boost/thread/pthread/once.hpp
index 7d6643526..d9eb52eda 100644
--- a/include/boost/thread/pthread/once.hpp
+++ b/include/boost/thread/pthread/once.hpp
@@ -19,14 +19,17 @@
 #include <boost/thread/detail/delete.hpp>
 #include <boost/core/no_exceptions_support.hpp>
 
-#include <boost/bind/bind.hpp>
 #include <boost/assert.hpp>
-#include <boost/config/abi_prefix.hpp>
-
 #include <boost/cstdint.hpp>
 #include <pthread.h>
 #include <csignal>
 
+#if !defined(BOOST_THREAD_PROVIDES_INVOKE) && !defined(BOOST_THREAD_PROVIDES_INVOKE_RET)
+#include <boost/bind/bind.hpp>
+#endif
+
+#include <boost/config/abi_prefix.hpp>
+
 namespace boost
 {
 
diff --git a/include/boost/thread/pthread/once_atomic.hpp b/include/boost/thread/pthread/once_atomic.hpp
index ce96702ff..a35c5efd9 100644
--- a/include/boost/thread/pthread/once_atomic.hpp
+++ b/include/boost/thread/pthread/once_atomic.hpp
@@ -16,8 +16,12 @@
 #include <boost/thread/detail/move.hpp>
 #include <boost/thread/detail/invoke.hpp>
 #include <boost/core/no_exceptions_support.hpp>
+#include <boost/atomic/capabilities.hpp>
+#include <boost/atomic/atomic.hpp>
+
+#if !defined(BOOST_THREAD_PROVIDES_INVOKE) && !defined(BOOST_THREAD_PROVIDES_INVOKE_RET)
 #include <boost/bind/bind.hpp>
-#include <boost/atomic.hpp>
+#endif
 
 #include <boost/config/abi_prefix.hpp>
 
diff --git a/include/boost/thread/pthread/shared_mutex.hpp b/include/boost/thread/pthread/shared_mutex.hpp
index 993e6f260..d4b828045 100644
--- a/include/boost/thread/pthread/shared_mutex.hpp
+++ b/include/boost/thread/pthread/shared_mutex.hpp
@@ -171,7 +171,7 @@ namespace boost
             boost::this_thread::disable_interruption do_not_disturb;
 #endif
             boost::unique_lock<boost::mutex> lk(state_change);
-            shared_cond.wait(lk, boost::bind(&state_data::can_lock_shared, boost::ref(state)));
+            shared_cond.wait(lk, boost::bind(&state_data::can_lock_shared, &state));
             state.lock_shared();
         }
 
@@ -194,7 +194,7 @@ namespace boost
             boost::this_thread::disable_interruption do_not_disturb;
 #endif
             boost::unique_lock<boost::mutex> lk(state_change);
-            if(!shared_cond.timed_wait(lk, timeout, boost::bind(&state_data::can_lock_shared, boost::ref(state))))
+            if(!shared_cond.timed_wait(lk, timeout, boost::bind(&state_data::can_lock_shared, &state)))
             {
                 return false;
             }
@@ -209,7 +209,7 @@ namespace boost
             boost::this_thread::disable_interruption do_not_disturb;
 #endif
             boost::unique_lock<boost::mutex> lk(state_change);
-            if(!shared_cond.timed_wait(lk, relative_time, boost::bind(&state_data::can_lock_shared, boost::ref(state))))
+            if(!shared_cond.timed_wait(lk, relative_time, boost::bind(&state_data::can_lock_shared, &state)))
             {
                 return false;
             }
@@ -230,7 +230,7 @@ namespace boost
           boost::this_thread::disable_interruption do_not_disturb;
 #endif
           boost::unique_lock<boost::mutex> lk(state_change);
-          if(!shared_cond.wait_until(lk, abs_time, boost::bind(&state_data::can_lock_shared, boost::ref(state))))
+          if(!shared_cond.wait_until(lk, abs_time, boost::bind(&state_data::can_lock_shared, &state)))
           {
               return false;
           }
@@ -270,7 +270,7 @@ namespace boost
 #endif
             boost::unique_lock<boost::mutex> lk(state_change);
             state.exclusive_waiting_blocked=true;
-            exclusive_cond.wait(lk, boost::bind(&state_data::can_lock, boost::ref(state)));
+            exclusive_cond.wait(lk, boost::bind(&state_data::can_lock, &state));
             state.exclusive=true;
         }
 
@@ -282,7 +282,7 @@ namespace boost
 #endif
             boost::unique_lock<boost::mutex> lk(state_change);
             state.exclusive_waiting_blocked=true;
-            if(!exclusive_cond.timed_wait(lk, timeout, boost::bind(&state_data::can_lock, boost::ref(state))))
+            if(!exclusive_cond.timed_wait(lk, timeout, boost::bind(&state_data::can_lock, &state)))
             {
                 state.exclusive_waiting_blocked=false;
                 release_waiters();
@@ -300,7 +300,7 @@ namespace boost
 #endif
             boost::unique_lock<boost::mutex> lk(state_change);
             state.exclusive_waiting_blocked=true;
-            if(!exclusive_cond.timed_wait(lk, relative_time, boost::bind(&state_data::can_lock, boost::ref(state))))
+            if(!exclusive_cond.timed_wait(lk, relative_time, boost::bind(&state_data::can_lock, &state)))
             {
                 state.exclusive_waiting_blocked=false;
                 release_waiters();
@@ -324,7 +324,7 @@ namespace boost
 #endif
           boost::unique_lock<boost::mutex> lk(state_change);
           state.exclusive_waiting_blocked=true;
-          if(!exclusive_cond.wait_until(lk, abs_time, boost::bind(&state_data::can_lock, boost::ref(state))))
+          if(!exclusive_cond.wait_until(lk, abs_time, boost::bind(&state_data::can_lock, &state)))
           {
               state.exclusive_waiting_blocked=false;
               release_waiters();
@@ -362,7 +362,7 @@ namespace boost
             boost::this_thread::disable_interruption do_not_disturb;
 #endif
             boost::unique_lock<boost::mutex> lk(state_change);
-            shared_cond.wait(lk, boost::bind(&state_data::can_lock_upgrade, boost::ref(state)));
+            shared_cond.wait(lk, boost::bind(&state_data::can_lock_upgrade, &state));
             state.lock_shared();
             state.upgrade=true;
         }
@@ -374,7 +374,7 @@ namespace boost
             boost::this_thread::disable_interruption do_not_disturb;
 #endif
             boost::unique_lock<boost::mutex> lk(state_change);
-            if(!shared_cond.timed_wait(lk, timeout, boost::bind(&state_data::can_lock_upgrade, boost::ref(state))))
+            if(!shared_cond.timed_wait(lk, timeout, boost::bind(&state_data::can_lock_upgrade, &state)))
             {
                 return false;
             }
@@ -390,7 +390,7 @@ namespace boost
             boost::this_thread::disable_interruption do_not_disturb;
 #endif
             boost::unique_lock<boost::mutex> lk(state_change);
-            if(!shared_cond.timed_wait(lk, relative_time, boost::bind(&state_data::can_lock_upgrade, boost::ref(state))))
+            if(!shared_cond.timed_wait(lk, relative_time, boost::bind(&state_data::can_lock_upgrade, &state)))
             {
                 return false;
             }
@@ -412,7 +412,7 @@ namespace boost
           boost::this_thread::disable_interruption do_not_disturb;
 #endif
           boost::unique_lock<boost::mutex> lk(state_change);
-          if(!shared_cond.wait_until(lk, abs_time, boost::bind(&state_data::can_lock_upgrade, boost::ref(state))))
+          if(!shared_cond.wait_until(lk, abs_time, boost::bind(&state_data::can_lock_upgrade, &state)))
           {
               return false;
           }
@@ -457,7 +457,7 @@ namespace boost
             boost::unique_lock<boost::mutex> lk(state_change);
             state.assert_lock_upgraded();
             state.unlock_shared();
-            upgrade_cond.wait(lk, boost::bind(&state_data::no_shared, boost::ref(state)));
+            upgrade_cond.wait(lk, boost::bind(&state_data::no_shared, &state));
             state.upgrade=false;
             state.exclusive=true;
             state.assert_locked();
@@ -511,7 +511,7 @@ namespace boost
 #endif
           boost::unique_lock<boost::mutex> lk(state_change);
           state.assert_lock_upgraded();
-          if(!shared_cond.wait_until(lk, abs_time, boost::bind(&state_data::one_shared, boost::ref(state))))
+          if(!shared_cond.wait_until(lk, abs_time, boost::bind(&state_data::one_shared, &state)))
           {
               return false;
           }
@@ -569,7 +569,7 @@ namespace boost
 #endif
           boost::unique_lock<boost::mutex> lk(state_change);
           state.assert_lock_shared();
-          if(!shared_cond.wait_until(lk, abs_time, boost::bind(&state_data::one_shared, boost::ref(state))))
+          if(!shared_cond.wait_until(lk, abs_time, boost::bind(&state_data::one_shared, &state)))
           {
               return false;
           }
@@ -623,7 +623,7 @@ namespace boost
 #endif
           boost::unique_lock<boost::mutex> lk(state_change);
           state.assert_lock_shared();
-          if(!exclusive_cond.wait_until(lk, abs_time, boost::bind(&state_data::can_lock_upgrade, boost::ref(state))))
+          if(!exclusive_cond.wait_until(lk, abs_time, boost::bind(&state_data::can_lock_upgrade, &state)))
           {
               return false;
           }
diff --git a/include/boost/thread/v2/shared_mutex.hpp b/include/boost/thread/v2/shared_mutex.hpp
index 8b0cf8ee1..70ba47daf 100644
--- a/include/boost/thread/v2/shared_mutex.hpp
+++ b/include/boost/thread/v2/shared_mutex.hpp
@@ -275,9 +275,9 @@ namespace boost {
     inline void shared_mutex::lock()
     {
       boost::unique_lock<mutex_t> lk(mut_);
-      gate1_.wait(lk, boost::bind(&shared_mutex::no_writer, boost::ref(*this)));
+      gate1_.wait(lk, boost::bind(&shared_mutex::no_writer, this));
       state_ |= write_entered_;
-      gate2_.wait(lk, boost::bind(&shared_mutex::no_readers, boost::ref(*this)));
+      gate2_.wait(lk, boost::bind(&shared_mutex::no_readers, this));
     }
 
     inline bool shared_mutex::try_lock()
@@ -298,13 +298,13 @@ namespace boost {
     {
       boost::unique_lock<mutex_t> lk(mut_);
       if (!gate1_.wait_until(lk, abs_time, boost::bind(
-            &shared_mutex::no_writer, boost::ref(*this))))
+            &shared_mutex::no_writer, this)))
       {
         return false;
       }
       state_ |= write_entered_;
       if (!gate2_.wait_until(lk, abs_time, boost::bind(
-            &shared_mutex::no_readers, boost::ref(*this))))
+            &shared_mutex::no_readers, this)))
       {
         state_ &= ~write_entered_;
         return false;
@@ -319,13 +319,13 @@ namespace boost {
     {
       boost::unique_lock<mutex_t> lk(mut_);
       if (!gate1_.timed_wait(lk, abs_or_rel_time, boost::bind(
-            &shared_mutex::no_writer, boost::ref(*this))))
+            &shared_mutex::no_writer, this)))
       {
         return false;
       }
       state_ |= write_entered_;
       if (!gate2_.timed_wait(lk, abs_or_rel_time, boost::bind(
-            &shared_mutex::no_readers, boost::ref(*this))))
+            &shared_mutex::no_readers, this)))
       {
         state_ &= ~write_entered_;
         return false;
@@ -350,7 +350,7 @@ namespace boost {
     inline void shared_mutex::lock_shared()
     {
       boost::unique_lock<mutex_t> lk(mut_);
-      gate1_.wait(lk, boost::bind(&shared_mutex::no_writer_no_max_readers, boost::ref(*this)));
+      gate1_.wait(lk, boost::bind(&shared_mutex::no_writer_no_max_readers, this));
       count_t num_readers = (state_ & n_readers_) + 1;
       state_ &= ~n_readers_;
       state_ |= num_readers;
@@ -376,7 +376,7 @@ namespace boost {
     {
       boost::unique_lock<mutex_t> lk(mut_);
       if (!gate1_.wait_until(lk, abs_time, boost::bind(
-            &shared_mutex::no_writer_no_max_readers, boost::ref(*this))))
+            &shared_mutex::no_writer_no_max_readers, this)))
       {
         return false;
       }
@@ -393,7 +393,7 @@ namespace boost {
     {
       boost::unique_lock<mutex_t> lk(mut_);
       if (!gate1_.timed_wait(lk, abs_or_rel_time, boost::bind(
-            &shared_mutex::no_writer_no_max_readers, boost::ref(*this))))
+            &shared_mutex::no_writer_no_max_readers, this)))
       {
         return false;
       }
@@ -653,9 +653,9 @@ namespace boost {
     inline void upgrade_mutex::lock()
     {
       boost::unique_lock<mutex_t> lk(mut_);
-      gate1_.wait(lk, boost::bind(&upgrade_mutex::no_writer_no_upgrader, boost::ref(*this)));
+      gate1_.wait(lk, boost::bind(&upgrade_mutex::no_writer_no_upgrader, this));
       state_ |= write_entered_;
-      gate2_.wait(lk, boost::bind(&upgrade_mutex::no_readers, boost::ref(*this)));
+      gate2_.wait(lk, boost::bind(&upgrade_mutex::no_readers, this));
     }
 
     inline bool upgrade_mutex::try_lock()
@@ -676,13 +676,13 @@ namespace boost {
     {
       boost::unique_lock<mutex_t> lk(mut_);
       if (!gate1_.wait_until(lk, abs_time, boost::bind(
-            &upgrade_mutex::no_writer_no_upgrader, boost::ref(*this))))
+            &upgrade_mutex::no_writer_no_upgrader, this)))
       {
         return false;
       }
       state_ |= write_entered_;
       if (!gate2_.wait_until(lk, abs_time, boost::bind(
-            &upgrade_mutex::no_readers, boost::ref(*this))))
+            &upgrade_mutex::no_readers, this)))
       {
         state_ &= ~write_entered_;
         return false;
@@ -697,13 +697,13 @@ namespace boost {
     {
       boost::unique_lock<mutex_t> lk(mut_);
       if (!gate1_.timed_wait(lk, abs_or_rel_time, boost::bind(
-            &upgrade_mutex::no_writer_no_upgrader, boost::ref(*this))))
+            &upgrade_mutex::no_writer_no_upgrader, this)))
       {
         return false;
       }
       state_ |= write_entered_;
       if (!gate2_.timed_wait(lk, abs_or_rel_time, boost::bind(
-            &upgrade_mutex::no_readers, boost::ref(*this))))
+            &upgrade_mutex::no_readers, this)))
       {
         state_ &= ~write_entered_;
         return false;
@@ -729,7 +729,7 @@ namespace boost {
     inline void upgrade_mutex::lock_shared()
     {
       boost::unique_lock<mutex_t> lk(mut_);
-      gate1_.wait(lk, boost::bind(&upgrade_mutex::no_writer_no_max_readers, boost::ref(*this)));
+      gate1_.wait(lk, boost::bind(&upgrade_mutex::no_writer_no_max_readers, this));
       count_t num_readers = (state_ & n_readers_) + 1;
       state_ &= ~n_readers_;
       state_ |= num_readers;
@@ -755,7 +755,7 @@ namespace boost {
     {
       boost::unique_lock<mutex_t> lk(mut_);
       if (!gate1_.wait_until(lk, abs_time, boost::bind(
-            &upgrade_mutex::no_writer_no_max_readers, boost::ref(*this))))
+            &upgrade_mutex::no_writer_no_max_readers, this)))
       {
         return false;
       }
@@ -772,7 +772,7 @@ namespace boost {
     {
       boost::unique_lock<mutex_t> lk(mut_);
       if (!gate1_.timed_wait(lk, abs_or_rel_time, boost::bind(
-            &upgrade_mutex::no_writer_no_max_readers, boost::ref(*this))))
+            &upgrade_mutex::no_writer_no_max_readers, this)))
       {
         return false;
       }
@@ -807,7 +807,7 @@ namespace boost {
     inline void upgrade_mutex::lock_upgrade()
     {
       boost::unique_lock<mutex_t> lk(mut_);
-      gate1_.wait(lk, boost::bind(&upgrade_mutex::no_writer_no_upgrader_no_max_readers, boost::ref(*this)));
+      gate1_.wait(lk, boost::bind(&upgrade_mutex::no_writer_no_upgrader_no_max_readers, this));
       count_t num_readers = (state_ & n_readers_) + 1;
       state_ &= ~n_readers_;
       state_ |= upgradable_entered_ | num_readers;
@@ -833,7 +833,7 @@ namespace boost {
     {
       boost::unique_lock<mutex_t> lk(mut_);
       if (!gate1_.wait_until(lk, abs_time, boost::bind(
-            &upgrade_mutex::no_writer_no_upgrader_no_max_readers, boost::ref(*this))))
+            &upgrade_mutex::no_writer_no_upgrader_no_max_readers, this)))
       {
         return false;
       }
@@ -850,7 +850,7 @@ namespace boost {
     {
       boost::unique_lock<mutex_t> lk(mut_);
       if (!gate1_.timed_wait(lk, abs_or_rel_time, boost::bind(
-            &upgrade_mutex::no_writer_no_upgrader_no_max_readers, boost::ref(*this))))
+            &upgrade_mutex::no_writer_no_upgrader_no_max_readers, this)))
       {
         return false;
       }
@@ -898,7 +898,7 @@ namespace boost {
       boost::unique_lock<mutex_t> lk(mut_);
       BOOST_ASSERT(one_or_more_readers());
       if (!gate1_.wait_until(lk, abs_time, boost::bind(
-            &upgrade_mutex::no_writer_no_upgrader, boost::ref(*this))))
+            &upgrade_mutex::no_writer_no_upgrader, this)))
       {
         return false;
       }
@@ -906,7 +906,7 @@ namespace boost {
       state_ &= ~n_readers_;
       state_ |= (write_entered_ | num_readers);
       if (!gate2_.wait_until(lk, abs_time, boost::bind(
-            &upgrade_mutex::no_readers, boost::ref(*this))))
+            &upgrade_mutex::no_readers, this)))
       {
         ++num_readers;
         state_ &= ~(write_entered_ | n_readers_);
@@ -953,7 +953,7 @@ namespace boost {
       boost::unique_lock<mutex_t> lk(mut_);
       BOOST_ASSERT(one_or_more_readers());
       if (!gate1_.wait_until(lk, abs_time, boost::bind(
-            &upgrade_mutex::no_writer_no_upgrader, boost::ref(*this))))
+            &upgrade_mutex::no_writer_no_upgrader, this)))
       {
         return false;
       }
@@ -987,7 +987,7 @@ namespace boost {
       count_t num_readers = (state_ & n_readers_) - 1;
       state_ &= ~(upgradable_entered_ | n_readers_);
       state_ |= write_entered_ | num_readers;
-      gate2_.wait(lk, boost::bind(&upgrade_mutex::no_readers, boost::ref(*this)));
+      gate2_.wait(lk, boost::bind(&upgrade_mutex::no_readers, this));
     }
 
     inline bool upgrade_mutex::try_unlock_upgrade_and_lock()
@@ -1017,7 +1017,7 @@ namespace boost {
       state_ &= ~(upgradable_entered_ | n_readers_);
       state_ |= (write_entered_ | num_readers);
       if (!gate2_.wait_until(lk, abs_time, boost::bind(
-            &upgrade_mutex::no_readers, boost::ref(*this))))
+            &upgrade_mutex::no_readers, this)))
       {
         ++num_readers;
         state_ &= ~(write_entered_ | n_readers_);
diff --git a/include/boost/thread/win32/once.hpp b/include/boost/thread/win32/once.hpp
index 5625dbc1b..f5850bdeb 100644
--- a/include/boost/thread/win32/once.hpp
+++ b/include/boost/thread/win32/once.hpp
@@ -22,7 +22,9 @@
 #include <boost/thread/detail/move.hpp>
 #include <boost/thread/detail/invoke.hpp>
 
+#if !defined(BOOST_THREAD_PROVIDES_INVOKE) && !defined(BOOST_THREAD_PROVIDES_INVOKE_RET)
 #include <boost/bind/bind.hpp>
+#endif
 
 #include <boost/config/abi_prefix.hpp>
 
@@ -152,7 +154,7 @@ namespace boost
             {
                 name_once_mutex(mutex_name,flag_address);
             }
-            
+
             return ::boost::detail::win32::create_event(
                 mutex_name, 
                 ::boost::detail::win32::manual_reset_event,
diff --git a/src/pthread/once_atomic.cpp b/src/pthread/once_atomic.cpp
index 69f5be809..5f480a4c6 100644
--- a/src/pthread/once_atomic.cpp
+++ b/src/pthread/once_atomic.cpp
@@ -11,8 +11,8 @@
 #include <boost/thread/pthread/pthread_mutex_scoped_lock.hpp>
 #include <boost/assert.hpp>
 #include <boost/static_assert.hpp>
-#include <boost/atomic.hpp>
 #include <boost/memory_order.hpp>
+#include <boost/atomic/atomic.hpp>
 #include <pthread.h>
 
 namespace boost
diff --git a/test/experimental/parallel/v1/exception_list_pass.cpp b/test/experimental/parallel/v1/exception_list_pass.cpp
index de79412ae..cc1a45f15 100644
--- a/test/experimental/parallel/v1/exception_list_pass.cpp
+++ b/test/experimental/parallel/v1/exception_list_pass.cpp
@@ -14,7 +14,7 @@
 
 #include <boost/thread/experimental/parallel/v1/exception_list.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 
 int main()
diff --git a/test/experimental/parallel/v2/task_region_pass.cpp b/test/experimental/parallel/v2/task_region_pass.cpp
index 814ef28e5..1ee8437f7 100644
--- a/test/experimental/parallel/v2/task_region_pass.cpp
+++ b/test/experimental/parallel/v2/task_region_pass.cpp
@@ -16,7 +16,7 @@
 #include <boost/thread/experimental/parallel/v2/task_region.hpp>
 #include <string>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if ! defined BOOST_NO_CXX11_LAMBDAS  && defined(BOOST_THREAD_PROVIDES_INVOKE)
 using boost::experimental::parallel::v2::task_region;
diff --git a/test/functional/invoke/invoke_int_0_pass.cpp b/test/functional/invoke/invoke_int_0_pass.cpp
index fa1f67543..afadb60cd 100644
--- a/test/functional/invoke/invoke_int_0_pass.cpp
+++ b/test/functional/invoke/invoke_int_0_pass.cpp
@@ -15,7 +15,7 @@
 // <boost/thread/detail/invoke.hpp>
 
 #include <boost/thread/detail/invoke.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int f()
 {
diff --git a/test/functional/invoke/invoke_lvalue_pass.cpp b/test/functional/invoke/invoke_lvalue_pass.cpp
index 154953d89..ee1adb055 100644
--- a/test/functional/invoke/invoke_lvalue_pass.cpp
+++ b/test/functional/invoke/invoke_lvalue_pass.cpp
@@ -16,7 +16,7 @@
 // <boost/thread/detail/invoke.hpp>
 
 #include <boost/thread/detail/invoke.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int count = 0;
 
diff --git a/test/functional/invoke/invoke_rvalue_pass.cpp b/test/functional/invoke/invoke_rvalue_pass.cpp
index 82ea09432..85d5d89b9 100644
--- a/test/functional/invoke/invoke_rvalue_pass.cpp
+++ b/test/functional/invoke/invoke_rvalue_pass.cpp
@@ -15,7 +15,7 @@
 // <boost/thread/detail/invoke.hpp>
 
 #include <boost/thread/detail/invoke.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int count = 0;
 
diff --git a/test/functional/invoker/invoker_int_0_pass.cpp b/test/functional/invoker/invoker_int_0_pass.cpp
index 123bde2e6..f0194078c 100644
--- a/test/functional/invoker/invoker_int_0_pass.cpp
+++ b/test/functional/invoker/invoker_int_0_pass.cpp
@@ -15,7 +15,7 @@
 // <boost/thread/detail/invoker.hpp>
 
 #include <boost/thread/detail/invoker.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int f()
 {
diff --git a/test/functional/invoker/invoker_lvalue_pass.cpp b/test/functional/invoker/invoker_lvalue_pass.cpp
index 42a98d45a..d1a6acaad 100644
--- a/test/functional/invoker/invoker_lvalue_pass.cpp
+++ b/test/functional/invoker/invoker_lvalue_pass.cpp
@@ -15,7 +15,7 @@
 // <boost/thread/detail/invoker.hpp>
 
 #include <boost/thread/detail/invoker.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int count = 0;
 
diff --git a/test/functional/invoker/invoker_rvalue_pass.cpp b/test/functional/invoker/invoker_rvalue_pass.cpp
index ae06e16b6..55139efd4 100644
--- a/test/functional/invoker/invoker_rvalue_pass.cpp
+++ b/test/functional/invoker/invoker_rvalue_pass.cpp
@@ -19,7 +19,7 @@
 #endif
 
 #include <boost/thread/detail/invoker.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int count = 0;
 
diff --git a/test/sync/conditions/condition_variable/copy_fail.cpp b/test/sync/conditions/condition_variable/copy_fail.cpp
index 374ce3165..58dd5b979 100644
--- a/test/sync/conditions/condition_variable/copy_fail.cpp
+++ b/test/sync/conditions/condition_variable/copy_fail.cpp
@@ -18,7 +18,7 @@
 // condition_variable(const condition_variable&) = delete;
 
 #include <boost/thread/condition_variable.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 void fail()
 {
diff --git a/test/sync/conditions/condition_variable/default_pass.cpp b/test/sync/conditions/condition_variable/default_pass.cpp
index 465a12de8..4842355da 100644
--- a/test/sync/conditions/condition_variable/default_pass.cpp
+++ b/test/sync/conditions/condition_variable/default_pass.cpp
@@ -18,7 +18,7 @@
 // condition_variable(const condition_variable&) = delete;
 
 #include <boost/thread/condition_variable.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/conditions/condition_variable/dtor_pass.cpp b/test/sync/conditions/condition_variable/dtor_pass.cpp
index 533898ed4..34b4a1cc7 100644
--- a/test/sync/conditions/condition_variable/dtor_pass.cpp
+++ b/test/sync/conditions/condition_variable/dtor_pass.cpp
@@ -21,7 +21,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/locks.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::condition_variable* cv;
 boost::mutex m;
diff --git a/test/sync/conditions/condition_variable/lost_notif_pass.cpp b/test/sync/conditions/condition_variable/lost_notif_pass.cpp
index 79dbcd295..a79a7dce2 100644
--- a/test/sync/conditions/condition_variable/lost_notif_pass.cpp
+++ b/test/sync/conditions/condition_variable/lost_notif_pass.cpp
@@ -21,7 +21,7 @@
 #include <boost/thread/condition_variable.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <cassert>
 
 // Summary of each test:
diff --git a/test/sync/conditions/condition_variable/native_handle_pass.cpp b/test/sync/conditions/condition_variable/native_handle_pass.cpp
index 9835f5920..51a4130d8 100644
--- a/test/sync/conditions/condition_variable/native_handle_pass.cpp
+++ b/test/sync/conditions/condition_variable/native_handle_pass.cpp
@@ -20,7 +20,8 @@
 #include <boost/thread/condition_variable.hpp>
 
 #include <boost/static_assert.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/type_traits/is_same.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/conditions/condition_variable/wait_for_pass.cpp b/test/sync/conditions/condition_variable/wait_for_pass.cpp
index 4c6a0af3e..d6dd519a7 100644
--- a/test/sync/conditions/condition_variable/wait_for_pass.cpp
+++ b/test/sync/conditions/condition_variable/wait_for_pass.cpp
@@ -21,7 +21,7 @@
 #include <boost/thread/condition_variable.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <cassert>
 #include "../../../timming.hpp"
 
diff --git a/test/sync/conditions/condition_variable/wait_for_pred_pass.cpp b/test/sync/conditions/condition_variable/wait_for_pred_pass.cpp
index 92ba82f1e..8b03f35cf 100644
--- a/test/sync/conditions/condition_variable/wait_for_pred_pass.cpp
+++ b/test/sync/conditions/condition_variable/wait_for_pred_pass.cpp
@@ -20,7 +20,7 @@
 #include <boost/thread/condition_variable.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <cassert>
 #include <iostream>
 #include "../../../timming.hpp"
diff --git a/test/sync/conditions/condition_variable/wait_pass.cpp b/test/sync/conditions/condition_variable/wait_pass.cpp
index 612724b85..1438ee4ae 100644
--- a/test/sync/conditions/condition_variable/wait_pass.cpp
+++ b/test/sync/conditions/condition_variable/wait_pass.cpp
@@ -21,7 +21,7 @@
 #include <boost/thread/condition_variable.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <cassert>
 #include <iostream>
 
diff --git a/test/sync/conditions/condition_variable/wait_until_pass.cpp b/test/sync/conditions/condition_variable/wait_until_pass.cpp
index 34ef32268..cafd66b22 100644
--- a/test/sync/conditions/condition_variable/wait_until_pass.cpp
+++ b/test/sync/conditions/condition_variable/wait_until_pass.cpp
@@ -20,7 +20,7 @@
 #include <boost/thread/condition_variable.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <iostream>
 #include <cassert>
 #include "../../../timming.hpp"
diff --git a/test/sync/conditions/condition_variable/wait_until_pred_pass.cpp b/test/sync/conditions/condition_variable/wait_until_pred_pass.cpp
index 120e49853..f4441ea4b 100644
--- a/test/sync/conditions/condition_variable/wait_until_pred_pass.cpp
+++ b/test/sync/conditions/condition_variable/wait_until_pred_pass.cpp
@@ -20,7 +20,7 @@
 #include <boost/thread/condition_variable.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <cassert>
 #include <iostream>
 #include "../../../timming.hpp"
diff --git a/test/sync/conditions/condition_variable_any/copy_fail.cpp b/test/sync/conditions/condition_variable_any/copy_fail.cpp
index 71d3a3f06..2b21d7013 100644
--- a/test/sync/conditions/condition_variable_any/copy_fail.cpp
+++ b/test/sync/conditions/condition_variable_any/copy_fail.cpp
@@ -18,7 +18,7 @@
 // condition_variable_any(const condition_variable_any&) = delete;
 
 #include <boost/thread/condition_variable.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 void fail()
 {
diff --git a/test/sync/conditions/condition_variable_any/default_pass.cpp b/test/sync/conditions/condition_variable_any/default_pass.cpp
index 21116ebc4..fdbc6dc8e 100644
--- a/test/sync/conditions/condition_variable_any/default_pass.cpp
+++ b/test/sync/conditions/condition_variable_any/default_pass.cpp
@@ -18,7 +18,7 @@
 // condition_variable_any(const condition_variable_any&) = delete;
 
 #include <boost/thread/condition_variable.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/conditions/condition_variable_any/dtor_pass.cpp b/test/sync/conditions/condition_variable_any/dtor_pass.cpp
index 7734d93b7..15930311e 100644
--- a/test/sync/conditions/condition_variable_any/dtor_pass.cpp
+++ b/test/sync/conditions/condition_variable_any/dtor_pass.cpp
@@ -21,7 +21,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/locks.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::condition_variable_any* cv;
 boost::timed_mutex m;
diff --git a/test/sync/conditions/condition_variable_any/lost_notif_pass.cpp b/test/sync/conditions/condition_variable_any/lost_notif_pass.cpp
index c696da3c2..08cb17602 100644
--- a/test/sync/conditions/condition_variable_any/lost_notif_pass.cpp
+++ b/test/sync/conditions/condition_variable_any/lost_notif_pass.cpp
@@ -21,7 +21,7 @@
 #include <boost/thread/condition_variable.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <cassert>
 
 // Summary of each test:
diff --git a/test/sync/conditions/condition_variable_any/wait_for_pass.cpp b/test/sync/conditions/condition_variable_any/wait_for_pass.cpp
index b1fca89f6..365badb47 100644
--- a/test/sync/conditions/condition_variable_any/wait_for_pass.cpp
+++ b/test/sync/conditions/condition_variable_any/wait_for_pass.cpp
@@ -20,7 +20,7 @@
 #include <boost/thread/condition_variable.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 #if defined BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/conditions/condition_variable_any/wait_for_pred_pass.cpp b/test/sync/conditions/condition_variable_any/wait_for_pred_pass.cpp
index 3885b23c1..9fd43a2f8 100644
--- a/test/sync/conditions/condition_variable_any/wait_for_pred_pass.cpp
+++ b/test/sync/conditions/condition_variable_any/wait_for_pred_pass.cpp
@@ -20,7 +20,7 @@
 #include <boost/thread/condition_variable.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 #if defined BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/conditions/condition_variable_any/wait_until_pass.cpp b/test/sync/conditions/condition_variable_any/wait_until_pass.cpp
index acf5fb1c4..a65d7af66 100644
--- a/test/sync/conditions/condition_variable_any/wait_until_pass.cpp
+++ b/test/sync/conditions/condition_variable_any/wait_until_pass.cpp
@@ -20,7 +20,7 @@
 #include <boost/thread/condition_variable.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 #if defined BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/conditions/condition_variable_any/wait_until_pred_pass.cpp b/test/sync/conditions/condition_variable_any/wait_until_pred_pass.cpp
index f6e9b7ee2..55dffa794 100644
--- a/test/sync/conditions/condition_variable_any/wait_until_pred_pass.cpp
+++ b/test/sync/conditions/condition_variable_any/wait_until_pred_pass.cpp
@@ -20,7 +20,7 @@
 #include <boost/thread/condition_variable.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 #if defined BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/conditions/cv_status/cv_status_pass.cpp b/test/sync/conditions/cv_status/cv_status_pass.cpp
index becac4da5..8413da621 100644
--- a/test/sync/conditions/cv_status/cv_status_pass.cpp
+++ b/test/sync/conditions/cv_status/cv_status_pass.cpp
@@ -18,7 +18,7 @@
 // static unsigned hardware_concurrency();
 
 #include <boost/thread/condition_variable.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/conditions/notify_all_at_thread_exit_pass.cpp b/test/sync/conditions/notify_all_at_thread_exit_pass.cpp
index d6eecbd95..a99c093d2 100644
--- a/test/sync/conditions/notify_all_at_thread_exit_pass.cpp
+++ b/test/sync/conditions/notify_all_at_thread_exit_pass.cpp
@@ -23,7 +23,7 @@
 #include <boost/thread/locks.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/chrono/chrono.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::condition_variable cv;
 boost::mutex mut;
diff --git a/test/sync/futures/async/async_executor_pass.cpp b/test/sync/futures/async/async_executor_pass.cpp
index d5a0f4423..7e2e3ae5f 100644
--- a/test/sync/futures/async/async_executor_pass.cpp
+++ b/test/sync/futures/async/async_executor_pass.cpp
@@ -29,7 +29,7 @@
 #include <boost/thread/detail/memory.hpp>
 #include <boost/thread/csbl/memory/unique_ptr.hpp>
 #include <memory>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/thread/executors/basic_thread_pool.hpp>
 #include <boost/thread/executor.hpp>
 
diff --git a/test/sync/futures/async/async_pass.cpp b/test/sync/futures/async/async_pass.cpp
index 86fdfdbec..d5e5daff4 100644
--- a/test/sync/futures/async/async_pass.cpp
+++ b/test/sync/futures/async/async_pass.cpp
@@ -34,7 +34,7 @@
 #include <boost/thread/detail/memory.hpp>
 #include <boost/thread/csbl/memory/unique_ptr.hpp>
 #include <memory>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 typedef boost::chrono::high_resolution_clock Clock;
 typedef boost::chrono::milliseconds ms;
diff --git a/test/sync/futures/future/async_deferred_then_pass.cpp b/test/sync/futures/future/async_deferred_then_pass.cpp
index b400074cd..7749b3a6a 100644
--- a/test/sync/futures/future/async_deferred_then_pass.cpp
+++ b/test/sync/futures/future/async_deferred_then_pass.cpp
@@ -16,7 +16,7 @@
 #include <boost/thread/detail/log.hpp>
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
 
diff --git a/test/sync/futures/future/copy_assign_fail.cpp b/test/sync/futures/future/copy_assign_fail.cpp
index 170f3a057..90d537fe8 100644
--- a/test/sync/futures/future/copy_assign_fail.cpp
+++ b/test/sync/futures/future/copy_assign_fail.cpp
@@ -21,7 +21,7 @@
 
 #define BOOST_THREAD_VERSION 3
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/futures/future/copy_ctor_fail.cpp b/test/sync/futures/future/copy_ctor_fail.cpp
index 3a16afd50..8c7d2c2b1 100644
--- a/test/sync/futures/future/copy_ctor_fail.cpp
+++ b/test/sync/futures/future/copy_ctor_fail.cpp
@@ -20,7 +20,7 @@
 
 #define BOOST_THREAD_VERSION 3
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/futures/future/default_pass.cpp b/test/sync/futures/future/default_pass.cpp
index 1b4cf392f..d33e289ec 100644
--- a/test/sync/futures/future/default_pass.cpp
+++ b/test/sync/futures/future/default_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/futures/future/dtor_pass.cpp b/test/sync/futures/future/dtor_pass.cpp
index abfca7d8c..3e2c86551 100644
--- a/test/sync/futures/future/dtor_pass.cpp
+++ b/test/sync/futures/future/dtor_pass.cpp
@@ -22,7 +22,7 @@
 #include <boost/exception/exception.hpp>
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #if defined BOOST_THREAD_PROVIDES_FUTURE_CTOR_ALLOCATORS
 #include "../test_allocator.hpp"
 #endif
diff --git a/test/sync/futures/future/get_or_pass.cpp b/test/sync/futures/future/get_or_pass.cpp
index 7db938d37..2d18f80cb 100644
--- a/test/sync/futures/future/get_or_pass.cpp
+++ b/test/sync/futures/future/get_or_pass.cpp
@@ -18,7 +18,7 @@
 #include <boost/thread/future.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/core/ref.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined BOOST_THREAD_USES_CHRONO
 
diff --git a/test/sync/futures/future/get_pass.cpp b/test/sync/futures/future/get_pass.cpp
index ec2ccf8b0..da5077880 100644
--- a/test/sync/futures/future/get_pass.cpp
+++ b/test/sync/futures/future/get_pass.cpp
@@ -28,7 +28,7 @@
 
 #include <boost/thread/future.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined BOOST_THREAD_USES_CHRONO
 
diff --git a/test/sync/futures/future/move_assign_pass.cpp b/test/sync/futures/future/move_assign_pass.cpp
index ebb13e5e0..19007111a 100644
--- a/test/sync/futures/future/move_assign_pass.cpp
+++ b/test/sync/futures/future/move_assign_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m0;
 boost::mutex m1;
diff --git a/test/sync/futures/future/move_ctor_pass.cpp b/test/sync/futures/future/move_ctor_pass.cpp
index 8da893a3c..701407d22 100644
--- a/test/sync/futures/future/move_ctor_pass.cpp
+++ b/test/sync/futures/future/move_ctor_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m;
 
diff --git a/test/sync/futures/future/share_pass.cpp b/test/sync/futures/future/share_pass.cpp
index 91c07f5cd..07176efed 100644
--- a/test/sync/futures/future/share_pass.cpp
+++ b/test/sync/futures/future/share_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/futures/future/then_deferred_pass.cpp b/test/sync/futures/future/then_deferred_pass.cpp
index 0ea37bd7f..2ef9cd29d 100644
--- a/test/sync/futures/future/then_deferred_pass.cpp
+++ b/test/sync/futures/future/then_deferred_pass.cpp
@@ -16,7 +16,7 @@
 #include <boost/thread/detail/log.hpp>
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <cassert>
 
 #if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
diff --git a/test/sync/futures/future/then_executor_pass.cpp b/test/sync/futures/future/then_executor_pass.cpp
index fcb062a0e..11aae4d89 100644
--- a/test/sync/futures/future/then_executor_pass.cpp
+++ b/test/sync/futures/future/then_executor_pass.cpp
@@ -18,7 +18,7 @@
 #include <boost/thread/future.hpp>
 #include <boost/thread/executors/basic_thread_pool.hpp>
 #include <boost/thread/executor.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <cassert>
 
 #if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
diff --git a/test/sync/futures/future/then_pass.cpp b/test/sync/futures/future/then_pass.cpp
index 12270679b..1ce7ae57c 100644
--- a/test/sync/futures/future/then_pass.cpp
+++ b/test/sync/futures/future/then_pass.cpp
@@ -16,7 +16,7 @@
 #include <boost/thread/detail/log.hpp>
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
 
diff --git a/test/sync/futures/future/wait_for_pass.cpp b/test/sync/futures/future/wait_for_pass.cpp
index 71bca7abe..9a6363633 100644
--- a/test/sync/futures/future/wait_for_pass.cpp
+++ b/test/sync/futures/future/wait_for_pass.cpp
@@ -29,7 +29,7 @@
 #include <boost/thread/future.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/chrono/chrono_io.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined BOOST_THREAD_USES_CHRONO
 
diff --git a/test/sync/futures/future/wait_pass.cpp b/test/sync/futures/future/wait_pass.cpp
index daa9b376f..12022f120 100644
--- a/test/sync/futures/future/wait_pass.cpp
+++ b/test/sync/futures/future/wait_pass.cpp
@@ -28,7 +28,7 @@
 #include <boost/thread/future.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/chrono/chrono_io.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined BOOST_THREAD_USES_CHRONO
 
diff --git a/test/sync/futures/future/wait_until_pass.cpp b/test/sync/futures/future/wait_until_pass.cpp
index e9351671d..8e89805d7 100644
--- a/test/sync/futures/future/wait_until_pass.cpp
+++ b/test/sync/futures/future/wait_until_pass.cpp
@@ -29,7 +29,7 @@
 #include <boost/thread/future.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/chrono/chrono_io.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 #if defined BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/futures/make_ready_future_pass.cpp b/test/sync/futures/make_ready_future_pass.cpp
index dfce3cde7..c006e6548 100644
--- a/test/sync/futures/make_ready_future_pass.cpp
+++ b/test/sync/futures/make_ready_future_pass.cpp
@@ -29,7 +29,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/static_assert.hpp>
 
 struct A
diff --git a/test/sync/futures/packaged_task/alloc_ctor_pass.cpp b/test/sync/futures/packaged_task/alloc_ctor_pass.cpp
index e83c06446..4164780c2 100644
--- a/test/sync/futures/packaged_task/alloc_ctor_pass.cpp
+++ b/test/sync/futures/packaged_task/alloc_ctor_pass.cpp
@@ -29,7 +29,7 @@
 
 #include <boost/thread/detail/config.hpp>
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 
 #if defined BOOST_THREAD_PROVIDES_FUTURE_CTOR_ALLOCATORS
diff --git a/test/sync/futures/packaged_task/copy_assign_fail.cpp b/test/sync/futures/packaged_task/copy_assign_fail.cpp
index 7f068eced..ad6088ccf 100644
--- a/test/sync/futures/packaged_task/copy_assign_fail.cpp
+++ b/test/sync/futures/packaged_task/copy_assign_fail.cpp
@@ -26,7 +26,7 @@
 #endif
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class A
 {
diff --git a/test/sync/futures/packaged_task/copy_ctor_fail.cpp b/test/sync/futures/packaged_task/copy_ctor_fail.cpp
index 22a174961..a69ee4b35 100644
--- a/test/sync/futures/packaged_task/copy_ctor_fail.cpp
+++ b/test/sync/futures/packaged_task/copy_ctor_fail.cpp
@@ -26,7 +26,7 @@
 #endif
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class A
 {
diff --git a/test/sync/futures/packaged_task/default_ctor_pass.cpp b/test/sync/futures/packaged_task/default_ctor_pass.cpp
index 7ab9f1e7c..9012982e3 100644
--- a/test/sync/futures/packaged_task/default_ctor_pass.cpp
+++ b/test/sync/futures/packaged_task/default_ctor_pass.cpp
@@ -26,7 +26,7 @@
 #endif
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <string>
 
 int main()
diff --git a/test/sync/futures/packaged_task/dtor_pass.cpp b/test/sync/futures/packaged_task/dtor_pass.cpp
index 89620ad05..ca00c2278 100644
--- a/test/sync/futures/packaged_task/dtor_pass.cpp
+++ b/test/sync/futures/packaged_task/dtor_pass.cpp
@@ -24,7 +24,7 @@
 
 #include <boost/thread/future.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if BOOST_THREAD_VERSION == 4
 #define BOOST_THREAD_DETAIL_SIGNATURE double()
diff --git a/test/sync/futures/packaged_task/func_ctor_pass.cpp b/test/sync/futures/packaged_task/func_ctor_pass.cpp
index a4bd3105f..bcd612c06 100644
--- a/test/sync/futures/packaged_task/func_ctor_pass.cpp
+++ b/test/sync/futures/packaged_task/func_ctor_pass.cpp
@@ -22,7 +22,7 @@
 #define BOOST_THREAD_VERSION 4
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if BOOST_THREAD_VERSION == 4
 #define BOOST_THREAD_DETAIL_SIGNATURE double()
diff --git a/test/sync/futures/packaged_task/get_future_pass.cpp b/test/sync/futures/packaged_task/get_future_pass.cpp
index 7b2985794..c1bcae94b 100644
--- a/test/sync/futures/packaged_task/get_future_pass.cpp
+++ b/test/sync/futures/packaged_task/get_future_pass.cpp
@@ -27,7 +27,7 @@
 #endif
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class A
 {
diff --git a/test/sync/futures/packaged_task/make_ready_at_thread_exit_pass.cpp b/test/sync/futures/packaged_task/make_ready_at_thread_exit_pass.cpp
index 08db7bbf2..a82005cd2 100644
--- a/test/sync/futures/packaged_task/make_ready_at_thread_exit_pass.cpp
+++ b/test/sync/futures/packaged_task/make_ready_at_thread_exit_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 4
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined BOOST_THREAD_USES_CHRONO && \
     defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && \
diff --git a/test/sync/futures/packaged_task/member_swap_pass.cpp b/test/sync/futures/packaged_task/member_swap_pass.cpp
index fe3c062f8..618c832f1 100644
--- a/test/sync/futures/packaged_task/member_swap_pass.cpp
+++ b/test/sync/futures/packaged_task/member_swap_pass.cpp
@@ -26,7 +26,7 @@
 #endif
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class A
 {
diff --git a/test/sync/futures/packaged_task/move_assign_pass.cpp b/test/sync/futures/packaged_task/move_assign_pass.cpp
index fe696c8fb..9dc8021d3 100644
--- a/test/sync/futures/packaged_task/move_assign_pass.cpp
+++ b/test/sync/futures/packaged_task/move_assign_pass.cpp
@@ -26,7 +26,7 @@
 #endif
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class A
 {
diff --git a/test/sync/futures/packaged_task/move_ctor_pass.cpp b/test/sync/futures/packaged_task/move_ctor_pass.cpp
index a5085b311..2c7e9c660 100644
--- a/test/sync/futures/packaged_task/move_ctor_pass.cpp
+++ b/test/sync/futures/packaged_task/move_ctor_pass.cpp
@@ -26,7 +26,7 @@
 #endif
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class A
 {
diff --git a/test/sync/futures/packaged_task/non_member_swap_pass.cpp b/test/sync/futures/packaged_task/non_member_swap_pass.cpp
index fb579094d..5f4511b69 100644
--- a/test/sync/futures/packaged_task/non_member_swap_pass.cpp
+++ b/test/sync/futures/packaged_task/non_member_swap_pass.cpp
@@ -26,7 +26,7 @@
 #endif
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class A
 {
diff --git a/test/sync/futures/packaged_task/operator_pass.cpp b/test/sync/futures/packaged_task/operator_pass.cpp
index db932f72b..4b067d366 100644
--- a/test/sync/futures/packaged_task/operator_pass.cpp
+++ b/test/sync/futures/packaged_task/operator_pass.cpp
@@ -22,7 +22,7 @@
 #define BOOST_THREAD_VERSION 4
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined BOOST_THREAD_USES_CHRONO
 
diff --git a/test/sync/futures/packaged_task/reset_pass.cpp b/test/sync/futures/packaged_task/reset_pass.cpp
index 711e7a57f..4e8cb4045 100644
--- a/test/sync/futures/packaged_task/reset_pass.cpp
+++ b/test/sync/futures/packaged_task/reset_pass.cpp
@@ -26,7 +26,7 @@
 #endif
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class A
 {
diff --git a/test/sync/futures/packaged_task/types_pass.cpp b/test/sync/futures/packaged_task/types_pass.cpp
index a52fb0439..6d677acec 100644
--- a/test/sync/futures/packaged_task/types_pass.cpp
+++ b/test/sync/futures/packaged_task/types_pass.cpp
@@ -23,7 +23,8 @@
 
 #include <boost/thread/future.hpp>
 #include <boost/static_assert.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/type_traits/is_same.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct A {};
 
diff --git a/test/sync/futures/packaged_task/use_allocator_pass.cpp b/test/sync/futures/packaged_task/use_allocator_pass.cpp
index ef75b7caa..3f65eef2a 100644
--- a/test/sync/futures/packaged_task/use_allocator_pass.cpp
+++ b/test/sync/futures/packaged_task/use_allocator_pass.cpp
@@ -29,7 +29,7 @@
 #endif
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/static_assert.hpp>
 
 #if defined BOOST_THREAD_PROVIDES_FUTURE_CTOR_ALLOCATORS
diff --git a/test/sync/futures/promise/alloc_ctor_pass.cpp b/test/sync/futures/promise/alloc_ctor_pass.cpp
index 0d0c3c0b9..7c018b34c 100644
--- a/test/sync/futures/promise/alloc_ctor_pass.cpp
+++ b/test/sync/futures/promise/alloc_ctor_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #if defined BOOST_THREAD_PROVIDES_FUTURE_CTOR_ALLOCATORS
 #include "../test_allocator.hpp"
 
diff --git a/test/sync/futures/promise/copy_assign_fail.cpp b/test/sync/futures/promise/copy_assign_fail.cpp
index 07895578f..59c505c03 100644
--- a/test/sync/futures/promise/copy_assign_fail.cpp
+++ b/test/sync/futures/promise/copy_assign_fail.cpp
@@ -18,7 +18,7 @@
 
 #define BOOST_THREAD_VERSION 3
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/futures/promise/copy_ctor_fail.cpp b/test/sync/futures/promise/copy_ctor_fail.cpp
index cfd67a6d7..6a1a38028 100644
--- a/test/sync/futures/promise/copy_ctor_fail.cpp
+++ b/test/sync/futures/promise/copy_ctor_fail.cpp
@@ -18,7 +18,7 @@
 
 #define BOOST_THREAD_VERSION 3
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/futures/promise/default_pass.cpp b/test/sync/futures/promise/default_pass.cpp
index 00198a168..e9ab069cc 100644
--- a/test/sync/futures/promise/default_pass.cpp
+++ b/test/sync/futures/promise/default_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/futures/promise/dtor_pass.cpp b/test/sync/futures/promise/dtor_pass.cpp
index e449c0378..09877e4e3 100644
--- a/test/sync/futures/promise/dtor_pass.cpp
+++ b/test/sync/futures/promise/dtor_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/futures/promise/emplace_pass.cpp b/test/sync/futures/promise/emplace_pass.cpp
index 6a1a35292..af2ffc705 100644
--- a/test/sync/futures/promise/emplace_pass.cpp
+++ b/test/sync/futures/promise/emplace_pass.cpp
@@ -22,7 +22,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/static_assert.hpp>
 
 struct A
diff --git a/test/sync/futures/promise/get_future_pass.cpp b/test/sync/futures/promise/get_future_pass.cpp
index 13a63b13d..4b9ae8fc6 100644
--- a/test/sync/futures/promise/get_future_pass.cpp
+++ b/test/sync/futures/promise/get_future_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/futures/promise/move_assign_pass.cpp b/test/sync/futures/promise/move_assign_pass.cpp
index 0190527c0..0fbee02bb 100644
--- a/test/sync/futures/promise/move_assign_pass.cpp
+++ b/test/sync/futures/promise/move_assign_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #if defined BOOST_THREAD_PROVIDES_FUTURE_CTOR_ALLOCATORS
 #include "../test_allocator.hpp"
 #endif
diff --git a/test/sync/futures/promise/move_ctor_pass.cpp b/test/sync/futures/promise/move_ctor_pass.cpp
index a72eb1829..eaac0ddfe 100644
--- a/test/sync/futures/promise/move_ctor_pass.cpp
+++ b/test/sync/futures/promise/move_ctor_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #if defined BOOST_THREAD_PROVIDES_FUTURE_CTOR_ALLOCATORS
 #include "../test_allocator.hpp"
 #endif
diff --git a/test/sync/futures/promise/set_exception_at_thread_exit_pass.cpp b/test/sync/futures/promise/set_exception_at_thread_exit_pass.cpp
index d23d0befb..44eb11823 100644
--- a/test/sync/futures/promise/set_exception_at_thread_exit_pass.cpp
+++ b/test/sync/futures/promise/set_exception_at_thread_exit_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 4
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/static_assert.hpp>
 
 namespace boost
diff --git a/test/sync/futures/promise/set_exception_pass.cpp b/test/sync/futures/promise/set_exception_pass.cpp
index c27aec293..679a24848 100644
--- a/test/sync/futures/promise/set_exception_pass.cpp
+++ b/test/sync/futures/promise/set_exception_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/static_assert.hpp>
 
 namespace boost
diff --git a/test/sync/futures/promise/set_lvalue_at_thread_exit_pass.cpp b/test/sync/futures/promise/set_lvalue_at_thread_exit_pass.cpp
index a143dc636..ddae1ef31 100644
--- a/test/sync/futures/promise/set_lvalue_at_thread_exit_pass.cpp
+++ b/test/sync/futures/promise/set_lvalue_at_thread_exit_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 4
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <memory>
 
 int i = 0;
diff --git a/test/sync/futures/promise/set_lvalue_pass.cpp b/test/sync/futures/promise/set_lvalue_pass.cpp
index 6acfb62d1..656020e58 100644
--- a/test/sync/futures/promise/set_lvalue_pass.cpp
+++ b/test/sync/futures/promise/set_lvalue_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/static_assert.hpp>
 
 int main()
diff --git a/test/sync/futures/promise/set_rvalue_at_thread_exit_pass.cpp b/test/sync/futures/promise/set_rvalue_at_thread_exit_pass.cpp
index 0b23b4834..e11546bcf 100644
--- a/test/sync/futures/promise/set_rvalue_at_thread_exit_pass.cpp
+++ b/test/sync/futures/promise/set_rvalue_at_thread_exit_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/thread/detail/memory.hpp>
 #include <boost/thread/csbl/memory/unique_ptr.hpp>
 
diff --git a/test/sync/futures/promise/set_rvalue_pass.cpp b/test/sync/futures/promise/set_rvalue_pass.cpp
index 63260d726..234e482ca 100644
--- a/test/sync/futures/promise/set_rvalue_pass.cpp
+++ b/test/sync/futures/promise/set_rvalue_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/static_assert.hpp>
 
 struct A
diff --git a/test/sync/futures/promise/set_value_at_thread_exit_const_pass.cpp b/test/sync/futures/promise/set_value_at_thread_exit_const_pass.cpp
index 4972cb7d8..40113102d 100644
--- a/test/sync/futures/promise/set_value_at_thread_exit_const_pass.cpp
+++ b/test/sync/futures/promise/set_value_at_thread_exit_const_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 4
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
 void func(boost::promise<int> p)
diff --git a/test/sync/futures/promise/set_value_at_thread_exit_void_pass.cpp b/test/sync/futures/promise/set_value_at_thread_exit_void_pass.cpp
index c79f2a23e..47ed7bfd9 100644
--- a/test/sync/futures/promise/set_value_at_thread_exit_void_pass.cpp
+++ b/test/sync/futures/promise/set_value_at_thread_exit_void_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 4
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int i = 0;
 
diff --git a/test/sync/futures/promise/set_value_const_pass.cpp b/test/sync/futures/promise/set_value_const_pass.cpp
index e4defb91b..f82d80c17 100644
--- a/test/sync/futures/promise/set_value_const_pass.cpp
+++ b/test/sync/futures/promise/set_value_const_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/static_assert.hpp>
 
 #ifdef BOOST_MSVC
diff --git a/test/sync/futures/promise/set_value_void_pass.cpp b/test/sync/futures/promise/set_value_void_pass.cpp
index 7c11d5b66..664e055bf 100644
--- a/test/sync/futures/promise/set_value_void_pass.cpp
+++ b/test/sync/futures/promise/set_value_void_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/static_assert.hpp>
 
 struct A
diff --git a/test/sync/futures/promise/use_allocator_pass.cpp b/test/sync/futures/promise/use_allocator_pass.cpp
index 3b1e96c7e..bd9f8d135 100644
--- a/test/sync/futures/promise/use_allocator_pass.cpp
+++ b/test/sync/futures/promise/use_allocator_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/static_assert.hpp>
 
 #if defined BOOST_THREAD_PROVIDES_FUTURE_CTOR_ALLOCATORS
diff --git a/test/sync/futures/shared_future/copy_assign_pass.cpp b/test/sync/futures/shared_future/copy_assign_pass.cpp
index 1b23b2d16..24a56a63e 100644
--- a/test/sync/futures/shared_future/copy_assign_pass.cpp
+++ b/test/sync/futures/shared_future/copy_assign_pass.cpp
@@ -21,7 +21,7 @@
 
 #define BOOST_THREAD_VERSION 3
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/futures/shared_future/copy_ctor_pass.cpp b/test/sync/futures/shared_future/copy_ctor_pass.cpp
index fd29c0fe3..4990d3bba 100644
--- a/test/sync/futures/shared_future/copy_ctor_pass.cpp
+++ b/test/sync/futures/shared_future/copy_ctor_pass.cpp
@@ -20,7 +20,7 @@
 
 #define BOOST_THREAD_VERSION 3
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/futures/shared_future/default_pass.cpp b/test/sync/futures/shared_future/default_pass.cpp
index 59ecea3a3..e1b74d961 100644
--- a/test/sync/futures/shared_future/default_pass.cpp
+++ b/test/sync/futures/shared_future/default_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/futures/shared_future/dtor_pass.cpp b/test/sync/futures/shared_future/dtor_pass.cpp
index 01fb591c0..159368e09 100644
--- a/test/sync/futures/shared_future/dtor_pass.cpp
+++ b/test/sync/futures/shared_future/dtor_pass.cpp
@@ -22,7 +22,7 @@
 #include <boost/exception/exception.hpp>
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #if defined BOOST_THREAD_PROVIDES_FUTURE_CTOR_ALLOCATORS
 #include "../test_allocator.hpp"
 #endif
diff --git a/test/sync/futures/shared_future/get_pass.cpp b/test/sync/futures/shared_future/get_pass.cpp
index 558fb024f..b74959f55 100644
--- a/test/sync/futures/shared_future/get_pass.cpp
+++ b/test/sync/futures/shared_future/get_pass.cpp
@@ -24,7 +24,7 @@
 
 #include <boost/thread/future.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined BOOST_THREAD_USES_CHRONO
 
diff --git a/test/sync/futures/shared_future/move_assign_pass.cpp b/test/sync/futures/shared_future/move_assign_pass.cpp
index 40ff4992c..8dca26d3d 100644
--- a/test/sync/futures/shared_future/move_assign_pass.cpp
+++ b/test/sync/futures/shared_future/move_assign_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m0;
 boost::mutex m1;
diff --git a/test/sync/futures/shared_future/move_ctor_pass.cpp b/test/sync/futures/shared_future/move_ctor_pass.cpp
index 533f5ec90..c131559bd 100644
--- a/test/sync/futures/shared_future/move_ctor_pass.cpp
+++ b/test/sync/futures/shared_future/move_ctor_pass.cpp
@@ -21,7 +21,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m;
 
diff --git a/test/sync/futures/shared_future/then_executor_pass.cpp b/test/sync/futures/shared_future/then_executor_pass.cpp
index 73b42fc8a..daffcd0e4 100644
--- a/test/sync/futures/shared_future/then_executor_pass.cpp
+++ b/test/sync/futures/shared_future/then_executor_pass.cpp
@@ -19,7 +19,7 @@
 #include <boost/thread/future.hpp>
 #include <boost/thread/executors/basic_thread_pool.hpp>
 #include <boost/thread/executor.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
 
diff --git a/test/sync/futures/shared_future/then_pass.cpp b/test/sync/futures/shared_future/then_pass.cpp
index e7cca062e..ffa6bedaf 100644
--- a/test/sync/futures/shared_future/then_pass.cpp
+++ b/test/sync/futures/shared_future/then_pass.cpp
@@ -16,7 +16,7 @@
 #include <boost/thread/detail/log.hpp>
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
 
diff --git a/test/sync/futures/shared_future/wait_for_pass.cpp b/test/sync/futures/shared_future/wait_for_pass.cpp
index e9d8ac684..c87b22aea 100644
--- a/test/sync/futures/shared_future/wait_for_pass.cpp
+++ b/test/sync/futures/shared_future/wait_for_pass.cpp
@@ -28,7 +28,7 @@
 #include <boost/thread/future.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/chrono/chrono_io.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 #if defined BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/futures/shared_future/wait_pass.cpp b/test/sync/futures/shared_future/wait_pass.cpp
index d2d1b31f6..8e96b7da9 100644
--- a/test/sync/futures/shared_future/wait_pass.cpp
+++ b/test/sync/futures/shared_future/wait_pass.cpp
@@ -28,7 +28,7 @@
 #include <boost/thread/future.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/chrono/chrono_io.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined BOOST_THREAD_USES_CHRONO
 
diff --git a/test/sync/futures/shared_future/wait_until_pass.cpp b/test/sync/futures/shared_future/wait_until_pass.cpp
index 8b05725e7..3568d0a6e 100644
--- a/test/sync/futures/shared_future/wait_until_pass.cpp
+++ b/test/sync/futures/shared_future/wait_until_pass.cpp
@@ -29,7 +29,7 @@
 #include <boost/thread/future.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/chrono/chrono_io.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 #if defined BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/futures/when_all/iterators_pass.cpp b/test/sync/futures/when_all/iterators_pass.cpp
index 2646074f0..c13b8064e 100644
--- a/test/sync/futures/when_all/iterators_pass.cpp
+++ b/test/sync/futures/when_all/iterators_pass.cpp
@@ -28,7 +28,7 @@
 #define BOOST_THREAD_VERSION 4
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <stdexcept>
 
 #ifdef BOOST_MSVC
diff --git a/test/sync/futures/when_all/none_pass.cpp b/test/sync/futures/when_all/none_pass.cpp
index 613e2368d..ca4d2c8dd 100644
--- a/test/sync/futures/when_all/none_pass.cpp
+++ b/test/sync/futures/when_all/none_pass.cpp
@@ -26,7 +26,7 @@
 #define BOOST_THREAD_VERSION 4
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/futures/when_all/one_pass.cpp b/test/sync/futures/when_all/one_pass.cpp
index 026abcf53..68397e8ca 100644
--- a/test/sync/futures/when_all/one_pass.cpp
+++ b/test/sync/futures/when_all/one_pass.cpp
@@ -27,7 +27,7 @@
 #define BOOST_THREAD_VERSION 4
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <stdexcept>
 
 #ifdef BOOST_MSVC
diff --git a/test/sync/futures/when_all/variadic_pass.cpp b/test/sync/futures/when_all/variadic_pass.cpp
index f3b93b8be..205776fa3 100644
--- a/test/sync/futures/when_all/variadic_pass.cpp
+++ b/test/sync/futures/when_all/variadic_pass.cpp
@@ -27,7 +27,7 @@
 #define BOOST_THREAD_VERSION 4
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <stdexcept>
 
 #ifdef BOOST_MSVC
diff --git a/test/sync/futures/when_any/iterators_pass.cpp b/test/sync/futures/when_any/iterators_pass.cpp
index 03336d022..d33ebd191 100644
--- a/test/sync/futures/when_any/iterators_pass.cpp
+++ b/test/sync/futures/when_any/iterators_pass.cpp
@@ -28,7 +28,7 @@
 #define BOOST_THREAD_VERSION 4
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <stdexcept>
 
 #ifdef BOOST_MSVC
diff --git a/test/sync/futures/when_any/none_pass.cpp b/test/sync/futures/when_any/none_pass.cpp
index 2edd0bc6d..672988e3c 100644
--- a/test/sync/futures/when_any/none_pass.cpp
+++ b/test/sync/futures/when_any/none_pass.cpp
@@ -26,7 +26,7 @@
 #define BOOST_THREAD_VERSION 4
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/futures/when_any/one_pass.cpp b/test/sync/futures/when_any/one_pass.cpp
index 61882ef6d..ba2ee738d 100644
--- a/test/sync/futures/when_any/one_pass.cpp
+++ b/test/sync/futures/when_any/one_pass.cpp
@@ -26,7 +26,7 @@
 #define BOOST_THREAD_VERSION 4
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #ifdef BOOST_MSVC
 #pragma warning(disable: 4127) // conditional expression is constant
diff --git a/test/sync/futures/when_any/variadic_pass.cpp b/test/sync/futures/when_any/variadic_pass.cpp
index 09b3951fc..9d12ccf84 100644
--- a/test/sync/futures/when_any/variadic_pass.cpp
+++ b/test/sync/futures/when_any/variadic_pass.cpp
@@ -26,7 +26,7 @@
 #define BOOST_THREAD_VERSION 4
 
 #include <boost/thread/future.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <stdexcept>
 
 #ifdef BOOST_MSVC
diff --git a/test/sync/mutual_exclusion/deque_views/single_thread_pass.cpp b/test/sync/mutual_exclusion/deque_views/single_thread_pass.cpp
index bd9ff152f..c373ed594 100644
--- a/test/sync/mutual_exclusion/deque_views/single_thread_pass.cpp
+++ b/test/sync/mutual_exclusion/deque_views/single_thread_pass.cpp
@@ -16,7 +16,7 @@
 #include <boost/thread/concurrent_queues/deque_adaptor.hpp>
 #include <boost/thread/concurrent_queues/deque_views.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/static_assert.hpp>
 
 class non_copyable
diff --git a/test/sync/mutual_exclusion/locks/lock_guard/adopt_lock_pass.cpp b/test/sync/mutual_exclusion/locks/lock_guard/adopt_lock_pass.cpp
index b6039c556..a366a7c1f 100644
--- a/test/sync/mutual_exclusion/locks/lock_guard/adopt_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/lock_guard/adopt_lock_pass.cpp
@@ -21,7 +21,7 @@
 #include <boost/thread/lock_guard.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../../timming.hpp"
 
 #ifdef BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/mutual_exclusion/locks/lock_guard/copy_assign_fail.cpp b/test/sync/mutual_exclusion/locks/lock_guard/copy_assign_fail.cpp
index a3957c750..28eacd525 100644
--- a/test/sync/mutual_exclusion/locks/lock_guard/copy_assign_fail.cpp
+++ b/test/sync/mutual_exclusion/locks/lock_guard/copy_assign_fail.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_guard.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m0;
 boost::mutex m1;
diff --git a/test/sync/mutual_exclusion/locks/lock_guard/copy_ctor_fail.cpp b/test/sync/mutual_exclusion/locks/lock_guard/copy_ctor_fail.cpp
index 5c1b3a1c2..5eff72a30 100644
--- a/test/sync/mutual_exclusion/locks/lock_guard/copy_ctor_fail.cpp
+++ b/test/sync/mutual_exclusion/locks/lock_guard/copy_ctor_fail.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_guard.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m0;
 boost::mutex m1;
diff --git a/test/sync/mutual_exclusion/locks/lock_guard/default_pass.cpp b/test/sync/mutual_exclusion/locks/lock_guard/default_pass.cpp
index 4fcc26a9b..18a7d2a25 100644
--- a/test/sync/mutual_exclusion/locks/lock_guard/default_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/lock_guard/default_pass.cpp
@@ -21,7 +21,7 @@
 #include <boost/thread/lock_guard.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../../timming.hpp"
 
 #ifdef BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/mutual_exclusion/locks/lock_guard/lock_guard_adopt_lock_compile_fail.cpp b/test/sync/mutual_exclusion/locks/lock_guard/lock_guard_adopt_lock_compile_fail.cpp
index 9aab78ddd..7e456c0ee 100644
--- a/test/sync/mutual_exclusion/locks/lock_guard/lock_guard_adopt_lock_compile_fail.cpp
+++ b/test/sync/mutual_exclusion/locks/lock_guard/lock_guard_adopt_lock_compile_fail.cpp
@@ -11,7 +11,7 @@
 
 #include <boost/thread/lock_guard.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/lock_guard/lock_guard_adopt_lock_compile_pass.cpp b/test/sync/mutual_exclusion/locks/lock_guard/lock_guard_adopt_lock_compile_pass.cpp
index a158677ad..57d6ac18d 100644
--- a/test/sync/mutual_exclusion/locks/lock_guard/lock_guard_adopt_lock_compile_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/lock_guard/lock_guard_adopt_lock_compile_pass.cpp
@@ -11,7 +11,7 @@
 
 #include <boost/thread/lock_guard.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/lock_guard/lock_guard_compile_fail.cpp b/test/sync/mutual_exclusion/locks/lock_guard/lock_guard_compile_fail.cpp
index eead4501c..921f0b4ef 100644
--- a/test/sync/mutual_exclusion/locks/lock_guard/lock_guard_compile_fail.cpp
+++ b/test/sync/mutual_exclusion/locks/lock_guard/lock_guard_compile_fail.cpp
@@ -11,7 +11,7 @@
 
 #include <boost/thread/lock_guard.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/lock_guard/lock_guard_compile_pass.cpp b/test/sync/mutual_exclusion/locks/lock_guard/lock_guard_compile_pass.cpp
index aee2e40e4..d9a01003a 100644
--- a/test/sync/mutual_exclusion/locks/lock_guard/lock_guard_compile_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/lock_guard/lock_guard_compile_pass.cpp
@@ -11,7 +11,7 @@
 
 #include <boost/thread/lock_guard.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/lock_guard/make_lock_guard_adopt_lock_pass.cpp b/test/sync/mutual_exclusion/locks/lock_guard/make_lock_guard_adopt_lock_pass.cpp
index cecdc84ce..806ae293b 100644
--- a/test/sync/mutual_exclusion/locks/lock_guard/make_lock_guard_adopt_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/lock_guard/make_lock_guard_adopt_lock_pass.cpp
@@ -22,7 +22,7 @@
 #include <boost/thread/lock_guard.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../../timming.hpp"
 
 
diff --git a/test/sync/mutual_exclusion/locks/lock_guard/make_lock_guard_pass.cpp b/test/sync/mutual_exclusion/locks/lock_guard/make_lock_guard_pass.cpp
index 853fae743..ec8dacc04 100644
--- a/test/sync/mutual_exclusion/locks/lock_guard/make_lock_guard_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/lock_guard/make_lock_guard_pass.cpp
@@ -23,7 +23,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../../timming.hpp"
 
 #ifdef BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/mutual_exclusion/locks/lock_guard/types_pass.cpp b/test/sync/mutual_exclusion/locks/lock_guard/types_pass.cpp
index 7c2d39375..4a351d362 100644
--- a/test/sync/mutual_exclusion/locks/lock_guard/types_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/lock_guard/types_pass.cpp
@@ -29,7 +29,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/locks/nested_strict_lock/copy_assign_fail.cpp b/test/sync/mutual_exclusion/locks/nested_strict_lock/copy_assign_fail.cpp
index c5d9a39b5..350310af8 100644
--- a/test/sync/mutual_exclusion/locks/nested_strict_lock/copy_assign_fail.cpp
+++ b/test/sync/mutual_exclusion/locks/nested_strict_lock/copy_assign_fail.cpp
@@ -12,7 +12,7 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/strict_lock.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m0;
 boost::mutex m1;
diff --git a/test/sync/mutual_exclusion/locks/nested_strict_lock/copy_ctor_fail.cpp b/test/sync/mutual_exclusion/locks/nested_strict_lock/copy_ctor_fail.cpp
index 1c0abf94a..6426d7e93 100644
--- a/test/sync/mutual_exclusion/locks/nested_strict_lock/copy_ctor_fail.cpp
+++ b/test/sync/mutual_exclusion/locks/nested_strict_lock/copy_ctor_fail.cpp
@@ -13,7 +13,7 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/strict_lock.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m0;
 boost::mutex m1;
diff --git a/test/sync/mutual_exclusion/locks/nested_strict_lock/default_pass.cpp b/test/sync/mutual_exclusion/locks/nested_strict_lock/default_pass.cpp
index 0182bdd95..fc0b0cd70 100644
--- a/test/sync/mutual_exclusion/locks/nested_strict_lock/default_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/nested_strict_lock/default_pass.cpp
@@ -13,7 +13,7 @@
 #include <boost/thread/strict_lock.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../../timming.hpp"
 
 #ifdef BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/mutual_exclusion/locks/nested_strict_lock/make_nested_strict_lock_pass.cpp b/test/sync/mutual_exclusion/locks/nested_strict_lock/make_nested_strict_lock_pass.cpp
index 5a10728cb..e47f1e159 100644
--- a/test/sync/mutual_exclusion/locks/nested_strict_lock/make_nested_strict_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/nested_strict_lock/make_nested_strict_lock_pass.cpp
@@ -15,7 +15,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../../timming.hpp"
 
 #ifdef BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/mutual_exclusion/locks/nested_strict_lock/owns_lock_pass.cpp b/test/sync/mutual_exclusion/locks/nested_strict_lock/owns_lock_pass.cpp
index be06b6a06..c75f836c5 100644
--- a/test/sync/mutual_exclusion/locks/nested_strict_lock/owns_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/nested_strict_lock/owns_lock_pass.cpp
@@ -12,7 +12,7 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/strict_lock.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/locks/nested_strict_lock/types_pass.cpp b/test/sync/mutual_exclusion/locks/nested_strict_lock/types_pass.cpp
index 5a7c690e4..60b99513c 100644
--- a/test/sync/mutual_exclusion/locks/nested_strict_lock/types_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/nested_strict_lock/types_pass.cpp
@@ -21,7 +21,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/locks/reverse_lock/types_pass.cpp b/test/sync/mutual_exclusion/locks/reverse_lock/types_pass.cpp
index 13a17fd3a..f3bb77d20 100644
--- a/test/sync/mutual_exclusion/locks/reverse_lock/types_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/reverse_lock/types_pass.cpp
@@ -22,7 +22,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/locks/reverse_lock/unique_lock_ctor_pass.cpp b/test/sync/mutual_exclusion/locks/reverse_lock/unique_lock_ctor_pass.cpp
index 57a1f1e01..6578336d1 100644
--- a/test/sync/mutual_exclusion/locks/reverse_lock/unique_lock_ctor_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/reverse_lock/unique_lock_ctor_pass.cpp
@@ -13,7 +13,7 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 
 int main()
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/cons/adopt_lock_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/cons/adopt_lock_pass.cpp
index f9089e7a8..1a970565d 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/cons/adopt_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/cons/adopt_lock_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 
 int main()
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/cons/copy_assign_fail.cpp b/test/sync/mutual_exclusion/locks/shared_lock/cons/copy_assign_fail.cpp
index 2bc99f34b..34cfec9ed 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/cons/copy_assign_fail.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/cons/copy_assign_fail.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m0;
 boost::shared_mutex m1;
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/cons/copy_ctor_fail.cpp b/test/sync/mutual_exclusion/locks/shared_lock/cons/copy_ctor_fail.cpp
index 43fddebe8..af3e67b27 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/cons/copy_ctor_fail.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/cons/copy_ctor_fail.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m0;
 boost::shared_mutex m1;
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/cons/default_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/cons/default_pass.cpp
index 9ccae93b7..055d3746a 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/cons/default_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/cons/default_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/cons/defer_lock_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/cons/defer_lock_pass.cpp
index 84388aca4..ed707f898 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/cons/defer_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/cons/defer_lock_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/cons/duration_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/cons/duration_pass.cpp
index 45037c224..1279ff015 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/cons/duration_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/cons/duration_pass.cpp
@@ -22,7 +22,7 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/chrono/chrono_io.hpp>
 #include "../../../../../timming.hpp"
 
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/cons/move_assign_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/cons/move_assign_pass.cpp
index ef54e229f..187458048 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/cons/move_assign_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/cons/move_assign_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m0;
 boost::shared_mutex m1;
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/cons/move_ctor_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/cons/move_ctor_pass.cpp
index 307c76142..d91e1fbf6 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/cons/move_ctor_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/cons/move_ctor_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/cons/move_ctor_unique_lock_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/cons/move_ctor_unique_lock_pass.cpp
index 38f6e7d7d..b9bdb39af 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/cons/move_ctor_unique_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/cons/move_ctor_unique_lock_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/cons/move_ctor_upgrade_lock_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/cons/move_ctor_upgrade_lock_pass.cpp
index 36ecb6a5a..b778095db 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/cons/move_ctor_upgrade_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/cons/move_ctor_upgrade_lock_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/cons/mutex_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/cons/mutex_pass.cpp
index f50aa6199..0860107a0 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/cons/mutex_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/cons/mutex_pass.cpp
@@ -21,7 +21,7 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../../../timming.hpp"
 
 boost::shared_mutex m;
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/cons/time_point_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/cons/time_point_pass.cpp
index 41d9cd8f9..641527349 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/cons/time_point_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/cons/time_point_pass.cpp
@@ -22,7 +22,7 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../../../timming.hpp"
 
 boost::shared_mutex m;
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/cons/try_to_lock_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/cons/try_to_lock_pass.cpp
index 5f3036c0c..e5866110d 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/cons/try_to_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/cons/try_to_lock_pass.cpp
@@ -21,7 +21,7 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../../../timming.hpp"
 
 boost::shared_mutex m;
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/locking/lock_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/locking/lock_pass.cpp
index 456c26dfd..65099f44d 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/locking/lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/locking/lock_pass.cpp
@@ -21,7 +21,7 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <iostream>
 #include "../../../../../timming.hpp"
 
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/locking/try_lock_for_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/locking/try_lock_for_pass.cpp
index 07d32df39..a5997890d 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/locking/try_lock_for_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/locking/try_lock_for_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 //#include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 bool try_lock_for_called = false;
 
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/locking/try_lock_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/locking/try_lock_pass.cpp
index 6a1997238..00e4c1a00 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/locking/try_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/locking/try_lock_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 //#include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 bool try_lock_called = false;
 
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/locking/try_lock_until_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/locking/try_lock_until_pass.cpp
index cdfd0e161..44d92c83b 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/locking/try_lock_until_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/locking/try_lock_until_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 bool try_lock_until_called = false;
 
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/locking/unlock_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/locking/unlock_pass.cpp
index e8ed7c74c..87f34c0d7 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/locking/unlock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/locking/unlock_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 //#include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 bool unlock_called = false;
 
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/mod/member_swap_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/mod/member_swap_pass.cpp
index 11f366bd6..65f37e7a9 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/mod/member_swap_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/mod/member_swap_pass.cpp
@@ -19,7 +19,7 @@
 // void swap(shared_lock& u);
 
 #include <boost/thread/lock_types.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct shared_mutex
 {
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/mod/non_member_swap_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/mod/non_member_swap_pass.cpp
index c0ccb8b9d..1b5db8411 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/mod/non_member_swap_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/mod/non_member_swap_pass.cpp
@@ -18,7 +18,7 @@
 //   void swap(shared_lock<Mutex>& x, shared_lock<Mutex>& y);
 
 #include <boost/thread/lock_types.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct shared_mutex
 {
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/mod/release_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/mod/release_pass.cpp
index c39ca50aa..d9e2aba2e 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/mod/release_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/mod/release_pass.cpp
@@ -19,7 +19,7 @@
 // void Mutex* release();
 
 #include <boost/thread/lock_types.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct shared_mutex
 {
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/obs/mutex_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/obs/mutex_pass.cpp
index 2012186ae..3656f7357 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/obs/mutex_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/obs/mutex_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/obs/op_bool_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/obs/op_bool_pass.cpp
index 407bfcc6f..fe8666c45 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/obs/op_bool_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/obs/op_bool_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/obs/owns_lock_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/obs/owns_lock_pass.cpp
index dce14d3e9..a0486f313 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/obs/owns_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/obs/owns_lock_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/shared_lock/types_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock/types_pass.cpp
index 2f83ef98f..73f96466d 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock/types_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock/types_pass.cpp
@@ -28,7 +28,8 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/static_assert.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/type_traits/is_same.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/locks/shared_lock_guard/adopt_lock_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock_guard/adopt_lock_pass.cpp
index fe125e8a0..0b8197b16 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock_guard/adopt_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock_guard/adopt_lock_pass.cpp
@@ -21,7 +21,7 @@
 #include <boost/thread/shared_lock_guard.hpp>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../../timming.hpp"
 
 #if defined BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/mutual_exclusion/locks/shared_lock_guard/copy_assign_fail.cpp b/test/sync/mutual_exclusion/locks/shared_lock_guard/copy_assign_fail.cpp
index 43607ac26..c5db43970 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock_guard/copy_assign_fail.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock_guard/copy_assign_fail.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/shared_lock_guard.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m0;
 boost::shared_mutex m1;
diff --git a/test/sync/mutual_exclusion/locks/shared_lock_guard/copy_ctor_fail.cpp b/test/sync/mutual_exclusion/locks/shared_lock_guard/copy_ctor_fail.cpp
index a7d4f006d..ce39fa55b 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock_guard/copy_ctor_fail.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock_guard/copy_ctor_fail.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/shared_lock_guard.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m0;
 boost::shared_mutex m1;
diff --git a/test/sync/mutual_exclusion/locks/shared_lock_guard/default_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock_guard/default_pass.cpp
index 694ba4a14..76ff543a6 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock_guard/default_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock_guard/default_pass.cpp
@@ -21,7 +21,7 @@
 #include <boost/thread/shared_lock_guard.hpp>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include  <iostream>
 #include "../../../../timming.hpp"
 
diff --git a/test/sync/mutual_exclusion/locks/shared_lock_guard/types_pass.cpp b/test/sync/mutual_exclusion/locks/shared_lock_guard/types_pass.cpp
index 57a2116d1..cc5a312d4 100644
--- a/test/sync/mutual_exclusion/locks/shared_lock_guard/types_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/shared_lock_guard/types_pass.cpp
@@ -29,7 +29,7 @@
 #include <boost/thread/shared_lock_guard.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/locks/strict_lock/copy_assign_fail.cpp b/test/sync/mutual_exclusion/locks/strict_lock/copy_assign_fail.cpp
index 1852224bb..af3666a43 100644
--- a/test/sync/mutual_exclusion/locks/strict_lock/copy_assign_fail.cpp
+++ b/test/sync/mutual_exclusion/locks/strict_lock/copy_assign_fail.cpp
@@ -11,7 +11,7 @@
 
 #include <boost/thread/strict_lock.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m0;
 boost::mutex m1;
diff --git a/test/sync/mutual_exclusion/locks/strict_lock/copy_ctor_fail.cpp b/test/sync/mutual_exclusion/locks/strict_lock/copy_ctor_fail.cpp
index 331610cb1..ec1baabb5 100644
--- a/test/sync/mutual_exclusion/locks/strict_lock/copy_ctor_fail.cpp
+++ b/test/sync/mutual_exclusion/locks/strict_lock/copy_ctor_fail.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/thread/strict_lock.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m0;
 boost::mutex m1;
diff --git a/test/sync/mutual_exclusion/locks/strict_lock/default_pass.cpp b/test/sync/mutual_exclusion/locks/strict_lock/default_pass.cpp
index aa2fb0071..cd1bfb56b 100644
--- a/test/sync/mutual_exclusion/locks/strict_lock/default_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/strict_lock/default_pass.cpp
@@ -12,7 +12,7 @@
 #include <boost/thread/strict_lock.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../../timming.hpp"
 
 #ifdef BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/mutual_exclusion/locks/strict_lock/make_strict_lock_pass.cpp b/test/sync/mutual_exclusion/locks/strict_lock/make_strict_lock_pass.cpp
index c5a3069f0..72adab31a 100644
--- a/test/sync/mutual_exclusion/locks/strict_lock/make_strict_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/strict_lock/make_strict_lock_pass.cpp
@@ -14,7 +14,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../../timming.hpp"
 
 #ifdef BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/mutual_exclusion/locks/strict_lock/owns_lock_pass.cpp b/test/sync/mutual_exclusion/locks/strict_lock/owns_lock_pass.cpp
index c0c2ec861..4e40d0c71 100644
--- a/test/sync/mutual_exclusion/locks/strict_lock/owns_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/strict_lock/owns_lock_pass.cpp
@@ -12,7 +12,7 @@
 #include <boost/thread/strict_lock.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #ifdef BOOST_THREAD_USES_CHRONO
 typedef boost::chrono::high_resolution_clock Clock;
diff --git a/test/sync/mutual_exclusion/locks/strict_lock/types_pass.cpp b/test/sync/mutual_exclusion/locks/strict_lock/types_pass.cpp
index f813e5ca8..4b546b1a2 100644
--- a/test/sync/mutual_exclusion/locks/strict_lock/types_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/strict_lock/types_pass.cpp
@@ -20,7 +20,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/adopt_lock_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/adopt_lock_pass.cpp
index 42d33378e..0e705d67e 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/adopt_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/adopt_lock_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 
 int main()
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/copy_assign_fail.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/copy_assign_fail.cpp
index d69a1eec7..3ba4e2a54 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/copy_assign_fail.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/copy_assign_fail.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m0;
 boost::mutex m1;
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/copy_ctor_fail.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/copy_ctor_fail.cpp
index 08fc3c344..9bd7d17e5 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/copy_ctor_fail.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/copy_ctor_fail.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m0;
 boost::mutex m1;
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/default_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/default_pass.cpp
index 7989b8173..d09a2a0a2 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/default_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/default_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/defer_lock_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/defer_lock_pass.cpp
index 5045af26e..d855a4855 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/defer_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/defer_lock_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/duration_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/duration_pass.cpp
index 19aa0575f..f19be6fa3 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/duration_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/duration_pass.cpp
@@ -24,7 +24,7 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/chrono/chrono_io.hpp>
 #include "../../../../../timming.hpp"
 
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_lock_adopt_lock_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_lock_adopt_lock_pass.cpp
index 2f385ec87..718ea7619 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_lock_adopt_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_lock_adopt_lock_pass.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/thread/lock_factories.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_lock_defer_lock_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_lock_defer_lock_pass.cpp
index e32fad168..9bea91ee7 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_lock_defer_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_lock_defer_lock_pass.cpp
@@ -14,7 +14,7 @@
 
 #include <boost/thread/lock_factories.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_lock_mutex_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_lock_mutex_pass.cpp
index 97b625564..53beaddd1 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_lock_mutex_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_lock_mutex_pass.cpp
@@ -14,7 +14,7 @@
 #include <boost/thread/lock_factories.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../../../timming.hpp"
 
 //#if ! defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_lock_try_to_lock_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_lock_try_to_lock_pass.cpp
index d0149d906..b3d58b048 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_lock_try_to_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_lock_try_to_lock_pass.cpp
@@ -14,7 +14,7 @@
 #include <boost/thread/lock_factories.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../../../timming.hpp"
 
 boost::mutex m;
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_locks_mutex_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_locks_mutex_pass.cpp
index 72c574b20..ee6645244 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_locks_mutex_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_locks_mutex_pass.cpp
@@ -13,7 +13,7 @@
 #include <boost/thread/lock_factories.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../../../timming.hpp"
 
 #if ! defined(BOOST_NO_CXX11_AUTO_DECLARATIONS) && ! defined BOOST_THREAD_NO_MAKE_UNIQUE_LOCKS && ! defined BOOST_NO_CXX11_RVALUE_REFERENCES
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/move_assign_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/move_assign_pass.cpp
index 7c84d1520..25ecd5ff2 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/move_assign_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/move_assign_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m0;
 boost::mutex m1;
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_pass.cpp
index cf682fbd4..738bd2bad 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_shared_lock_for_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_shared_lock_for_pass.cpp
index 0e61cb1a7..7a728e601 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_shared_lock_for_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_shared_lock_for_pass.cpp
@@ -26,7 +26,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_shared_lock_try_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_shared_lock_try_pass.cpp
index 3068866f0..859af7259 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_shared_lock_try_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_shared_lock_try_pass.cpp
@@ -24,7 +24,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_shared_lock_until_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_shared_lock_until_pass.cpp
index f1e54cf45..319650ee1 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_shared_lock_until_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_shared_lock_until_pass.cpp
@@ -26,7 +26,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_upgrade_lock_for_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_upgrade_lock_for_pass.cpp
index 7437ee0e7..33028f731 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_upgrade_lock_for_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_upgrade_lock_for_pass.cpp
@@ -24,7 +24,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::upgrade_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_upgrade_lock_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_upgrade_lock_pass.cpp
index c72067ae9..91d30537f 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_upgrade_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_upgrade_lock_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::upgrade_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_upgrade_lock_try_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_upgrade_lock_try_pass.cpp
index fdbdf2165..d788f1c40 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_upgrade_lock_try_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_upgrade_lock_try_pass.cpp
@@ -22,7 +22,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::upgrade_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_upgrade_lock_until_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_upgrade_lock_until_pass.cpp
index cd33f709c..c3c80d070 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_upgrade_lock_until_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_upgrade_lock_until_pass.cpp
@@ -24,7 +24,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::upgrade_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/mutex_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/mutex_pass.cpp
index d5b7ca295..f8a5d6fad 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/mutex_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/mutex_pass.cpp
@@ -22,7 +22,7 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <iostream>
 #include "../../../../../timming.hpp"
 
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/time_point_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/time_point_pass.cpp
index 53358de6e..47bd9428b 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/time_point_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/time_point_pass.cpp
@@ -24,7 +24,7 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../../../timming.hpp"
 
 #if defined BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/cons/try_to_lock_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/cons/try_to_lock_pass.cpp
index 0f0c8ded4..3297515c2 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/cons/try_to_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/cons/try_to_lock_pass.cpp
@@ -22,7 +22,7 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../../../timming.hpp"
 
 
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/locking/lock_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/locking/lock_pass.cpp
index 94edb4342..510de661e 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/locking/lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/locking/lock_pass.cpp
@@ -21,7 +21,7 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <iostream>
 #include "../../../../../timming.hpp"
 
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/locking/try_lock_for_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/locking/try_lock_for_pass.cpp
index 2be8416eb..9ee4f88dc 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/locking/try_lock_for_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/locking/try_lock_for_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 //#include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined BOOST_THREAD_USES_CHRONO
 
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/locking/try_lock_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/locking/try_lock_pass.cpp
index 8553c1c0b..47c5ffb22 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/locking/try_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/locking/try_lock_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 //#include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 bool try_lock_called = false;
 
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/locking/try_lock_until_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/locking/try_lock_until_pass.cpp
index df6e7369e..90e80aadc 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/locking/try_lock_until_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/locking/try_lock_until_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined BOOST_THREAD_USES_CHRONO
 
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/locking/unlock_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/locking/unlock_pass.cpp
index 4ad954f24..fa20757f6 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/locking/unlock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/locking/unlock_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 //#include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 
 bool unlock_called = false;
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/mod/member_swap_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/mod/member_swap_pass.cpp
index 617682fe3..f4b32836a 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/mod/member_swap_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/mod/member_swap_pass.cpp
@@ -19,7 +19,7 @@
 // void swap(unique_lock& u);
 
 #include <boost/thread/lock_types.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct mutex
 {
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/mod/non_member_swap_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/mod/non_member_swap_pass.cpp
index 74ba5ff3f..b7b69cb85 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/mod/non_member_swap_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/mod/non_member_swap_pass.cpp
@@ -18,7 +18,7 @@
 //   void swap(unique_lock<Mutex>& x, unique_lock<Mutex>& y);
 
 #include <boost/thread/lock_types.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct mutex
 {
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/mod/release_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/mod/release_pass.cpp
index 63c3831e5..fe9715da2 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/mod/release_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/mod/release_pass.cpp
@@ -19,7 +19,7 @@
 // void Mutex* release();
 
 #include <boost/thread/lock_types.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct mutex
 {
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/obs/mutex_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/obs/mutex_pass.cpp
index 68f1bbb6d..5d5949a8d 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/obs/mutex_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/obs/mutex_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/obs/op_bool_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/obs/op_bool_pass.cpp
index 3fa18225a..c56fabdbd 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/obs/op_bool_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/obs/op_bool_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/obs/op_int_fail.cpp b/test/sync/mutual_exclusion/locks/unique_lock/obs/op_int_fail.cpp
index 92fe0ffcb..733c7daa9 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/obs/op_int_fail.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/obs/op_int_fail.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/obs/owns_lock_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/obs/owns_lock_pass.cpp
index 6a9f019aa..380e91430 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/obs/owns_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/obs/owns_lock_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 
 int main()
diff --git a/test/sync/mutual_exclusion/locks/unique_lock/types_pass.cpp b/test/sync/mutual_exclusion/locks/unique_lock/types_pass.cpp
index 69b963a6f..e00f55079 100644
--- a/test/sync/mutual_exclusion/locks/unique_lock/types_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/unique_lock/types_pass.cpp
@@ -28,7 +28,8 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/static_assert.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/type_traits/is_same.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/adopt_lock_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/adopt_lock_pass.cpp
index 1822fe0b6..7849c1492 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/adopt_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/adopt_lock_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 
 int main()
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/copy_assign_fail.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/copy_assign_fail.cpp
index 521304d81..e1a0f9f38 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/copy_assign_fail.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/copy_assign_fail.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m0;
 boost::shared_mutex m1;
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/copy_ctor_fail.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/copy_ctor_fail.cpp
index 8e20196b1..1ddbf5200 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/copy_ctor_fail.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/copy_ctor_fail.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m0;
 boost::shared_mutex m1;
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/default_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/default_pass.cpp
index 59ea2a9a2..983264b42 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/default_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/default_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/defer_lock_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/defer_lock_pass.cpp
index ececb845c..4902cd2a3 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/defer_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/defer_lock_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/duration_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/duration_pass.cpp
index b6506b9b3..59882d2c0 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/duration_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/duration_pass.cpp
@@ -24,7 +24,7 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/chrono/chrono_io.hpp>
 #include "../../../../../timming.hpp"
 
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_assign_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_assign_pass.cpp
index 42ef355c9..8f91b84a2 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_assign_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_assign_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m0;
 boost::shared_mutex m1;
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_pass.cpp
index 5d5c0a948..300e771d0 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_shared_lock_for_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_shared_lock_for_pass.cpp
index ccad7b1ac..2246fa2f3 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_shared_lock_for_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_shared_lock_for_pass.cpp
@@ -26,7 +26,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_shared_lock_try_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_shared_lock_try_pass.cpp
index 93deda8c3..5181bed7c 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_shared_lock_try_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_shared_lock_try_pass.cpp
@@ -24,7 +24,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_shared_lock_until_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_shared_lock_until_pass.cpp
index 3d2c2871b..796582a78 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_shared_lock_until_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_shared_lock_until_pass.cpp
@@ -26,7 +26,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_unique_lock_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_unique_lock_pass.cpp
index 3d591d176..8917de647 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_unique_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_unique_lock_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/mutex_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/mutex_pass.cpp
index 1e634807d..67d318c4f 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/mutex_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/mutex_pass.cpp
@@ -22,7 +22,7 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <iostream>
 #include "../../../../../timming.hpp"
 
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/time_point_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/time_point_pass.cpp
index 4cf71476b..ac5512522 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/time_point_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/time_point_pass.cpp
@@ -24,7 +24,7 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../../../timming.hpp"
 
 boost::shared_mutex m;
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/try_to_lock_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/try_to_lock_pass.cpp
index 9a7fe26bf..91be65ded 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/cons/try_to_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/cons/try_to_lock_pass.cpp
@@ -22,7 +22,7 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../../../timming.hpp"
 
 boost::shared_mutex m;
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/locking/lock_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/locking/lock_pass.cpp
index 2ff49ac96..7ec16f839 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/locking/lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/locking/lock_pass.cpp
@@ -21,7 +21,7 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <iostream>
 #include "../../../../../timming.hpp"
 
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/locking/try_lock_for_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/locking/try_lock_for_pass.cpp
index 5f8f4f5fe..6f4fd6426 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/locking/try_lock_for_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/locking/try_lock_for_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 //#include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 bool try_lock_for_called = false;
 
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/locking/try_lock_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/locking/try_lock_pass.cpp
index 820fd71a3..05721fc47 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/locking/try_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/locking/try_lock_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 //#include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 bool try_lock_called = false;
 
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/locking/try_lock_until_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/locking/try_lock_until_pass.cpp
index 1c53d6a5b..1587074d9 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/locking/try_lock_until_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/locking/try_lock_until_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 bool try_lock_until_called = false;
 
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/locking/unlock_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/locking/unlock_pass.cpp
index bc49a0433..c9daae9a0 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/locking/unlock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/locking/unlock_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/lock_types.hpp>
 //#include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 bool unlock_called = false;
 
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/mod/member_swap_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/mod/member_swap_pass.cpp
index 4b0752ef5..68b8eaa55 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/mod/member_swap_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/mod/member_swap_pass.cpp
@@ -19,7 +19,7 @@
 // void swap(upgrade_lock& u);
 
 #include <boost/thread/lock_types.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct shared_mutex
 {
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/mod/non_member_swap_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/mod/non_member_swap_pass.cpp
index c7ebaa271..7c64642f9 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/mod/non_member_swap_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/mod/non_member_swap_pass.cpp
@@ -18,7 +18,7 @@
 //   void swap(upgrade_lock<Mutex>& x, upgrade_lock<Mutex>& y);
 
 #include <boost/thread/lock_types.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct shared_mutex
 {
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/mod/release_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/mod/release_pass.cpp
index 226819446..ca01e3640 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/mod/release_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/mod/release_pass.cpp
@@ -19,7 +19,7 @@
 // void Mutex* release();
 
 #include <boost/thread/lock_types.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct shared_mutex
 {
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/obs/mutex_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/obs/mutex_pass.cpp
index 276cd0a93..a92308726 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/obs/mutex_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/obs/mutex_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/obs/op_bool_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/obs/op_bool_pass.cpp
index 4e722d174..ae891de4a 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/obs/op_bool_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/obs/op_bool_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/obs/owns_lock_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/obs/owns_lock_pass.cpp
index 9d8b80d69..72b904c23 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/obs/owns_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/obs/owns_lock_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 boost::shared_mutex m;
 
diff --git a/test/sync/mutual_exclusion/locks/upgrade_lock/types_pass.cpp b/test/sync/mutual_exclusion/locks/upgrade_lock/types_pass.cpp
index 876428e46..f1bc6410c 100644
--- a/test/sync/mutual_exclusion/locks/upgrade_lock/types_pass.cpp
+++ b/test/sync/mutual_exclusion/locks/upgrade_lock/types_pass.cpp
@@ -28,7 +28,8 @@
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/static_assert.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/type_traits/is_same.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/mutex/assign_fail.cpp b/test/sync/mutual_exclusion/mutex/assign_fail.cpp
index fa1aff9b5..5e4827bf5 100644
--- a/test/sync/mutual_exclusion/mutex/assign_fail.cpp
+++ b/test/sync/mutual_exclusion/mutex/assign_fail.cpp
@@ -19,7 +19,7 @@
 // mutex& operator=(const mutex&) = delete;
 
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/mutex/copy_fail.cpp b/test/sync/mutual_exclusion/mutex/copy_fail.cpp
index e6f6d6b88..3a091cd90 100644
--- a/test/sync/mutual_exclusion/mutex/copy_fail.cpp
+++ b/test/sync/mutual_exclusion/mutex/copy_fail.cpp
@@ -19,7 +19,7 @@
 // mutex(const mutex&) = delete;
 
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/mutex/default_pass.cpp b/test/sync/mutual_exclusion/mutex/default_pass.cpp
index a911eefcf..a55dfcd9b 100644
--- a/test/sync/mutual_exclusion/mutex/default_pass.cpp
+++ b/test/sync/mutual_exclusion/mutex/default_pass.cpp
@@ -19,7 +19,7 @@
 // mutex();
 
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/mutex/lock_compile_fail.cpp b/test/sync/mutual_exclusion/mutex/lock_compile_fail.cpp
index f6bf74b56..acdc35b88 100644
--- a/test/sync/mutual_exclusion/mutex/lock_compile_fail.cpp
+++ b/test/sync/mutual_exclusion/mutex/lock_compile_fail.cpp
@@ -8,7 +8,7 @@
 // class mutex;
 
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 void fail()
 {
diff --git a/test/sync/mutual_exclusion/mutex/lock_compile_pass.cpp b/test/sync/mutual_exclusion/mutex/lock_compile_pass.cpp
index 9da22a59d..53dfabdc3 100644
--- a/test/sync/mutual_exclusion/mutex/lock_compile_pass.cpp
+++ b/test/sync/mutual_exclusion/mutex/lock_compile_pass.cpp
@@ -8,7 +8,7 @@
 // class mutex;
 
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 void pass()
 {
diff --git a/test/sync/mutual_exclusion/mutex/lock_pass.cpp b/test/sync/mutual_exclusion/mutex/lock_pass.cpp
index 94818fbad..13b94834f 100644
--- a/test/sync/mutual_exclusion/mutex/lock_pass.cpp
+++ b/test/sync/mutual_exclusion/mutex/lock_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 boost::mutex m;
diff --git a/test/sync/mutual_exclusion/mutex/native_handle_pass.cpp b/test/sync/mutual_exclusion/mutex/native_handle_pass.cpp
index 489ec375d..63b6b51f7 100644
--- a/test/sync/mutual_exclusion/mutex/native_handle_pass.cpp
+++ b/test/sync/mutual_exclusion/mutex/native_handle_pass.cpp
@@ -20,7 +20,7 @@
 // native_handle_type native_handle();
 
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/mutex/try_lock_compile_fail.cpp b/test/sync/mutual_exclusion/mutex/try_lock_compile_fail.cpp
index 05c2016cb..139b826de 100644
--- a/test/sync/mutual_exclusion/mutex/try_lock_compile_fail.cpp
+++ b/test/sync/mutual_exclusion/mutex/try_lock_compile_fail.cpp
@@ -8,7 +8,7 @@
 // class mutex;
 
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 void fail()
 {
diff --git a/test/sync/mutual_exclusion/mutex/try_lock_compile_pass.cpp b/test/sync/mutual_exclusion/mutex/try_lock_compile_pass.cpp
index e4cec906a..0b381468a 100644
--- a/test/sync/mutual_exclusion/mutex/try_lock_compile_pass.cpp
+++ b/test/sync/mutual_exclusion/mutex/try_lock_compile_pass.cpp
@@ -8,7 +8,7 @@
 // class mutex;
 
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 void pass()
 {
diff --git a/test/sync/mutual_exclusion/mutex/try_lock_pass.cpp b/test/sync/mutual_exclusion/mutex/try_lock_pass.cpp
index b973c1b23..1c503d2be 100644
--- a/test/sync/mutual_exclusion/mutex/try_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/mutex/try_lock_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 
diff --git a/test/sync/mutual_exclusion/null_mutex/assign_fail.cpp b/test/sync/mutual_exclusion/null_mutex/assign_fail.cpp
index e8b440abd..64a74e42d 100644
--- a/test/sync/mutual_exclusion/null_mutex/assign_fail.cpp
+++ b/test/sync/mutual_exclusion/null_mutex/assign_fail.cpp
@@ -19,7 +19,7 @@
 // null_mutex& operator=(const null_mutex&) = delete;
 
 #include <boost/thread/null_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/null_mutex/copy_fail.cpp b/test/sync/mutual_exclusion/null_mutex/copy_fail.cpp
index 66668f5e0..80e7cca92 100644
--- a/test/sync/mutual_exclusion/null_mutex/copy_fail.cpp
+++ b/test/sync/mutual_exclusion/null_mutex/copy_fail.cpp
@@ -19,7 +19,7 @@
 // null_mutex(const null_mutex&) = delete;
 
 #include <boost/thread/null_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/null_mutex/default_pass.cpp b/test/sync/mutual_exclusion/null_mutex/default_pass.cpp
index 343431a9e..eb2f620e7 100644
--- a/test/sync/mutual_exclusion/null_mutex/default_pass.cpp
+++ b/test/sync/mutual_exclusion/null_mutex/default_pass.cpp
@@ -19,7 +19,7 @@
 // null_mutex();
 
 #include <boost/thread/null_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/null_mutex/lock_pass.cpp b/test/sync/mutual_exclusion/null_mutex/lock_pass.cpp
index 3c91e25f6..793878114 100644
--- a/test/sync/mutual_exclusion/null_mutex/lock_pass.cpp
+++ b/test/sync/mutual_exclusion/null_mutex/lock_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/null_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 boost::null_mutex m;
diff --git a/test/sync/mutual_exclusion/null_mutex/try_lock_for_pass.cpp b/test/sync/mutual_exclusion/null_mutex/try_lock_for_pass.cpp
index 1f5f5e9fc..891b06e30 100644
--- a/test/sync/mutual_exclusion/null_mutex/try_lock_for_pass.cpp
+++ b/test/sync/mutual_exclusion/null_mutex/try_lock_for_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/null_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 #if defined BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/mutual_exclusion/null_mutex/try_lock_pass.cpp b/test/sync/mutual_exclusion/null_mutex/try_lock_pass.cpp
index cc51928bb..1bdd71faf 100644
--- a/test/sync/mutual_exclusion/null_mutex/try_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/null_mutex/try_lock_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/null_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 
diff --git a/test/sync/mutual_exclusion/null_mutex/try_lock_until_pass.cpp b/test/sync/mutual_exclusion/null_mutex/try_lock_until_pass.cpp
index 8a6985165..d03cb9ddb 100644
--- a/test/sync/mutual_exclusion/null_mutex/try_lock_until_pass.cpp
+++ b/test/sync/mutual_exclusion/null_mutex/try_lock_until_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/null_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 #if defined BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/mutual_exclusion/once/call_once/call_once_pass.cpp b/test/sync/mutual_exclusion/once/call_once/call_once_pass.cpp
index ac7b80769..cb6c26e2c 100644
--- a/test/sync/mutual_exclusion/once/call_once/call_once_pass.cpp
+++ b/test/sync/mutual_exclusion/once/call_once/call_once_pass.cpp
@@ -25,7 +25,7 @@
 
 #include <boost/thread/once.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #ifdef BOOST_THREAD_PROVIDES_ONCE_CXX11
 #define BOOST_INIT_ONCE_INIT
diff --git a/test/sync/mutual_exclusion/queue_views/single_thread_pass.cpp b/test/sync/mutual_exclusion/queue_views/single_thread_pass.cpp
index 05a628230..b47a396e9 100644
--- a/test/sync/mutual_exclusion/queue_views/single_thread_pass.cpp
+++ b/test/sync/mutual_exclusion/queue_views/single_thread_pass.cpp
@@ -16,7 +16,7 @@
 #include <boost/thread/concurrent_queues/queue_adaptor.hpp>
 #include <boost/thread/concurrent_queues/queue_views.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/static_assert.hpp>
 
 class non_copyable
diff --git a/test/sync/mutual_exclusion/recursive_mutex/assign_fail.cpp b/test/sync/mutual_exclusion/recursive_mutex/assign_fail.cpp
index 041102e91..74a8dd842 100644
--- a/test/sync/mutual_exclusion/recursive_mutex/assign_fail.cpp
+++ b/test/sync/mutual_exclusion/recursive_mutex/assign_fail.cpp
@@ -19,7 +19,7 @@
 // recursive_mutex& operator=(const recursive_mutex&) = delete;
 
 #include <boost/thread/recursive_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/recursive_mutex/copy_fail.cpp b/test/sync/mutual_exclusion/recursive_mutex/copy_fail.cpp
index 932422d15..f12a21dc5 100644
--- a/test/sync/mutual_exclusion/recursive_mutex/copy_fail.cpp
+++ b/test/sync/mutual_exclusion/recursive_mutex/copy_fail.cpp
@@ -19,7 +19,7 @@
 // recursive_mutex(const recursive_mutex&) = delete;
 
 #include <boost/thread/recursive_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/recursive_mutex/default_pass.cpp b/test/sync/mutual_exclusion/recursive_mutex/default_pass.cpp
index 6b6199720..b0d3b81e7 100644
--- a/test/sync/mutual_exclusion/recursive_mutex/default_pass.cpp
+++ b/test/sync/mutual_exclusion/recursive_mutex/default_pass.cpp
@@ -19,7 +19,7 @@
 // recursive_mutex();
 
 #include <boost/thread/recursive_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/recursive_mutex/lock_pass.cpp b/test/sync/mutual_exclusion/recursive_mutex/lock_pass.cpp
index a5410d25e..f52d9fd2b 100644
--- a/test/sync/mutual_exclusion/recursive_mutex/lock_pass.cpp
+++ b/test/sync/mutual_exclusion/recursive_mutex/lock_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/recursive_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 
diff --git a/test/sync/mutual_exclusion/recursive_mutex/native_handle_pass.cpp b/test/sync/mutual_exclusion/recursive_mutex/native_handle_pass.cpp
index b784f24e5..0f5e5b923 100644
--- a/test/sync/mutual_exclusion/recursive_mutex/native_handle_pass.cpp
+++ b/test/sync/mutual_exclusion/recursive_mutex/native_handle_pass.cpp
@@ -20,7 +20,7 @@
 // native_handle_type native_handle();
 
 #include <boost/thread/recursive_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/recursive_mutex/try_lock_pass.cpp b/test/sync/mutual_exclusion/recursive_mutex/try_lock_pass.cpp
index 0f8fe822a..a88e26249 100644
--- a/test/sync/mutual_exclusion/recursive_mutex/try_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/recursive_mutex/try_lock_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/recursive_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <iostream>
 #include "../../../timming.hpp"
 
diff --git a/test/sync/mutual_exclusion/recursive_timed_mutex/assign_fail.cpp b/test/sync/mutual_exclusion/recursive_timed_mutex/assign_fail.cpp
index 48b9cc47d..f6e215a30 100644
--- a/test/sync/mutual_exclusion/recursive_timed_mutex/assign_fail.cpp
+++ b/test/sync/mutual_exclusion/recursive_timed_mutex/assign_fail.cpp
@@ -19,7 +19,7 @@
 // recursive_timed_mutex& operator=(const recursive_timed_mutex&) = delete;
 
 #include <boost/thread/recursive_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/recursive_timed_mutex/copy_fail.cpp b/test/sync/mutual_exclusion/recursive_timed_mutex/copy_fail.cpp
index b4e96c7ac..62a4e9c9d 100644
--- a/test/sync/mutual_exclusion/recursive_timed_mutex/copy_fail.cpp
+++ b/test/sync/mutual_exclusion/recursive_timed_mutex/copy_fail.cpp
@@ -19,7 +19,7 @@
 // recursive_timed_mutex(const recursive_timed_mutex&) = delete;
 
 #include <boost/thread/recursive_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/recursive_timed_mutex/default_pass.cpp b/test/sync/mutual_exclusion/recursive_timed_mutex/default_pass.cpp
index 1e75b7b04..ef6107ee0 100644
--- a/test/sync/mutual_exclusion/recursive_timed_mutex/default_pass.cpp
+++ b/test/sync/mutual_exclusion/recursive_timed_mutex/default_pass.cpp
@@ -19,7 +19,7 @@
 // recursive_timed_mutex();
 
 #include <boost/thread/recursive_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/recursive_timed_mutex/lock_pass.cpp b/test/sync/mutual_exclusion/recursive_timed_mutex/lock_pass.cpp
index bd0646f64..4762db2c7 100644
--- a/test/sync/mutual_exclusion/recursive_timed_mutex/lock_pass.cpp
+++ b/test/sync/mutual_exclusion/recursive_timed_mutex/lock_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/recursive_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <iostream>
 #include "../../../timming.hpp"
 
diff --git a/test/sync/mutual_exclusion/recursive_timed_mutex/native_handle_pass.cpp b/test/sync/mutual_exclusion/recursive_timed_mutex/native_handle_pass.cpp
index bcd375e53..d0c4487bb 100644
--- a/test/sync/mutual_exclusion/recursive_timed_mutex/native_handle_pass.cpp
+++ b/test/sync/mutual_exclusion/recursive_timed_mutex/native_handle_pass.cpp
@@ -20,7 +20,7 @@
 // native_handle_type native_handle();
 
 #include <boost/thread/recursive_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/recursive_timed_mutex/try_lock_for_pass.cpp b/test/sync/mutual_exclusion/recursive_timed_mutex/try_lock_for_pass.cpp
index c7f6d2b0b..3b8c1a962 100644
--- a/test/sync/mutual_exclusion/recursive_timed_mutex/try_lock_for_pass.cpp
+++ b/test/sync/mutual_exclusion/recursive_timed_mutex/try_lock_for_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/recursive_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 #if defined BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/mutual_exclusion/recursive_timed_mutex/try_lock_pass.cpp b/test/sync/mutual_exclusion/recursive_timed_mutex/try_lock_pass.cpp
index 3874d6853..7a92af4e8 100644
--- a/test/sync/mutual_exclusion/recursive_timed_mutex/try_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/recursive_timed_mutex/try_lock_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/recursive_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 boost::recursive_timed_mutex m;
diff --git a/test/sync/mutual_exclusion/recursive_timed_mutex/try_lock_until_pass.cpp b/test/sync/mutual_exclusion/recursive_timed_mutex/try_lock_until_pass.cpp
index 238467204..f028ea96f 100644
--- a/test/sync/mutual_exclusion/recursive_timed_mutex/try_lock_until_pass.cpp
+++ b/test/sync/mutual_exclusion/recursive_timed_mutex/try_lock_until_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/recursive_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 #if defined BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/mutual_exclusion/shared_mutex/assign_fail.cpp b/test/sync/mutual_exclusion/shared_mutex/assign_fail.cpp
index ee6446d7e..e67795e03 100644
--- a/test/sync/mutual_exclusion/shared_mutex/assign_fail.cpp
+++ b/test/sync/mutual_exclusion/shared_mutex/assign_fail.cpp
@@ -19,7 +19,7 @@
 // shared_mutex& operator=(const shared_mutex&) = delete;
 
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/shared_mutex/copy_fail.cpp b/test/sync/mutual_exclusion/shared_mutex/copy_fail.cpp
index 9627f9f66..280546d90 100644
--- a/test/sync/mutual_exclusion/shared_mutex/copy_fail.cpp
+++ b/test/sync/mutual_exclusion/shared_mutex/copy_fail.cpp
@@ -19,7 +19,7 @@
 // shared_mutex(const shared_mutex&) = delete;
 
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/shared_mutex/default_pass.cpp b/test/sync/mutual_exclusion/shared_mutex/default_pass.cpp
index 730c9cafc..a0bbaccfd 100644
--- a/test/sync/mutual_exclusion/shared_mutex/default_pass.cpp
+++ b/test/sync/mutual_exclusion/shared_mutex/default_pass.cpp
@@ -19,7 +19,7 @@
 // shared_mutex();
 
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/shared_mutex/lock_pass.cpp b/test/sync/mutual_exclusion/shared_mutex/lock_pass.cpp
index 0b53fb275..d8d1b8cb3 100644
--- a/test/sync/mutual_exclusion/shared_mutex/lock_pass.cpp
+++ b/test/sync/mutual_exclusion/shared_mutex/lock_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 boost::shared_mutex m;
diff --git a/test/sync/mutual_exclusion/shared_mutex/try_lock_for_pass.cpp b/test/sync/mutual_exclusion/shared_mutex/try_lock_for_pass.cpp
index bc06576ec..207456def 100644
--- a/test/sync/mutual_exclusion/shared_mutex/try_lock_for_pass.cpp
+++ b/test/sync/mutual_exclusion/shared_mutex/try_lock_for_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 boost::shared_mutex m;
diff --git a/test/sync/mutual_exclusion/shared_mutex/try_lock_pass.cpp b/test/sync/mutual_exclusion/shared_mutex/try_lock_pass.cpp
index 515589a6f..b52995caf 100644
--- a/test/sync/mutual_exclusion/shared_mutex/try_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/shared_mutex/try_lock_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 boost::shared_mutex m;
diff --git a/test/sync/mutual_exclusion/shared_mutex/try_lock_until_pass.cpp b/test/sync/mutual_exclusion/shared_mutex/try_lock_until_pass.cpp
index dd8a1a816..42ac0e46a 100644
--- a/test/sync/mutual_exclusion/shared_mutex/try_lock_until_pass.cpp
+++ b/test/sync/mutual_exclusion/shared_mutex/try_lock_until_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 boost::shared_mutex m;
diff --git a/test/sync/mutual_exclusion/sync_bounded_queue/multi_thread_pass.cpp b/test/sync/mutual_exclusion/sync_bounded_queue/multi_thread_pass.cpp
index 9975a995a..c7e74a912 100644
--- a/test/sync/mutual_exclusion/sync_bounded_queue/multi_thread_pass.cpp
+++ b/test/sync/mutual_exclusion/sync_bounded_queue/multi_thread_pass.cpp
@@ -20,7 +20,7 @@
 #include <boost/thread/future.hpp>
 #include <boost/thread/barrier.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct call_push
 {
diff --git a/test/sync/mutual_exclusion/sync_bounded_queue/single_thread_pass.cpp b/test/sync/mutual_exclusion/sync_bounded_queue/single_thread_pass.cpp
index 201e0bc13..49b90fa5f 100644
--- a/test/sync/mutual_exclusion/sync_bounded_queue/single_thread_pass.cpp
+++ b/test/sync/mutual_exclusion/sync_bounded_queue/single_thread_pass.cpp
@@ -14,7 +14,7 @@
 
 #include <boost/thread/sync_bounded_queue.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class non_copyable
 {
diff --git a/test/sync/mutual_exclusion/sync_deque/multi_thread_pass.cpp b/test/sync/mutual_exclusion/sync_deque/multi_thread_pass.cpp
index 703c54f40..e63fff8c9 100644
--- a/test/sync/mutual_exclusion/sync_deque/multi_thread_pass.cpp
+++ b/test/sync/mutual_exclusion/sync_deque/multi_thread_pass.cpp
@@ -20,7 +20,7 @@
 #include <boost/thread/future.hpp>
 #include <boost/thread/barrier.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 template <typename ValueType>
 struct call_push_back
diff --git a/test/sync/mutual_exclusion/sync_deque/single_thread_pass.cpp b/test/sync/mutual_exclusion/sync_deque/single_thread_pass.cpp
index 5170bcf61..4cebae3c3 100644
--- a/test/sync/mutual_exclusion/sync_deque/single_thread_pass.cpp
+++ b/test/sync/mutual_exclusion/sync_deque/single_thread_pass.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/thread/concurrent_queues/sync_deque.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class non_copyable
 {
diff --git a/test/sync/mutual_exclusion/sync_pq/pq_multi_thread_pass.cpp b/test/sync/mutual_exclusion/sync_pq/pq_multi_thread_pass.cpp
index 92e183079..fb9182830 100644
--- a/test/sync/mutual_exclusion/sync_pq/pq_multi_thread_pass.cpp
+++ b/test/sync/mutual_exclusion/sync_pq/pq_multi_thread_pass.cpp
@@ -19,6 +19,7 @@
 #include <boost/thread/barrier.hpp>
 #include <boost/thread/concurrent_queues/sync_priority_queue.hpp>
 
+#include <boost/bind/bind.hpp>
 #include <boost/core/lightweight_test.hpp>
 
 #ifdef BOOST_MSVC
diff --git a/test/sync/mutual_exclusion/sync_pq/pq_single_thread_pass.cpp b/test/sync/mutual_exclusion/sync_pq/pq_single_thread_pass.cpp
index b51827731..d705df8eb 100644
--- a/test/sync/mutual_exclusion/sync_pq/pq_single_thread_pass.cpp
+++ b/test/sync/mutual_exclusion/sync_pq/pq_single_thread_pass.cpp
@@ -19,7 +19,7 @@
 #include <boost/chrono.hpp>
 #include <boost/thread/concurrent_queues/sync_priority_queue.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 using namespace boost::chrono;
diff --git a/test/sync/mutual_exclusion/sync_pq/tq_multi_thread_pass.cpp b/test/sync/mutual_exclusion/sync_pq/tq_multi_thread_pass.cpp
index 77656f8b3..17ee30f30 100644
--- a/test/sync/mutual_exclusion/sync_pq/tq_multi_thread_pass.cpp
+++ b/test/sync/mutual_exclusion/sync_pq/tq_multi_thread_pass.cpp
@@ -17,6 +17,7 @@
 #include <boost/chrono.hpp>
 #include <boost/thread/concurrent_queues/sync_timed_queue.hpp>
 
+#include <boost/bind/bind.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
diff --git a/test/sync/mutual_exclusion/sync_pq/tq_single_thread_pass.cpp b/test/sync/mutual_exclusion/sync_pq/tq_single_thread_pass.cpp
index dd4dfc17f..13fb84d3a 100644
--- a/test/sync/mutual_exclusion/sync_pq/tq_single_thread_pass.cpp
+++ b/test/sync/mutual_exclusion/sync_pq/tq_single_thread_pass.cpp
@@ -16,6 +16,7 @@
 #include <boost/thread.hpp>
 #include <boost/chrono.hpp>
 #include <boost/function.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/thread/concurrent_queues/sync_timed_queue.hpp>
 #include <boost/thread/executors/work.hpp>
 
diff --git a/test/sync/mutual_exclusion/sync_queue/multi_thread_pass.cpp b/test/sync/mutual_exclusion/sync_queue/multi_thread_pass.cpp
index 556ca68e9..3c26dbc6c 100644
--- a/test/sync/mutual_exclusion/sync_queue/multi_thread_pass.cpp
+++ b/test/sync/mutual_exclusion/sync_queue/multi_thread_pass.cpp
@@ -20,7 +20,7 @@
 #include <boost/thread/future.hpp>
 #include <boost/thread/barrier.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 template <typename ValueType>
 struct call_push
diff --git a/test/sync/mutual_exclusion/sync_queue/single_thread_pass.cpp b/test/sync/mutual_exclusion/sync_queue/single_thread_pass.cpp
index 8f47ec82a..49445bbd6 100644
--- a/test/sync/mutual_exclusion/sync_queue/single_thread_pass.cpp
+++ b/test/sync/mutual_exclusion/sync_queue/single_thread_pass.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/thread/sync_queue.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class non_copyable
 {
diff --git a/test/sync/mutual_exclusion/synchronized_value/call_pass.cpp b/test/sync/mutual_exclusion/synchronized_value/call_pass.cpp
index f1ed8be4a..57045110d 100644
--- a/test/sync/mutual_exclusion/synchronized_value/call_pass.cpp
+++ b/test/sync/mutual_exclusion/synchronized_value/call_pass.cpp
@@ -23,7 +23,7 @@
 
 #include <boost/thread/synchronized_value.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct S {
   int f() const {return 1;}
diff --git a/test/sync/mutual_exclusion/synchronized_value/copy_T_assign_pass.cpp b/test/sync/mutual_exclusion/synchronized_value/copy_T_assign_pass.cpp
index 3b43f8f90..21cbbc229 100644
--- a/test/sync/mutual_exclusion/synchronized_value/copy_T_assign_pass.cpp
+++ b/test/sync/mutual_exclusion/synchronized_value/copy_T_assign_pass.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/thread/synchronized_value.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/synchronized_value/copy_T_ctor_pass.cpp b/test/sync/mutual_exclusion/synchronized_value/copy_T_ctor_pass.cpp
index e395c57aa..f95ae6caa 100644
--- a/test/sync/mutual_exclusion/synchronized_value/copy_T_ctor_pass.cpp
+++ b/test/sync/mutual_exclusion/synchronized_value/copy_T_ctor_pass.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/thread/synchronized_value.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/synchronized_value/copy_assign_pass.cpp b/test/sync/mutual_exclusion/synchronized_value/copy_assign_pass.cpp
index d4e80b0ce..d282b6e5d 100644
--- a/test/sync/mutual_exclusion/synchronized_value/copy_assign_pass.cpp
+++ b/test/sync/mutual_exclusion/synchronized_value/copy_assign_pass.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/thread/synchronized_value.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/synchronized_value/copy_ctor_pass.cpp b/test/sync/mutual_exclusion/synchronized_value/copy_ctor_pass.cpp
index 13fcf6d80..b30f66cb0 100644
--- a/test/sync/mutual_exclusion/synchronized_value/copy_ctor_pass.cpp
+++ b/test/sync/mutual_exclusion/synchronized_value/copy_ctor_pass.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/thread/synchronized_value.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/synchronized_value/default_ctor_pass.cpp b/test/sync/mutual_exclusion/synchronized_value/default_ctor_pass.cpp
index 7b4095650..3ceb5455c 100644
--- a/test/sync/mutual_exclusion/synchronized_value/default_ctor_pass.cpp
+++ b/test/sync/mutual_exclusion/synchronized_value/default_ctor_pass.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/thread/synchronized_value.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/synchronized_value/indirect_pass.cpp b/test/sync/mutual_exclusion/synchronized_value/indirect_pass.cpp
index 09b8e89d2..785c9d4ee 100644
--- a/test/sync/mutual_exclusion/synchronized_value/indirect_pass.cpp
+++ b/test/sync/mutual_exclusion/synchronized_value/indirect_pass.cpp
@@ -14,7 +14,7 @@
 
 #include <boost/thread/synchronized_value.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct S {
   int f() const {return 1;}
diff --git a/test/sync/mutual_exclusion/synchronized_value/move_T_assign_pass.cpp b/test/sync/mutual_exclusion/synchronized_value/move_T_assign_pass.cpp
index 146ed2e51..5ada80582 100644
--- a/test/sync/mutual_exclusion/synchronized_value/move_T_assign_pass.cpp
+++ b/test/sync/mutual_exclusion/synchronized_value/move_T_assign_pass.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/thread/synchronized_value.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/synchronized_value/move_T_ctor_pass.cpp b/test/sync/mutual_exclusion/synchronized_value/move_T_ctor_pass.cpp
index 564d57da8..3a7e7960d 100644
--- a/test/sync/mutual_exclusion/synchronized_value/move_T_ctor_pass.cpp
+++ b/test/sync/mutual_exclusion/synchronized_value/move_T_ctor_pass.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/thread/synchronized_value.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/synchronized_value/move_assign_pass.cpp b/test/sync/mutual_exclusion/synchronized_value/move_assign_pass.cpp
index 818216382..d1ccc607a 100644
--- a/test/sync/mutual_exclusion/synchronized_value/move_assign_pass.cpp
+++ b/test/sync/mutual_exclusion/synchronized_value/move_assign_pass.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/thread/synchronized_value.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/synchronized_value/move_ctor_pass.cpp b/test/sync/mutual_exclusion/synchronized_value/move_ctor_pass.cpp
index 7250e896f..b0eb259ed 100644
--- a/test/sync/mutual_exclusion/synchronized_value/move_ctor_pass.cpp
+++ b/test/sync/mutual_exclusion/synchronized_value/move_ctor_pass.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/thread/synchronized_value.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/synchronized_value/swap_T_pass.cpp b/test/sync/mutual_exclusion/synchronized_value/swap_T_pass.cpp
index 801b514d6..0a0ff30a1 100644
--- a/test/sync/mutual_exclusion/synchronized_value/swap_T_pass.cpp
+++ b/test/sync/mutual_exclusion/synchronized_value/swap_T_pass.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/thread/synchronized_value.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/synchronized_value/swap_pass.cpp b/test/sync/mutual_exclusion/synchronized_value/swap_pass.cpp
index c52069ff3..22caeadb7 100644
--- a/test/sync/mutual_exclusion/synchronized_value/swap_pass.cpp
+++ b/test/sync/mutual_exclusion/synchronized_value/swap_pass.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/thread/synchronized_value.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/synchronized_value/synchronize_pass.cpp b/test/sync/mutual_exclusion/synchronized_value/synchronize_pass.cpp
index af24d79b6..d27c58e65 100644
--- a/test/sync/mutual_exclusion/synchronized_value/synchronize_pass.cpp
+++ b/test/sync/mutual_exclusion/synchronized_value/synchronize_pass.cpp
@@ -15,7 +15,7 @@
 
 #include <boost/thread/synchronized_value.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct S {
   int f() const {return 1;}
diff --git a/test/sync/mutual_exclusion/timed_mutex/assign_fail.cpp b/test/sync/mutual_exclusion/timed_mutex/assign_fail.cpp
index 49188e130..4b9972155 100644
--- a/test/sync/mutual_exclusion/timed_mutex/assign_fail.cpp
+++ b/test/sync/mutual_exclusion/timed_mutex/assign_fail.cpp
@@ -19,7 +19,7 @@
 // timed_mutex& operator=(const timed_mutex&) = delete;
 
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/timed_mutex/copy_fail.cpp b/test/sync/mutual_exclusion/timed_mutex/copy_fail.cpp
index ed0a4c955..3977196e6 100644
--- a/test/sync/mutual_exclusion/timed_mutex/copy_fail.cpp
+++ b/test/sync/mutual_exclusion/timed_mutex/copy_fail.cpp
@@ -19,7 +19,7 @@
 // timed_mutex(const timed_mutex&) = delete;
 
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/timed_mutex/default_pass.cpp b/test/sync/mutual_exclusion/timed_mutex/default_pass.cpp
index 6b7c6f2b3..c5ac77d9d 100644
--- a/test/sync/mutual_exclusion/timed_mutex/default_pass.cpp
+++ b/test/sync/mutual_exclusion/timed_mutex/default_pass.cpp
@@ -19,7 +19,7 @@
 // timed_mutex();
 
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/sync/mutual_exclusion/timed_mutex/lock_pass.cpp b/test/sync/mutual_exclusion/timed_mutex/lock_pass.cpp
index 8d2733e1f..50079a815 100644
--- a/test/sync/mutual_exclusion/timed_mutex/lock_pass.cpp
+++ b/test/sync/mutual_exclusion/timed_mutex/lock_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 boost::timed_mutex m;
diff --git a/test/sync/mutual_exclusion/timed_mutex/native_handle_pass.cpp b/test/sync/mutual_exclusion/timed_mutex/native_handle_pass.cpp
index b203e5d91..32a4c0d38 100644
--- a/test/sync/mutual_exclusion/timed_mutex/native_handle_pass.cpp
+++ b/test/sync/mutual_exclusion/timed_mutex/native_handle_pass.cpp
@@ -20,7 +20,7 @@
 // native_handle_type native_handle();
 
 #include <boost/thread/mutex.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 
 int main()
diff --git a/test/sync/mutual_exclusion/timed_mutex/try_lock_for_pass.cpp b/test/sync/mutual_exclusion/timed_mutex/try_lock_for_pass.cpp
index 94d790e0e..04774a3c8 100644
--- a/test/sync/mutual_exclusion/timed_mutex/try_lock_for_pass.cpp
+++ b/test/sync/mutual_exclusion/timed_mutex/try_lock_for_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 #if defined BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/mutual_exclusion/timed_mutex/try_lock_pass.cpp b/test/sync/mutual_exclusion/timed_mutex/try_lock_pass.cpp
index 96e99e7f7..3f87564b4 100644
--- a/test/sync/mutual_exclusion/timed_mutex/try_lock_pass.cpp
+++ b/test/sync/mutual_exclusion/timed_mutex/try_lock_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 
diff --git a/test/sync/mutual_exclusion/timed_mutex/try_lock_until_pass.cpp b/test/sync/mutual_exclusion/timed_mutex/try_lock_until_pass.cpp
index 958a42d03..b4f849058 100644
--- a/test/sync/mutual_exclusion/timed_mutex/try_lock_until_pass.cpp
+++ b/test/sync/mutual_exclusion/timed_mutex/try_lock_until_pass.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "../../../timming.hpp"
 
 #if defined BOOST_THREAD_USES_CHRONO
diff --git a/test/sync/mutual_exclusion/with_lock_guard/with_lock_guard_bind.cpp b/test/sync/mutual_exclusion/with_lock_guard/with_lock_guard_bind.cpp
index 9ec0dfdfb..e5e073b60 100644
--- a/test/sync/mutual_exclusion/with_lock_guard/with_lock_guard_bind.cpp
+++ b/test/sync/mutual_exclusion/with_lock_guard/with_lock_guard_bind.cpp
@@ -8,11 +8,12 @@
 
 #define BOOST_THREAD_VERSION 4
 
-#include <boost/detail/lightweight_test.hpp> // BOOST_TEST
+#include <boost/core/lightweight_test.hpp> // BOOST_TEST
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/with_lock_guard.hpp>
 #include <boost/bind/bind.hpp>
+#include <boost/core/ref.hpp>
 
 class Foo {
  public:
diff --git a/test/sync/mutual_exclusion/with_lock_guard/with_lock_guard_lambda.cpp b/test/sync/mutual_exclusion/with_lock_guard/with_lock_guard_lambda.cpp
index 8eda53dea..d0e41423e 100644
--- a/test/sync/mutual_exclusion/with_lock_guard/with_lock_guard_lambda.cpp
+++ b/test/sync/mutual_exclusion/with_lock_guard/with_lock_guard_lambda.cpp
@@ -14,7 +14,7 @@
 
 #define BOOST_THREAD_VERSION 4
 
-#include <boost/detail/lightweight_test.hpp> // BOOST_TEST
+#include <boost/core/lightweight_test.hpp> // BOOST_TEST
 
 #include <iostream> // std::cout
 #include <boost/thread/mutex.hpp>
diff --git a/test/sync/mutual_exclusion/with_lock_guard/with_lock_guard_move.cpp b/test/sync/mutual_exclusion/with_lock_guard/with_lock_guard_move.cpp
index 2c685790d..cb4cc920b 100644
--- a/test/sync/mutual_exclusion/with_lock_guard/with_lock_guard_move.cpp
+++ b/test/sync/mutual_exclusion/with_lock_guard/with_lock_guard_move.cpp
@@ -8,7 +8,7 @@
 
 #define BOOST_THREAD_VERSION 4
 
-#include <boost/detail/lightweight_test.hpp> // BOOST_TEST
+#include <boost/core/lightweight_test.hpp> // BOOST_TEST
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/with_lock_guard.hpp>
diff --git a/test/sync/mutual_exclusion/with_lock_guard/with_lock_guard_simple.cpp b/test/sync/mutual_exclusion/with_lock_guard/with_lock_guard_simple.cpp
index dc9c44455..876be358b 100644
--- a/test/sync/mutual_exclusion/with_lock_guard/with_lock_guard_simple.cpp
+++ b/test/sync/mutual_exclusion/with_lock_guard/with_lock_guard_simple.cpp
@@ -8,7 +8,7 @@
 
 #define BOOST_THREAD_VERSION 4
 
-#include <boost/detail/lightweight_test.hpp> // BOOST_TEST
+#include <boost/core/lightweight_test.hpp> // BOOST_TEST
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/with_lock_guard.hpp>
diff --git a/test/test_10963.cpp b/test/test_10963.cpp
index 1ec8d6cfc..31b6ca041 100644
--- a/test/test_10963.cpp
+++ b/test/test_10963.cpp
@@ -15,6 +15,7 @@
 #include <cassert>
 #include <boost/thread/executors/basic_thread_pool.hpp>
 
+#include <boost/type_traits/is_same.hpp>
 
 struct TestCallback
 {
@@ -42,18 +43,18 @@ int main()
     boost::promise<void> test_promise;
     boost::future<void> test_future(test_promise.get_future());
     auto f1 = test_future.then(TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
     auto f2 = f1.then(TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f2), boost::future<boost::future<void> > >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f2), boost::future<boost::future<void> > >::value);
   }
   {
     boost::basic_thread_pool executor;
     boost::promise<void> test_promise;
     boost::future<void> test_future(test_promise.get_future());
     auto f1 = test_future.then(executor, TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
     auto f2 = f1.then(executor, TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f2), boost::future<boost::future<void> > >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f2), boost::future<boost::future<void> > >::value);
 
   }
 #endif
diff --git a/test/test_10964.cpp b/test/test_10964.cpp
index 48ee5cd95..c1712ac96 100644
--- a/test/test_10964.cpp
+++ b/test/test_10964.cpp
@@ -16,6 +16,8 @@
 #include <iostream>
 #include <boost/thread/executors/basic_thread_pool.hpp>
 
+#include <boost/type_traits/is_same.hpp>
+
 struct TestCallback
 {
   typedef boost::future<void> result_type;
@@ -77,7 +79,7 @@ int main()
   std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
   {
     auto f1 = boost::make_ready_future().then(TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
     f1.wait();
   }
   std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
@@ -85,11 +87,11 @@ int main()
   {
     auto f1 = boost::make_ready_future().then(TestCallback());
     std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
     std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
     auto f2 = f1.unwrap();
     std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f2), boost::future<void> >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f2), boost::future<void> >::value);
     std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
     f2.wait();
     std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
@@ -98,26 +100,26 @@ int main()
   for (int i=0; i< number_of_tests; i++)
   {
     auto f1 = boost::make_ready_future().then(TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
     boost::future<void> f2 = f1.get();
   }
   std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
   {
     auto f1 = boost::make_ready_future().then(TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
     auto f3 = f1.then(TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f3), boost::future<boost::future<void> > >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f3), boost::future<boost::future<void> > >::value);
     f3.wait();
   }
   std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
   for (int i=0; i< number_of_tests; i++)
   {
     auto f1 = boost::make_ready_future().then(TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
     auto f2 = f1.unwrap();
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f2), boost::future<void> >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f2), boost::future<void> >::value);
     auto f3 = f2.then(TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f3), boost::future<boost::future<void> > >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f3), boost::future<boost::future<void> > >::value);
     f3.wait();
   }
   std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
@@ -137,9 +139,9 @@ int main()
   for (int i=0; i< number_of_tests; i++)
   {
     auto f1 = boost::make_ready_future().then(TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
     auto f3 = f1.then(TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f3), boost::future<boost::future<void> > >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f3), boost::future<boost::future<void> > >::value);
     f3.wait();
   }
   std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
@@ -147,9 +149,9 @@ int main()
   {
     boost::basic_thread_pool executor;
     auto f1 = boost::make_ready_future().then(executor, TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
     auto f3 = f1.then(executor, TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f3), boost::future<boost::future<void> > >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f3), boost::future<boost::future<void> > >::value);
     f3.wait();
   }
 #if 1
@@ -160,14 +162,14 @@ int main()
     boost::basic_thread_pool executor(2);
 
     auto f1 = boost::make_ready_future().then(executor, TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
     std::cout << __FILE__ << "[" << __LINE__ << "] " << int(f1.valid()) << std::endl;
     auto f2 = f1.unwrap();
     std::cout << __FILE__ << "[" << __LINE__ << "] " << int(f2.valid()) << std::endl;
 
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f2), boost::future<void> >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f2), boost::future<void> >::value);
     auto f3 = f2.then(executor, TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f3), boost::future<boost::future<void> > >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f3), boost::future<boost::future<void> > >::value);
     f3.wait();
   }
 #endif
@@ -177,11 +179,11 @@ int main()
     boost::basic_thread_pool executor;
 
     auto f1 = boost::make_ready_future().then(executor, TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f1), boost::future<boost::future<void> > >::value);
     auto f2 = f1.unwrap();
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f2), boost::future<void> >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f2), boost::future<void> >::value);
     auto f3 = f2.then(executor, TestCallback());
-    BOOST_STATIC_ASSERT(std::is_same<decltype(f3), boost::future<boost::future<void> > >::value);
+    BOOST_STATIC_ASSERT(boost::is_same<decltype(f3), boost::future<boost::future<void> > >::value);
     f3.wait();
   }
   std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
diff --git a/test/test_2309.cpp b/test/test_2309.cpp
index c3208f97f..f25dfa506 100644
--- a/test/test_2309.cpp
+++ b/test/test_2309.cpp
@@ -11,7 +11,7 @@
 #include <iostream>
 
 #include <boost/thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
   using namespace std;
 
diff --git a/test/test_2741.cpp b/test/test_2741.cpp
index 349d7d2ae..258b4ecfc 100644
--- a/test/test_2741.cpp
+++ b/test/test_2741.cpp
@@ -8,9 +8,6 @@
 
 #include <boost/thread/thread_only.hpp>
 #include <boost/thread/xtime.hpp>
-#include <boost/bind/bind.hpp>
-#include <boost/ref.hpp>
-#include <boost/utility.hpp>
 
 #include <iostream>
 #include <boost/test/unit_test.hpp>
@@ -75,5 +72,3 @@ BOOST_AUTO_TEST_CASE(test_creation_with_attrs)
 {
   timed_test(&do_test_creation_with_attrs, 1);
 }
-
-
diff --git a/test/test_3837.cpp b/test/test_3837.cpp
index fd0056f33..c179ab311 100644
--- a/test/test_3837.cpp
+++ b/test/test_3837.cpp
@@ -7,7 +7,8 @@
 #include <boost/thread.hpp>
 #include <boost/thread/thread_only.hpp>
 #include <boost/optional.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/bind/bind.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost;
 using namespace boost::chrono;
diff --git a/test/test_4648.cpp b/test/test_4648.cpp
index 34fb131af..2752d5924 100644
--- a/test/test_4648.cpp
+++ b/test/test_4648.cpp
@@ -6,6 +6,7 @@
 #include <iostream>
 #include <boost/thread.hpp>
 #include <boost/current_function.hpp>
+#include <boost/bind/bind.hpp>
 
 class boostThreadLocksTest
 {
diff --git a/test/test_5502.cpp b/test/test_5502.cpp
index 455e79eec..797899728 100644
--- a/test/test_5502.cpp
+++ b/test/test_5502.cpp
@@ -12,12 +12,13 @@
 int XXX = 20;
 int YYY = 10;
 
+#include <boost/bind/bind.hpp>
 #include <boost/thread/thread_only.hpp>
 #include <boost/thread/shared_mutex.hpp>
 
 //#include <unistd.h>
 #include <iostream>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace std;
 
diff --git a/test/test_7328.cpp b/test/test_7328.cpp
index 0c0cca03a..2be684685 100644
--- a/test/test_7328.cpp
+++ b/test/test_7328.cpp
@@ -7,7 +7,7 @@
 
 #include <iostream>
 #include <boost/thread/thread_only.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined BOOST_THREAD_USES_CHRONO
 
diff --git a/test/test_8557.cpp b/test/test_8557.cpp
index b8efee5a1..f76a7ec22 100644
--- a/test/test_8557.cpp
+++ b/test/test_8557.cpp
@@ -10,8 +10,6 @@
 
 #include <boost/thread/mutex.hpp>
 
-#include <boost/bind/bind.hpp>
-
 #include <iostream>
 
        static void
diff --git a/test/test_8943.cpp b/test/test_8943.cpp
index 99cf70de1..14be45159 100644
--- a/test/test_8943.cpp
+++ b/test/test_8943.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>
 
 #if defined(WIN32)
 #include <tchar.h>
diff --git a/test/test_8960.cpp b/test/test_8960.cpp
index 84cce77e4..6a7c03a3d 100644
--- a/test/test_8960.cpp
+++ b/test/test_8960.cpp
@@ -5,14 +5,12 @@
 
 #include <boost/thread/thread.hpp>
 #include <iostream>
-
-#include <iostream>
+#include <stdexcept>
 
 #include <boost/thread.hpp>
 #include <boost/thread/locks.hpp>
 #include <boost/chrono.hpp>
-//#include <boost/bind/bind.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 
 void do_thread()
diff --git a/test/test_9303.cpp b/test/test_9303.cpp
index af8be567d..6bdaa2a14 100644
--- a/test/test_9303.cpp
+++ b/test/test_9303.cpp
@@ -4,6 +4,7 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_THREAD_VERSION 4
+    #include <string>
     #include <iostream>
     #include <fstream>
     #include <stdio.h>
@@ -11,6 +12,7 @@
     #include <boost/make_shared.hpp>
     #include <boost/shared_ptr.hpp>
     #include <boost/bind/bind.hpp>
+    #include <boost/core/ref.hpp>
     #include <boost/asio.hpp>
     #include <boost/thread.hpp>
     #include <boost/thread/future.hpp>
@@ -86,7 +88,7 @@
 
     #if defined EXAMPLE_3
         //! Doesn't compile in C++03.
-        //! error: variable âboost::packaged_task<std::basic_string<char>(std::basic_string<char>&)> exampleâ has initializer but incomplete type
+        //! error: variable "boost::packaged_task<std::basic_string<char>(std::basic_string<char>&)> example" has initializer but incomplete type
 
         {
             boost::packaged_task<std::string(std::string&)> example(string_with_params);
diff --git a/test/test_barrier.cpp b/test/test_barrier.cpp
index 5baf19cd4..188221739 100644
--- a/test/test_barrier.cpp
+++ b/test/test_barrier.cpp
@@ -12,7 +12,7 @@
 #include <boost/thread/thread.hpp>
 #include <boost/thread/barrier.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <vector>
 
 namespace {
diff --git a/test/test_barrier_size_fct.cpp b/test/test_barrier_size_fct.cpp
index 2671af848..ff8a7612f 100644
--- a/test/test_barrier_size_fct.cpp
+++ b/test/test_barrier_size_fct.cpp
@@ -10,7 +10,7 @@
 #include <boost/thread/thread.hpp>
 #include <boost/thread/barrier.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <vector>
 
 namespace {
diff --git a/test/test_barrier_void_fct.cpp b/test/test_barrier_void_fct.cpp
index 77a65e581..0572864f8 100644
--- a/test/test_barrier_void_fct.cpp
+++ b/test/test_barrier_void_fct.cpp
@@ -10,7 +10,7 @@
 #include <boost/thread/thread.hpp>
 #include <boost/thread/barrier.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <vector>
 
 namespace {
diff --git a/test/test_completion_latch.cpp b/test/test_completion_latch.cpp
index bef883654..252908b1e 100644
--- a/test/test_completion_latch.cpp
+++ b/test/test_completion_latch.cpp
@@ -10,7 +10,7 @@
 #include <boost/thread/thread.hpp>
 #include <boost/thread/completion_latch.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <vector>
 
 namespace
diff --git a/test/test_latch.cpp b/test/test_latch.cpp
index e2972c9b1..deecd3612 100644
--- a/test/test_latch.cpp
+++ b/test/test_latch.cpp
@@ -10,7 +10,7 @@
 #include <boost/thread/thread.hpp>
 #include <boost/thread/latch.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <vector>
 
 namespace
diff --git a/test/test_lock_concept.cpp b/test/test_lock_concept.cpp
index ba7de5cd6..3b0cc2e2e 100644
--- a/test/test_lock_concept.cpp
+++ b/test/test_lock_concept.cpp
@@ -9,6 +9,7 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
 #include <boost/mpl/vector.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/lock_types.hpp>
 #include <boost/thread/shared_mutex.hpp>
diff --git a/test/test_ml.cpp b/test/test_ml.cpp
index 61b7eff56..d2ca3c038 100644
--- a/test/test_ml.cpp
+++ b/test/test_ml.cpp
@@ -6,7 +6,8 @@
 #include <boost/config.hpp>
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/bind/bind.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/thread/future.hpp>
 #include <boost/utility/result_of.hpp>
 #include <functional>
diff --git a/test/test_mutex.cpp b/test/test_mutex.cpp
index e6ac24e27..d581a053d 100644
--- a/test/test_mutex.cpp
+++ b/test/test_mutex.cpp
@@ -16,6 +16,8 @@
 #include <boost/thread/thread_time.hpp>
 #include <boost/thread/condition.hpp>
 
+#include <boost/bind/bind.hpp>
+
 #define BOOST_TEST_MODULE Boost.Threads: mutex test suite
 
 #include <boost/test/unit_test.hpp>
diff --git a/test/test_scheduler.cpp b/test/test_scheduler.cpp
index 5847ff010..193bd4c5c 100644
--- a/test/test_scheduler.cpp
+++ b/test/test_scheduler.cpp
@@ -16,6 +16,7 @@
 #include <boost/thread/executors/scheduler.hpp>
 #include <boost/thread/executors/basic_thread_pool.hpp>
 #include <boost/chrono/chrono_io.hpp>
+#include <boost/bind/bind.hpp>
 #include <iostream>
 
 #include <boost/core/lightweight_test.hpp>
diff --git a/test/test_scheduling_adaptor.cpp b/test/test_scheduling_adaptor.cpp
index 38c073bda..4fe11a10a 100644
--- a/test/test_scheduling_adaptor.cpp
+++ b/test/test_scheduling_adaptor.cpp
@@ -14,6 +14,7 @@
 #define BOOST_THREAD_PROVIDES_EXECUTORS
 
 #include <boost/function.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/thread/executors/executor.hpp>
 #include <boost/thread/executors/basic_thread_pool.hpp>
 #include <boost/thread/executors/scheduling_adaptor.hpp>
diff --git a/test/test_thread.cpp b/test/test_thread.cpp
index ab9ddba0d..8706cd9a2 100644
--- a/test/test_thread.cpp
+++ b/test/test_thread.cpp
@@ -13,8 +13,8 @@
 #include <boost/thread/thread_only.hpp>
 #include <boost/thread/xtime.hpp>
 #include <boost/bind/bind.hpp>
-#include <boost/ref.hpp>
-#include <boost/utility.hpp>
+#include <boost/core/ref.hpp>
+#include <boost/core/noncopyable.hpp>
 
 #define BOOST_TEST_MODULE Boost.Threads: thread test suite
 
diff --git a/test/test_thread_launching.cpp b/test/test_thread_launching.cpp
index 0c74871d3..5e1c4b1eb 100644
--- a/test/test_thread_launching.cpp
+++ b/test/test_thread_launching.cpp
@@ -8,8 +8,8 @@
 
 #include <boost/thread/thread_only.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/ref.hpp>
-#include <boost/utility.hpp>
+#include <boost/core/ref.hpp>
+#include <boost/core/noncopyable.hpp>
 #include <string>
 #include <vector>
 
diff --git a/test/test_thread_mf.cpp b/test/test_thread_mf.cpp
index 843008fa7..413652dad 100644
--- a/test/test_thread_mf.cpp
+++ b/test/test_thread_mf.cpp
@@ -8,7 +8,7 @@
 #define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/thread_only.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct X
 {
diff --git a/test/test_time_jumps.cpp b/test/test_time_jumps.cpp
index 706bafa47..705bf11d5 100644
--- a/test/test_time_jumps.cpp
+++ b/test/test_time_jumps.cpp
@@ -4,18 +4,19 @@
 	#include <sys/time.h>
 #endif
 
-#include "boost/bind/bind.hpp"
-#include "boost/chrono.hpp"
-#include "boost/chrono/ceil.hpp"
-#include "boost/date_time.hpp"
-#include "boost/thread/concurrent_queues/sync_priority_queue.hpp"
-#include "boost/thread/concurrent_queues/sync_timed_queue.hpp"
-#include "boost/thread/future.hpp"
-#include "boost/thread/mutex.hpp"
-#include "boost/thread/recursive_mutex.hpp"
-#include "boost/thread/shared_lock_guard.hpp"
-#include "boost/thread/shared_mutex.hpp"
-#include "boost/thread/thread.hpp"
+#include <boost/bind/bind.hpp>
+#include <boost/core/ref.hpp>
+#include <boost/chrono.hpp>
+#include <boost/chrono/ceil.hpp>
+#include <boost/date_time.hpp>
+#include <boost/thread/concurrent_queues/sync_priority_queue.hpp>
+#include <boost/thread/concurrent_queues/sync_timed_queue.hpp>
+#include <boost/thread/future.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/recursive_mutex.hpp>
+#include <boost/thread/shared_lock_guard.hpp>
+#include <boost/thread/shared_mutex.hpp>
+#include <boost/thread/thread.hpp>
 
 #include <iomanip>
 #ifdef TEST_CPP14_FEATURES
diff --git a/test/threads/container/thread_ptr_list_pass.cpp b/test/threads/container/thread_ptr_list_pass.cpp
index 76047051f..2727d036f 100644
--- a/test/threads/container/thread_ptr_list_pass.cpp
+++ b/test/threads/container/thread_ptr_list_pass.cpp
@@ -10,9 +10,9 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/csbl/list.hpp>
 //#include <boost/interprocess/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <iostream>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 
 int count = 0;
diff --git a/test/threads/container/thread_vector_pass.cpp b/test/threads/container/thread_vector_pass.cpp
index 059a77e36..6c45317d6 100644
--- a/test/threads/container/thread_vector_pass.cpp
+++ b/test/threads/container/thread_vector_pass.cpp
@@ -9,7 +9,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/csbl/vector.hpp>
 #include <iostream>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/static_assert.hpp>
 
 int count = 0;
diff --git a/test/threads/this_thread/get_id/get_id_pass.cpp b/test/threads/this_thread/get_id/get_id_pass.cpp
index f0287cb6a..2020ba447 100644
--- a/test/threads/this_thread/get_id/get_id_pass.cpp
+++ b/test/threads/this_thread/get_id/get_id_pass.cpp
@@ -17,7 +17,7 @@
 
 #include <boost/thread/thread_only.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/threads/this_thread/sleep_for/sleep_for_pass.cpp b/test/threads/this_thread/sleep_for/sleep_for_pass.cpp
index 05c5a790d..09a18f00b 100644
--- a/test/threads/this_thread/sleep_for/sleep_for_pass.cpp
+++ b/test/threads/this_thread/sleep_for/sleep_for_pass.cpp
@@ -19,7 +19,7 @@
 #include <cstdlib>
 #include <algorithm>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined BOOST_THREAD_USES_CHRONO
 
diff --git a/test/threads/this_thread/sleep_until/sleep_until_pass.cpp b/test/threads/this_thread/sleep_until/sleep_until_pass.cpp
index 232712eed..8aed8f622 100644
--- a/test/threads/this_thread/sleep_until/sleep_until_pass.cpp
+++ b/test/threads/this_thread/sleep_until/sleep_until_pass.cpp
@@ -19,7 +19,7 @@
 #include <cstdlib>
 #include <algorithm>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined BOOST_THREAD_USES_CHRONO
 
diff --git a/test/threads/thread/assign/copy_fail.cpp b/test/threads/thread/assign/copy_fail.cpp
index 5ccac5b31..80c50f59d 100644
--- a/test/threads/thread/assign/copy_fail.cpp
+++ b/test/threads/thread/assign/copy_fail.cpp
@@ -21,7 +21,7 @@
 #include <boost/thread/thread_only.hpp>
 #include <new>
 #include <cstdlib>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class G
 {
diff --git a/test/threads/thread/assign/move_pass.cpp b/test/threads/thread/assign/move_pass.cpp
index 293c5d838..a5344f623 100644
--- a/test/threads/thread/assign/move_pass.cpp
+++ b/test/threads/thread/assign/move_pass.cpp
@@ -24,7 +24,7 @@
 #include <new>
 #include <cstdlib>
 #include <cassert>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class G
 {
diff --git a/test/threads/thread/constr/FArgs_pass.cpp b/test/threads/thread/constr/FArgs_pass.cpp
index e12c51878..ed0a2891b 100644
--- a/test/threads/thread/constr/FArgs_pass.cpp
+++ b/test/threads/thread/constr/FArgs_pass.cpp
@@ -21,7 +21,7 @@
 #include <cstdlib>
 #include <cassert>
 #include <boost/thread/thread_only.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 unsigned throw_one = 0xFFFF;
 
diff --git a/test/threads/thread/constr/F_pass.cpp b/test/threads/thread/constr/F_pass.cpp
index b99e90bab..de6c2635f 100644
--- a/test/threads/thread/constr/F_pass.cpp
+++ b/test/threads/thread/constr/F_pass.cpp
@@ -21,7 +21,7 @@
 #include <cstdlib>
 #include <cassert>
 #include <boost/thread/thread_only.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 unsigned throw_one = 0xFFFF;
 
diff --git a/test/threads/thread/constr/FrvalueArgs_pass.cpp b/test/threads/thread/constr/FrvalueArgs_pass.cpp
index e76db7022..0c81e91b3 100644
--- a/test/threads/thread/constr/FrvalueArgs_pass.cpp
+++ b/test/threads/thread/constr/FrvalueArgs_pass.cpp
@@ -23,7 +23,7 @@
 #include <new>
 #include <cstdlib>
 #include <cassert>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class MoveOnly
 {
diff --git a/test/threads/thread/constr/Frvalue_pass.cpp b/test/threads/thread/constr/Frvalue_pass.cpp
index 38061e0a7..dfddf3aac 100644
--- a/test/threads/thread/constr/Frvalue_pass.cpp
+++ b/test/threads/thread/constr/Frvalue_pass.cpp
@@ -23,7 +23,7 @@
 #include <new>
 #include <cstdlib>
 #include <cassert>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/static_assert.hpp>
 
 class MoveOnly
diff --git a/test/threads/thread/constr/copy_fail.cpp b/test/threads/thread/constr/copy_fail.cpp
index caa72c2d8..6a2685333 100644
--- a/test/threads/thread/constr/copy_fail.cpp
+++ b/test/threads/thread/constr/copy_fail.cpp
@@ -21,7 +21,7 @@
 #include <boost/thread/thread_only.hpp>
 #include <new>
 #include <cstdlib>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class G
 {
diff --git a/test/threads/thread/constr/default_pass.cpp b/test/threads/thread/constr/default_pass.cpp
index cea602d15..d94bf8ad9 100644
--- a/test/threads/thread/constr/default_pass.cpp
+++ b/test/threads/thread/constr/default_pass.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/thread/thread_only.hpp>
 #include <cassert>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/threads/thread/constr/lambda_pass.cpp b/test/threads/thread/constr/lambda_pass.cpp
index 34a3e53c3..441f13cd7 100644
--- a/test/threads/thread/constr/lambda_pass.cpp
+++ b/test/threads/thread/constr/lambda_pass.cpp
@@ -21,7 +21,7 @@
 #include <cstdlib>
 #include <cassert>
 #include <boost/thread/thread_only.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if ! defined BOOST_NO_CXX11_LAMBDAS
 
diff --git a/test/threads/thread/constr/move_pass.cpp b/test/threads/thread/constr/move_pass.cpp
index 66f9d7546..0caca29ac 100644
--- a/test/threads/thread/constr/move_pass.cpp
+++ b/test/threads/thread/constr/move_pass.cpp
@@ -20,7 +20,7 @@
 #include <boost/thread/thread_only.hpp>
 #include <new>
 #include <cstdlib>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class G
 {
diff --git a/test/threads/thread/destr/dtor_pass.cpp b/test/threads/thread/destr/dtor_pass.cpp
index ea0e6bac4..4c4eebd29 100644
--- a/test/threads/thread/destr/dtor_pass.cpp
+++ b/test/threads/thread/destr/dtor_pass.cpp
@@ -22,7 +22,7 @@
 #include <boost/thread/thread_only.hpp>
 #include <new>
 #include <cstdlib>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class G
 {
diff --git a/test/threads/thread/id/hash_pass.cpp b/test/threads/thread/id/hash_pass.cpp
index 6ce52c97a..645f90335 100644
--- a/test/threads/thread/id/hash_pass.cpp
+++ b/test/threads/thread/id/hash_pass.cpp
@@ -24,7 +24,7 @@
 
 
 #include <boost/thread/thread_only.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/threads/thread/members/detach_pass.cpp b/test/threads/thread/members/detach_pass.cpp
index 927175338..59ce8a62f 100644
--- a/test/threads/thread/members/detach_pass.cpp
+++ b/test/threads/thread/members/detach_pass.cpp
@@ -21,7 +21,7 @@
 #include <new>
 #include <cstdlib>
 #include <cassert>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class G
 {
diff --git a/test/threads/thread/members/get_id_pass.cpp b/test/threads/thread/members/get_id_pass.cpp
index dcaa7090b..459495030 100644
--- a/test/threads/thread/members/get_id_pass.cpp
+++ b/test/threads/thread/members/get_id_pass.cpp
@@ -21,7 +21,7 @@
 #include <new>
 #include <cstdlib>
 #include <cassert>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class G
 {
diff --git a/test/threads/thread/members/join_pass.cpp b/test/threads/thread/members/join_pass.cpp
index f2d42b72b..322f48156 100644
--- a/test/threads/thread/members/join_pass.cpp
+++ b/test/threads/thread/members/join_pass.cpp
@@ -24,7 +24,7 @@
 #include <cstdlib>
 #include <cassert>
 #include <iostream>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class G
 {
diff --git a/test/threads/thread/members/joinable_pass.cpp b/test/threads/thread/members/joinable_pass.cpp
index dcf09d1f8..d0e4de915 100644
--- a/test/threads/thread/members/joinable_pass.cpp
+++ b/test/threads/thread/members/joinable_pass.cpp
@@ -21,7 +21,7 @@
 #include <new>
 #include <cstdlib>
 #include <cassert>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class G
 {
diff --git a/test/threads/thread/members/native_handle_pass.cpp b/test/threads/thread/members/native_handle_pass.cpp
index 01115da05..7f4fbcbd4 100644
--- a/test/threads/thread/members/native_handle_pass.cpp
+++ b/test/threads/thread/members/native_handle_pass.cpp
@@ -21,7 +21,7 @@
 #include <new>
 #include <cstdlib>
 #include <cassert>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class G
 {
diff --git a/test/threads/thread/members/swap_pass.cpp b/test/threads/thread/members/swap_pass.cpp
index 16af2d1b8..427306aa0 100644
--- a/test/threads/thread/members/swap_pass.cpp
+++ b/test/threads/thread/members/swap_pass.cpp
@@ -19,7 +19,7 @@
 
 #include <boost/thread/thread_only.hpp>
 #include <cstdlib>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class G
 {
diff --git a/test/threads/thread/members/try_join_for_pass.cpp b/test/threads/thread/members/try_join_for_pass.cpp
index 5215d18d6..41b357ac5 100644
--- a/test/threads/thread/members/try_join_for_pass.cpp
+++ b/test/threads/thread/members/try_join_for_pass.cpp
@@ -26,7 +26,7 @@
 #include <cstdlib>
 #include <cassert>
 #include <iostream>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined BOOST_THREAD_USES_CHRONO
 
diff --git a/test/threads/thread/members/try_join_until_pass.cpp b/test/threads/thread/members/try_join_until_pass.cpp
index 749ff5b06..ed9d2ad65 100644
--- a/test/threads/thread/members/try_join_until_pass.cpp
+++ b/test/threads/thread/members/try_join_until_pass.cpp
@@ -26,7 +26,7 @@
 #include <cstdlib>
 #include <cassert>
 #include <iostream>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined BOOST_THREAD_USES_CHRONO
 
diff --git a/test/threads/thread/non_members/swap_pass.cpp b/test/threads/thread/non_members/swap_pass.cpp
index eb6faf157..5726ab2cc 100644
--- a/test/threads/thread/non_members/swap_pass.cpp
+++ b/test/threads/thread/non_members/swap_pass.cpp
@@ -19,7 +19,7 @@
 #include <new>
 #include <cstdlib>
 #include <cassert>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class G
 {
diff --git a/test/threads/thread/static/hardware_concurrency_pass.cpp b/test/threads/thread/static/hardware_concurrency_pass.cpp
index 2a2a227ed..5dcd5cd69 100644
--- a/test/threads/thread/static/hardware_concurrency_pass.cpp
+++ b/test/threads/thread/static/hardware_concurrency_pass.cpp
@@ -18,7 +18,7 @@
 // static unsigned hardware_concurrency();
 
 #include <boost/thread/thread_only.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/timming.hpp b/test/timming.hpp
index 92c4d3972..c978f5d9d 100644
--- a/test/timming.hpp
+++ b/test/timming.hpp
@@ -7,7 +7,7 @@
 #define BOOST_THREAD_TEST_TIMMING_HPP
 
 #include <boost/thread/detail/config.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if ! defined BOOST_THREAD_TEST_TIME_MS
 #ifdef BOOST_THREAD_PLATFORM_WIN32