diff --git a/include/libtorrent/torrent.hpp b/include/libtorrent/torrent.hpp
index bfb3cc065..cb562a694 100644
--- a/include/libtorrent/torrent.hpp
+++ b/include/libtorrent/torrent.hpp
@@ -1570,7 +1570,7 @@ namespace libtorrent
 
 		// this is the number of peers that are seeds, and count against
 		// m_num_seeds, but have not yet been connected
-		boost::uint16_t m_num_connecting_seeds = 0;
+		std::uint16_t m_num_connecting_seeds = 0;
 
 		// the timestamp of the last byte uploaded from this torrent specified in
 		// session_time. This is signed because it must be able to represent time
diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp
index 2c8928fef..fc2d19779 100644
--- a/src/peer_connection.cpp
+++ b/src/peer_connection.cpp
@@ -5018,7 +5018,7 @@ namespace libtorrent
 		// only add new piece-chunks if the send buffer is small enough
 		// otherwise there will be no end to how large it will be!
 
-		int buffer_size_watermark = int(boost::int64_t(m_uploaded_last_second)
+		int buffer_size_watermark = int(std::int64_t(m_uploaded_last_second)
 			* m_settings.get_int(settings_pack::send_buffer_watermark_factor) / 100);
 
 		if (buffer_size_watermark < m_settings.get_int(settings_pack::send_buffer_low_watermark))
diff --git a/src/settings_pack.cpp b/src/settings_pack.cpp
index bbaa4b457..fa5b926fe 100644
--- a/src/settings_pack.cpp
+++ b/src/settings_pack.cpp
@@ -673,8 +673,8 @@ namespace libtorrent
 		{
 			case string_type_base:
 			{
-				std::pair<boost::uint16_t, std::string> v(name, std::string());
-				std::vector<std::pair<boost::uint16_t, std::string> >::iterator i
+				std::pair<std::uint16_t, std::string> v(name, std::string());
+				std::vector<std::pair<std::uint16_t, std::string> >::iterator i
 					= std::lower_bound(m_strings.begin(), m_strings.end(), v
 						, &compare_first<std::string>);
 				if (i != m_strings.end() && i->first == name) m_strings.erase(i);
@@ -682,8 +682,8 @@ namespace libtorrent
 			}
 			case int_type_base:
 			{
-				std::pair<boost::uint16_t, int> v(name, 0);
-				std::vector<std::pair<boost::uint16_t, int> >::iterator i
+				std::pair<std::uint16_t, int> v(name, 0);
+				std::vector<std::pair<std::uint16_t, int> >::iterator i
 					= std::lower_bound(m_ints.begin(), m_ints.end(), v
 						, &compare_first<int>);
 				if (i != m_ints.end() && i->first == name) m_ints.erase(i);
@@ -691,8 +691,8 @@ namespace libtorrent
 			}
 			case bool_type_base:
 			{
-				std::pair<boost::uint16_t, bool> v(name, false);
-				std::vector<std::pair<boost::uint16_t, bool> >::iterator i
+				std::pair<std::uint16_t, bool> v(name, false);
+				std::vector<std::pair<std::uint16_t, bool> >::iterator i
 					= std::lower_bound(m_bools.begin(), m_bools.end(), v
 					, &compare_first<bool>);
 				if (i != m_bools.end() && i->first == name) m_bools.erase(i);