diff --git a/include/boost/detail/spinlock_pool.hpp b/include/boost/detail/spinlock_pool.hpp
index 92d26cb..a264b1a 100644
--- a/include/boost/detail/spinlock_pool.hpp
+++ b/include/boost/detail/spinlock_pool.hpp
@@ -21,7 +21,9 @@
 //  spinlock_pool<2> is reserved for shared_ptr atomic access
 //
 
+#include <boost/config.hpp>
 #include <boost/detail/spinlock.hpp>
+#include <cstddef>
 
 namespace boost
 {
@@ -39,7 +41,7 @@ public:
 
     static spinlock & spinlock_for( void const * pv )
     {
-        size_t i = reinterpret_cast< size_t >( pv ) % 41;
+        std::size_t i = reinterpret_cast< std::size_t >( pv ) % 41;
         return pool_[ i ];
     }
 
diff --git a/include/boost/enable_shared_from_this.hpp b/include/boost/enable_shared_from_this.hpp
index 55f94ac..10accd6 100644
--- a/include/boost/enable_shared_from_this.hpp
+++ b/include/boost/enable_shared_from_this.hpp
@@ -13,9 +13,10 @@
 //  http://www.boost.org/libs/smart_ptr/enable_shared_from_this.html
 //
 
+#include <boost/config.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/assert.hpp>
-#include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
 
 namespace boost
 {
@@ -77,6 +78,12 @@ private:
         }
     }
 
+#if defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, <= 0x551 )
+
+public:
+
+#endif
+
     template<typename U>
     void sp_accept_owner( shared_ptr<U> & owner ) const
     {