diff --git a/src/addrman.cpp b/src/addrman.cpp
index 3ccd3751bc..ef1538b6e9 100644
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@@ -6,18 +6,19 @@
 #include <addrman.h>
 #include <addrman_impl.h>
 
-#include <clientversion.h>
 #include <hash.h>
-#include <logging.h>
 #include <netaddress.h>
+#include <protocol.h>
+#include <random.h>
 #include <serialize.h>
 #include <streams.h>
+#include <timedata.h>
+#include <tinyformat.h>
+#include <uint256.h>
 #include <util/check.h>
 
 #include <cmath>
 #include <optional>
-#include <unordered_map>
-#include <unordered_set>
 
 /** Over how many buckets entries with tried addresses from a single group (/16 for IPv4) are spread */
 static constexpr uint32_t ADDRMAN_TRIED_BUCKETS_PER_GROUP{8};
diff --git a/src/addrman.h b/src/addrman.h
index 84c2bf2201..b0944bcfd5 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -6,17 +6,15 @@
 #ifndef BITCOIN_ADDRMAN_H
 #define BITCOIN_ADDRMAN_H
 
-#include <fs.h>
-#include <logging.h>
 #include <netaddress.h>
 #include <protocol.h>
-#include <sync.h>
+#include <streams.h>
 #include <timedata.h>
 
 #include <cstdint>
+#include <memory>
 #include <optional>
-#include <set>
-#include <unordered_map>
+#include <utility>
 #include <vector>
 
 class AddrManImpl;
diff --git a/src/addrman_impl.h b/src/addrman_impl.h
index 160efb2c0e..c37c7b4779 100644
--- a/src/addrman_impl.h
+++ b/src/addrman_impl.h
@@ -5,6 +5,21 @@
 #ifndef BITCOIN_ADDRMAN_IMPL_H
 #define BITCOIN_ADDRMAN_IMPL_H
 
+#include <logging.h>
+#include <netaddress.h>
+#include <protocol.h>
+#include <serialize.h>
+#include <sync.h>
+#include <uint256.h>
+
+#include <cstdint>
+#include <optional>
+#include <set>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
+#include <vector>
+
 /** Total number of buckets for tried addresses */
 static constexpr int32_t ADDRMAN_TRIED_BUCKET_COUNT_LOG2{8};
 static constexpr int ADDRMAN_TRIED_BUCKET_COUNT{1 << ADDRMAN_TRIED_BUCKET_COUNT_LOG2};