diff --git a/src/qt/test/addressbooktests.cpp b/src/qt/test/addressbooktests.cpp
--- a/src/qt/test/addressbooktests.cpp
+++ b/src/qt/test/addressbooktests.cpp
@@ -15,7 +15,6 @@
 #include <cashaddrenc.h>
 #include <key.h>
 #include <key_io.h>
-#include <pubkey.h>
 #include <wallet/wallet.h>
 
 #include <QApplication>
diff --git a/src/qt/test/apptests.cpp b/src/qt/test/apptests.cpp
--- a/src/qt/test/apptests.cpp
+++ b/src/qt/test/apptests.cpp
@@ -49,7 +49,6 @@
 
 #include <univalue.h>
 
-#include <new>
 #include <string>
 
 namespace {
diff --git a/src/qt/test/rpcnestedtests.h b/src/qt/test/rpcnestedtests.h
--- a/src/qt/test/rpcnestedtests.h
+++ b/src/qt/test/rpcnestedtests.h
@@ -5,9 +5,6 @@
 #ifndef BITCOIN_QT_TEST_RPCNESTEDTESTS_H
 #define BITCOIN_QT_TEST_RPCNESTEDTESTS_H
 
-#include <txdb.h>
-#include <txmempool.h>
-
 #include <QObject>
 #include <QTest>
 
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -7,7 +7,6 @@
 #include <chainparams.h>
 #include <config.h>
 #include <consensus/validation.h>
-#include <fs.h>
 #include <interfaces/node.h>
 #include <qt/rpcconsole.h>
 #include <rpc/register.h>
diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp
--- a/src/qt/test/test_main.cpp
+++ b/src/qt/test/test_main.cpp
@@ -6,7 +6,6 @@
 #include <config/bitcoin-config.h>
 #endif
 
-#include <chainparams.h>
 #include <compat/setenv.h>
 #include <interfaces/node.h>
 #include <key.h>
diff --git a/src/test/allocator_tests.cpp b/src/test/allocator_tests.cpp
--- a/src/test/allocator_tests.cpp
+++ b/src/test/allocator_tests.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <support/allocators/secure.h>
 #include <util/system.h>
 
 #include <test/setup_common.h>
diff --git a/src/test/arith_uint256_tests.cpp b/src/test/arith_uint256_tests.cpp
--- a/src/test/arith_uint256_tests.cpp
+++ b/src/test/arith_uint256_tests.cpp
@@ -5,7 +5,6 @@
 #include <arith_uint256.h>
 
 #include <uint256.h>
-#include <version.h>
 
 #include <test/setup_common.h>
 
diff --git a/src/test/bip32_tests.cpp b/src/test/bip32_tests.cpp
--- a/src/test/bip32_tests.cpp
+++ b/src/test/bip32_tests.cpp
@@ -6,7 +6,6 @@
 #include <key.h>
 #include <key_io.h>
 #include <streams.h>
-#include <uint256.h>
 #include <util/strencodings.h>
 #include <util/system.h>
 
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
--- a/src/test/blockencodings_tests.cpp
+++ b/src/test/blockencodings_tests.cpp
@@ -8,7 +8,6 @@
 #include <config.h>
 #include <consensus/merkle.h>
 #include <pow.h>
-#include <random.h>
 #include <streams.h>
 #include <txmempool.h>
 
diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp
--- a/src/test/checkqueue_tests.cpp
+++ b/src/test/checkqueue_tests.cpp
@@ -17,7 +17,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <memory>
-#include <random.h>
 #include <unordered_set>
 
 // BasicTestingSetup not sufficient because nScriptCheckThreads is not set
diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp
--- a/src/test/dbwrapper_tests.cpp
+++ b/src/test/dbwrapper_tests.cpp
@@ -4,7 +4,6 @@
 
 #include <dbwrapper.h>
 
-#include <random.h>
 #include <uint256.h>
 
 #include <test/setup_common.h>
diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp
--- a/src/test/denialofservice_tests.cpp
+++ b/src/test/denialofservice_tests.cpp
@@ -15,6 +15,7 @@
 #include <script/sign.h>
 #include <serialize.h>
 #include <util/system.h>
+#include <util/time.h>
 #include <validation.h>
 
 #include <test/setup_common.h>
diff --git a/src/test/flatfile_tests.cpp b/src/test/flatfile_tests.cpp
--- a/src/test/flatfile_tests.cpp
+++ b/src/test/flatfile_tests.cpp
@@ -6,6 +6,7 @@
 
 #include <clientversion.h>
 #include <streams.h>
+#include <util/system.h>
 
 #include <test/setup_common.h>
 
diff --git a/src/test/fs_tests.cpp b/src/test/fs_tests.cpp
--- a/src/test/fs_tests.cpp
+++ b/src/test/fs_tests.cpp
@@ -4,6 +4,8 @@
 //
 #include <fs.h>
 
+#include <util/system.h>
+
 #include <test/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/fuzz/deserialize.cpp b/src/test/fuzz/deserialize.cpp
--- a/src/test/fuzz/deserialize.cpp
+++ b/src/test/fuzz/deserialize.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 <addrdb.h>
 #include <addrman.h>
 #include <blockencodings.h>
 #include <chain.h>
@@ -11,15 +12,12 @@
 #include <net.h>
 #include <primitives/block.h>
 #include <protocol.h>
-#include <pubkey.h>
-#include <script/script.h>
 #include <streams.h>
 #include <undo.h>
 #include <version.h>
 
 #include <test/fuzz/fuzz.h>
 
-#include <algorithm>
 #include <cstdint>
 #include <unistd.h>
 #include <vector>
diff --git a/src/test/fuzz/fuzz.h b/src/test/fuzz/fuzz.h
--- a/src/test/fuzz/fuzz.h
+++ b/src/test/fuzz/fuzz.h
@@ -6,7 +6,6 @@
 #define BITCOIN_TEST_FUZZ_FUZZ_H
 
 #include <cstdint>
-#include <functional>
 #include <vector>
 
 void test_one_input(std::vector<uint8_t> buffer);
diff --git a/src/test/fuzz/script_flags.cpp b/src/test/fuzz/script_flags.cpp
--- a/src/test/fuzz/script_flags.cpp
+++ b/src/test/fuzz/script_flags.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <script/interpreter.h>
-#include <script/script.h>
 #include <streams.h>
 #include <version.h>
 
diff --git a/src/test/hash_tests.cpp b/src/test/hash_tests.cpp
--- a/src/test/hash_tests.cpp
+++ b/src/test/hash_tests.cpp
@@ -13,8 +13,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <vector>
-
 BOOST_FIXTURE_TEST_SUITE(hash_tests, BasicTestingSetup)
 
 BOOST_AUTO_TEST_CASE(murmurhash3) {
diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp
--- a/src/test/key_tests.cpp
+++ b/src/test/key_tests.cpp
@@ -6,7 +6,6 @@
 
 #include <chainparams.h> // For Params()
 #include <key_io.h>
-#include <script/script.h>
 #include <uint256.h>
 #include <util/strencodings.h>
 #include <util/system.h>
diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp
--- a/src/test/mempool_tests.cpp
+++ b/src/test/mempool_tests.cpp
@@ -7,13 +7,13 @@
 #include <policy/policy.h>
 #include <reverse_iterator.h>
 #include <util/system.h>
+#include <util/time.h>
 
 #include <test/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
 #include <algorithm>
-#include <list>
 #include <vector>
 
 BOOST_FIXTURE_TEST_SUITE(mempool_tests, TestingSetup)
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -14,12 +14,12 @@
 #include <consensus/tx_verify.h>
 #include <consensus/validation.h>
 #include <policy/policy.h>
-#include <pubkey.h>
 #include <script/standard.h>
 #include <txmempool.h>
 #include <uint256.h>
 #include <util/strencodings.h>
 #include <util/system.h>
+#include <util/time.h>
 #include <validation.h>
 
 #include <test/setup_common.h>
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -4,11 +4,11 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #include <net.h>
 
+#include <addrdb.h>
 #include <addrman.h>
 #include <chainparams.h>
 #include <clientversion.h>
 #include <config.h>
-#include <hash.h>
 #include <netbase.h>
 #include <serialize.h>
 #include <streams.h>
diff --git a/src/test/policyestimator_tests.cpp b/src/test/policyestimator_tests.cpp
--- a/src/test/policyestimator_tests.cpp
+++ b/src/test/policyestimator_tests.cpp
@@ -8,6 +8,7 @@
 #include <txmempool.h>
 #include <uint256.h>
 #include <util/system.h>
+#include <util/time.h>
 
 #include <test/setup_common.h>
 
diff --git a/src/test/pow_tests.cpp b/src/test/pow_tests.cpp
--- a/src/test/pow_tests.cpp
+++ b/src/test/pow_tests.cpp
@@ -7,7 +7,6 @@
 #include <chain.h>
 #include <chainparams.h>
 #include <config.h>
-#include <random.h>
 #include <util/system.h>
 
 #include <test/setup_common.h>
diff --git a/src/test/raii_event_tests.cpp b/src/test/raii_event_tests.cpp
--- a/src/test/raii_event_tests.cpp
+++ b/src/test/raii_event_tests.cpp
@@ -17,7 +17,6 @@
 
 #include <cstdlib>
 #include <map>
-#include <vector>
 
 static std::map<void *, short> tags;
 static std::map<void *, uint16_t> orders;
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -12,6 +12,7 @@
 #include <interfaces/chain.h>
 #include <key_io.h>
 #include <netbase.h>
+#include <util/time.h>
 
 #include <test/setup_common.h>
 
diff --git a/src/test/script_standard_tests.cpp b/src/test/script_standard_tests.cpp
--- a/src/test/script_standard_tests.cpp
+++ b/src/test/script_standard_tests.cpp
@@ -6,7 +6,6 @@
 #include <keystore.h>
 #include <script/ismine.h>
 #include <script/script.h>
-#include <script/script_error.h>
 #include <script/standard.h>
 #include <test/setup_common.h>
 
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -31,7 +31,6 @@
 #include <univalue.h>
 
 #include <cstdint>
-#include <fstream>
 #include <string>
 #include <vector>
 
diff --git a/src/test/scriptnum10.h b/src/test/scriptnum10.h
--- a/src/test/scriptnum10.h
+++ b/src/test/scriptnum10.h
@@ -6,7 +6,6 @@
 #ifndef BITCOIN_TEST_SCRIPTNUM10_H
 #define BITCOIN_TEST_SCRIPTNUM10_H
 
-#include <algorithm>
 #include <cassert>
 #include <cstdint>
 #include <limits>
diff --git a/src/test/setup_common.cpp b/src/test/setup_common.cpp
--- a/src/test/setup_common.cpp
+++ b/src/test/setup_common.cpp
@@ -5,7 +5,6 @@
 #include <test/setup_common.h>
 
 #include <banman.h>
-#include <chain.h>
 #include <chainparams.h>
 #include <config.h>
 #include <consensus/consensus.h>
@@ -16,7 +15,7 @@
 #include <key.h>
 #include <logging.h>
 #include <miner.h>
-#include <net_processing.h>
+#include <net.h>
 #include <noui.h>
 #include <pow.h>
 #include <pubkey.h>
@@ -29,8 +28,10 @@
 #include <streams.h>
 #include <txdb.h>
 #include <txmempool.h>
-#include <ui_interface.h>
+#include <util/strencodings.h>
+#include <util/time.h>
 #include <validation.h>
+#include <validationinterface.h>
 
 #include <memory>
 
diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp
--- a/src/test/sigopcount_tests.cpp
+++ b/src/test/sigopcount_tests.cpp
@@ -5,7 +5,6 @@
 #include <coins.h>
 #include <consensus/consensus.h>
 #include <consensus/tx_verify.h>
-#include <consensus/validation.h>
 #include <key.h>
 #include <policy/policy.h>
 #include <pubkey.h>
diff --git a/src/test/streams_tests.cpp b/src/test/streams_tests.cpp
--- a/src/test/streams_tests.cpp
+++ b/src/test/streams_tests.cpp
@@ -4,8 +4,6 @@
 
 #include <streams.h>
 
-#include <support/allocators/zeroafterfree.h>
-
 #include <test/setup_common.h>
 
 #include <boost/assign/std/vector.hpp> // for 'operator+=()'
diff --git a/src/test/txvalidation_tests.cpp b/src/test/txvalidation_tests.cpp
--- a/src/test/txvalidation_tests.cpp
+++ b/src/test/txvalidation_tests.cpp
@@ -2,15 +2,15 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <amount.h>
 #include <config.h>
 #include <consensus/validation.h>
 #include <primitives/transaction.h>
 #include <script/script.h>
-#include <test/setup_common.h>
 #include <txmempool.h>
 #include <validation.h>
 
+#include <test/setup_common.h>
+
 #include <boost/test/unit_test.hpp>
 
 BOOST_AUTO_TEST_SUITE(txvalidation_tests)
diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp
--- a/src/test/txvalidationcache_tests.cpp
+++ b/src/test/txvalidationcache_tests.cpp
@@ -7,15 +7,11 @@
 #include <consensus/validation.h>
 #include <key.h>
 #include <keystore.h>
-#include <miner.h>
 #include <policy/policy.h>
-#include <pubkey.h>
-#include <random.h>
 #include <script/scriptcache.h>
 #include <script/sighashtype.h>
 #include <script/sign.h>
 #include <txmempool.h>
-#include <util/time.h>
 #include <validation.h>
 
 #include <test/lcg.h>
diff --git a/src/test/uint256_tests.cpp b/src/test/uint256_tests.cpp
--- a/src/test/uint256_tests.cpp
+++ b/src/test/uint256_tests.cpp
@@ -11,11 +11,8 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <cmath>
 #include <cstdint>
-#include <cstdio>
 #include <iomanip>
-#include <limits>
 #include <sstream>
 #include <string>
 
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -5,10 +5,10 @@
 #include <util/system.h>
 
 #include <clientversion.h>
-#include <primitives/transaction.h>
 #include <sync.h>
 #include <util/moneystr.h>
 #include <util/strencodings.h>
+#include <util/time.h>
 
 #include <test/setup_common.h>
 
@@ -20,6 +20,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #endif
+#include <thread>
 #include <vector>
 
 BOOST_FIXTURE_TEST_SUITE(util_tests, BasicTestingSetup)
diff --git a/src/test/validation_block_tests.cpp b/src/test/validation_block_tests.cpp
--- a/src/test/validation_block_tests.cpp
+++ b/src/test/validation_block_tests.cpp
@@ -17,6 +17,8 @@
 #include <validation.h>
 #include <validationinterface.h>
 
+#include <thread>
+
 struct RegtestingSetup : public TestingSetup {
     RegtestingSetup() : TestingSetup(CBaseChainParams::REGTEST) {}
 };
diff --git a/src/wallet/test/init_tests.cpp b/src/wallet/test/init_tests.cpp
--- a/src/wallet/test/init_tests.cpp
+++ b/src/wallet/test/init_tests.cpp
@@ -9,6 +9,7 @@
 #include <walletinitinterface.h>
 
 #include <test/setup_common.h>
+#include <util/system.h>
 #include <wallet/test/init_test_fixture.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/wallet/test/psbt_wallet_tests.cpp b/src/wallet/test/psbt_wallet_tests.cpp
--- a/src/wallet/test/psbt_wallet_tests.cpp
+++ b/src/wallet/test/psbt_wallet_tests.cpp
@@ -3,15 +3,12 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <key_io.h>
-#include <script/sign.h>
 #include <util/strencodings.h>
 #include <wallet/test/wallet_test_fixture.h>
 #include <wallet/wallet.h>
 
 #include <test/setup_common.h>
 
-#include <univalue.h>
-
 #include <boost/test/unit_test.hpp>
 
 BOOST_FIXTURE_TEST_SUITE(psbt_wallet_tests, WalletTestingSetup)
diff --git a/src/wallet/test/wallet_test_fixture.cpp b/src/wallet/test/wallet_test_fixture.cpp
--- a/src/wallet/test/wallet_test_fixture.cpp
+++ b/src/wallet/test/wallet_test_fixture.cpp
@@ -6,7 +6,7 @@
 
 #include <chainparams.h>
 #include <rpc/server.h>
-#include <wallet/db.h>
+#include <validationinterface.h>
 #include <wallet/rpcdump.h>
 #include <wallet/rpcwallet.h>
 #include <wallet/wallet.h>
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -22,8 +22,6 @@
 
 #include <cstdint>
 #include <memory>
-#include <set>
-#include <utility>
 #include <vector>
 
 BOOST_FIXTURE_TEST_SUITE(wallet_tests, WalletTestingSetup)