diff --git a/doc/container.qbk b/doc/container.qbk
index dd1bc7d..65d4e90 100644
--- a/doc/container.qbk
+++ b/doc/container.qbk
@@ -439,7 +439,7 @@ not constructed on the fly when auxiliary memory is needed).
 [section:scoped_allocator Scoped allocators]
 
 C++11 improves stateful allocators with the introduction of
-[@http://http://en.cppreference.com/w/cpp/memory/scoped_allocator_adaptor `std::scoped_allocator_adaptor`]
+[@http://en.cppreference.com/w/cpp/memory/scoped_allocator_adaptor `std::scoped_allocator_adaptor`]
 class template. `scoped_allocator_adaptor` is instantiated with one outer allocator and zero or more inner
 allocators.
 
@@ -617,8 +617,12 @@ use [*Boost.Container]? There are several reasons for that:
 [section:release_notes_boost_1_51_00 Boost 1.51 Release]
 
 *  Fixed bugs
+  [@https://svn.boost.org/trac/boost/ticket/6763 #6763],
+  [@https://svn.boost.org/trac/boost/ticket/6803 #6803],
   [@https://svn.boost.org/trac/boost/ticket/7114 #7114],
   [@https://svn.boost.org/trac/boost/ticket/7103 #7103].
+  [@https://svn.boost.org/trac/boost/ticket/7123 #7123],
+
 
 [endsect]
 
@@ -627,13 +631,13 @@ use [*Boost.Container]? There are several reasons for that:
 *  Added Scoped Allocator Model support.
 
 *  Fixed bugs
+  [@https://svn.boost.org/trac/boost/ticket/6533 #6533],
+  [@https://svn.boost.org/trac/boost/ticket/6536 #6536],
   [@https://svn.boost.org/trac/boost/ticket/6566 #6566],
   [@https://svn.boost.org/trac/boost/ticket/6575 #6575],
   [@https://svn.boost.org/trac/boost/ticket/6606 #6606],
   [@https://svn.boost.org/trac/boost/ticket/6615 #6615],
-  [@https://svn.boost.org/trac/boost/ticket/6533 #6533],
-  [@https://svn.boost.org/trac/boost/ticket/6536 #6536],
-
+  
 [endsect]
 
 
diff --git a/proj/vc7ide/container.vcproj b/proj/vc7ide/container.vcproj
index 50610a6..fcd9e8a 100644
--- a/proj/vc7ide/container.vcproj
+++ b/proj/vc7ide/container.vcproj
@@ -203,6 +203,9 @@
 			<File
 				RelativePath="..\..\..\..\boost\container\scoped_allocator.hpp">
 			</File>
+			<File
+				RelativePath="..\..\..\..\boost\container\scoped_allocator_fwd.hpp">
+			</File>
 			<File
 				RelativePath="..\..\..\..\boost\container\set.hpp">
 			</File>
diff --git a/test/scoped_allocator_adaptor_test.cpp b/test/scoped_allocator_adaptor_test.cpp
index 6afca6e..66d86b0 100644
--- a/test/scoped_allocator_adaptor_test.cpp
+++ b/test/scoped_allocator_adaptor_test.cpp
@@ -8,20 +8,15 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 #include <boost/container/detail/config_begin.hpp>
-#include <boost/container/scoped_allocator.hpp>
+#include <boost/container/scoped_allocator_fwd.hpp>
 #include <cstddef>
-#include <boost/static_assert.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/container/detail/function_detector.hpp>
 #include <boost/container/detail/mpl.hpp>
 #include <boost/move/move.hpp>
+#include <boost/type_traits/integral_constant.hpp>
 #include <memory>
-#include <boost/container/vector.hpp>
-#include <boost/container/detail/pair.hpp>
 
 using namespace boost::container;
 
-
 template<class T, unsigned int Id, bool Propagate = false>
 class test_allocator
 {
@@ -242,6 +237,12 @@ struct constructible_with_allocator_suffix
 }  //namespace boost {
 
 
+#include <boost/container/scoped_allocator.hpp>
+#include <boost/type_traits/is_same.hpp>
+#include <boost/static_assert.hpp>
+#include <boost/container/vector.hpp>
+#include <boost/container/detail/pair.hpp>
+
 int main()
 {
    typedef test_allocator<tagged_integer<0>, 0>   OuterAlloc;
diff --git a/test/util.hpp b/test/util.hpp
index 639c17b..9bfe1af 100644
--- a/test/util.hpp
+++ b/test/util.hpp
@@ -71,7 +71,7 @@ inline bool in_range(const boost::posix_time::ptime& xt, int secs=1)
 boost::xtime xsecs(int secs)
 {
    boost::xtime ret;
-   boost::xtime_get(&ret, boost::TIME_UTC_);
+   boost::xtime_get(&ret, boost::TIME_UTC);
    ret.sec += secs;
    return ret;
 }