Merge pull request #4619 from PastaPastaPasta/remove-includes

refactor: Remove includes; backport 16659

src/arith_uint256.cpp

@@ -9,8 +9,6 @@
 #include <util/strencodings.h>
 #include <crypto/common.h>
 
-#include <stdio.h>
-#include <string.h>
 
 template <unsigned int BITS>
 base_uint<BITS>::base_uint(const std::string& str)

src/arith_uint256.h

@@ -6,13 +6,11 @@
 #ifndef BITCOIN_ARITH_UINT256_H
 #define BITCOIN_ARITH_UINT256_H
 
-#include <assert.h>
 #include <cstring>
 #include <limits>
 #include <stdexcept>
 #include <stdint.h>
 #include <string>
-#include <vector>
 
 class uint256;
 

src/batchedlogger.cpp

@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <batchedlogger.h>
-#include <util/system.h>
 
 CBatchedLogger::CBatchedLogger(BCLog::LogFlags _category, const std::string& _header) :
     accept(LogAcceptCategory(_category)), header(_header)

src/bench/base58.cpp

@@ -4,12 +4,10 @@
 
 #include <bench/bench.h>
 
-#include <validation.h>
 #include <base58.h>
 
 #include <array>
 #include <vector>
-#include <string>
 
 
 static void Base58Encode(benchmark::Bench& bench)

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.cpp

@@ -10,9 +10,7 @@
 
 #include <algorithm>
 #include <assert.h>
-#include <iomanip>
 #include <iostream>
-#include <numeric>
 #include <regex>
 
 namespace {

src/bench/bench.h

@@ -6,7 +6,6 @@
 #define BITCOIN_BENCH_BENCH_H
 
 #include <functional>
-#include <limits>
 #include <map>
 #include <string>
 #include <vector>

src/bench/bench_dash.cpp

@@ -5,15 +5,10 @@
 #include <bench/bench.h>
 
 #include <crypto/sha256.h>
-#include <key.h>
 #include <stacktraces.h>
 #include <util/strencodings.h>
 #include <util/system.h>
 
-#include <boost/lexical_cast.hpp>
-
-#include <memory>
-
 #include <bls/bls.h>
 
 static const char* DEFAULT_BENCH_FILTER = ".*";

src/bench/block_assemble.cpp

@@ -5,14 +5,12 @@
 #include <bench/bench.h>
 #include <consensus/consensus.h>
 #include <consensus/validation.h>
-#include <crypto/sha256.h>
 #include <script/standard.h>
 #include <test/util.h>
 #include <txmempool.h>
 #include <validation.h>
 
 
-#include <list>
 #include <vector>
 
 static void AssembleBlock(benchmark::Bench& bench)

src/bench/chacha20.cpp

@@ -2,10 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <iostream>
 
 #include <bench/bench.h>
-#include <hash.h>
 #include <crypto/chacha20.h>
 
 /* Number of bytes to process per iteration */

src/bench/chacha_poly_aead.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 <iostream>
 
 #include <bench/bench.h>
 #include <crypto/chacha_poly_aead.h>

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/duplicate_inputs.cpp

@@ -4,19 +4,13 @@
 
 #include <bench/bench.h>
 #include <chainparams.h>
-#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>
 
 
 static void DuplicateInputs(benchmark::Bench& bench)

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>
 
 // Extremely fast-running benchmark:
 #include <math.h>

src/bench/lockedpool.cpp

@@ -6,7 +6,6 @@
 
 #include <support/lockedpool.h>
 
-#include <iostream>
 #include <vector>
 
 #define ASIZE 2048

src/bench/mempool_eviction.cpp

@@ -6,8 +6,6 @@
 #include <policy/policy.h>
 #include <txmempool.h>
 
-#include <list>
-#include <vector>
 
 static void AddTx(const CTransactionRef& tx, const CAmount& nFee, CTxMemPool& pool) EXCLUSIVE_LOCKS_REQUIRED(cs_main, pool.cs)
 {

src/bench/poly1305.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 <iostream>
 #include <vector>
 
 #include <bench/bench.h>

src/bench/rollingbloom.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 <iostream>
 
 #include <bench/bench.h>
 #include <bloom.h>

src/bench/rpc_mempool.cpp

@@ -9,8 +9,6 @@
 
 #include <univalue.h>
 
-#include <list>
-#include <vector>
 
 static void AddTx(const CTransactionRef& tx, const CAmount& fee, CTxMemPool& pool) EXCLUSIVE_LOCKS_REQUIRED(cs_main, pool.cs)
 {

src/bench/wallet_balance.cpp

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

src/blockencodings.h

@@ -7,7 +7,6 @@
 
 #include <primitives/block.h>
 
-#include <memory>
 
 class CTxMemPool;
 

src/bloom.cpp

@@ -7,7 +7,6 @@
 #include <primitives/transaction.h>
 #include <evo/specialtx.h>
 #include <evo/providertx.h>
-#include <evo/cbtx.h>
 #include <llmq/commitment.h>
 #include <hash.h>
 #include <script/script.h>
@@ -18,8 +17,6 @@
 #include <math.h>
 #include <stdlib.h>
 
-#include <algorithm>
-
 #define LN2SQUARED 0.4804530139182014246671025263266649717305529515945455
 #define LN2 0.6931471805599453094172321214581765680755001343602552
 

src/compressor.cpp

@@ -5,7 +5,6 @@
 
 #include <compressor.h>
 
-#include <hash.h>
 #include <pubkey.h>
 #include <script/standard.h>
 

src/consensus/merkle.h

@@ -5,10 +5,8 @@
 #ifndef BITCOIN_CONSENSUS_MERKLE_H
 #define BITCOIN_CONSENSUS_MERKLE_H
 
-#include <stdint.h>
 #include <vector>
 
-#include <primitives/transaction.h>
 #include <primitives/block.h>
 #include <uint256.h>
 

src/consensus/params.h

@@ -7,10 +7,10 @@
 #define BITCOIN_CONSENSUS_PARAMS_H
 
 #include <uint256.h>
-#include <map>
-#include <string>
 #include <llmq/params.h>
 
+#include <map>
+
 namespace Consensus {
 
 enum DeploymentPos

src/consensus/tx_verify.cpp

@@ -13,7 +13,6 @@
 #include <chain.h>
 #include <coins.h>
 #include <util/moneystr.h>
-#include <version.h>
 
 bool IsFinalTx(const CTransaction &tx, int nBlockHeight, int64_t nBlockTime)
 {

src/core_read.cpp

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

@@ -4,7 +4,6 @@
 
 #include <core_io.h>
 
-#include <consensus/consensus.h>
 #include <consensus/validation.h>
 #include <key_io.h>
 #include <primitives/transaction.h>
@@ -13,7 +12,6 @@
 #include <serialize.h>
 #include <streams.h>
 #include <univalue.h>
-#include <util/system.h>
 #include <util/moneystr.h>
 #include <util/strencodings.h>
 

src/crypto/aes.cpp

@@ -5,7 +5,6 @@
 #include <crypto/aes.h>
 #include <crypto/common.h>
 
-#include <assert.h>
 #include <string.h>
 
 extern "C" {

src/crypto/blake.c

@@ -32,7 +32,6 @@
 
 #include <stddef.h>
 #include <string.h>
-#include <limits.h>
 
 #include "sph_blake.h"
 

src/crypto/bmw.c

@@ -32,7 +32,6 @@
 
 #include <stddef.h>
 #include <string.h>
-#include <limits.h>
 
 #ifdef __cplusplus
 extern "C"{

src/crypto/chacha_poly_aead.cpp

@@ -4,14 +4,12 @@
 
 #include <crypto/chacha_poly_aead.h>
 
-#include <crypto/common.h>
 #include <crypto/poly1305.h>
 #include <support/cleanse.h>
 
 #include <assert.h>
 #include <string.h>
 
-#include <cstdio>
 #include <limits>
 
 #ifndef HAVE_TIMINGSAFE_BCMP

src/crypto/cubehash.c

@@ -32,7 +32,6 @@
 
 #include <stddef.h>
 #include <string.h>
-#include <limits.h>
 
 #include "sph_cubehash.h"
 #ifdef __cplusplus

src/crypto/echo.c

@@ -32,7 +32,6 @@
 
 #include <stddef.h>
 #include <string.h>
-#include <limits.h>
 
 #include "sph_echo.h"
 

src/crypto/luffa.c

@@ -32,7 +32,6 @@
 
 #include <stddef.h>
 #include <string.h>
-#include <limits.h>
 
 #include "sph_luffa.h"
 

src/crypto/sha256.cpp

@@ -7,7 +7,6 @@
 
 #include <assert.h>
 #include <string.h>
-#include <atomic>
 
 #if defined(__x86_64__) || defined(__amd64__) || defined(__i386__)
 #if defined(USE_ASM)

src/crypto/sha256_shani.cpp

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

src/crypto/sha3.cpp

@@ -9,7 +9,6 @@
 #include <crypto/common.h>
 #include <span.h>
 
-#include <algorithm>
 #include <array> // For std::begin and std::end.
 
 #include <stdint.h>

src/crypto/simd.c

@@ -32,7 +32,6 @@
 
 #include <stddef.h>
 #include <string.h>
-#include <limits.h>
 
 #include "sph_simd.h"
 

src/dash-cli.cpp

@@ -10,7 +10,6 @@
 
 #include <chainparamsbase.h>
 #include <clientversion.h>
-#include <fs.h>
 #include <rpc/client.h>
 #include <rpc/protocol.h>
 #include <stacktraces.h>

src/dash-tx.cpp

@@ -13,7 +13,6 @@
 #include <core_io.h>
 #include <key_io.h>
 #include <keystore.h>
-#include <policy/policy.h>
 #include <primitives/transaction.h>
 #include <script/script.h>
 #include <script/sign.h>

src/dash-wallet.cpp

@@ -14,8 +14,6 @@
 #include <util/strencodings.h>
 #include <wallet/wallettool.h>
 
-#include <stdio.h>
-
 const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;
 
 static void SetupWalletToolArgs()

src/dashd.cpp

@@ -11,10 +11,9 @@
 #include <chainparams.h>
 #include <clientversion.h>
 #include <compat.h>
-#include <fs.h>
+#include <init.h>
 #include <interfaces/chain.h>
 #include <rpc/server.h>
-#include <init.h>
 #include <noui.h>
 #include <shutdown.h>
 #include <util/system.h>

src/dbwrapper.h

@@ -11,7 +11,6 @@
 #include <streams.h>
 #include <util/system.h>
 #include <util/strencodings.h>
-#include <version.h>
 
 #include <typeindex>
 

src/dummywallet.cpp

@@ -6,8 +6,6 @@
 #include <util/system.h>
 #include <walletinitinterface.h>
 
-#include <stdio.h>
-
 class CWallet;
 
 namespace interfaces {

src/httprpc.cpp

@@ -6,17 +6,14 @@
 
 #include <chainparams.h>
 #include <httpserver.h>
-#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>
 #include <ui_interface.h>
 #include <walletinitinterface.h>
 #include <crypto/hmac_sha256.h>
-#include <stdio.h>
 
 #include <memory>
 

src/httprpc.h

@@ -5,8 +5,6 @@
 #ifndef BITCOIN_HTTPRPC_H
 #define BITCOIN_HTTPRPC_H
 
-#include <string>
-#include <map>
 
 /** Start HTTP RPC subsystem.
  * Precondition; HTTP and RPC has been started.

src/httpserver.cpp

@@ -5,7 +5,6 @@
 #include <httpserver.h>
 
 #include <chainparamsbase.h>
-#include <compat.h>
 #include <util/system.h>
 #include <util/strencodings.h>
 #include <util/threadnames.h>
@@ -16,14 +15,10 @@
 #include <ui_interface.h>
 
 #include <deque>
-#include <memory>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string>
 
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <signal.h>
 
 #include <event2/thread.h>
 #include <event2/buffer.h>
@@ -41,7 +36,6 @@
 #endif
 
 #include <thread>
-#include <mutex>
 #include <condition_variable>
 
 /** Maximum size of http request (request line + headers) */

src/httpserver.h

@@ -6,7 +6,6 @@
 #define BITCOIN_HTTPSERVER_H
 
 #include <string>
-#include <stdint.h>
 #include <functional>
 
 static const int DEFAULT_HTTP_THREADS=4;

src/index/base.h

@@ -9,7 +9,6 @@
 #include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <threadinterrupt.h>
-#include <uint256.h>
 #include <validationinterface.h>
 
 class CBlockIndex;

src/interfaces/chain.cpp

@@ -16,13 +16,11 @@
 #include <policy/policy.h>
 #include <primitives/block.h>
 #include <primitives/transaction.h>
-#include <protocol.h>
 #include <rpc/protocol.h>
 #include <rpc/server.h>
 #include <shutdown.h>
 #include <policy/settings.h>
 #include <sync.h>
-#include <threadsafety.h>
 #include <timedata.h>
 #include <txmempool.h>
 #include <ui_interface.h>

src/interfaces/node.cpp

@@ -5,7 +5,6 @@
 #include <interfaces/node.h>
 
 #include <addrdb.h>
-#include <amount.h>
 #include <banman.h>
 #include <chain.h>
 #include <chainparams.h>
@@ -24,7 +23,6 @@
 #include <netbase.h>
 #include <policy/feerate.h>
 #include <policy/fees.h>
-#include <policy/policy.h>
 #include <policy/settings.h>
 #include <primitives/block.h>
 #include <rpc/server.h>
@@ -44,7 +42,6 @@
 #include <coinjoin/coinjoin.h>
 #include <coinjoin/options.h>
 
-#include <atomic>
 #include <univalue.h>
 
 class CWallet;

src/interfaces/wallet.cpp

@@ -5,16 +5,12 @@
 #include <interfaces/wallet.h>
 
 #include <amount.h>
-#include <chain.h>
 #include <coinjoin/client.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>
@@ -22,7 +18,6 @@
 #include <script/standard.h>
 #include <support/allocators/secure.h>
 #include <sync.h>
-#include <timedata.h>
 #include <txmempool.h> // for mempool.cs
 #include <ui_interface.h>
 #include <uint256.h>
@@ -32,7 +27,6 @@
 #include <wallet/rpcwallet.h>
 #include <wallet/load.h>
 #include <wallet/wallet.h>
-#include <wallet/walletutil.h>
 
 #include <memory>
 #include <string>

src/key_io.cpp

@@ -7,15 +7,12 @@
 #include <base58.h>
 #include <bech32.h>
 #include <chainparams.h>
-#include <script/script.h>
-#include <util/strencodings.h>
 
 #include <boost/variant/apply_visitor.hpp>
 #include <boost/variant/static_visitor.hpp>
 
 #include <assert.h>
 #include <string.h>
-#include <algorithm>
 
 namespace
 {

src/llmq/dkgsessionhandler.cpp

@@ -15,7 +15,6 @@
 #include <masternode/node.h>
 #include <chainparams.h>
 #include <net_processing.h>
-#include <spork.h>
 
 namespace llmq
 {

src/llmq/dkgsessionmgr.cpp

@@ -11,7 +11,6 @@
 #include <chainparams.h>
 #include <net_processing.h>
 #include <spork.h>
-#include <validation.h>
 
 namespace llmq
 {

src/logging.cpp

@@ -8,8 +8,6 @@
 #include <util/threadnames.h>
 #include <util/time.h>
 
-#include <mutex>
-
 const char * const DEFAULT_DEBUGLOGFILE = "debug.log";
 
 BCLog::Logger& LogInstance()

src/masternode/node.cpp

@@ -13,8 +13,6 @@
 #include <validation.h>
 #include <warnings.h>
 
-#include <bls/bls.h>
-
 // Keep track of the active Masternode
 CCriticalSection activeMasternodeInfoCs;
 CActiveMasternodeInfo activeMasternodeInfo GUARDED_BY(activeMasternodeInfoCs);

src/miner.cpp

@@ -9,18 +9,14 @@
 #include <amount.h>
 #include <chain.h>
 #include <chainparams.h>
-#include <coins.h>
 #include <consensus/consensus.h>
 #include <consensus/tx_verify.h>
 #include <consensus/merkle.h>
 #include <consensus/validation.h>
-#include <hash.h>
-#include <net.h>
 #include <policy/feerate.h>
 #include <policy/policy.h>
 #include <pow.h>
 #include <primitives/transaction.h>
-#include <script/standard.h>
 #include <timedata.h>
 #include <util/system.h>
 #include <util/moneystr.h>
@@ -37,7 +33,6 @@
 #include <masternode/payments.h>
 
 #include <algorithm>
-#include <queue>
 #include <utility>
 
 // Unconfirmed transactions in the memory pool often depend on other

src/net.cpp

@@ -15,10 +15,8 @@
 #include <chainparams.h>
 #include <clientversion.h>
 #include <consensus/consensus.h>
-#include <crypto/common.h>
 #include <crypto/sha256.h>
 #include <net_permissions.h>
-#include <primitives/transaction.h>
 #include <netbase.h>
 #include <scheduler.h>
 #include <ui_interface.h>
@@ -52,7 +50,6 @@
 
 #ifdef USE_UPNP
 #include <miniupnpc/miniupnpc.h>
-#include <miniupnpc/miniwget.h>
 #include <miniupnpc/upnpcommands.h>
 #include <miniupnpc/upnperrors.h>
 // The minimum supported miniUPnPc API version is set to 10. This keeps compatibility

src/net_processing.cpp

@@ -7,7 +7,6 @@
 
 #include <addrman.h>
 #include <banman.h>
-#include <arith_uint256.h>
 #include <blockencodings.h>
 #include <blockfilter.h>
 #include <chainparams.h>
@@ -18,7 +17,6 @@
 #include <merkleblock.h>
 #include <netmessagemaker.h>
 #include <netbase.h>
-#include <policy/fees.h>
 #include <policy/policy.h>
 #include <primitives/block.h>
 #include <primitives/transaction.h>
@@ -27,10 +25,8 @@
 #include <scheduler.h>
 #include <streams.h>
 #include <tinyformat.h>
-#include <txdb.h>
 #include <index/txindex.h>
 #include <txmempool.h>
-#include <ui_interface.h>
 #include <util/system.h>
 #include <util/moneystr.h>
 #include <util/strencodings.h>

src/netaddress.cpp

@@ -18,7 +18,6 @@
 #include <array>
 #include <cstdint>
 #include <ios>
-#include <iterator>
 #include <tuple>
 
 constexpr size_t CNetAddr::V1_SERIALIZATION_SIZE;

src/netaddress.h

@@ -13,7 +13,6 @@
 #include <compat.h>
 #include <prevector.h>
 #include <serialize.h>
-#include <span.h>
 #include <tinyformat.h>
 #include <util/strencodings.h>
 #include <util/string.h>

src/netbase.cpp

@@ -5,17 +5,14 @@
 
 #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>
 
 #include <atomic>
 #include <cstdint>
-#include <limits>
 
 #ifndef WIN32
 #include <fcntl.h>

src/node/coinstats.cpp

@@ -5,9 +5,7 @@
 
 #include <node/coinstats.h>
 
-#include <amount.h>
 #include <coins.h>
-#include <chain.h>
 #include <hash.h>
 #include <serialize.h>
 #include <validation.h>

src/node/transaction.cpp

@@ -6,10 +6,10 @@
 #include <consensus/validation.h>
 #include <net.h>
 #include <txmempool.h>
+#include <util/validation.h>
 #include <validation.h>
 #include <validationinterface.h>
 #include <node/transaction.h>
-#include <util/validation.h>
 
 #include <future>
 

src/node/transaction.h

@@ -7,7 +7,6 @@
 
 #include <attributes.h>
 #include <primitives/transaction.h>
-#include <uint256.h>
 #include <util/error.h>
 
 /**

src/noui.cpp

@@ -9,12 +9,9 @@
 #include <ui_interface.h>
 #include <util/system.h>
 
-#include <cstdio>
-#include <stdint.h>
 #include <string>
 
 #include <boost/signals2/connection.hpp>
-#include <boost/signals2/signal.hpp>
 
 /** Store connections so we can disconnect them when suppressing output */
 boost::signals2::connection noui_ThreadSafeMessageBoxConn;

src/policy/fees.cpp

@@ -4,10 +4,8 @@
 // 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>
 #include <streams.h>
 #include <txmempool.h>
 #include <util/system.h>

src/policy/policy.cpp

@@ -7,11 +7,8 @@
 
 #include <policy/policy.h>
 
-#include <validation.h>
 #include <coins.h>
 #include <policy/settings.h>
-#include <tinyformat.h>
-#include <util/system.h>
 #include <util/strencodings.h>
 
 

src/policy/settings.cpp

@@ -3,8 +3,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <policy/settings.h>
-
 #include <policy/feerate.h>
 #include <policy/policy.h>
 

src/pow.cpp

@@ -7,7 +7,6 @@
 
 #include <arith_uint256.h>
 #include <chain.h>
-#include <chainparams.h>
 #include <primitives/block.h>
 #include <uint256.h>
 

src/prevector.h

@@ -12,7 +12,6 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <iterator>
 #include <type_traits>
 
 /** Implements a drop-in replacement for std::vector<T> which stores up to N

src/primitives/block.cpp

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

src/protocol.h

@@ -15,7 +15,6 @@
 #include <uint256.h>
 #include <version.h>
 
-#include <atomic>
 #include <stdint.h>
 #include <string>
 

src/psbt.h

@@ -7,6 +7,7 @@
 
 #include <attributes.h>
 #include <node/transaction.h>
+#include <optional.h>
 #include <primitives/transaction.h>
 #include <pubkey.h>
 #include <script/sign.h>

src/qt/bantablemodel.cpp

@@ -9,8 +9,6 @@
 #include <qt/guiutil.h>
 
 #include <interfaces/node.h>
-#include <sync.h>
-#include <util/time.h>
 
 #include <algorithm>
 

src/qt/coincontroldialog.cpp

@@ -21,7 +21,6 @@
 #include <wallet/coincontrol.h>
 #include <interfaces/node.h>
 #include <key_io.h>
-#include <policy/fees.h>
 #include <policy/policy.h>
 #include <validation.h> // For mempool
 #include <wallet/fees.h>

src/qt/peertablemodel.cpp

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

src/qt/qvalidatedlineedit.cpp

@@ -4,7 +4,6 @@
 
 #include <qt/qvalidatedlineedit.h>
 
-#include <qt/bitcoinaddressvalidator.h>
 #include <qt/guiutil.h>
 
 QValidatedLineEdit::QValidatedLineEdit(QWidget *parent) :

src/qt/signverifymessagedialog.cpp

@@ -15,7 +15,6 @@
 #include <util/validation.h> // For strMessageMagic
 #include <validation.h>
 
-#include <string>
 #include <vector>
 
 #include <QButtonGroup>

src/qt/splashscreen.cpp

@@ -19,7 +19,6 @@
 #include <qt/networkstyle.h>
 #include <ui_interface.h>
 #include <util/system.h>
-#include <version.h>
 
 #include <QApplication>
 #include <QCloseEvent>

src/qt/transactiondesc.cpp

@@ -19,7 +19,6 @@
 #include <interfaces/node.h>
 #include <validation.h>
 #include <script/script.h>
-#include <timedata.h>
 #include <util/system.h>
 
 #include <stdint.h>

src/qt/walletframe.cpp

@@ -11,7 +11,6 @@
 #include <qt/walletview.h>
 
 #include <cassert>
-#include <cstdio>
 
 #include <QHBoxLayout>
 #include <QLabel>

src/qt/walletmodel.h

@@ -22,7 +22,6 @@
 #include <interfaces/wallet.h>
 #include <support/allocators/secure.h>
 
-#include <map>
 #include <vector>
 
 #include <QObject>

src/qt/walletmodeltransaction.h

@@ -7,7 +7,6 @@
 
 #include <qt/walletmodel.h>
 
-#include <memory>
 #include <amount.h>
 
 #include <QObject>

src/random.cpp

@@ -16,14 +16,12 @@
 #include <util/time.h> // for GetTimeMicros()
 
 #include <stdlib.h>
-#include <chrono>
 #include <thread>
 
 #include <support/allocators/secure.h>
 
 #ifndef WIN32
 #include <fcntl.h>
-#include <sys/time.h>
 #endif
 
 #ifdef HAVE_SYS_GETRANDOM
@@ -41,13 +39,11 @@
 #include <sys/sysctl.h>
 #endif
 
-#include <mutex>
 
 #if defined(__x86_64__) || defined(__amd64__) || defined(__i386__)
 #include <cpuid.h>
 #endif
 
-#include <openssl/err.h>
 #include <openssl/rand.h>
 #include <openssl/conf.h>
 

src/rest.cpp

@@ -3,7 +3,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <attributes.h>
 #include <chain.h>
 #include <chainparams.h>
 #include <core_io.h>

src/rpc/blockchain.cpp

@@ -7,14 +7,12 @@
 #include <rpc/blockchain.h>
 
 #include <amount.h>
-#include <base58.h>
 #include <blockfilter.h>
 #include <chain.h>
 #include <chainparams.h>
 #include <coins.h>
 #include <node/coinstats.h>
 #include <core_io.h>
-#include <hash.h>
 #include <consensus/validation.h>
 #include <index/blockfilterindex.h>
 #include <key_io.h>
@@ -27,7 +25,6 @@
 #include <script/descriptor.h>
 #include <streams.h>
 #include <sync.h>
-#include <txdb.h>
 #include <txmempool.h>
 #include <util/strencodings.h>
 #include <util/validation.h>
@@ -50,7 +47,6 @@
 
 #include <boost/thread/thread.hpp> // boost::thread::interrupt
 
-#include <memory>
 #include <mutex>
 #include <condition_variable>
 #include <merkleblock.h>

src/rpc/client.cpp

@@ -5,11 +5,9 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <rpc/client.h>
-#include <rpc/protocol.h>
 #include <util/system.h>
 
 #include <set>
-#include <stdint.h>
 
 class CRPCConvertParam
 {

src/rpc/misc.cpp

@@ -4,11 +4,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <chain.h>
 #include <chainparams.h>
-#include <clientversion.h>
 #include <consensus/consensus.h>
-#include <core_io.h>
 #include <evo/mnauth.h>
 #include <httpserver.h>
 #include <key_io.h>
@@ -18,13 +15,11 @@
 #include <rpc/server.h>
 #include <rpc/util.h>
 #include <script/descriptor.h>
-#include <timedata.h>
 #include <txmempool.h>
 #include <util/system.h>
 #include <util/strencodings.h>
 #include <validation.h>
 #include <util/validation.h>
-#include <warnings.h>
 
 #include <masternode/sync.h>
 #include <spork.h>

src/rpc/net.cpp

@@ -13,7 +13,6 @@
 #include <net_processing.h>
 #include <net_permissions.h>
 #include <netbase.h>
-#include <policy/policy.h>
 #include <policy/settings.h>
 #include <rpc/protocol.h>
 #include <rpc/util.h>

src/rpc/protocol.cpp

@@ -7,11 +7,9 @@
 #include <rpc/protocol.h>
 
 #include <random.h>
-#include <tinyformat.h>
 #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

@@ -7,7 +7,6 @@
 #include <chain.h>
 #include <chainparams.h>
 #include <coins.h>
-#include <compat/byteswap.h>
 #include <consensus/validation.h>
 #include <core_io.h>
 #include <index/txindex.h>
@@ -16,7 +15,6 @@
 #include <key_io.h>
 #include <keystore.h>
 #include <merkleblock.h>
-#include <net.h>
 #include <node/transaction.h>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
@@ -25,7 +23,6 @@
 #include <rpc/server.h>
 #include <rpc/util.h>
 #include <script/script.h>
-#include <script/script_error.h>
 #include <script/sign.h>
 #include <script/standard.h>
 #include <txmempool.h>
@@ -37,11 +34,8 @@
 #include <validationinterface.h>
 
 #include <evo/specialtx.h>
-#include <evo/providertx.h>
-#include <evo/cbtx.h>
 
 #include <llmq/chainlocks.h>
-#include <llmq/commitment.h>
 #include <llmq/instantsend.h>
 
 #include <stdint.h>

src/rpc/rawtransaction_util.cpp

@@ -11,11 +11,9 @@
 #include <key_io.h>
 #include <keystore.h>
 #include <policy/policy.h>
-#include <policy/settings.h>
 #include <primitives/transaction.h>
 #include <rpc/protocol.h>
 #include <rpc/util.h>
-#include <tinyformat.h>
 #include <univalue.h>
 #include <util/strencodings.h>
 #include <validation.h>

src/rpc/server.cpp

@@ -7,13 +7,10 @@
 #include <rpc/server.h>
 
 #include <chainparams.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>
 

src/rpc/server.h

@@ -8,9 +8,7 @@
 
 #include <amount.h>
 #include <rpc/protocol.h>
-#include <uint256.h>
 
-#include <list>
 #include <map>
 #include <stdint.h>
 #include <string>

src/script/interpreter.h

@@ -11,7 +11,6 @@
 
 #include <vector>
 #include <stdint.h>
-#include <string>
 
 class CPubKey;
 class CScript;

src/script/ismine.cpp

@@ -8,7 +8,6 @@
 #include <key.h>
 #include <keystore.h>
 #include <script/script.h>
-#include <script/sign.h>
 
 
 typedef std::vector<unsigned char> valtype;

src/script/script.cpp

@@ -4,7 +4,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <script/script.h>
-#include <tinyformat.h>
 #include <util/strencodings.h>
 
 const char* GetOpName(opcodetype opcode)