diff --git a/examples/client_test.cpp b/examples/client_test.cpp
index 87d255c80..16af75284 100644
--- a/examples/client_test.cpp
+++ b/examples/client_test.cpp
@@ -611,8 +611,8 @@ std::string path_to_url(std::string f)
 		else
 		{
 			ret.push_back('%');
-			ret.push_back(hex_chars[boost::uint8_t(f[i]) >> 4]);
-			ret.push_back(hex_chars[boost::uint8_t(f[i]) & 0xf]);
+			ret.push_back(hex_chars[std::uint8_t(f[i]) >> 4]);
+			ret.push_back(hex_chars[std::uint8_t(f[i]) & 0xf]);
 		}
 	}
 	return ret;
@@ -2167,4 +2167,3 @@ int main(int argc, char* argv[])
 
 	return 0;
 }
-
diff --git a/include/libtorrent/storage.hpp b/include/libtorrent/storage.hpp
index e149b4d85..7862bc230 100644
--- a/include/libtorrent/storage.hpp
+++ b/include/libtorrent/storage.hpp
@@ -41,13 +41,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <unordered_set>
 #include <memory>
 
-#include "libtorrent/aux_/disable_warnings_push.hpp"
-#include <sys/types.h>
-#include "libtorrent/aux_/disable_warnings_pop.hpp"
-
 #include "libtorrent/piece_picker.hpp"
 #include "libtorrent/peer_request.hpp"
-#include "libtorrent/hasher.hpp"
 #include "libtorrent/file.hpp"
 #include "libtorrent/disk_buffer_holder.hpp"
 #include "libtorrent/storage_defs.hpp"
diff --git a/src/storage.cpp b/src/storage.cpp
index e07734034..88ed61edc 100644
--- a/src/storage.cpp
+++ b/src/storage.cpp
@@ -64,9 +64,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "libtorrent/storage.hpp"
 #include "libtorrent/torrent.hpp"
-#include "libtorrent/hasher.hpp"
 #include "libtorrent/session.hpp"
-#include "libtorrent/peer_id.hpp"
 #include "libtorrent/file.hpp"
 #include "libtorrent/invariant_check.hpp"
 #include "libtorrent/file_pool.hpp"
@@ -1252,7 +1250,7 @@ namespace libtorrent
 			if (m_file_created[file] == false)
 			{
 				error_code e;
-				boost::int64_t const size = files().file_size(file);
+				std::int64_t const size = files().file_size(file);
 				h->set_size(size, e);
 				m_file_created.set_bit(file);
 				if (e)
@@ -1674,4 +1672,3 @@ namespace libtorrent
 		return m_has_fence > 1 ? fence_post_none : fence_post_flush;
 	}
 } // namespace libtorrent
-