diff --git a/src/addrdb.h b/src/addrdb.h
index 3da630fff8e..0037495d188 100644
--- a/src/addrdb.h
+++ b/src/addrdb.h
@@ -6,12 +6,11 @@
 #ifndef BITCOIN_ADDRDB_H
 #define BITCOIN_ADDRDB_H
 
-#include <net_types.h> // For banmap_t
-#include <univalue.h>
+#include <net_types.h>
 #include <util/fs.h>
 #include <util/result.h>
 
-#include <optional>
+#include <memory>
 #include <vector>
 
 class ArgsManager;
@@ -19,7 +18,6 @@ class AddrMan;
 class CAddress;
 class CDataStream;
 class NetGroupManager;
-struct bilingual_str;
 
 bool DumpPeerAddresses(const ArgsManager& args, const AddrMan& addr);
 /** Only used by tests. */
diff --git a/src/kernel/checks.h b/src/kernel/checks.h
index 216aad73418..fd8c167015f 100644
--- a/src/kernel/checks.h
+++ b/src/kernel/checks.h
@@ -7,8 +7,6 @@
 
 #include <util/result.h>
 
-struct bilingual_str;
-
 namespace kernel {
 
 struct Context;
diff --git a/src/txdb.h b/src/txdb.h
index c65101618cc..04d0ecb39f2 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -13,6 +13,9 @@
 #include <util/fs.h>
 #include <util/result.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <functional>
 #include <memory>
 #include <optional>
 #include <string>
@@ -21,11 +24,11 @@
 
 class CBlockFileInfo;
 class CBlockIndex;
+class COutPoint;
 class uint256;
 namespace Consensus {
 struct Params;
 };
-struct bilingual_str;
 
 //! -dbcache default (MiB)
 static const int64_t nDefaultDbCache = 450;