diff --git a/example/cookbook/do_the_bind.cpp b/example/cookbook/do_the_bind.cpp
index ac5baee4..8458e64b 100644
--- a/example/cookbook/do_the_bind.cpp
+++ b/example/cookbook/do_the_bind.cpp
@@ -46,7 +46,7 @@
 #include <boost/mpl/max.hpp>
 #include <boost/mpl/next.hpp>
 
-#include <boost/ref.hpp>
+#include <boost/core/ref.hpp>
 #include <iostream>
 #include <typeinfo>
 
diff --git a/include/boost/fusion/support/deduce.hpp b/include/boost/fusion/support/deduce.hpp
index b75381c5..ee7e3dc9 100644
--- a/include/boost/fusion/support/deduce.hpp
+++ b/include/boost/fusion/support/deduce.hpp
@@ -10,7 +10,7 @@
 #define BOOST_FUSION_SUPPORT_DEDUCE_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
-#include <boost/ref.hpp>
+#include <boost/core/ref.hpp>
 
 #ifndef BOOST_NO_CXX11_HDR_FUNCTIONAL
 #include <functional>
diff --git a/include/boost/fusion/support/detail/as_fusion_element.hpp b/include/boost/fusion/support/detail/as_fusion_element.hpp
index 2af960ee..08f4db92 100644
--- a/include/boost/fusion/support/detail/as_fusion_element.hpp
+++ b/include/boost/fusion/support/detail/as_fusion_element.hpp
@@ -9,7 +9,7 @@
 #define FUSION_AS_FUSION_ELEMENT_05052005_0338
 
 #include <boost/fusion/support/config.hpp>
-#include <boost/ref.hpp>
+#include <boost/core/ref.hpp>
 
 #ifndef BOOST_NO_CXX11_HDR_FUNCTIONAL
 #include <functional>
diff --git a/test/functional/fused.cpp b/test/functional/fused.cpp
index b2ce8dde..63a47348 100644
--- a/test/functional/fused.cpp
+++ b/test/functional/fused.cpp
@@ -9,7 +9,7 @@
 #include <boost/fusion/functional/adapter/fused.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/noncopyable.hpp>
+#include <boost/core/noncopyable.hpp>
 
 #include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/container/vector.hpp>
diff --git a/test/functional/fused_function_object.cpp b/test/functional/fused_function_object.cpp
index 399745a0..cd3e2ea9 100644
--- a/test/functional/fused_function_object.cpp
+++ b/test/functional/fused_function_object.cpp
@@ -9,7 +9,7 @@
 #include <boost/fusion/functional/adapter/fused_function_object.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/noncopyable.hpp>
+#include <boost/core/noncopyable.hpp>
 #include <boost/mpl/empty_base.hpp>
 
 #include <boost/fusion/container/generation/make_vector.hpp>
diff --git a/test/functional/fused_procedure.cpp b/test/functional/fused_procedure.cpp
index 1ed0ddf7..07b84e43 100644
--- a/test/functional/fused_procedure.cpp
+++ b/test/functional/fused_procedure.cpp
@@ -9,7 +9,7 @@
 #include <boost/fusion/functional/adapter/fused_procedure.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/noncopyable.hpp>
+#include <boost/core/noncopyable.hpp>
 #include <boost/mpl/empty_base.hpp>
 
 #include <boost/fusion/container/generation/make_vector.hpp>
diff --git a/test/functional/invoke.cpp b/test/functional/invoke.cpp
index 3117eb3f..af3b813f 100644
--- a/test/functional/invoke.cpp
+++ b/test/functional/invoke.cpp
@@ -16,7 +16,7 @@
 #endif
 
 #include <memory>
-#include <boost/noncopyable.hpp>
+#include <boost/core/noncopyable.hpp>
 
 #include <boost/type_traits/is_same.hpp>
 
diff --git a/test/functional/invoke_function_object.cpp b/test/functional/invoke_function_object.cpp
index 7c75f06d..54cefc38 100644
--- a/test/functional/invoke_function_object.cpp
+++ b/test/functional/invoke_function_object.cpp
@@ -17,7 +17,7 @@
 #include <boost/type_traits/is_same.hpp>
 
 #include <memory>
-#include <boost/noncopyable.hpp>
+#include <boost/core/noncopyable.hpp>
 
 #include <boost/mpl/int.hpp>
 
diff --git a/test/functional/invoke_procedure.cpp b/test/functional/invoke_procedure.cpp
index 3877ca30..a608e304 100644
--- a/test/functional/invoke_procedure.cpp
+++ b/test/functional/invoke_procedure.cpp
@@ -16,7 +16,7 @@
 #endif
 
 #include <memory>
-#include <boost/noncopyable.hpp>
+#include <boost/core/noncopyable.hpp>
 
 #include <boost/mpl/int.hpp>
 
diff --git a/test/functional/make_fused.cpp b/test/functional/make_fused.cpp
index ceb82063..6503ee28 100644
--- a/test/functional/make_fused.cpp
+++ b/test/functional/make_fused.cpp
@@ -9,7 +9,7 @@
 #include <boost/fusion/functional/generation/make_fused.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/noncopyable.hpp>
+#include <boost/core/noncopyable.hpp>
 #include <boost/mpl/empty_base.hpp>
 
 #include <boost/fusion/container/generation/make_vector.hpp>
diff --git a/test/functional/make_fused_function_object.cpp b/test/functional/make_fused_function_object.cpp
index 79ea517b..9f803c4d 100644
--- a/test/functional/make_fused_function_object.cpp
+++ b/test/functional/make_fused_function_object.cpp
@@ -9,7 +9,7 @@
 #include <boost/fusion/functional/generation/make_fused_function_object.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/noncopyable.hpp>
+#include <boost/core/noncopyable.hpp>
 #include <boost/mpl/empty_base.hpp>
 
 #include <boost/fusion/container/generation/make_vector.hpp>
diff --git a/test/functional/make_fused_procedure.cpp b/test/functional/make_fused_procedure.cpp
index 2fa2762c..51a82f78 100644
--- a/test/functional/make_fused_procedure.cpp
+++ b/test/functional/make_fused_procedure.cpp
@@ -9,7 +9,7 @@
 #include <boost/fusion/functional/generation/make_fused_procedure.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/noncopyable.hpp>
+#include <boost/core/noncopyable.hpp>
 #include <boost/mpl/empty_base.hpp>
 
 #include <boost/fusion/container/generation/make_vector.hpp>
diff --git a/test/functional/make_unfused.cpp b/test/functional/make_unfused.cpp
index 73be142b..b8ee9938 100644
--- a/test/functional/make_unfused.cpp
+++ b/test/functional/make_unfused.cpp
@@ -9,7 +9,7 @@
 #include <boost/fusion/functional/generation/make_unfused.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/noncopyable.hpp>
+#include <boost/core/noncopyable.hpp>
 
 #include <boost/mpl/empty_base.hpp>
 #include <boost/mpl/if.hpp>
@@ -19,11 +19,11 @@
 
 #include <boost/utility/result_of.hpp>
 #include <boost/core/enable_if.hpp>
+#include <boost/core/ref.hpp>
 
 #include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/algorithm/iteration/fold.hpp>
 
-#include <boost/ref.hpp>
 
 namespace fusion = boost::fusion;
 namespace mpl = boost::mpl;
diff --git a/test/functional/unfused.cpp b/test/functional/unfused.cpp
index 1e30eabd..21c0d42e 100644
--- a/test/functional/unfused.cpp
+++ b/test/functional/unfused.cpp
@@ -9,7 +9,7 @@
 #include <boost/fusion/functional/adapter/unfused.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/noncopyable.hpp>
+#include <boost/core/noncopyable.hpp>
 
 #include <boost/mpl/empty_base.hpp>
 #include <boost/mpl/identity.hpp>
diff --git a/test/functional/unfused_typed.cpp b/test/functional/unfused_typed.cpp
index eaa03425..a0f76d49 100644
--- a/test/functional/unfused_typed.cpp
+++ b/test/functional/unfused_typed.cpp
@@ -9,7 +9,7 @@
 #include <boost/fusion/functional/adapter/unfused_typed.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/noncopyable.hpp>
+#include <boost/core/noncopyable.hpp>
 
 #include <boost/mpl/empty_base.hpp>
 #include <boost/mpl/identity.hpp>
diff --git a/test/sequence/deduce_sequence.cpp b/test/sequence/deduce_sequence.cpp
index a1569f46..3bccc20a 100644
--- a/test/sequence/deduce_sequence.cpp
+++ b/test/sequence/deduce_sequence.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/mpl/equal.hpp>
 
-#include <boost/ref.hpp>
+#include <boost/core/ref.hpp>
 #ifndef BOOST_NO_CXX11_HDR_FUNCTIONAL
 #include <functional>
 #endif