diff --git a/src/node/miner.h b/src/node/miner.h
index 70de9e1db0f..41735215854 100644
--- a/src/node/miner.h
+++ b/src/node/miner.h
@@ -21,10 +21,11 @@
 #include <boost/multi_index_container.hpp>
 
 class ArgsManager;
-class ChainstateManager;
 class CBlockIndex;
 class CChainParams;
 class CScript;
+class Chainstate;
+class ChainstateManager;
 
 namespace Consensus { struct Params; };
 
diff --git a/src/test/miniminer_tests.cpp b/src/test/miniminer_tests.cpp
index 1ee9e0c0664..da724f8d7b9 100644
--- a/src/test/miniminer_tests.cpp
+++ b/src/test/miniminer_tests.cpp
@@ -2,6 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #include <node/mini_miner.h>
+#include <random.h>
 #include <txmempool.h>
 #include <util/time.h>
 
diff --git a/src/txmempool.h b/src/txmempool.h
index 4d7d53ff687..afaaf0d4d67 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -6,15 +6,6 @@
 #ifndef BITCOIN_TXMEMPOOL_H
 #define BITCOIN_TXMEMPOOL_H
 
-#include <atomic>
-#include <map>
-#include <optional>
-#include <set>
-#include <string>
-#include <string_view>
-#include <utility>
-#include <vector>
-
 #include <kernel/mempool_limits.h>
 #include <kernel/mempool_options.h>
 
@@ -26,7 +17,6 @@
 #include <policy/feerate.h>
 #include <policy/packages.h>
 #include <primitives/transaction.h>
-#include <random.h>
 #include <sync.h>
 #include <util/epochguard.h>
 #include <util/hasher.h>
@@ -40,9 +30,16 @@
 #include <boost/multi_index/tag.hpp>
 #include <boost/multi_index_container.hpp>
 
-class CBlockIndex;
+#include <atomic>
+#include <map>
+#include <optional>
+#include <set>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
+
 class CChain;
-class Chainstate;
 
 /** Fake height value used in Coin to signify they are only in the memory pool (since 0.8) */
 static const uint32_t MEMPOOL_HEIGHT = 0x7FFFFFFF;