From 3025cc41b6ecccf07e2a8e1b18f97c761273220b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= <igaztanaga@gmail.com>
Date: Wed, 17 Sep 2014 23:36:23 +0200
Subject: [PATCH] Replace "boost/move/utility.hpp" with
 "boost/move/utility_core.hpp" to minimize dependencies.

---
 example/doc_move_containers.cpp                          | 2 +-
 include/boost/container/allocator_traits.hpp             | 2 +-
 include/boost/container/deque.hpp                        | 2 +-
 include/boost/container/detail/advanced_insert_int.hpp   | 4 ++--
 include/boost/container/detail/flat_tree.hpp             | 2 +-
 include/boost/container/detail/iterators.hpp             | 2 +-
 include/boost/container/detail/multiallocation_chain.hpp | 2 +-
 include/boost/container/detail/node_alloc_holder.hpp     | 2 +-
 include/boost/container/detail/pair.hpp                  | 2 +-
 include/boost/container/detail/preprocessor.hpp          | 4 ++--
 include/boost/container/detail/tree.hpp                  | 2 +-
 include/boost/container/detail/type_traits.hpp           | 2 +-
 include/boost/container/detail/utilities.hpp             | 2 +-
 include/boost/container/flat_map.hpp                     | 2 +-
 include/boost/container/flat_set.hpp                     | 2 +-
 include/boost/container/list.hpp                         | 2 +-
 include/boost/container/map.hpp                          | 2 +-
 include/boost/container/scoped_allocator.hpp             | 2 +-
 include/boost/container/set.hpp                          | 4 ++--
 include/boost/container/slist.hpp                        | 2 +-
 include/boost/container/stable_vector.hpp                | 2 +-
 include/boost/container/string.hpp                       | 2 +-
 include/boost/container/vector.hpp                       | 6 +++---
 proj/to-do.txt                                           | 3 ---
 test/allocator_traits_test.cpp                           | 2 +-
 test/default_init_test.hpp                               | 4 ++--
 test/deque_test.cpp                                      | 2 +-
 test/dummy_test_allocator.hpp                            | 2 +-
 test/emplace_test.hpp                                    | 2 +-
 test/insert_vs_emplace_test.cpp                          | 2 +-
 test/list_test.hpp                                       | 2 +-
 test/map_test.hpp                                        | 2 +-
 test/movable_int.hpp                                     | 2 +-
 test/scoped_allocator_adaptor_test.cpp                   | 2 +-
 test/scoped_allocator_usage_test.cpp                     | 2 +-
 test/set_test.hpp                                        | 2 +-
 test/vector_test.cpp                                     | 2 +-
 test/vector_test.hpp                                     | 4 ++--
 38 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/example/doc_move_containers.cpp b/example/doc_move_containers.cpp
index ffb09de..e7b09f0 100644
--- a/example/doc_move_containers.cpp
+++ b/example/doc_move_containers.cpp
@@ -11,7 +11,7 @@
 #include <boost/container/detail/workaround.hpp>
 //[doc_move_containers
 #include <boost/container/vector.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <cassert>
 
 //Non-copyable class
diff --git a/include/boost/container/allocator_traits.hpp b/include/boost/container/allocator_traits.hpp
index 4857212..a1596ba 100644
--- a/include/boost/container/allocator_traits.hpp
+++ b/include/boost/container/allocator_traits.hpp
@@ -29,7 +29,7 @@
 #include <boost/container/detail/memory_util.hpp>
 #include <boost/type_traits/integral_constant.hpp>
 #include <boost/container/detail/mpl.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <limits> //numeric_limits<>::max()
 #include <new>    //placement new
 #include <memory> //std::allocator
diff --git a/include/boost/container/deque.hpp b/include/boost/container/deque.hpp
index 0ae3fb1..56277bd 100644
--- a/include/boost/container/deque.hpp
+++ b/include/boost/container/deque.hpp
@@ -36,7 +36,7 @@
 #include <boost/type_traits/has_trivial_assign.hpp>
 #include <boost/type_traits/has_nothrow_copy.hpp>
 #include <boost/type_traits/has_nothrow_assign.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/move/iterator.hpp>
 #include <boost/move/detail/move_helpers.hpp>
 #include <boost/move/traits.hpp>
diff --git a/include/boost/container/detail/advanced_insert_int.hpp b/include/boost/container/detail/advanced_insert_int.hpp
index 10438e1..cee7370 100644
--- a/include/boost/container/detail/advanced_insert_int.hpp
+++ b/include/boost/container/detail/advanced_insert_int.hpp
@@ -21,7 +21,7 @@
 #include <boost/container/allocator_traits.hpp>
 #include <boost/container/detail/destroyers.hpp>
 #include <boost/aligned_storage.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/container/detail/mpl.hpp>
 #include <boost/container/detail/type_traits.hpp>
 #include <iterator>  //std::iterator_traits
@@ -196,7 +196,7 @@ insert_copy_proxy<A, It> get_insert_value_proxy(const typename std::iterator_tra
 #ifdef BOOST_CONTAINER_PERFECT_FORWARDING
 
 #include <boost/container/detail/variadic_templates_tools.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <typeinfo>
 //#include <iostream> //For debugging purposes
 
diff --git a/include/boost/container/detail/flat_tree.hpp b/include/boost/container/detail/flat_tree.hpp
index 958ee04..d3d45af 100644
--- a/include/boost/container/detail/flat_tree.hpp
+++ b/include/boost/container/detail/flat_tree.hpp
@@ -25,7 +25,7 @@
 #include <utility>
 
 #include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 
 #include <boost/container/detail/utilities.hpp>
 #include <boost/container/detail/pair.hpp>
diff --git a/include/boost/container/detail/iterators.hpp b/include/boost/container/detail/iterators.hpp
index ffc7236..b9dfc50 100644
--- a/include/boost/container/detail/iterators.hpp
+++ b/include/boost/container/detail/iterators.hpp
@@ -20,7 +20,7 @@
 
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/container/allocator_traits.hpp>
 #include <boost/container/detail/type_traits.hpp>
 #include <boost/static_assert.hpp>
diff --git a/include/boost/container/detail/multiallocation_chain.hpp b/include/boost/container/detail/multiallocation_chain.hpp
index 38c331c..4e4a8c6 100644
--- a/include/boost/container/detail/multiallocation_chain.hpp
+++ b/include/boost/container/detail/multiallocation_chain.hpp
@@ -21,7 +21,7 @@
 #include <boost/intrusive/slist.hpp>
 #include <boost/intrusive/pointer_traits.hpp>
 #include <boost/type_traits/make_unsigned.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 
 namespace boost {
 namespace container {
diff --git a/include/boost/container/detail/node_alloc_holder.hpp b/include/boost/container/detail/node_alloc_holder.hpp
index 493a5c9..c3ebb00 100644
--- a/include/boost/container/detail/node_alloc_holder.hpp
+++ b/include/boost/container/detail/node_alloc_holder.hpp
@@ -21,7 +21,7 @@
 #include <utility>
 #include <functional>
 
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/intrusive/options.hpp>
 
 #include <boost/container/detail/version_type.hpp>
diff --git a/include/boost/container/detail/pair.hpp b/include/boost/container/detail/pair.hpp
index caad081..b7ad84c 100644
--- a/include/boost/container/detail/pair.hpp
+++ b/include/boost/container/detail/pair.hpp
@@ -28,7 +28,7 @@
 #include <utility>   //std::pair
 #include <algorithm> //std::swap
 
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 
 
 #ifndef BOOST_CONTAINER_PERFECT_FORWARDING
diff --git a/include/boost/container/detail/preprocessor.hpp b/include/boost/container/detail/preprocessor.hpp
index 7e4f5eb..3f25417 100644
--- a/include/boost/container/detail/preprocessor.hpp
+++ b/include/boost/container/detail/preprocessor.hpp
@@ -17,7 +17,7 @@
 
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 
 #ifdef BOOST_CONTAINER_PERFECT_FORWARDING
 //#error "This file is not needed when perfect forwarding is available"
@@ -39,7 +39,7 @@
 #include <boost/preprocessor/arithmetic/sub.hpp>
 #include <boost/preprocessor/arithmetic/add.hpp>
 #include <boost/preprocessor/iteration/iterate.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 
 #define BOOST_CONTAINER_MAX_CONSTRUCTOR_PARAMETERS 10
 
diff --git a/include/boost/container/detail/tree.hpp b/include/boost/container/detail/tree.hpp
index 9e901a8..6bb0b7a 100644
--- a/include/boost/container/detail/tree.hpp
+++ b/include/boost/container/detail/tree.hpp
@@ -32,7 +32,7 @@
 #include <boost/intrusive/splaytree.hpp>
 #include <boost/intrusive/sgtree.hpp>
 //
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/type_traits/has_trivial_destructor.hpp>
 #include <boost/core/no_exceptions_support.hpp>
 //
diff --git a/include/boost/container/detail/type_traits.hpp b/include/boost/container/detail/type_traits.hpp
index 50e3b88..a461500 100644
--- a/include/boost/container/detail/type_traits.hpp
+++ b/include/boost/container/detail/type_traits.hpp
@@ -22,7 +22,7 @@
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
 
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 
 namespace boost {
 namespace container {
diff --git a/include/boost/container/detail/utilities.hpp b/include/boost/container/detail/utilities.hpp
index 31eba07..afe7d9f 100644
--- a/include/boost/container/detail/utilities.hpp
+++ b/include/boost/container/detail/utilities.hpp
@@ -27,7 +27,7 @@
 #include <boost/type_traits/has_trivial_assign.hpp>
 #include <boost/type_traits/is_pod.hpp>
 #include <boost/move/core.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/move/iterator.hpp>
 #include <boost/assert.hpp>
 #include <boost/container/throw_exception.hpp>
diff --git a/include/boost/container/flat_map.hpp b/include/boost/container/flat_map.hpp
index f76e207..e7ff31a 100644
--- a/include/boost/container/flat_map.hpp
+++ b/include/boost/container/flat_map.hpp
@@ -27,7 +27,7 @@
 #include <boost/container/detail/mpl.hpp>
 #include <boost/container/allocator_traits.hpp>
 #include <boost/container/throw_exception.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/move/detail/move_helpers.hpp>
 #include <boost/move/traits.hpp>
 #include <boost/core/no_exceptions_support.hpp>
diff --git a/include/boost/container/flat_set.hpp b/include/boost/container/flat_set.hpp
index 9779882..1307f34 100644
--- a/include/boost/container/flat_set.hpp
+++ b/include/boost/container/flat_set.hpp
@@ -25,7 +25,7 @@
 #include <boost/container/detail/flat_tree.hpp>
 #include <boost/container/detail/mpl.hpp>
 #include <boost/container/allocator_traits.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/move/detail/move_helpers.hpp>
 #include <boost/move/traits.hpp>
 
diff --git a/include/boost/container/list.hpp b/include/boost/container/list.hpp
index c93f300..e81de0b 100644
--- a/include/boost/container/list.hpp
+++ b/include/boost/container/list.hpp
@@ -21,7 +21,7 @@
 #include <boost/container/detail/iterators.hpp>
 #include <boost/container/detail/mpl.hpp>
 #include <boost/container/throw_exception.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/move/iterator.hpp>
 #include <boost/move/detail/move_helpers.hpp>
 #include <boost/move/traits.hpp>
diff --git a/include/boost/container/map.hpp b/include/boost/container/map.hpp
index c632fec..6abfa1a 100644
--- a/include/boost/container/map.hpp
+++ b/include/boost/container/map.hpp
@@ -30,7 +30,7 @@
 #include <boost/container/detail/pair.hpp>
 #include <boost/container/detail/type_traits.hpp>
 #include <boost/container/throw_exception.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/move/detail/move_helpers.hpp>
 #include <boost/move/traits.hpp>
 #include <boost/static_assert.hpp>
diff --git a/include/boost/container/scoped_allocator.hpp b/include/boost/container/scoped_allocator.hpp
index a2ebe14..9b3c6d9 100644
--- a/include/boost/container/scoped_allocator.hpp
+++ b/include/boost/container/scoped_allocator.hpp
@@ -30,7 +30,7 @@
 #include <boost/container/detail/utilities.hpp>
 #include <utility>
 #include <boost/container/detail/pair.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/core/no_exceptions_support.hpp>
 
 namespace boost { namespace container {
diff --git a/include/boost/container/set.hpp b/include/boost/container/set.hpp
index dfb90ca..3e2c2aa 100644
--- a/include/boost/container/set.hpp
+++ b/include/boost/container/set.hpp
@@ -23,12 +23,12 @@
 #include <functional>
 #include <memory>
 
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/move/detail/move_helpers.hpp>
 #include <boost/move/traits.hpp>
 #include <boost/container/detail/mpl.hpp>
 #include <boost/container/detail/tree.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #ifndef BOOST_CONTAINER_PERFECT_FORWARDING
 #include <boost/container/detail/preprocessor.hpp>
 #endif
diff --git a/include/boost/container/slist.hpp b/include/boost/container/slist.hpp
index 8aa1d76..c195951 100644
--- a/include/boost/container/slist.hpp
+++ b/include/boost/container/slist.hpp
@@ -20,7 +20,7 @@
 
 #include <boost/container/container_fwd.hpp>
 #include <boost/container/throw_exception.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/move/detail/move_helpers.hpp>
 #include <boost/move/traits.hpp>
 #include <boost/intrusive/pointer_traits.hpp>
diff --git a/include/boost/container/stable_vector.hpp b/include/boost/container/stable_vector.hpp
index 6d723cc..cf3b177 100644
--- a/include/boost/container/stable_vector.hpp
+++ b/include/boost/container/stable_vector.hpp
@@ -37,7 +37,7 @@
 #include <boost/intrusive/pointer_traits.hpp>
 #include <boost/core/no_exceptions_support.hpp>
 #include <boost/aligned_storage.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/move/iterator.hpp>
 #include <boost/move/detail/move_helpers.hpp>
 #include <algorithm> //max
diff --git a/include/boost/container/string.hpp b/include/boost/container/string.hpp
index dc909e2..242e9dd 100644
--- a/include/boost/container/string.hpp
+++ b/include/boost/container/string.hpp
@@ -25,7 +25,7 @@
 #include <boost/container/allocator_traits.hpp>
 #include <boost/container/detail/allocator_version_traits.hpp>
 #include <boost/container/detail/mpl.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/intrusive/pointer_traits.hpp>
diff --git a/include/boost/container/vector.hpp b/include/boost/container/vector.hpp
index 1f40f7c..ffca47c 100644
--- a/include/boost/container/vector.hpp
+++ b/include/boost/container/vector.hpp
@@ -41,7 +41,7 @@
 #include <boost/container/allocator_traits.hpp>
 #include <boost/container/detail/allocator_version_traits.hpp>
 #include <boost/container/throw_exception.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/move/iterator.hpp>
 #include <boost/move/detail/move_helpers.hpp>
 #include <boost/move/traits.hpp>
@@ -351,8 +351,8 @@ struct vector_alloc_holder
    size_type next_capacity(size_type additional_objects) const
    {
       return next_capacity_calculator
-         <size_type, NextCapacityDouble/*NextCapacity60Percent*/>::
-            get( allocator_traits_type::max_size(this->alloc())
+         <size_type, NextCapacityDouble //NextCapacity60Percent
+         >::get( allocator_traits_type::max_size(this->alloc())
                , this->m_capacity, additional_objects );
    }
 
diff --git a/proj/to-do.txt b/proj/to-do.txt
index a101c69..9c33223 100644
--- a/proj/to-do.txt
+++ b/proj/to-do.txt
@@ -1,10 +1,7 @@
 ->Change "insert" and "push_back"/"push_front" to catch non-const rvalues
 ->Add an example with stateful allocators
 ->Add test to check convertible types in push_back/insert
-->Add SCARY iterators.
 ->Align with C++11 [multi]map::insert(P &&p) overload.
-->Unify all allocator version traits in one class (starting from stable_vector_detail::allocator_version_wrapper)
-   maybe in allocator_traits?
 ->Fix code marked with "//to-do: if possible, an efficient way to deallocate allocated blocks"
 ->Add BOOST_CONTAINER_TRY, etc. macros to allow disabling exceptions only in this library (just like Boost.Intrusive)
 ->Add macro to change the default allocator std::allocator to another one
diff --git a/test/allocator_traits_test.cpp b/test/allocator_traits_test.cpp
index ac6a1a1..407a62b 100644
--- a/test/allocator_traits_test.cpp
+++ b/test/allocator_traits_test.cpp
@@ -14,7 +14,7 @@
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/integral_constant.hpp>
 #include <boost/container/detail/function_detector.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <memory>
 
 template<class T>
diff --git a/test/default_init_test.hpp b/test/default_init_test.hpp
index 2624dba..4af9d59 100644
--- a/test/default_init_test.hpp
+++ b/test/default_init_test.hpp
@@ -19,7 +19,7 @@
 #include <functional>
 #include <list>
 
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/container/detail/mpl.hpp>
 #include "print_container.hpp"
 #include "check_equal_containers.hpp"
@@ -28,7 +28,7 @@
 #include <vector>
 #include "emplace_test.hpp"
 #include "input_from_forward_iterator.hpp"
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/move/iterator.hpp>
 #include <boost/core/no_exceptions_support.hpp>
 #include <boost/static_assert.hpp>
diff --git a/test/deque_test.cpp b/test/deque_test.cpp
index 7b1cdac..c2c686e 100644
--- a/test/deque_test.cpp
+++ b/test/deque_test.cpp
@@ -25,7 +25,7 @@
 #include "check_equal_containers.hpp"
 #include "dummy_test_allocator.hpp"
 #include "movable_int.hpp"
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/move/iterator.hpp>
 #include <boost/container/detail/mpl.hpp>
 #include <boost/container/detail/type_traits.hpp>
diff --git a/test/dummy_test_allocator.hpp b/test/dummy_test_allocator.hpp
index dd4872a..3ecfc98 100644
--- a/test/dummy_test_allocator.hpp
+++ b/test/dummy_test_allocator.hpp
@@ -27,7 +27,7 @@
 #include <boost/container/detail/version_type.hpp>
 #include <boost/container/detail/multiallocation_chain.hpp>
 #include <boost/container/throw_exception.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <memory>
 #include <algorithm>
 #include <cstddef>
diff --git a/test/emplace_test.hpp b/test/emplace_test.hpp
index c772c9c..62824c5 100644
--- a/test/emplace_test.hpp
+++ b/test/emplace_test.hpp
@@ -15,7 +15,7 @@
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
 #include <boost/container/detail/mpl.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/container/detail/utilities.hpp>
 #include <boost/aligned_storage.hpp>
 
diff --git a/test/insert_vs_emplace_test.cpp b/test/insert_vs_emplace_test.cpp
index 66d4c52..c523dab 100644
--- a/test/insert_vs_emplace_test.cpp
+++ b/test/insert_vs_emplace_test.cpp
@@ -14,7 +14,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 #include <iostream>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/container/vector.hpp>
 #include <boost/core/lightweight_test.hpp>
 
diff --git a/test/list_test.hpp b/test/list_test.hpp
index 5de5711..35fe5fe 100644
--- a/test/list_test.hpp
+++ b/test/list_test.hpp
@@ -19,7 +19,7 @@
 #include <functional>
 #include "print_container.hpp"
 #include "input_from_forward_iterator.hpp"
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/move/iterator.hpp>
 #include <string>
 
diff --git a/test/map_test.hpp b/test/map_test.hpp
index 115be9c..79c8787 100644
--- a/test/map_test.hpp
+++ b/test/map_test.hpp
@@ -20,7 +20,7 @@
 #include <boost/container/detail/utilities.hpp>
 #include <boost/container/detail/pair.hpp>
 #include <boost/move/iterator.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <string>
 
 #include <boost/intrusive/detail/has_member_function_callable_with.hpp>
diff --git a/test/movable_int.hpp b/test/movable_int.hpp
index dd0b343..ad01d63 100644
--- a/test/movable_int.hpp
+++ b/test/movable_int.hpp
@@ -13,7 +13,7 @@
 
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <ostream>
 
 namespace boost {
diff --git a/test/scoped_allocator_adaptor_test.cpp b/test/scoped_allocator_adaptor_test.cpp
index 9ccbb72..58b6ee8 100644
--- a/test/scoped_allocator_adaptor_test.cpp
+++ b/test/scoped_allocator_adaptor_test.cpp
@@ -12,7 +12,7 @@
 #include <boost/container/detail/utilities.hpp>
 #include <cstddef>
 #include <boost/container/detail/mpl.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/type_traits/integral_constant.hpp>
 #include <memory>
 
diff --git a/test/scoped_allocator_usage_test.cpp b/test/scoped_allocator_usage_test.cpp
index c361ba2..111d12a 100644
--- a/test/scoped_allocator_usage_test.cpp
+++ b/test/scoped_allocator_usage_test.cpp
@@ -1,7 +1,7 @@
 #include <boost/container/detail/config_begin.hpp>
 #include <memory>
 
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/container/vector.hpp>
 #include <boost/container/deque.hpp>
 #include <boost/container/list.hpp>
diff --git a/test/set_test.hpp b/test/set_test.hpp
index b10834a..0e43a43 100644
--- a/test/set_test.hpp
+++ b/test/set_test.hpp
@@ -17,7 +17,7 @@
 #include <set>
 #include <functional>
 #include "print_container.hpp"
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/move/iterator.hpp>
 #include <string>
 
diff --git a/test/vector_test.cpp b/test/vector_test.cpp
index 614e17c..945ea7c 100644
--- a/test/vector_test.cpp
+++ b/test/vector_test.cpp
@@ -19,7 +19,7 @@
 #include <boost/container/node_allocator.hpp>
 #include <boost/container/adaptive_pool.hpp>
 
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include "check_equal_containers.hpp"
 #include "movable_int.hpp"
 #include "expand_bwd_test_allocator.hpp"
diff --git a/test/vector_test.hpp b/test/vector_test.hpp
index 5a6a064..36fbe2d 100644
--- a/test/vector_test.hpp
+++ b/test/vector_test.hpp
@@ -19,7 +19,7 @@
 #include <functional>
 #include <list>
 
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/container/detail/mpl.hpp>
 #include "print_container.hpp"
 #include "check_equal_containers.hpp"
@@ -28,7 +28,7 @@
 #include <vector>
 #include "emplace_test.hpp"
 #include "input_from_forward_iterator.hpp"
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/move/iterator.hpp>
 #include <boost/core/no_exceptions_support.hpp>
 #include <boost/static_assert.hpp>