diff --git a/include/boost/utility/value_init.hpp b/include/boost/utility/value_init.hpp
index c3cd713..b685416 100644
--- a/include/boost/utility/value_init.hpp
+++ b/include/boost/utility/value_init.hpp
@@ -23,7 +23,7 @@
 // contains. More details on these issues are at libs/utility/value_init.htm
 
 #include <boost/config.hpp> // For BOOST_NO_COMPLETE_VALUE_INITIALIZATION.
-#include <boost/core/swap.hpp>
+#include <boost/core/invoke_swap.hpp>
 #include <cstring>
 #include <cstddef>
 
@@ -117,7 +117,7 @@ class initialized
     BOOST_GPU_ENABLED
     void swap(initialized & arg)
     {
-      ::boost::swap( this->data(), arg.data() );
+      ::boost::core::invoke_swap( this->data(), arg.data() );
     }
 
     BOOST_GPU_ENABLED
diff --git a/test/value_init_test.cpp b/test/value_init_test.cpp
index 8cfb72e..78bd3b1 100644
--- a/test/value_init_test.cpp
+++ b/test/value_init_test.cpp
@@ -21,6 +21,7 @@
 #pragma hdrstop
 #endif
 
+#include <boost/core/invoke_swap.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/config/workaround.hpp>
 
@@ -360,7 +361,7 @@ int main()
   boost::value_initialized<SwapFunctionCallTester> swapFunctionCallTester2;
   get(swapFunctionCallTester1).data = 1;
   get(swapFunctionCallTester2).data = 2;
-  boost::swap(swapFunctionCallTester1, swapFunctionCallTester2);
+  boost::core::invoke_swap(swapFunctionCallTester1, swapFunctionCallTester2);
   BOOST_TEST( get(swapFunctionCallTester1).data == 2 );
   BOOST_TEST( get(swapFunctionCallTester2).data == 1 );
   BOOST_TEST( get(swapFunctionCallTester1).is_custom_swap_called );