diff --git a/src/addrman.cpp b/src/addrman.cpp
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@@ -7,7 +7,6 @@
 
 #include <hash.h>
 #include <serialize.h>
-#include <streams.h>
 
 #include <cmath>
 
diff --git a/src/arith_uint256.cpp b/src/arith_uint256.cpp
--- a/src/arith_uint256.cpp
+++ b/src/arith_uint256.cpp
@@ -7,7 +7,6 @@
 
 #include <crypto/common.h>
 #include <uint256.h>
-#include <util/strencodings.h>
 
 #include <cstdio>
 #include <cstring>
diff --git a/src/bench/base58.cpp b/src/bench/base58.cpp
--- a/src/bench/base58.cpp
+++ b/src/bench/base58.cpp
@@ -5,7 +5,6 @@
 #include <bench/bench.h>
 
 #include <base58.h>
-#include <validation.h>
 
 #include <array>
 #include <string>
diff --git a/src/bench/bench_bitcoin.cpp b/src/bench/bench_bitcoin.cpp
--- a/src/bench/bench_bitcoin.cpp
+++ b/src/bench/bench_bitcoin.cpp
@@ -4,8 +4,6 @@
 
 #include <bench/bench.h>
 
-#include <crypto/sha256.h>
-#include <key.h>
 #include <util/strencodings.h>
 #include <util/system.h>
 
diff --git a/src/bench/checkqueue.cpp b/src/bench/checkqueue.cpp
--- a/src/bench/checkqueue.cpp
+++ b/src/bench/checkqueue.cpp
@@ -7,7 +7,6 @@
 #include <prevector.h>
 #include <random.h>
 #include <util/system.h>
-#include <validation.h>
 
 #include <boost/thread/thread.hpp>
 
diff --git a/src/bench/crypto_hash.cpp b/src/bench/crypto_hash.cpp
--- a/src/bench/crypto_hash.cpp
+++ b/src/bench/crypto_hash.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-#include <bloom.h>
 #include <crypto/ripemd160.h>
 #include <crypto/sha1.h>
 #include <crypto/sha256.h>
@@ -12,7 +11,6 @@
 #include <hash.h>
 #include <random.h>
 #include <uint256.h>
-#include <util/time.h>
 
 #include <iostream>
 #include <string>
diff --git a/src/bench/duplicate_inputs.cpp b/src/bench/duplicate_inputs.cpp
--- a/src/bench/duplicate_inputs.cpp
+++ b/src/bench/duplicate_inputs.cpp
@@ -9,13 +9,10 @@
 #include <config.h>
 #include <consensus/merkle.h>
 #include <consensus/validation.h>
-#include <miner.h>
-#include <policy/policy.h>
 #include <pow.h>
 #include <script/scriptcache.h>
 #include <txmempool.h>
 #include <validation.h>
-#include <validationinterface.h>
 
 #include <list>
 #include <vector>
diff --git a/src/bench/examples.cpp b/src/bench/examples.cpp
--- a/src/bench/examples.cpp
+++ b/src/bench/examples.cpp
@@ -4,7 +4,6 @@
 
 #include <bench/bench.h>
 #include <util/time.h>
-#include <validation.h>
 
 // Sanity test: this should loop ten times, and
 // min/max/average should be close to 100ms.
diff --git a/src/bench/rpc_mempool.cpp b/src/bench/rpc_mempool.cpp
--- a/src/bench/rpc_mempool.cpp
+++ b/src/bench/rpc_mempool.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-#include <policy/policy.h>
 #include <rpc/blockchain.h>
 #include <txmempool.h>
 
diff --git a/src/bench/wallet_balance.cpp b/src/bench/wallet_balance.cpp
--- a/src/bench/wallet_balance.cpp
+++ b/src/bench/wallet_balance.cpp
@@ -5,7 +5,6 @@
 #include <bench/bench.h>
 #include <config.h>
 #include <interfaces/chain.h>
-#include <key_io.h>
 #include <optional.h>
 #include <test/util.h>
 #include <validationinterface.h>
diff --git a/src/bitcoin-wallet.cpp b/src/bitcoin-wallet.cpp
--- a/src/bitcoin-wallet.cpp
+++ b/src/bitcoin-wallet.cpp
@@ -8,7 +8,6 @@
 
 #include <chainparams.h>
 #include <chainparamsbase.h>
-#include <consensus/consensus.h>
 #include <logging.h>
 #include <util/strencodings.h>
 #include <util/system.h>
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -13,18 +13,15 @@
 #include <config.h>
 #include <fs.h>
 #include <httprpc.h>
-#include <httpserver.h>
 #include <init.h>
 #include <interfaces/chain.h>
 #include <noui.h>
-#include <rpc/server.h>
 #include <shutdown.h>
 #include <ui_interface.h>
 #include <util/strencodings.h>
 #include <util/system.h>
 #include <util/threadnames.h>
 #include <util/translation.h>
-#include <walletinitinterface.h>
 
 #include <functional>
 
diff --git a/src/consensus/merkle.cpp b/src/consensus/merkle.cpp
--- a/src/consensus/merkle.cpp
+++ b/src/consensus/merkle.cpp
@@ -4,7 +4,6 @@
 
 #include <consensus/merkle.h>
 #include <hash.h>
-#include <util/strencodings.h>
 
 /*     WARNING! If you're reading this because you're learning about crypto
        and/or designing a new system that will use merkle trees, keep in mind
diff --git a/src/core_read.cpp b/src/core_read.cpp
--- a/src/core_read.cpp
+++ b/src/core_read.cpp
@@ -2,8 +2,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <core_io.h>
-
 #include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <psbt.h>
@@ -12,7 +10,6 @@
 #include <serialize.h>
 #include <streams.h>
 #include <util/strencodings.h>
-#include <util/system.h>
 #include <version.h>
 
 #include <univalue.h>
diff --git a/src/core_write.cpp b/src/core_write.cpp
--- a/src/core_write.cpp
+++ b/src/core_write.cpp
@@ -12,7 +12,6 @@
 #include <script/standard.h>
 #include <serialize.h>
 #include <streams.h>
-#include <util/moneystr.h>
 #include <util/strencodings.h>
 #include <util/system.h>
 
diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp
--- a/src/crypto/aes.cpp
+++ b/src/crypto/aes.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <crypto/aes.h>
-#include <crypto/common.h>
 
 #include <cassert>
 #include <cstring>
diff --git a/src/crypto/sha256_avx2.cpp b/src/crypto/sha256_avx2.cpp
--- a/src/crypto/sha256_avx2.cpp
+++ b/src/crypto/sha256_avx2.cpp
@@ -4,7 +4,6 @@
 #include <immintrin.h>
 
 #include <crypto/common.h>
-#include <crypto/sha256.h>
 
 namespace sha256d64_avx2 {
 namespace {
diff --git a/src/crypto/sha256_sse41.cpp b/src/crypto/sha256_sse41.cpp
--- a/src/crypto/sha256_sse41.cpp
+++ b/src/crypto/sha256_sse41.cpp
@@ -4,7 +4,6 @@
 #include <immintrin.h>
 
 #include <crypto/common.h>
-#include <crypto/sha256.h>
 
 namespace sha256d64_sse41 {
 namespace {
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -9,7 +9,6 @@
 #include <crypto/hmac_sha256.h>
 #include <httpserver.h>
 #include <key_io.h>
-#include <random.h>
 #include <rpc/protocol.h>
 #include <rpc/server.h>
 #include <sync.h>
diff --git a/src/init.cpp b/src/init.cpp
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -56,7 +56,6 @@
 #include <validation.h>
 #include <validationinterface.h>
 #include <walletinitinterface.h>
-#include <warnings.h>
 
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/replace.hpp>
diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp
--- a/src/interfaces/node.cpp
+++ b/src/interfaces/node.cpp
@@ -23,7 +23,6 @@
 #include <policy/settings.h>
 #include <primitives/block.h>
 #include <rpc/server.h>
-#include <scheduler.h>
 #include <shutdown.h>
 #include <sync.h>
 #include <txmempool.h>
diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp
--- a/src/interfaces/wallet.cpp
+++ b/src/interfaces/wallet.cpp
@@ -5,25 +5,18 @@
 #include <interfaces/wallet.h>
 
 #include <amount.h>
-#include <chain.h>
+#include <chainparams.h>
 #include <consensus/validation.h>
-#include <init.h>
 #include <interfaces/chain.h>
 #include <interfaces/handler.h>
-#include <net.h>
 #include <policy/fees.h>
-#include <policy/policy.h>
 #include <primitives/transaction.h>
-#include <rpc/server.h>
-#include <scheduler.h>
 #include <script/ismine.h>
 #include <script/standard.h>
 #include <support/allocators/secure.h>
 #include <sync.h>
-#include <timedata.h>
 #include <ui_interface.h>
 #include <util/system.h>
-#include <validation.h>
 #include <wallet/fees.h>
 #include <wallet/load.h>
 #include <wallet/rpcdump.h>
diff --git a/src/key.cpp b/src/key.cpp
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -5,7 +5,6 @@
 
 #include <key.h>
 
-#include <arith_uint256.h>
 #include <crypto/common.h>
 #include <crypto/hmac_sha512.h>
 #include <pubkey.h>
diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp
--- a/src/merkleblock.cpp
+++ b/src/merkleblock.cpp
@@ -7,7 +7,6 @@
 
 #include <consensus/consensus.h>
 #include <hash.h>
-#include <util/strencodings.h>
 
 CMerkleBlock::CMerkleBlock(const CBlock &block, CBloomFilter *filter,
                            const std::set<TxId> *txids) {
diff --git a/src/miner.cpp b/src/miner.cpp
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -15,7 +15,6 @@
 #include <consensus/merkle.h>
 #include <consensus/tx_verify.h>
 #include <consensus/validation.h>
-#include <hash.h>
 #include <minerfund.h>
 #include <net.h>
 #include <policy/policy.h>
@@ -29,7 +28,6 @@
 #include <util/system.h>
 #include <util/validation.h>
 #include <validation.h>
-#include <validationinterface.h>
 
 #include <algorithm>
 #include <queue>
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -29,8 +29,6 @@
 #include <scheduler.h>
 #include <tinyformat.h>
 #include <txmempool.h>
-#include <ui_interface.h>
-#include <util/moneystr.h>
 #include <util/strencodings.h>
 #include <util/system.h>
 #include <util/validation.h>
diff --git a/src/netbase.cpp b/src/netbase.cpp
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -5,10 +5,7 @@
 
 #include <netbase.h>
 
-#include <hash.h>
-#include <random.h>
 #include <sync.h>
-#include <uint256.h>
 #include <util/strencodings.h>
 #include <util/system.h>
 
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -8,10 +8,7 @@
 
 #include <coins.h>
 #include <policy/policy.h>
-#include <policy/settings.h>
 #include <script/interpreter.h>
-#include <tinyformat.h>
-#include <util/strencodings.h>
 #include <util/system.h>
 
 Amount GetDustThreshold(const CTxOut &txout, const CFeeRate &dustRelayFeeIn) {
diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
--- a/src/primitives/block.cpp
+++ b/src/primitives/block.cpp
@@ -8,7 +8,6 @@
 #include <crypto/common.h>
 #include <hash.h>
 #include <tinyformat.h>
-#include <util/strencodings.h>
 
 BlockHash CBlockHeader::GetHash() const {
     return BlockHash(SerializeHash(*this));
diff --git a/src/psbt.cpp b/src/psbt.cpp
--- a/src/psbt.cpp
+++ b/src/psbt.cpp
@@ -2,9 +2,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <coins.h>
-#include <consensus/tx_verify.h>
-#include <policy/policy.h>
 #include <psbt.h>
 #include <util/strencodings.h>
 
diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp
--- a/src/qt/addressbookpage.cpp
+++ b/src/qt/addressbookpage.cpp
@@ -10,7 +10,6 @@
 #include <qt/forms/ui_addressbookpage.h>
 
 #include <qt/addresstablemodel.h>
-#include <qt/bitcoingui.h>
 #include <qt/csvmodelwriter.h>
 #include <qt/editaddressdialog.h>
 #include <qt/guiutil.h>
diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp
--- a/src/qt/addresstablemodel.cpp
+++ b/src/qt/addresstablemodel.cpp
@@ -5,7 +5,6 @@
 #include <qt/addresstablemodel.h>
 
 #include <cashaddrenc.h>
-#include <interfaces/node.h>
 #include <key_io.h>
 #include <qt/guiutil.h>
 #include <qt/walletmodel.h>
diff --git a/src/qt/bantablemodel.cpp b/src/qt/bantablemodel.cpp
--- a/src/qt/bantablemodel.cpp
+++ b/src/qt/bantablemodel.cpp
@@ -5,8 +5,6 @@
 #include <qt/bantablemodel.h>
 
 #include <qt/clientmodel.h>
-#include <qt/guiconstants.h>
-#include <qt/guiutil.h>
 
 #include <interfaces/node.h>
 #include <sync.h>
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -26,13 +26,10 @@
 #include <qt/splashscreen.h>
 #include <qt/utilitydialog.h>
 #include <qt/winshutdownmonitor.h>
-#include <rpc/server.h>
 #include <ui_interface.h>
 #include <uint256.h>
 #include <util/system.h>
 #include <util/threadnames.h>
-#include <walletinitinterface.h>
-#include <warnings.h>
 
 #ifdef ENABLE_WALLET
 #include <qt/paymentserver.h>
diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp
--- a/src/qt/bitcoinunits.cpp
+++ b/src/qt/bitcoinunits.cpp
@@ -4,8 +4,6 @@
 
 #include <qt/bitcoinunits.h>
 
-#include <primitives/transaction.h>
-
 #include <QStringList>
 
 BitcoinUnits::BitcoinUnits(QObject *parent)
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -4,8 +4,6 @@
 
 #include <qt/clientmodel.h>
 
-#include <chain.h>
-#include <chainparams.h>
 #include <checkpoints.h>
 #include <clientversion.h>
 #include <config.h>
@@ -17,11 +15,7 @@
 #include <qt/guiconstants.h>
 #include <qt/guiutil.h>
 #include <qt/peertablemodel.h>
-#include <txmempool.h>
-#include <ui_interface.h>
 #include <util/system.h>
-#include <validation.h>
-#include <warnings.h>
 
 #include <QDebug>
 #include <QTimer>
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -9,7 +9,6 @@
 #include <qt/coincontroldialog.h>
 #include <qt/forms/ui_coincontroldialog.h>
 
-#include <base58.h>
 #include <cashaddrenc.h>
 #include <interfaces/node.h>
 #include <key_io.h>
@@ -20,7 +19,6 @@
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>
 #include <qt/walletmodel.h>
-#include <validation.h> // For mempool
 #include <wallet/coincontrol.h>
 #include <wallet/wallet.h>
 
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
--- a/src/qt/peertablemodel.cpp
+++ b/src/qt/peertablemodel.cpp
@@ -10,7 +10,6 @@
 
 #include <interfaces/node.h>
 #include <sync.h>
-#include <validation.h> // for cs_main
 
 #include <algorithm>
 
diff --git a/src/qt/platformstyle.cpp b/src/qt/platformstyle.cpp
--- a/src/qt/platformstyle.cpp
+++ b/src/qt/platformstyle.cpp
@@ -4,8 +4,6 @@
 
 #include <qt/platformstyle.h>
 
-#include <qt/guiconstants.h>
-
 #include <QApplication>
 #include <QColor>
 #include <QIcon>
diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp
--- a/src/qt/receivecoinsdialog.cpp
+++ b/src/qt/receivecoinsdialog.cpp
@@ -7,9 +7,7 @@
 #include <qt/forms/ui_receivecoinsdialog.h>
 #include <qt/receivecoinsdialog.h>
 
-#include <qt/addressbookpage.h>
 #include <qt/addresstablemodel.h>
-#include <qt/bitcoinunits.h>
 #include <qt/guiutil.h>
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>
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
@@ -3,8 +3,6 @@
 
 #include <interfaces/chain.h>
 #include <interfaces/node.h>
-#include <qt/addressbookpage.h>
-#include <qt/addresstablemodel.h>
 #include <qt/editaddressdialog.h>
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>
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
@@ -19,9 +19,6 @@
 #if defined(HAVE_CONFIG_H)
 #include <config/bitcoin-config.h>
 #endif
-#ifdef ENABLE_WALLET
-#include <wallet/db.h>
-#endif
 
 #include <test/setup_common.h>
 
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
@@ -4,15 +4,11 @@
 
 #include <qt/test/rpcnestedtests.h>
 
-#include <chainparams.h>
 #include <config.h>
-#include <consensus/validation.h>
 #include <interfaces/node.h>
 #include <qt/rpcconsole.h>
-#include <rpc/register.h>
 #include <rpc/server.h>
 #include <util/system.h>
-#include <validation.h>
 
 #include <test/setup_common.h>
 
diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp
--- a/src/qt/test/wallettests.cpp
+++ b/src/qt/test/wallettests.cpp
@@ -1,7 +1,6 @@
 #include <qt/test/util.h>
 #include <qt/test/wallettests.h>
 
-#include <base58.h>
 #include <cashaddrenc.h>
 #include <chain.h>
 #include <chainparams.h>
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -22,8 +22,6 @@
 #include <timedata.h>
 #include <util/system.h>
 #include <validation.h>
-#include <wallet/db.h>
-#include <wallet/wallet.h>
 
 #include <cstdint>
 #include <string>
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -7,11 +7,8 @@
 #include <cashaddrenc.h>
 #include <chain.h>       // For MAX_BLOCK_TIME_GAP
 #include <chainparams.h> // For Params()
-#include <consensus/consensus.h>
 #include <interfaces/wallet.h>
 #include <key_io.h>
-#include <timedata.h>
-#include <validation.h>
 
 #include <QDateTime>
 
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -6,7 +6,6 @@
 
 #include <core_io.h>
 #include <interfaces/handler.h>
-#include <interfaces/node.h>
 #include <qt/addresstablemodel.h>
 #include <qt/guiconstants.h>
 #include <qt/guiutil.h>
@@ -15,10 +14,7 @@
 #include <qt/transactiondesc.h>
 #include <qt/transactionrecord.h>
 #include <qt/walletmodel.h>
-#include <sync.h>
 #include <uint256.h>
-#include <util/system.h>
-#include <validation.h>
 
 #include <algorithm>
 
diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
--- a/src/qt/utilitydialog.cpp
+++ b/src/qt/utilitydialog.cpp
@@ -10,13 +10,8 @@
 
 #include <clientversion.h>
 #include <init.h>
-#include <interfaces/node.h>
 #include <qt/bitcoingui.h>
-#include <qt/clientmodel.h>
 #include <qt/forms/ui_helpmessagedialog.h>
-#include <qt/guiconstants.h>
-#include <qt/guiutil.h>
-#include <qt/intro.h>
 #ifdef ENABLE_BIP70
 #include <qt/paymentrequestplus.h>
 #endif
diff --git a/src/qt/walletmodeltransaction.cpp b/src/qt/walletmodeltransaction.cpp
--- a/src/qt/walletmodeltransaction.cpp
+++ b/src/qt/walletmodeltransaction.cpp
@@ -8,7 +8,6 @@
 
 #include <qt/walletmodeltransaction.h>
 
-#include <interfaces/node.h>
 #include <policy/policy.h>
 
 WalletModelTransaction::WalletModelTransaction(
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -14,7 +14,6 @@
 #include <consensus/validation.h>
 #include <core_io.h>
 #include <hash.h>
-#include <index/txindex.h>
 #include <key_io.h>
 #include <node/coinstats.h>
 #include <policy/policy.h>
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -3,27 +3,20 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <chain.h>
-#include <clientversion.h>
+#include <chainparams.h>
 #include <config.h>
-#include <core_io.h>
 #include <httpserver.h>
 #include <key_io.h>
 #include <logging.h>
-#include <net.h>
-#include <netbase.h>
 #include <outputtype.h>
 #include <rpc/blockchain.h>
 #include <rpc/server.h>
 #include <rpc/util.h>
 #include <script/descriptor.h>
-#include <timedata.h>
 #include <util/check.h>
 #include <util/strencodings.h>
 #include <util/system.h>
 #include <util/validation.h>
-#include <validation.h>
-#include <warnings.h>
 
 #include <univalue.h>
 
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -5,7 +5,6 @@
 #include <rpc/server.h>
 
 #include <banman.h>
-#include <chainparams.h>
 #include <clientversion.h>
 #include <config.h>
 #include <core_io.h>
@@ -19,7 +18,6 @@
 #include <rpc/util.h>
 #include <sync.h>
 #include <timedata.h>
-#include <ui_interface.h>
 #include <util/strencodings.h>
 #include <util/system.h>
 #include <validation.h>
diff --git a/src/rpc/protocol.cpp b/src/rpc/protocol.cpp
--- a/src/rpc/protocol.cpp
+++ b/src/rpc/protocol.cpp
@@ -10,7 +10,6 @@
 #include <util/strencodings.h>
 #include <util/system.h>
 #include <util/time.h>
-#include <version.h>
 
 #include <cstdint>
 
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -8,20 +8,15 @@
 #include <coins.h>
 #include <compat/byteswap.h>
 #include <config.h>
-#include <consensus/tx_verify.h>
 #include <consensus/validation.h>
 #include <core_io.h>
 #include <index/txindex.h>
-#include <init.h>
-#include <interfaces/chain.h>
 #include <key_io.h>
 #include <keystore.h>
 #include <merkleblock.h>
 #include <node/coin.h>
 #include <node/psbt.h>
 #include <node/transaction.h>
-#include <policy/policy.h>
-#include <policy/settings.h>
 #include <primitives/transaction.h>
 #include <psbt.h>
 #include <rpc/rawtransaction_util.h>
@@ -33,7 +28,6 @@
 #include <script/standard.h>
 #include <txmempool.h>
 #include <uint256.h>
-#include <util/bip32.h>
 #include <util/error.h>
 #include <util/moneystr.h>
 #include <util/strencodings.h>
diff --git a/src/rpc/rawtransaction_util.cpp b/src/rpc/rawtransaction_util.cpp
--- a/src/rpc/rawtransaction_util.cpp
+++ b/src/rpc/rawtransaction_util.cpp
@@ -7,7 +7,6 @@
 
 #include <coins.h>
 #include <core_io.h>
-#include <interfaces/chain.h>
 #include <key_io.h>
 #include <keystore.h>
 #include <policy/policy.h>
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -9,11 +9,9 @@
 #include <config.h>
 #include <fs.h>
 #include <key_io.h>
-#include <random.h>
 #include <rpc/util.h>
 #include <shutdown.h>
 #include <sync.h>
-#include <ui_interface.h>
 #include <util/strencodings.h>
 #include <util/system.h>
 
diff --git a/src/script/script.cpp b/src/script/script.cpp
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -6,7 +6,6 @@
 #include <script/script.h>
 
 #include <script/script_flags.h>
-#include <tinyformat.h>
 #include <util/strencodings.h>
 
 #include <algorithm>
diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp
--- a/src/script/sigcache.cpp
+++ b/src/script/sigcache.cpp
@@ -6,7 +6,6 @@
 #include <script/sigcache.h>
 
 #include <cuckoocache.h>
-#include <memusage.h>
 #include <pubkey.h>
 #include <random.h>
 #include <uint256.h>
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -7,8 +7,6 @@
 
 #include <pubkey.h>
 #include <script/script.h>
-#include <util/strencodings.h>
-#include <util/system.h>
 
 typedef std::vector<uint8_t> valtype;
 
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -5,12 +5,10 @@
 #include <coins.h>
 
 #include <clientversion.h>
-#include <consensus/validation.h>
 #include <script/standard.h>
 #include <streams.h>
 #include <undo.h>
 #include <util/strencodings.h>
-#include <validation.h>
 
 #include <test/setup_common.h>
 
@@ -19,6 +17,9 @@
 #include <map>
 #include <vector>
 
+void UpdateCoins(CCoinsViewCache &inputs, const CTransaction &tx,
+                 CTxUndo &txundo, int nHeight);
+
 namespace {
 
 //! equality test
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
@@ -11,7 +11,6 @@
 #include <keystore.h>
 #include <net.h>
 #include <net_processing.h>
-#include <pow.h>
 #include <script/sign.h>
 #include <serialize.h>
 #include <util/system.h>
diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp
--- a/src/test/multisig_tests.cpp
+++ b/src/test/multisig_tests.cpp
@@ -6,7 +6,6 @@
 #include <keystore.h>
 #include <policy/policy.h>
 #include <script/interpreter.h>
-#include <script/ismine.h>
 #include <script/script.h>
 #include <script/script_error.h>
 #include <script/sighashtype.h>
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
@@ -10,8 +10,6 @@
 #include <core_io.h>
 #include <init.h>
 #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_p2sh_tests.cpp b/src/test/script_p2sh_tests.cpp
--- a/src/test/script_p2sh_tests.cpp
+++ b/src/test/script_p2sh_tests.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <consensus/tx_verify.h>
-#include <core_io.h>
 #include <key.h>
 #include <keystore.h>
 #include <policy/policy.h>
diff --git a/src/test/torcontrol_tests.cpp b/src/test/torcontrol_tests.cpp
--- a/src/test/torcontrol_tests.cpp
+++ b/src/test/torcontrol_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 <torcontrol.h>
 
 #include <test/setup_common.h>
 
diff --git a/src/test/txindex_tests.cpp b/src/test/txindex_tests.cpp
--- a/src/test/txindex_tests.cpp
+++ b/src/test/txindex_tests.cpp
@@ -8,7 +8,6 @@
 #include <script/standard.h>
 #include <util/system.h>
 #include <util/time.h>
-#include <validation.h>
 
 #include <test/setup_common.h>
 
diff --git a/src/timedata.cpp b/src/timedata.cpp
--- a/src/timedata.cpp
+++ b/src/timedata.cpp
@@ -11,7 +11,6 @@
 #include <netaddress.h>
 #include <sync.h>
 #include <ui_interface.h>
-#include <util/strencodings.h>
 #include <util/system.h>
 #include <util/translation.h>
 #include <warnings.h>
diff --git a/src/txdb.cpp b/src/txdb.cpp
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -6,8 +6,6 @@
 #include <txdb.h>
 
 #include <chain.h>
-#include <chainparams.h>
-#include <hash.h>
 #include <pow.h>
 #include <random.h>
 #include <shutdown.h>
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -16,8 +16,6 @@
 #include <policy/policy.h>
 #include <policy/settings.h>
 #include <reverse_iterator.h>
-#include <streams.h>
-#include <timedata.h>
 #include <util/moneystr.h>
 #include <util/system.h>
 #include <util/time.h>
diff --git a/src/ui_interface.cpp b/src/ui_interface.cpp
--- a/src/ui_interface.cpp
+++ b/src/ui_interface.cpp
@@ -4,8 +4,6 @@
 
 #include <ui_interface.h>
 
-#include <util/system.h>
-
 #include <boost/signals2/last_value.hpp>
 #include <boost/signals2/signal.hpp>
 
diff --git a/src/util/system.cpp b/src/util/system.cpp
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -12,8 +12,6 @@
 
 #include <chainparamsbase.h>
 #include <fs.h>
-#include <random.h>
-#include <serialize.h>
 #include <util/strencodings.h>
 #include <util/time.h>
 #include <util/translation.h>
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
--- a/src/validationinterface.cpp
+++ b/src/validationinterface.cpp
@@ -7,8 +7,6 @@
 
 #include <scheduler.h>
 #include <txmempool.h>
-#include <util/system.h>
-#include <validation.h>
 
 #include <atomic>
 #include <future>
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -5,14 +5,10 @@
 
 #include <wallet/db.h>
 
-#include <addrman.h>
 #include <fs.h>
-#include <hash.h>
-#include <protocol.h>
 #include <util/strencodings.h>
 #include <util/system.h>
 #include <util/translation.h>
-#include <wallet/walletutil.h>
 
 #include <boost/thread.hpp> // boost::this_thread::interruption_point() (mingw)
 
diff --git a/src/wallet/fees.cpp b/src/wallet/fees.cpp
--- a/src/wallet/fees.cpp
+++ b/src/wallet/fees.cpp
@@ -6,10 +6,8 @@
 #include <wallet/fees.h>
 
 #include <config.h>
-#include <policy/policy.h>
 #include <txmempool.h>
 #include <util/system.h>
-#include <validation.h>
 #include <wallet/coincontrol.h>
 #include <wallet/wallet.h>
 
diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp
--- a/src/wallet/init.cpp
+++ b/src/wallet/init.cpp
@@ -8,14 +8,10 @@
 #include <init.h>
 #include <interfaces/chain.h>
 #include <net.h>
-#include <scheduler.h>
-#include <util/error.h>
 #include <util/moneystr.h>
 #include <util/system.h>
 #include <util/translation.h>
-#include <validation.h>
 #include <wallet/rpcdump.h>
-#include <wallet/rpcwallet.h>
 #include <wallet/wallet.h>
 #include <wallet/walletutil.h>
 #include <walletinitinterface.h>
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -18,7 +18,6 @@
 #include <util/system.h>
 #include <util/time.h>
 #include <util/translation.h>
-#include <validation.h>
 #include <wallet/rpcwallet.h>
 #include <wallet/wallet.h>
 
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4,33 +4,28 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <amount.h>
-#include <chain.h>
 #include <chainparams.h> // for GetConsensus.
+#include <coins.h>
 #include <config.h>
 #include <consensus/validation.h>
 #include <core_io.h>
 #include <init.h>
 #include <interfaces/chain.h>
 #include <key_io.h>
-#include <net.h>
 #include <node/transaction.h>
 #include <outputtype.h>
 #include <policy/fees.h>
-#include <policy/policy.h>
 #include <rpc/mining.h>
 #include <rpc/rawtransaction_util.h>
 #include <rpc/server.h>
 #include <rpc/util.h>
 #include <script/descriptor.h>
-#include <shutdown.h>
-#include <timedata.h>
 #include <util/bip32.h>
 #include <util/error.h>
 #include <util/moneystr.h>
 #include <util/system.h>
 #include <util/url.h>
 #include <util/validation.h>
-#include <validation.h>
 #include <wallet/coincontrol.h>
 #include <wallet/psbtwallet.h>
 #include <wallet/rpcwallet.h>
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
@@ -3,12 +3,9 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <chainparams.h>
-#include <init.h>
 #include <noui.h>
 #include <test/lib/logging.h>
 #include <util/system.h>
-#include <wallet/wallet.h>
-#include <walletinitinterface.h>
 
 #include <test/setup_common.h>
 #include <wallet/test/init_test_fixture.h>
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
@@ -5,10 +5,8 @@
 #include <wallet/test/wallet_test_fixture.h>
 
 #include <chainparams.h>
-#include <rpc/server.h>
 #include <validationinterface.h>
 #include <wallet/rpcdump.h>
-#include <wallet/rpcwallet.h>
 #include <wallet/wallet.h>
 
 WalletTestingSetup::WalletTestingSetup(const std::string &chainName)
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -6,6 +6,7 @@
 #include <wallet/wallet.h>
 
 #include <chain.h>
+#include <chainparams.h>
 #include <checkpoints.h>
 #include <config.h>
 #include <consensus/consensus.h>
@@ -16,7 +17,6 @@
 #include <key.h>
 #include <key_io.h>
 #include <keystore.h>
-#include <net.h>
 #include <policy/mempool.h>
 #include <policy/policy.h>
 #include <policy/settings.h>
@@ -26,9 +26,6 @@
 #include <script/script.h>
 #include <script/sighashtype.h>
 #include <script/sign.h>
-#include <shutdown.h>
-#include <timedata.h>
-#include <txmempool.h>
 #include <ui_interface.h>
 #include <util/bip32.h>
 #include <util/error.h>
diff --git a/src/wallet/wallettool.cpp b/src/wallet/wallettool.cpp
--- a/src/wallet/wallettool.cpp
+++ b/src/wallet/wallettool.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 <base58.h>
 #include <chainparams.h>
 #include <fs.h>
 #include <util/system.h>
diff --git a/src/zmq/zmqabstractnotifier.cpp b/src/zmq/zmqabstractnotifier.cpp
--- a/src/zmq/zmqabstractnotifier.cpp
+++ b/src/zmq/zmqabstractnotifier.cpp
@@ -4,8 +4,6 @@
 
 #include <zmq/zmqabstractnotifier.h>
 
-#include <util/system.h>
-
 CZMQAbstractNotifier::~CZMQAbstractNotifier() {
     assert(!psocket);
 }
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
--- a/src/zmq/zmqnotificationinterface.cpp
+++ b/src/zmq/zmqnotificationinterface.cpp
@@ -5,7 +5,6 @@
 #include <zmq/zmqnotificationinterface.h>
 #include <zmq/zmqpublishnotifier.h>
 
-#include <streams.h>
 #include <util/system.h>
 #include <validation.h>
 #include <version.h>
diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh
--- a/test/lint/lint-circular-dependencies.sh
+++ b/test/lint/lint-circular-dependencies.sh
@@ -10,7 +10,6 @@
 
 EXPECTED_CIRCULAR_DEPENDENCIES=(
     "index/txindex -> validation -> index/txindex"
-    "policy/policy -> policy/settings -> policy/policy"
     "qt/addresstablemodel -> qt/walletmodel -> qt/addresstablemodel"
     "qt/bantablemodel -> qt/clientmodel -> qt/bantablemodel"
     "qt/bitcoingui -> qt/utilitydialog -> qt/bitcoingui"
@@ -22,16 +21,11 @@
     "qt/transactiontablemodel -> qt/walletmodel -> qt/transactiontablemodel"
     "qt/walletmodel -> qt/walletmodeltransaction -> qt/walletmodel"
     "txmempool -> validation -> txmempool"
-    "validation -> validationinterface -> validation"
     "wallet/coincontrol -> wallet/wallet -> wallet/coincontrol"
     "wallet/fees -> wallet/wallet -> wallet/fees"
     "wallet/rpcwallet -> wallet/wallet -> wallet/rpcwallet"
     "wallet/wallet -> wallet/walletdb -> wallet/wallet"
-    "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/addressbookpage"
     "txmempool -> validation -> validationinterface -> txmempool"
-    "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/receivecoinsdialog -> qt/addressbookpage"
-    "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/signverifymessagedialog -> qt/addressbookpage"
-    "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/sendcoinsdialog -> qt/sendcoinsentry -> qt/addressbookpage"
     "avalanche -> validation -> avalanche"
     "chainparams -> protocol -> chainparams"
     "chainparamsbase -> util/system -> chainparamsbase"