diff --git a/include/boost/smart_ptr/detail/shared_count.hpp b/include/boost/smart_ptr/detail/shared_count.hpp
index a6aa028..410862c 100644
--- a/include/boost/smart_ptr/detail/shared_count.hpp
+++ b/include/boost/smart_ptr/detail/shared_count.hpp
@@ -28,7 +28,7 @@
 #include <boost/core/addressof.hpp>
 #include <boost/config.hpp>
 #include <boost/config/workaround.hpp>
-#include <boost/cstdint.hpp>
+#include <cstdint>
 #include <memory>            // std::auto_ptr
 #include <functional>        // std::less
 #include <cstddef>           // std::size_t
@@ -91,7 +91,7 @@ template< class D > struct sp_convert_reference< D& >
 
 template<class T> std::size_t sp_hash_pointer( T* p ) noexcept
 {
-    boost::uintptr_t v = reinterpret_cast<boost::uintptr_t>( p );
+    std::uintptr_t v = reinterpret_cast<std::uintptr_t>( p );
 
     // match boost::hash<T*>
     return static_cast<std::size_t>( v + ( v >> 3 ) );
diff --git a/include/boost/smart_ptr/detail/sp_counted_base_nt.hpp b/include/boost/smart_ptr/detail/sp_counted_base_nt.hpp
index 04b7a6a..7e63c43 100644
--- a/include/boost/smart_ptr/detail/sp_counted_base_nt.hpp
+++ b/include/boost/smart_ptr/detail/sp_counted_base_nt.hpp
@@ -20,7 +20,7 @@
 
 #include <boost/smart_ptr/detail/sp_typeinfo_.hpp>
 #include <boost/config.hpp>
-#include <boost/cstdint.hpp>
+#include <cstdint>
 
 #if defined(BOOST_SP_REPORT_IMPLEMENTATION)
 
@@ -42,8 +42,8 @@ private:
     sp_counted_base( sp_counted_base const & );
     sp_counted_base & operator= ( sp_counted_base const & );
 
-    boost::int_least32_t use_count_;        // #shared
-    boost::int_least32_t weak_count_;       // #weak + (#shared != 0)
+    std::int_least32_t use_count_;        // #shared
+    std::int_least32_t weak_count_;       // #weak + (#shared != 0)
 
 public: