diff --git a/example/doc_clone_ptr.cpp b/example/doc_clone_ptr.cpp
index 976b142..f1b72b0 100644
--- a/example/doc_clone_ptr.cpp
+++ b/example/doc_clone_ptr.cpp
@@ -9,7 +9,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 #include <boost/move/detail/config_begin.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 
 //[clone_ptr_base_derived
 class Base
diff --git a/example/doc_construct_forward.cpp b/example/doc_construct_forward.cpp
index 4eee536..388a97c 100644
--- a/example/doc_construct_forward.cpp
+++ b/example/doc_construct_forward.cpp
@@ -12,7 +12,7 @@
 #include <boost/move/detail/config_begin.hpp>
 
 //[construct_forward_example
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <iostream>
 
 class copyable_only_tester
diff --git a/example/doc_file_descriptor.cpp b/example/doc_file_descriptor.cpp
index 1dd7bc0..0ec3987 100644
--- a/example/doc_file_descriptor.cpp
+++ b/example/doc_file_descriptor.cpp
@@ -14,7 +14,7 @@
 
 //[file_descriptor_def
 
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <stdexcept>
 
 class file_descriptor
diff --git a/include/boost/move/algorithm.hpp b/include/boost/move/algorithm.hpp
index 43a81c3..da2f186 100644
--- a/include/boost/move/algorithm.hpp
+++ b/include/boost/move/algorithm.hpp
@@ -16,7 +16,7 @@
 
 #include <boost/move/detail/config_begin.hpp>
 
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/move/iterator.hpp>
 #include <boost/detail/no_exceptions_support.hpp>
 
diff --git a/include/boost/move/detail/config_begin.hpp b/include/boost/move/detail/config_begin.hpp
index 8505f4b..7e90c3b 100644
--- a/include/boost/move/detail/config_begin.hpp
+++ b/include/boost/move/detail/config_begin.hpp
@@ -7,7 +7,9 @@
 // See http://www.boost.org/libs/move for documentation.
 //
 //////////////////////////////////////////////////////////////////////////////
+#ifndef BOOST_CONFIG_HPP
 #include <boost/config.hpp>
+#endif
 
 #ifdef BOOST_MSVC
    #pragma warning (push)
diff --git a/include/boost/move/detail/move_helpers.hpp b/include/boost/move/detail/move_helpers.hpp
index 49c5efe..78d98ea 100644
--- a/include/boost/move/detail/move_helpers.hpp
+++ b/include/boost/move/detail/move_helpers.hpp
@@ -12,7 +12,7 @@
 #ifndef BOOST_MOVE_MOVE_HELPERS_HPP
 #define BOOST_MOVE_MOVE_HELPERS_HPP
 
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/move/detail/meta_utils.hpp>
 
 #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
diff --git a/include/boost/move/iterator.hpp b/include/boost/move/iterator.hpp
index 79e7bfd..dda6f83 100644
--- a/include/boost/move/iterator.hpp
+++ b/include/boost/move/iterator.hpp
@@ -15,7 +15,7 @@
 #define BOOST_MOVE_ITERATOR_HPP
 
 #include <boost/move/detail/config_begin.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <iterator>  //std::iterator
 
 namespace boost {
@@ -177,14 +177,16 @@ inline move_iterator<It> make_move_iterator(const It &it)
 //! back of a container
 template <typename C> // C models Container
 class back_move_insert_iterator
-   : public std::iterator<std::output_iterator_tag, void, void, void, void>
 {
    C* container_m;
 
    public:
-   typedef C                        container_type;
-   typedef typename C::value_type   value_type;
-   typedef typename C::reference    reference;
+   typedef C                           container_type;
+   typedef typename C::value_type      value_type;
+   typedef typename C::reference       reference;
+   typedef typename C::pointer         pointer;
+   typedef typename C::difference_type difference_type;
+   typedef std::output_iterator_tag    iterator_category;
 
    explicit back_move_insert_iterator(C& x) : container_m(&x) { }
 
@@ -217,14 +219,16 @@ inline back_move_insert_iterator<C> back_move_inserter(C& x)
 //! front of a container
 template <typename C> // C models Container
 class front_move_insert_iterator
-   : public std::iterator<std::output_iterator_tag, void, void, void, void>
 {
    C* container_m;
 
 public:
-   typedef C                        container_type;
-   typedef typename C::value_type   value_type;
-   typedef typename C::reference    reference;
+   typedef C                           container_type;
+   typedef typename C::value_type      value_type;
+   typedef typename C::reference       reference;
+   typedef typename C::pointer         pointer;
+   typedef typename C::difference_type difference_type;
+   typedef std::output_iterator_tag    iterator_category;
 
    explicit front_move_insert_iterator(C& x) : container_m(&x) { }
 
@@ -254,15 +258,17 @@ inline front_move_insert_iterator<C> front_move_inserter(C& x)
 //////////////////////////////////////////////////////////////////////////////
 template <typename C> // C models Container
 class move_insert_iterator
-   : public std::iterator<std::output_iterator_tag, void, void, void, void>
 {
    C* container_m;
    typename C::iterator pos_;
 
    public:
-   typedef C                        container_type;
-   typedef typename C::value_type   value_type;
-   typedef typename C::reference    reference;
+   typedef C                           container_type;
+   typedef typename C::value_type      value_type;
+   typedef typename C::reference       reference;
+   typedef typename C::pointer         pointer;
+   typedef typename C::difference_type difference_type;
+   typedef std::output_iterator_tag    iterator_category;
 
    explicit move_insert_iterator(C& x, typename C::iterator pos)
       : container_m(&x), pos_(pos)
diff --git a/test/construct_forward.cpp b/test/construct_forward.cpp
index 6922d82..87c9a80 100644
--- a/test/construct_forward.cpp
+++ b/test/construct_forward.cpp
@@ -9,7 +9,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 #include <boost/move/detail/config_begin.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/utility/enable_if.hpp>
 #include "../example/movable.hpp"
 #include "../example/copymovable.hpp"
diff --git a/test/conversion_test.cpp b/test/conversion_test.cpp
index 13a1adc..cf28d6a 100644
--- a/test/conversion_test.cpp
+++ b/test/conversion_test.cpp
@@ -8,7 +8,7 @@
 // See http://www.boost.org/libs/move for documentation.
 //
 //////////////////////////////////////////////////////////////////////////////
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <boost/move/detail/meta_utils.hpp>
 #include <cassert>
 #include <new>
diff --git a/test/copy_elision_test.cpp b/test/copy_elision_test.cpp
index b15ebf2..4faf5ba 100644
--- a/test/copy_elision_test.cpp
+++ b/test/copy_elision_test.cpp
@@ -12,7 +12,7 @@
 # define BOOST_COPYABLE_AND_MOVABLE(X)
 # define MOVE(x) (x)
 #else
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 # define MOVE(x) boost::move(x)
 #endif
 
diff --git a/test/copy_move_optimization.cpp b/test/copy_move_optimization.cpp
index 4702a6f..06d1847 100644
--- a/test/copy_move_optimization.cpp
+++ b/test/copy_move_optimization.cpp
@@ -9,7 +9,7 @@
 //Since RVO is better than move-construction,
 //avoid copy constructor overloading.
 #include <boost/move/detail/config_begin.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include <iostream>
 
 bool moved = false;
diff --git a/test/move.cpp b/test/move.cpp
index 3c98159..2d40ec8 100644
--- a/test/move.cpp
+++ b/test/move.cpp
@@ -10,7 +10,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 #include <boost/move/detail/config_begin.hpp>
-#include <boost/move/utility.hpp>
+#include <boost/move/utility_core.hpp>
 #include "../example/movable.hpp"
 #include "../example/copymovable.hpp"
 #include <boost/static_assert.hpp>