diff --git a/include/boost/detail/shared_count.hpp b/include/boost/detail/shared_count.hpp
index 0395053..e139a7d 100644
--- a/include/boost/detail/shared_count.hpp
+++ b/include/boost/detail/shared_count.hpp
@@ -29,7 +29,7 @@
 #include <boost/detail/sp_counted_base.hpp>
 #include <boost/detail/sp_counted_impl.hpp>
 
-#include <memory>           // std::auto_ptr, std::allocator
+#include <memory>           // std::auto_ptr
 #include <functional>       // std::less
 #include <new>              // std::bad_alloc
 #include <typeinfo>         // std::type_info in get_deleter
diff --git a/include/boost/detail/sp_counted_impl.hpp b/include/boost/detail/sp_counted_impl.hpp
index 51557db..6963f59 100644
--- a/include/boost/detail/sp_counted_impl.hpp
+++ b/include/boost/detail/sp_counted_impl.hpp
@@ -31,7 +31,10 @@
 #include <boost/detail/quick_allocator.hpp>
 #endif
 
+#if defined(BOOST_SP_USE_STD_ALLOCATOR)
 #include <memory>           // std::allocator
+#endif
+
 #include <typeinfo>         // std::type_info in get_deleter
 #include <cstddef>          // std::size_t
 
diff --git a/include/boost/shared_ptr.hpp b/include/boost/shared_ptr.hpp
index cb94325..08b2a95 100644
--- a/include/boost/shared_ptr.hpp
+++ b/include/boost/shared_ptr.hpp
@@ -20,13 +20,14 @@
 #include <boost/detail/shared_ptr_nmt.hpp>
 #else
 
+#include <memory>               // for std::auto_ptr
+
 #include <boost/assert.hpp>
 #include <boost/checked_delete.hpp>
 #include <boost/throw_exception.hpp>
 #include <boost/detail/shared_count.hpp>
 #include <boost/detail/workaround.hpp>
 
-#include <memory>               // for std::auto_ptr
 #include <algorithm>            // for std::swap
 #include <functional>           // for std::less
 #include <typeinfo>             // for std::bad_cast
diff --git a/include/boost/weak_ptr.hpp b/include/boost/weak_ptr.hpp
index a4073fc..cd9ee63 100644
--- a/include/boost/weak_ptr.hpp
+++ b/include/boost/weak_ptr.hpp
@@ -13,6 +13,8 @@
 //  See http://www.boost.org/libs/smart_ptr/weak_ptr.htm for documentation.
 //
 
+#include <memory> // boost.TR1 include order fix
+#include <boost/detail/shared_count.hpp>
 #include <boost/shared_ptr.hpp>
 
 #ifdef BOOST_MSVC  // moved here to work around VC++ compiler crash