diff --git a/include/boost/container/container_fwd.hpp b/include/boost/container/container_fwd.hpp
index db7a67f..20ac778 100644
--- a/include/boost/container/container_fwd.hpp
+++ b/include/boost/container/container_fwd.hpp
@@ -41,65 +41,24 @@
 //!
 //! And finally it defines the following types
 
-//////////////////////////////////////////////////////////////////////////////
-//                        Standard predeclarations
-//////////////////////////////////////////////////////////////////////////////
-
 #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
+//Std forward declarations
+#ifndef BOOST_CONTAINER_DETAIL_STD_FWD_HPP
+   #include <boost/container/detail/std_fwd.hpp>
+#endif
+
 namespace boost{
 namespace intrusive{
    //Create namespace to avoid compilation errors
 }}
 
 namespace boost{ namespace container{ namespace container_detail{
-
-namespace bi = boost::intrusive;
-
+   namespace bi = boost::intrusive;
 }}}
 
 #include <cstddef>
 
-# if defined(__clang__) && defined(_LIBCPP_VERSION)
-   #define BOOST_CONTAINER_CLANG_INLINE_STD_NS
-   #pragma GCC diagnostic push
-   #pragma GCC diagnostic ignored "-Wc++11-extensions"
-
-   #define BOOST_CONTAINER_STD_NS_BEG _LIBCPP_BEGIN_NAMESPACE_STD
-   #define BOOST_CONTAINER_STD_NS_END _LIBCPP_END_NAMESPACE_STD
-
-#endif
-
-#if !defined(BOOST_CONTAINER_STD_NS_BEG)
-
-   #define BOOST_CONTAINER_STD_NS_BEG namespace std{
-   #define BOOST_CONTAINER_STD_NS_END }
-
-#endif
-
-BOOST_CONTAINER_STD_NS_BEG
-
-template<class T>
-class allocator;
-
-template<class T>
-struct less;
-
-template<class T1, class T2>
-struct pair;
-
-template<class T>
-struct char_traits;
-
-BOOST_CONTAINER_STD_NS_END
-
-#ifdef BOOST_CONTAINER_CLANG_INLINE_STD_NS
-
-#pragma GCC diagnostic pop
-#undef BOOST_CONTAINER_CLANG_INLINE_STD_NS
-
-#endif   //BOOST_CONTAINER_CLANG_INLINE_STD_NS
-
 #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/include/boost/container/detail/node_alloc_holder.hpp b/include/boost/container/detail/node_alloc_holder.hpp
index 68cc42b..250c559 100644
--- a/include/boost/container/detail/node_alloc_holder.hpp
+++ b/include/boost/container/detail/node_alloc_holder.hpp
@@ -32,9 +32,8 @@
 #include <boost/container/detail/mpl.hpp>
 #include <boost/container/detail/destroyers.hpp>
 #include <boost/container/detail/memory_util.hpp>
-#include <boost/container/detail/allocator_version_traits.hpp>
-#include <boost/core/no_exceptions_support.hpp>
 #include <boost/container/detail/placement_new.hpp>
+#include <boost/core/no_exceptions_support.hpp>
 
 #ifndef BOOST_CONTAINER_PERFECT_FORWARDING
 #include <boost/container/detail/preprocessor.hpp>
diff --git a/include/boost/container/detail/preprocessor.hpp b/include/boost/container/detail/preprocessor.hpp
index 9cae499..838eff2 100644
--- a/include/boost/container/detail/preprocessor.hpp
+++ b/include/boost/container/detail/preprocessor.hpp
@@ -32,10 +32,7 @@
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/repetition/enum_trailing_params.hpp>
 #include <boost/preprocessor/repetition/enum_trailing.hpp>
-#include <boost/preprocessor/repetition/enum_shifted_params.hpp>
-#include <boost/preprocessor/repetition/enum_shifted.hpp>
 #include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/logical/not.hpp>
 #include <boost/preprocessor/arithmetic/sub.hpp>
 #include <boost/preprocessor/arithmetic/add.hpp>
 #include <boost/preprocessor/iteration/iterate.hpp>
diff --git a/include/boost/container/detail/std_fwd.hpp b/include/boost/container/detail/std_fwd.hpp
new file mode 100644
index 0000000..a2edecc
--- /dev/null
+++ b/include/boost/container/detail/std_fwd.hpp
@@ -0,0 +1,59 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+// (C) Copyright Ion Gaztanaga 2014-2014. Distributed under the Boost
+// Software License, Version 1.0. (See accompanying file
+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// See http://www.boost.org/libs/container for documentation.
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#ifndef BOOST_CONTAINER_DETAIL_STD_FWD_HPP
+#define BOOST_CONTAINER_DETAIL_STD_FWD_HPP
+
+#if defined(_MSC_VER)
+#  pragma once
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+//                        Standard predeclarations
+//////////////////////////////////////////////////////////////////////////////
+
+#if defined(__clang__) && defined(_LIBCPP_VERSION)
+   #define BOOST_CONTAINER_CLANG_INLINE_STD_NS
+   #pragma GCC diagnostic push
+   #pragma GCC diagnostic ignored "-Wc++11-extensions"
+   #define BOOST_CONTAINER_STD_NS_BEG _LIBCPP_BEGIN_NAMESPACE_STD
+   #define BOOST_CONTAINER_STD_NS_END _LIBCPP_END_NAMESPACE_STD
+#else
+   #define BOOST_CONTAINER_STD_NS_BEG namespace std{
+   #define BOOST_CONTAINER_STD_NS_END }
+#endif
+
+BOOST_CONTAINER_STD_NS_BEG
+
+template<class T>
+class allocator;
+
+template<class T>
+struct less;
+
+template<class T1, class T2>
+struct pair;
+
+template<class T>
+struct char_traits;
+
+struct input_iterator_tag;
+struct forward_iterator_tag;
+struct bidirectional_iterator_tag;
+struct random_access_iterator_tag;
+
+BOOST_CONTAINER_STD_NS_END
+
+#ifdef BOOST_CONTAINER_CLANG_INLINE_STD_NS
+   #pragma GCC diagnostic pop
+   #undef BOOST_CONTAINER_CLANG_INLINE_STD_NS
+#endif   //BOOST_CONTAINER_CLANG_INLINE_STD_NS
+
+#endif //#ifndef BOOST_CONTAINER_DETAIL_STD_FWD_HPP
diff --git a/include/boost/container/detail/type_traits.hpp b/include/boost/container/detail/type_traits.hpp
index a461500..9ff3614 100644
--- a/include/boost/container/detail/type_traits.hpp
+++ b/include/boost/container/detail/type_traits.hpp
@@ -22,8 +22,6 @@
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
 
-#include <boost/move/utility_core.hpp>
-
 namespace boost {
 namespace container {
 namespace container_detail {
@@ -101,6 +99,15 @@ struct remove_reference<T&&>
 
 #else
 
+} // namespace container_detail {
+}  //namespace container {
+
+template<class T>
+class rv;
+
+namespace container {
+namespace container_detail {
+
 template<class T>
 struct remove_reference< ::boost::rv<T> >
 {
@@ -206,6 +213,21 @@ struct remove_ref_const
    typedef typename remove_const< typename remove_reference<T>::type >::type type;
 };
 
+template <class T>
+struct make_unsigned
+{
+   typedef T type;
+};
+
+template <> struct make_unsigned<bool> {};
+template <> struct make_unsigned<signed char>      {typedef unsigned char      type;};
+template <> struct make_unsigned<signed short>     {typedef unsigned short     type;};
+template <> struct make_unsigned<signed int>       {typedef unsigned int       type;};
+template <> struct make_unsigned<signed long>      {typedef unsigned long      type;};
+#ifdef BOOST_HAS_LONG_LONG
+template <> struct make_unsigned<signed long long> {typedef unsigned long long type;};
+#endif
+
 } // namespace container_detail
 }  //namespace container {
 }  //namespace boost {
diff --git a/include/boost/container/scoped_allocator.hpp b/include/boost/container/scoped_allocator.hpp
index 9b3c6d9..0a29871 100644
--- a/include/boost/container/scoped_allocator.hpp
+++ b/include/boost/container/scoped_allocator.hpp
@@ -292,7 +292,7 @@ namespace container_detail {
 
    #else // #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
-   //Without variadic templates, we need to use de preprocessor to generate
+   //Without variadic templates, we need to use the preprocessor to generate
    //some specializations.
 
    #define BOOST_CONTAINER_MAX_IS_CONSTRUCTIBLE_PARAMETERS \
diff --git a/include/boost/container/slist.hpp b/include/boost/container/slist.hpp
index d4ecde9..b6b4c38 100644
--- a/include/boost/container/slist.hpp
+++ b/include/boost/container/slist.hpp
@@ -31,6 +31,7 @@
 #include <boost/core/no_exceptions_support.hpp>
 #include <boost/container/detail/node_alloc_holder.hpp>
 #include <boost/intrusive/slist.hpp>
+#include <iterator>
 
 
 #if defined(BOOST_CONTAINER_PERFECT_FORWARDING) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
diff --git a/proj/vc7ide/container.vcproj b/proj/vc7ide/container.vcproj
index 7d606ea..291c603 100644
--- a/proj/vc7ide/container.vcproj
+++ b/proj/vc7ide/container.vcproj
@@ -257,6 +257,9 @@
 				<File
 					RelativePath="..\..\..\..\boost\container\detail\singleton.hpp">
 				</File>
+				<File
+					RelativePath="..\..\..\..\boost\container\detail\std_fwd.hpp">
+				</File>
 				<File
 					RelativePath="..\..\..\..\boost\container\detail\transform_iterator.hpp">
 				</File>
diff --git a/test/scoped_allocator_adaptor_test.cpp b/test/scoped_allocator_adaptor_test.cpp
index 425e295..dadeba6 100644
--- a/test/scoped_allocator_adaptor_test.cpp
+++ b/test/scoped_allocator_adaptor_test.cpp
@@ -13,7 +13,6 @@
 #include <cstddef>
 #include <boost/container/detail/mpl.hpp>
 #include <boost/move/utility_core.hpp>
-#include <boost/type_traits/integral_constant.hpp>
 #include <memory>
 
 using namespace boost::container;
diff --git a/test/vector_test.cpp b/test/vector_test.cpp
index ad331b7..0ec3eb1 100644
--- a/test/vector_test.cpp
+++ b/test/vector_test.cpp
@@ -7,10 +7,8 @@
 // See http://www.boost.org/libs/container for documentation.
 //
 //////////////////////////////////////////////////////////////////////////////
-#include <boost/container/detail/config_begin.hpp>
-#include <algorithm>
+
 #include <memory>
-#include <vector>
 #include <iostream>
 #include <functional>
 
@@ -160,7 +158,7 @@ int main()
          positions[i] = 0u;
       }
       for(std::size_t i = 0, max = vector_int2.size(); i != max; ++i){
-         vector_int2[i] = i;
+         vector_int2[i] = (int)i;
       }
 
       vector_int.insert(vector_int.begin(), 999);
@@ -254,4 +252,3 @@ int main()
    return 0;
 
 }
-#include <boost/container/detail/config_end.hpp>