diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97874088..e7a1d024 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,6 @@ target_link_libraries(boost_unordered
     Boost::mp11
     Boost::predef
     Boost::preprocessor
-    Boost::smart_ptr
     Boost::static_assert
     Boost::throw_exception
     Boost::tuple
diff --git a/include/boost/unordered/detail/foa/rw_spinlock.hpp b/include/boost/unordered/detail/foa/rw_spinlock.hpp
index a429e5e0..83e00255 100644
--- a/include/boost/unordered/detail/foa/rw_spinlock.hpp
+++ b/include/boost/unordered/detail/foa/rw_spinlock.hpp
@@ -5,8 +5,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/smart_ptr/detail/sp_thread_pause.hpp>
-#include <boost/smart_ptr/detail/sp_thread_sleep.hpp>
+#include <boost/core/yield_primitives.hpp>
 #include <atomic>
 #include <cstdint>
 
@@ -64,10 +63,10 @@ public:
                     if( state_.compare_exchange_weak( st, newst, std::memory_order_acquire, std::memory_order_relaxed ) ) return;
                 }
 
-                boost::detail::sp_thread_pause();
+                boost::core::sp_thread_pause();
             }
 
-            boost::detail::sp_thread_sleep();
+            boost::core::sp_thread_sleep();
         }
     }
 
@@ -132,7 +131,7 @@ public:
                     state_.compare_exchange_weak( st, newst, std::memory_order_relaxed, std::memory_order_relaxed );
                 }
 
-                boost::detail::sp_thread_pause();
+                boost::core::sp_thread_pause();
             }
 
             // clear writer pending bit before going to sleep
@@ -169,7 +168,7 @@ public:
                 }
             }
 
-            boost::detail::sp_thread_sleep();
+            boost::core::sp_thread_sleep();
         }
     }
 
diff --git a/test/cmake_subdir_test/CMakeLists.txt b/test/cmake_subdir_test/CMakeLists.txt
index d356029b..745cd109 100644
--- a/test/cmake_subdir_test/CMakeLists.txt
+++ b/test/cmake_subdir_test/CMakeLists.txt
@@ -22,7 +22,6 @@ move
 mp11
 predef
 preprocessor
-smart_ptr
 static_assert
 throw_exception
 tuple