Make reasoning about dependencies easier by not including unused dependencies

src/addrman.cpp

@@ -7,7 +7,6 @@
 
 #include <hash.h>
 #include <serialize.h>
-#include <streams.h>
 
 int CAddrInfo::GetTriedBucket(const uint256& nKey) const
 {

src/arith_uint256.cpp

@@ -6,7 +6,6 @@
 #include <arith_uint256.h>
 
 #include <uint256.h>
-#include <util/strencodings.h>
 #include <crypto/common.h>
 
 #include <stdio.h>

src/bench/base58.cpp

@@ -4,7 +4,6 @@
 
 #include <bench/bench.h>
 
-#include <validation.h>
 #include <base58.h>
 
 #include <array>

src/bench/bech32.cpp

@@ -4,7 +4,6 @@
 
 #include <bench/bench.h>
 
-#include <validation.h>
 #include <bech32.h>
 #include <util/strencodings.h>
 

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>
 

src/bench/chacha20.cpp

@@ -5,7 +5,6 @@
 #include <iostream>
 
 #include <bench/bench.h>
-#include <hash.h>
 #include <crypto/chacha20.h>
 
 /* Number of bytes to process per iteration */

src/bench/checkqueue.cpp

@@ -4,7 +4,6 @@
 
 #include <bench/bench.h>
 #include <util/system.h>
-#include <validation.h>
 #include <checkqueue.h>
 #include <prevector.h>
 #include <vector>

src/bench/crypto_hash.cpp

@@ -5,11 +5,9 @@
 #include <iostream>
 
 #include <bench/bench.h>
-#include <bloom.h>
 #include <hash.h>
 #include <random.h>
 #include <uint256.h>
-#include <util/time.h>
 #include <crypto/ripemd160.h>
 #include <crypto/sha1.h>
 #include <crypto/sha256.h>

src/bench/duplicate_inputs.cpp

@@ -7,13 +7,9 @@
 #include <coins.h>
 #include <consensus/merkle.h>
 #include <consensus/validation.h>
-#include <miner.h>
-#include <policy/policy.h>
 #include <pow.h>
-#include <test/util.h>
 #include <txmempool.h>
 #include <validation.h>
-#include <validationinterface.h>
 
 #include <list>
 #include <vector>

src/bench/examples.cpp

@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-#include <validation.h>
 #include <util/time.h>
 
 // Sanity test: this should loop ten times, and

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>
 

src/bench/verify_script.cpp

@@ -8,7 +8,6 @@
 #include <script/bitcoinconsensus.h>
 #endif
 #include <script/script.h>
-#include <script/sign.h>
 #include <script/standard.h>
 #include <streams.h>
 

src/bench/wallet_balance.cpp

@@ -4,7 +4,6 @@
 
 #include <bench/bench.h>
 #include <interfaces/chain.h>
-#include <key_io.h>
 #include <optional.h>
 #include <test/util.h>
 #include <validationinterface.h>

src/bitcoin-wallet.cpp

@@ -8,7 +8,6 @@
 
 #include <chainparams.h>
 #include <chainparamsbase.h>
-#include <consensus/consensus.h>
 #include <logging.h>
 #include <util/system.h>
 #include <util/strencodings.h>

src/bitcoind.cpp

@@ -12,16 +12,12 @@
 #include <compat.h>
 #include <fs.h>
 #include <interfaces/chain.h>
-#include <rpc/server.h>
 #include <init.h>
 #include <noui.h>
 #include <shutdown.h>
 #include <util/system.h>
-#include <httpserver.h>
-#include <httprpc.h>
 #include <util/threadnames.h>
 #include <util/strencodings.h>
-#include <walletinitinterface.h>
 
 #include <stdio.h>
 

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

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 <script/script.h>
@@ -11,7 +9,6 @@
 #include <serialize.h>
 #include <streams.h>
 #include <univalue.h>
-#include <util/system.h>
 #include <util/strencodings.h>
 #include <version.h>
 

src/core_write.cpp

@@ -13,7 +13,6 @@
 #include <streams.h>
 #include <univalue.h>
 #include <util/system.h>
-#include <util/moneystr.h>
 #include <util/strencodings.h>
 
 UniValue ValueFromAmount(const CAmount& amount)

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 <assert.h>
 #include <string.h>

src/crypto/sha256_avx2.cpp

@@ -3,7 +3,6 @@
 #include <stdint.h>
 #include <immintrin.h>
 
-#include <crypto/sha256.h>
 #include <crypto/common.h>
 
 namespace sha256d64_avx2 {

src/crypto/sha256_sse41.cpp

@@ -3,7 +3,6 @@
 #include <stdint.h>
 #include <immintrin.h>
 
-#include <crypto/sha256.h>
 #include <crypto/common.h>
 
 namespace sha256d64_sse41 {

src/httprpc.cpp

@@ -9,7 +9,6 @@
 #include <key_io.h>
 #include <rpc/protocol.h>
 #include <rpc/server.h>
-#include <random.h>
 #include <sync.h>
 #include <util/system.h>
 #include <util/strencodings.h>

src/init.cpp

@@ -51,7 +51,6 @@
 #include <util/moneystr.h>
 #include <util/validation.h>
 #include <validationinterface.h>
-#include <warnings.h>
 #include <walletinitinterface.h>
 #include <stdint.h>
 #include <stdio.h>

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>

src/interfaces/wallet.cpp

@@ -5,27 +5,19 @@
 #include <interfaces/wallet.h>
 
 #include <amount.h>
-#include <chain.h>
 #include <consensus/validation.h>
-#include <init.h>
 #include <interfaces/chain.h>
 #include <interfaces/handler.h>
-#include <net.h>
 #include <policy/feerate.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 <uint256.h>
 #include <util/system.h>
-#include <validation.h>
 #include <wallet/feebumper.h>
 #include <wallet/fees.h>
 #include <wallet/rpcwallet.h>

src/key.cpp

@@ -5,7 +5,6 @@
 
 #include <key.h>
 
-#include <arith_uint256.h>
 #include <crypto/common.h>
 #include <crypto/hmac_sha512.h>
 #include <random.h>

src/merkleblock.cpp

@@ -7,7 +7,6 @@
 
 #include <hash.h>
 #include <consensus/consensus.h>
-#include <util/strencodings.h>
 
 
 CMerkleBlock::CMerkleBlock(const CBlock& block, CBloomFilter* filter, const std::set<uint256>* txids)

src/miner.cpp

@@ -13,8 +13,6 @@
 #include <consensus/merkle.h>
 #include <consensus/tx_verify.h>
 #include <consensus/validation.h>
-#include <hash.h>
-#include <net.h>
 #include <policy/feerate.h>
 #include <policy/policy.h>
 #include <pow.h>
@@ -24,7 +22,6 @@
 #include <util/moneystr.h>
 #include <util/system.h>
 #include <util/validation.h>
-#include <validationinterface.h>
 
 #include <algorithm>
 #include <queue>

src/net_processing.cpp

@@ -25,9 +25,7 @@
 #include <scheduler.h>
 #include <tinyformat.h>
 #include <txmempool.h>
-#include <ui_interface.h>
 #include <util/system.h>
-#include <util/moneystr.h>
 #include <util/strencodings.h>
 #include <util/validation.h>
 

src/netbase.cpp

@@ -5,10 +5,7 @@
 
 #include <netbase.h>
 
-#include <hash.h>
 #include <sync.h>
-#include <uint256.h>
-#include <random.h>
 #include <tinyformat.h>
 #include <util/system.h>
 #include <util/strencodings.h>

src/policy/fees.cpp

@@ -4,7 +4,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <policy/fees.h>
-#include <policy/policy.h>
 
 #include <clientversion.h>
 #include <primitives/transaction.h>

src/policy/policy.cpp

@@ -9,10 +9,6 @@
 
 #include <consensus/validation.h>
 #include <coins.h>
-#include <policy/settings.h>
-#include <tinyformat.h>
-#include <util/system.h>
-#include <util/strencodings.h>
 
 
 CAmount GetDustThreshold(const CTxOut& txout, const CFeeRate& dustRelayFeeIn)

src/primitives/block.cpp

@@ -7,7 +7,6 @@
 
 #include <hash.h>
 #include <tinyformat.h>
-#include <util/strencodings.h>
 #include <crypto/common.h>
 
 uint256 CBlockHeader::GetHash() const

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>
 

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>

src/qt/addresstablemodel.cpp

@@ -7,7 +7,6 @@
 #include <qt/guiutil.h>
 #include <qt/walletmodel.h>
 
-#include <interfaces/node.h>
 #include <key_io.h>
 #include <wallet/wallet.h>
 

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>

src/qt/bitcoin.cpp

@@ -31,13 +31,9 @@
 #include <interfaces/node.h>
 #include <noui.h>
 #include <util/threadnames.h>
-#include <rpc/server.h>
 #include <ui_interface.h>
 #include <uint256.h>
 #include <util/system.h>
-#include <warnings.h>
-
-#include <walletinitinterface.h>
 
 #include <memory>
 #include <stdint.h>

src/qt/bitcoinunits.cpp

@@ -4,8 +4,6 @@
 
 #include <qt/bitcoinunits.h>
 
-#include <primitives/transaction.h>
-
 #include <QStringList>
 
 BitcoinUnits::BitcoinUnits(QObject *parent):

src/qt/clientmodel.cpp

@@ -9,18 +9,12 @@
 #include <qt/guiutil.h>
 #include <qt/peertablemodel.h>
 
-#include <chain.h>
-#include <chainparams.h>
 #include <clientversion.h>
 #include <interfaces/handler.h>
 #include <interfaces/node.h>
-#include <validation.h>
 #include <net.h>
 #include <netbase.h>
-#include <txmempool.h>
-#include <ui_interface.h>
 #include <util/system.h>
-#include <warnings.h>
 
 #include <stdint.h>
 

src/qt/coincontroldialog.cpp

@@ -10,12 +10,10 @@
 #include <qt/forms/ui_coincontroldialog.h>
 
 #include <qt/addresstablemodel.h>
-#include <base58.h>
 #include <qt/bitcoinunits.h>
 #include <qt/guiutil.h>
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>
-#include <txmempool.h>
 #include <qt/walletmodel.h>
 
 #include <wallet/coincontrol.h>
@@ -23,8 +21,6 @@
 #include <key_io.h>
 #include <policy/fees.h>
 #include <policy/policy.h>
-#include <validation.h> // For mempool
-#include <wallet/fees.h>
 #include <wallet/wallet.h>
 
 #include <QApplication>

src/qt/peertablemodel.cpp

@@ -9,7 +9,6 @@
 #include <qt/guiutil.h>
 
 #include <interfaces/node.h>
-#include <validation.h> // for cs_main
 #include <sync.h>
 
 #include <QDebug>

src/qt/platformstyle.cpp

@@ -4,8 +4,6 @@
 
 #include <qt/platformstyle.h>
 
-#include <qt/guiconstants.h>
-
 #include <QApplication>
 #include <QColor>
 #include <QImage>

src/qt/receivecoinsdialog.cpp

@@ -7,9 +7,7 @@
 #include <qt/receivecoinsdialog.h>
 #include <qt/forms/ui_receivecoinsdialog.h>
 
-#include <qt/addressbookpage.h>
 #include <qt/addresstablemodel.h>
-#include <qt/bitcoinunits.h>
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>
 #include <qt/receiverequestdialog.h>

src/qt/receiverequestdialog.cpp

@@ -8,7 +8,6 @@
 #include <qt/bitcoinunits.h>
 #include <qt/guiutil.h>
 #include <qt/optionsmodel.h>
-#include <qt/qrimagewidget.h>
 
 #include <QClipboard>
 #include <QPixmap>

src/qt/test/addressbooktests.cpp

@@ -4,8 +4,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>

src/qt/test/apptests.cpp

@@ -5,7 +5,6 @@
 #include <qt/test/apptests.h>
 
 #include <chainparams.h>
-#include <init.h>
 #include <qt/bitcoin.h>
 #include <qt/bitcoingui.h>
 #include <qt/networkstyle.h>
@@ -16,9 +15,6 @@
 #if defined(HAVE_CONFIG_H)
 #include <config/bitcoin-config.h>
 #endif
-#ifdef ENABLE_WALLET
-#include <wallet/db.h>
-#endif
 
 #include <QAction>
 #include <QEventLoop>

src/qt/test/rpcnestedtests.cpp

@@ -4,12 +4,8 @@
 
 #include <qt/test/rpcnestedtests.h>
 
-#include <chainparams.h>
-#include <consensus/validation.h>
 #include <fs.h>
 #include <interfaces/node.h>
-#include <validation.h>
-#include <rpc/register.h>
 #include <rpc/server.h>
 #include <qt/rpcconsole.h>
 #include <test/setup_common.h>

src/qt/test/wallettests.cpp

@@ -1,10 +1,8 @@
 #include <qt/test/wallettests.h>
 #include <qt/test/util.h>
 
-#include <init.h>
 #include <interfaces/chain.h>
 #include <interfaces/node.h>
-#include <base58.h>
 #include <qt/bitcoinamountfield.h>
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>

src/qt/transactiondesc.cpp

@@ -20,8 +20,6 @@
 #include <script/script.h>
 #include <timedata.h>
 #include <util/system.h>
-#include <wallet/db.h>
-#include <wallet/wallet.h>
 #include <policy/policy.h>
 
 #include <stdint.h>

src/qt/transactionrecord.cpp

@@ -5,11 +5,8 @@
 #include <qt/transactionrecord.h>
 
 #include <chain.h>
-#include <consensus/consensus.h>
 #include <interfaces/wallet.h>
 #include <key_io.h>
-#include <timedata.h>
-#include <validation.h>
 
 #include <stdint.h>
 

src/qt/transactiontablemodel.cpp

@@ -15,11 +15,7 @@
 
 #include <core_io.h>
 #include <interfaces/handler.h>
-#include <interfaces/node.h>
-#include <sync.h>
 #include <uint256.h>
-#include <util/system.h>
-#include <validation.h>
 
 #include <QColor>
 #include <QDateTime>

src/qt/transactionview.cpp

@@ -10,7 +10,6 @@
 #include <qt/editaddressdialog.h>
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>
-#include <qt/sendcoinsdialog.h>
 #include <qt/transactiondescdialog.h>
 #include <qt/transactionfilterproxy.h>
 #include <qt/transactionrecord.h>

src/qt/utilitydialog.cpp

@@ -11,17 +11,12 @@
 #include <qt/forms/ui_helpmessagedialog.h>
 
 #include <qt/bitcoingui.h>
-#include <qt/clientmodel.h>
-#include <qt/guiconstants.h>
-#include <qt/intro.h>
 #ifdef ENABLE_BIP70
 #include <qt/paymentrequestplus.h>
 #endif
-#include <qt/guiutil.h>
 
 #include <clientversion.h>
 #include <init.h>
-#include <interfaces/node.h>
 #include <util/system.h>
 #include <util/strencodings.h>
 

src/qt/walletmodeltransaction.cpp

@@ -8,7 +8,6 @@
 
 #include <qt/walletmodeltransaction.h>
 
-#include <interfaces/node.h>
 #include <policy/policy.h>
 
 WalletModelTransaction::WalletModelTransaction(const QList<SendCoinsRecipient> &_recipients) :

src/rpc/blockchain.cpp

@@ -6,7 +6,6 @@
 #include <rpc/blockchain.h>
 
 #include <amount.h>
-#include <base58.h>
 #include <blockfilter.h>
 #include <chain.h>
 #include <chainparams.h>
@@ -15,7 +14,6 @@
 #include <core_io.h>
 #include <hash.h>
 #include <index/blockfilterindex.h>
-#include <index/txindex.h>
 #include <key_io.h>
 #include <policy/feerate.h>
 #include <policy/policy.h>

src/rpc/misc.cpp

@@ -3,25 +3,17 @@
 // 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 <core_io.h>
 #include <crypto/ripemd160.h>
 #include <key_io.h>
-#include <validation.h>
 #include <httpserver.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/system.h>
 #include <util/strencodings.h>
 #include <util/validation.h>
-#include <warnings.h>
 
 #include <stdint.h>
 #include <tuple>

src/rpc/net.cpp

@@ -5,7 +5,6 @@
 #include <rpc/server.h>
 
 #include <banman.h>
-#include <chainparams.h>
 #include <clientversion.h>
 #include <core_io.h>
 #include <net.h>
@@ -17,7 +16,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>

src/rpc/protocol.cpp

@@ -10,7 +10,6 @@
 #include <util/system.h>
 #include <util/strencodings.h>
 #include <util/time.h>
-#include <version.h>
 
 /**
  * JSON-RPC protocol.  Bitcoin speaks version 1.0 for maximum compatibility,

src/rpc/rawtransaction.cpp

@@ -6,21 +6,16 @@
 #include <chain.h>
 #include <coins.h>
 #include <compat/byteswap.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/rbf.h>
-#include <policy/settings.h>
 #include <primitives/transaction.h>
 #include <psbt.h>
 #include <rpc/rawtransaction_util.h>
@@ -31,7 +26,6 @@
 #include <script/sign.h>
 #include <script/standard.h>
 #include <uint256.h>
-#include <util/bip32.h>
 #include <util/moneystr.h>
 #include <util/strencodings.h>
 #include <validation.h>

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>

src/rpc/server.cpp

@@ -7,11 +7,9 @@
 
 #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>
 

src/script/script.cpp

@@ -5,7 +5,6 @@
 
 #include <script/script.h>
 
-#include <tinyformat.h>
 #include <util/strencodings.h>
 
 const char* GetOpName(opcodetype opcode)

src/script/sigcache.cpp

@@ -5,7 +5,6 @@
 
 #include <script/sigcache.h>
 
-#include <memusage.h>
 #include <pubkey.h>
 #include <random.h>
 #include <uint256.h>

src/script/standard.cpp

@@ -8,8 +8,6 @@
 #include <crypto/sha256.h>
 #include <pubkey.h>
 #include <script/script.h>
-#include <util/system.h>
-#include <util/strencodings.h>
 
 
 typedef std::vector<unsigned char> valtype;

src/test/coins_tests.cpp

@@ -4,13 +4,11 @@
 
 #include <attributes.h>
 #include <coins.h>
-#include <consensus/validation.h>
 #include <script/standard.h>
 #include <test/setup_common.h>
 #include <uint256.h>
 #include <undo.h>
 #include <util/strencodings.h>
-#include <validation.h>
 
 #include <map>
 #include <vector>

src/test/denialofservice_tests.cpp

@@ -9,7 +9,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>

src/test/miner_tests.cpp

@@ -7,7 +7,6 @@
 #include <consensus/consensus.h>
 #include <consensus/merkle.h>
 #include <consensus/tx_verify.h>
-#include <consensus/validation.h>
 #include <miner.h>
 #include <policy/policy.h>
 #include <pubkey.h>

src/test/multisig_tests.cpp

@@ -9,7 +9,6 @@
 #include <script/script_error.h>
 #include <script/interpreter.h>
 #include <script/sign.h>
-#include <script/ismine.h>
 #include <uint256.h>
 #include <test/setup_common.h>
 

src/test/rpc_tests.cpp

@@ -9,8 +9,6 @@
 #include <core_io.h>
 #include <init.h>
 #include <interfaces/chain.h>
-#include <key_io.h>
-#include <netbase.h>
 
 #include <test/setup_common.h>
 

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 <validation.h>

src/test/setup_common.cpp

@@ -18,7 +18,6 @@
 #include <rpc/server.h>
 #include <script/sigcache.h>
 #include <streams.h>
-#include <ui_interface.h>
 #include <util/validation.h>
 #include <validation.h>
 

src/test/torcontrol_tests.cpp

@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 //
 #include <test/setup_common.h>
-#include <torcontrol.h>
 
 #include <boost/test/unit_test.hpp>
 

src/test/txindex_tests.cpp

@@ -8,7 +8,6 @@
 #include <test/setup_common.h>
 #include <util/system.h>
 #include <util/time.h>
-#include <validation.h>
 
 #include <boost/test/unit_test.hpp>
 

src/test/txvalidationcache_tests.cpp

@@ -13,9 +13,7 @@
 #include <script/sign.h>
 #include <test/setup_common.h>
 #include <util/time.h>
-#include <core_io.h>
 #include <keystore.h>
-#include <policy/policy.h>
 
 #include <boost/test/unit_test.hpp>
 

src/test/util.cpp

@@ -6,14 +6,11 @@
 
 #include <chainparams.h>
 #include <consensus/merkle.h>
-#include <consensus/validation.h>
 #include <key_io.h>
 #include <miner.h>
 #include <outputtype.h>
 #include <pow.h>
-#include <scheduler.h>
 #include <script/standard.h>
-#include <txdb.h>
 #include <validation.h>
 #include <validationinterface.h>
 #ifdef ENABLE_WALLET

src/timedata.cpp

@@ -12,7 +12,6 @@
 #include <sync.h>
 #include <ui_interface.h>
 #include <util/system.h>
-#include <util/strencodings.h>
 #include <warnings.h>
 
 

src/txdb.cpp

@@ -5,8 +5,6 @@
 
 #include <txdb.h>
 
-#include <chainparams.h>
-#include <hash.h>
 #include <random.h>
 #include <pow.h>
 #include <shutdown.h>

src/txmempool.cpp

@@ -13,8 +13,6 @@
 #include <policy/fees.h>
 #include <policy/settings.h>
 #include <reverse_iterator.h>
-#include <streams.h>
-#include <timedata.h>
 #include <util/system.h>
 #include <util/moneystr.h>
 #include <util/time.h>

src/ui_interface.cpp

@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <ui_interface.h>
-#include <util/system.h>
 
 #include <boost/signals2/last_value.hpp>
 #include <boost/signals2/signal.hpp>

src/util/system.cpp

@@ -6,8 +6,6 @@
 #include <util/system.h>
 
 #include <chainparamsbase.h>
-#include <random.h>
-#include <serialize.h>
 #include <util/strencodings.h>
 
 #include <stdarg.h>

src/validation.cpp

@@ -20,7 +20,6 @@
 #include <index/txindex.h>
 #include <policy/fees.h>
 #include <policy/policy.h>
-#include <policy/rbf.h>
 #include <policy/settings.h>
 #include <pow.h>
 #include <primitives/block.h>

src/validationinterface.cpp

@@ -8,8 +8,6 @@
 #include <primitives/block.h>
 #include <scheduler.h>
 #include <txmempool.h>
-#include <util/system.h>
-#include <validation.h>
 
 #include <list>
 #include <atomic>

src/wallet/db.cpp

@@ -5,11 +5,7 @@
 
 #include <wallet/db.h>
 
-#include <addrman.h>
-#include <hash.h>
-#include <protocol.h>
 #include <util/strencodings.h>
-#include <wallet/walletutil.h>
 
 #include <stdint.h>
 

src/wallet/feebumper.cpp

@@ -10,14 +10,10 @@
 #include <wallet/wallet.h>
 #include <policy/fees.h>
 #include <policy/policy.h>
-#include <policy/rbf.h>
-#include <validation.h> //for mempool access
-#include <txmempool.h>
 #include <util/moneystr.h>
 #include <util/rbf.h>
 #include <util/system.h>
 #include <util/validation.h>
-#include <net.h>
 
 //! Check whether transaction has descendant in wallet or mempool, or has been
 //! mined, or conflicts with a mined transaction. Return a feebumper::Result.

src/wallet/fees.cpp

@@ -5,9 +5,7 @@
 
 #include <wallet/fees.h>
 
-#include <policy/policy.h>
 #include <util/system.h>
-#include <validation.h>
 #include <wallet/coincontrol.h>
 #include <wallet/wallet.h>
 

src/wallet/init.cpp

@@ -3,18 +3,13 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <chainparams.h>
 #include <init.h>
 #include <interfaces/chain.h>
 #include <net.h>
-#include <scheduler.h>
 #include <outputtype.h>
-#include <util/error.h>
 #include <util/system.h>
 #include <util/moneystr.h>
-#include <validation.h>
 #include <walletinitinterface.h>
-#include <wallet/rpcwallet.h>
 #include <wallet/wallet.h>
 #include <wallet/walletutil.h>
 

src/wallet/rpcdump.cpp

@@ -16,7 +16,6 @@
 #include <util/bip32.h>
 #include <util/system.h>
 #include <util/time.h>
-#include <validation.h>
 #include <wallet/wallet.h>
 
 #include <wallet/rpcwallet.h>

src/wallet/rpcwallet.cpp

@@ -4,33 +4,27 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <amount.h>
-#include <chain.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/feerate.h>
 #include <policy/fees.h>
-#include <policy/policy.h>
 #include <policy/rbf.h>
 #include <rpc/rawtransaction_util.h>
 #include <rpc/server.h>
 #include <rpc/util.h>
 #include <script/descriptor.h>
 #include <script/sign.h>
-#include <shutdown.h>
-#include <timedata.h>
 #include <util/bip32.h>
 #include <util/fees.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/feebumper.h>
 #include <wallet/psbtwallet.h>

src/wallet/test/init_tests.cpp

@@ -7,11 +7,6 @@
 #include <test/setup_common.h>
 #include <wallet/test/init_test_fixture.h>
 
-#include <init.h>
-#include <walletinitinterface.h>
-#include <wallet/wallet.h>
-
-
 BOOST_FIXTURE_TEST_SUITE(init_tests, InitWalletDirTestingSetup)
 
 BOOST_AUTO_TEST_CASE(walletinit_verify_walletdir_default)

src/wallet/test/psbt_wallet_tests.cpp

@@ -7,7 +7,6 @@
 #include <util/bip32.h>
 #include <util/strencodings.h>
 #include <wallet/psbtwallet.h>
-#include <wallet/rpcwallet.h>
 #include <wallet/wallet.h>
 #include <univalue.h>
 

src/wallet/test/wallet_test_fixture.cpp

@@ -4,9 +4,7 @@
 
 #include <wallet/test/wallet_test_fixture.h>
 
-#include <rpc/server.h>
 #include <wallet/db.h>
-#include <wallet/rpcwallet.h>
 
 WalletTestingSetup::WalletTestingSetup(const std::string& chainName)
     : TestingSetup(chainName),

src/wallet/wallet.cpp

@@ -14,17 +14,12 @@
 #include <key.h>
 #include <key_io.h>
 #include <keystore.h>
-#include <net.h>
 #include <policy/fees.h>
 #include <policy/policy.h>
-#include <policy/rbf.h>
 #include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <script/descriptor.h>
 #include <script/script.h>
-#include <shutdown.h>
-#include <timedata.h>
-#include <txmempool.h>
 #include <util/bip32.h>
 #include <util/error.h>
 #include <util/fees.h>

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 <fs.h>
 #include <util/system.h>
 #include <wallet/wallet.h>

src/warnings.cpp

@@ -4,7 +4,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <sync.h>
-#include <clientversion.h>
 #include <util/system.h>
 #include <warnings.h>
 

src/zmq/zmqabstractnotifier.cpp

@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <zmq/zmqabstractnotifier.h>
-#include <util/system.h>
 
 const int CZMQAbstractNotifier::DEFAULT_ZMQ_SNDHWM;
 

src/zmq/zmqnotificationinterface.cpp

@@ -7,7 +7,6 @@
 
 #include <version.h>
 #include <validation.h>
-#include <streams.h>
 #include <util/system.h>
 
 void zmqError(const char *str)

test/lint/lint-circular-dependencies.sh

@@ -12,7 +12,6 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "chainparamsbase -> util/system -> chainparamsbase"
     "index/txindex -> validation -> index/txindex"
     "policy/fees -> txmempool -> policy/fees"
-    "policy/policy -> policy/settings -> policy/policy"
     "qt/addresstablemodel -> qt/walletmodel -> qt/addresstablemodel"
     "qt/bantablemodel -> qt/clientmodel -> qt/bantablemodel"
     "qt/bitcoingui -> qt/utilitydialog -> qt/bitcoingui"
@@ -25,18 +24,12 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "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/wallet -> wallet/walletdb -> wallet/wallet"
     "policy/fees -> txmempool -> validation -> policy/fees"
-    "policy/rbf -> txmempool -> validation -> policy/rbf"
-    "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/addressbookpage"
     "qt/guiutil -> qt/walletmodel -> qt/optionsmodel -> qt/guiutil"
     "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"
 )
 
 EXIT_CODE=0