diff --git a/include/libtorrent/aux_/mmap_disk_job.hpp b/include/libtorrent/aux_/mmap_disk_job.hpp
index 035ba31e2f6..19cb4995b60 100644
--- a/include/libtorrent/aux_/mmap_disk_job.hpp
+++ b/include/libtorrent/aux_/mmap_disk_job.hpp
@@ -12,23 +12,8 @@ see LICENSE file.
 #ifndef TORRENT_MMAP_DISK_JOB_HPP
 #define TORRENT_MMAP_DISK_JOB_HPP
 
-#include "libtorrent/fwd.hpp"
-#include "libtorrent/error_code.hpp"
-#include "libtorrent/aux_/tailqueue.hpp"
-#include "libtorrent/sha1_hash.hpp"
-#include "libtorrent/disk_interface.hpp"
-#include "libtorrent/aux_/vector.hpp"
-#include "libtorrent/units.hpp"
-#include "libtorrent/session_types.hpp"
-#include "libtorrent/flags.hpp"
 #include "libtorrent/aux_/disk_job.hpp"
 
-#include <variant>
-#include <string>
-#include <vector>
-#include <memory>
-#include <functional>
-
 namespace libtorrent::aux {
 
 	struct mmap_storage;
diff --git a/src/mmap_disk_io.cpp b/src/mmap_disk_io.cpp
index c4da321c9ee..a833be25147 100644
--- a/src/mmap_disk_io.cpp
+++ b/src/mmap_disk_io.cpp
@@ -21,14 +21,13 @@ see LICENSE file.
 #include "libtorrent/aux_/throw.hpp"
 #include "libtorrent/error_code.hpp"
 #include "libtorrent/error.hpp"
-#include "libtorrent/torrent_info.hpp"
 #include "libtorrent/aux_/disk_buffer_pool.hpp"
 #include "libtorrent/aux_/mmap_disk_job.hpp"
 #include "libtorrent/performance_counters.hpp"
 #include "libtorrent/aux_/debug.hpp"
 #include "libtorrent/units.hpp"
 #include "libtorrent/hasher.hpp"
-#include "libtorrent/aux_/platform_util.hpp"
+#include "libtorrent/aux_/platform_util.hpp" // for set_thread_name
 #include "libtorrent/aux_/disk_job_pool.hpp"
 #include "libtorrent/aux_/disk_io_thread_pool.hpp"
 #include "libtorrent/aux_/store_buffer.hpp"
@@ -39,7 +38,6 @@ see LICENSE file.
 #include "libtorrent/aux_/numeric_cast.hpp"
 #include "libtorrent/settings_pack.hpp"
 #include "libtorrent/aux_/file_view_pool.hpp"
-#include "libtorrent/aux_/scope_end.hpp"
 #include "libtorrent/aux_/storage_array.hpp"
 #include "libtorrent/aux_/disk_completed_queue.hpp"
 
diff --git a/src/storage_utils.cpp b/src/storage_utils.cpp
index 130c0642bb7..981f025c365 100644
--- a/src/storage_utils.cpp
+++ b/src/storage_utils.cpp
@@ -28,6 +28,7 @@ see LICENSE file.
 #endif
 
 #include <set>
+#include <algorithm>
 
 namespace libtorrent { namespace aux {