From 3c5dcb036aee7052c4eb19ee26e8abd2664e4fbf Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 16 Oct 2019 17:33:48 -0400
Subject: [PATCH 1/2] Merge #16659: refactoring: Remove unused includes

084e17cebd424b8e8ced674bc810eef4e6ee5d3b Remove unused includes (practicalswift)

Pull request description:

  As requested by MarcoFalke in https://github.com/bitcoin/bitcoin/pull/16273#issuecomment-521332089:

  This PR removes unused includes.

  Please note that in contrast to #16273 I'm limiting the scope to the trivial cases of pure removals (i.e. no includes added) to make reviewing easier.

  I'm seeking "Concept ACK":s for this obviously non-urgent minor cleanup.

  Rationale:
  * Avoids unnecessary re-compiles in case of header changes.
  * Makes reasoning about code dependencies easier.
  * Reduces compile-time memory usage.
  * Reduces compilation time.
  * Warm fuzzy feeling of being lean :-)

ACKs for top commit:
  ryanofsky:
    Code review ACK 084e17cebd424b8e8ced674bc810eef4e6ee5d3b. PR only removes include lines and it still compiles. In the worst case someone might have to explicitly add an include later for something now included implicitly. But maybe some effort was taken to avoid this, and it wouldn't be a tragedy anyway.

Tree-SHA512: 89de56edc6ceea4696e9579bccff10c80080821685b9fb4e8c5ef593b6e43cf662f358788701bb09f84867693f66b2e4db035b92b522a0a775f50b7ecffd6a6d
---
 src/arith_uint256.cpp                | 2 --
 src/arith_uint256.h                  | 2 --
 src/bench/base58.cpp                 | 1 -
 src/bench/bench.h                    | 1 -
 src/bench/block_assemble.cpp         | 1 -
 src/bench/chacha20.cpp               | 1 -
 src/bench/chacha_poly_aead.cpp       | 1 -
 src/bench/duplicate_inputs.cpp       | 3 ---
 src/bench/lockedpool.cpp             | 1 -
 src/bench/mempool_eviction.cpp       | 2 --
 src/bench/poly1305.cpp               | 1 -
 src/bench/rollingbloom.cpp           | 1 -
 src/bench/rpc_mempool.cpp            | 2 --
 src/blockencodings.h                 | 1 -
 src/compressor.cpp                   | 1 -
 src/consensus/merkle.h               | 2 --
 src/consensus/params.h               | 2 --
 src/crypto/aes.cpp                   | 1 -
 src/crypto/chacha_poly_aead.cpp      | 1 -
 src/crypto/sha256.cpp                | 1 -
 src/crypto/sha256_shani.cpp          | 1 -
 src/dash-cli.cpp                     | 1 -
 src/dash-tx.cpp                      | 1 -
 src/dash-wallet.cpp                  | 2 --
 src/dashd.cpp                        | 3 +--
 src/dbwrapper.h                      | 1 -
 src/dummywallet.cpp                  | 2 --
 src/httprpc.cpp                      | 2 --
 src/httprpc.h                        | 2 --
 src/httpserver.cpp                   | 1 -
 src/httpserver.h                     | 1 -
 src/index/base.h                     | 1 -
 src/interfaces/chain.cpp             | 2 --
 src/interfaces/node.cpp              | 3 ---
 src/interfaces/wallet.cpp            | 2 --
 src/key_io.cpp                       | 1 -
 src/miner.cpp                        | 2 --
 src/net.cpp                          | 3 ---
 src/net_processing.cpp               | 1 -
 src/netaddress.h                     | 1 -
 src/node/coinstats.cpp               | 2 --
 src/node/transaction.cpp             | 3 +--
 src/node/transaction.h               | 1 -
 src/noui.cpp                         | 2 --
 src/policy/fees.cpp                  | 1 -
 src/prevector.h                      | 1 -
 src/primitives/block.cpp             | 1 -
 src/protocol.h                       | 1 -
 src/qt/bantablemodel.cpp             | 2 --
 src/qt/coincontroldialog.cpp         | 1 -
 src/qt/peertablemodel.cpp            | 2 --
 src/qt/signverifymessagedialog.cpp   | 1 -
 src/qt/splashscreen.cpp              | 1 -
 src/qt/test/paymentservertests.cpp   | 1 -
 src/qt/transactiondesc.cpp           | 1 -
 src/qt/walletframe.cpp               | 1 -
 src/qt/walletmodel.h                 | 1 -
 src/qt/walletmodeltransaction.h      | 1 -
 src/random.cpp                       | 2 --
 src/rest.cpp                         | 1 -
 src/rpc/blockchain.cpp               | 1 -
 src/rpc/client.cpp                   | 1 -
 src/rpc/net.cpp                      | 1 -
 src/rpc/rawtransaction.cpp           | 2 --
 src/rpc/server.cpp                   | 2 --
 src/rpc/server.h                     | 2 --
 src/script/interpreter.h             | 1 -
 src/script/ismine.cpp                | 1 -
 src/script/sign.h                    | 1 -
 src/script/standard.h                | 1 -
 src/serialize.h                      | 1 -
 src/streams.h                        | 2 --
 src/sync.cpp                         | 2 --
 src/test/bip32_tests.cpp             | 1 -
 src/test/compress_tests.cpp          | 1 -
 src/test/policyestimator_tests.cpp   | 1 -
 src/test/pow_tests.cpp               | 1 -
 src/test/skiplist_tests.cpp          | 1 -
 src/test/streams_tests.cpp           | 1 -
 src/test/txindex_tests.cpp           | 1 -
 src/threadinterrupt.h                | 1 -
 src/torcontrol.h                     | 1 -
 src/txdb.h                           | 1 -
 src/txmempool.h                      | 1 -
 src/ui_interface.h                   | 1 -
 src/uint256.cpp                      | 1 -
 src/uint256.h                        | 1 -
 src/util/moneystr.cpp                | 1 -
 src/util/moneystr.h                  | 1 -
 src/util/system.cpp                  | 1 -
 src/util/threadnames.cpp             | 1 -
 src/validation.cpp                   | 3 ---
 src/validation.h                     | 2 --
 src/validationinterface.cpp          | 2 --
 src/wallet/crypter.cpp               | 3 ---
 src/wallet/crypter.h                 | 1 -
 src/wallet/db.h                      | 2 --
 src/wallet/fees.cpp                  | 1 -
 src/wallet/init.cpp                  | 1 -
 src/wallet/psbtwallet.h              | 2 --
 src/wallet/rpcdump.cpp               | 1 -
 src/wallet/rpcwallet.cpp             | 2 --
 src/wallet/wallet.cpp                | 1 -
 src/wallet/walletdb.h                | 2 --
 src/wallet/wallettool.h              | 1 -
 src/warnings.h                       | 1 -
 src/zmq/zmqnotificationinterface.cpp | 1 -
 src/zmq/zmqnotificationinterface.h   | 2 --
 108 files changed, 2 insertions(+), 150 deletions(-)

diff --git a/src/arith_uint256.cpp b/src/arith_uint256.cpp
index 5273e13c81..f4cd70255a 100644
--- a/src/arith_uint256.cpp
+++ b/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)
diff --git a/src/arith_uint256.h b/src/arith_uint256.h
index 6248ac4e3f..0b3332724f 100644
--- a/src/arith_uint256.h
+++ b/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;
 
diff --git a/src/bench/base58.cpp b/src/bench/base58.cpp
index 1521982baf..8199decd38 100644
--- a/src/bench/base58.cpp
+++ b/src/bench/base58.cpp
@@ -9,7 +9,6 @@
 
 #include <array>
 #include <vector>
-#include <string>
 
 
 static void Base58Encode(benchmark::Bench& bench)
diff --git a/src/bench/bench.h b/src/bench/bench.h
index 6f0022befd..955e85a201 100644
--- a/src/bench/bench.h
+++ b/src/bench/bench.h
@@ -6,7 +6,6 @@
 #define BITCOIN_BENCH_BENCH_H
 
 #include <functional>
-#include <limits>
 #include <map>
 #include <string>
 #include <vector>
diff --git a/src/bench/block_assemble.cpp b/src/bench/block_assemble.cpp
index aa31d3e6fe..e3e50dab96 100644
--- a/src/bench/block_assemble.cpp
+++ b/src/bench/block_assemble.cpp
@@ -12,7 +12,6 @@
 #include <validation.h>
 
 
-#include <list>
 #include <vector>
 
 static void AssembleBlock(benchmark::Bench& bench)
diff --git a/src/bench/chacha20.cpp b/src/bench/chacha20.cpp
index a1b36cf250..33573a978b 100644
--- a/src/bench/chacha20.cpp
+++ b/src/bench/chacha20.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 <hash.h>
diff --git a/src/bench/chacha_poly_aead.cpp b/src/bench/chacha_poly_aead.cpp
index e6a1c56fd2..c0c44e289d 100644
--- a/src/bench/chacha_poly_aead.cpp
+++ b/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>
diff --git a/src/bench/duplicate_inputs.cpp b/src/bench/duplicate_inputs.cpp
index 7f1f4953bf..d803ac2b56 100644
--- a/src/bench/duplicate_inputs.cpp
+++ b/src/bench/duplicate_inputs.cpp
@@ -4,7 +4,6 @@
 
 #include <bench/bench.h>
 #include <chainparams.h>
-#include <coins.h>
 #include <consensus/merkle.h>
 #include <consensus/validation.h>
 #include <miner.h>
@@ -15,8 +14,6 @@
 #include <validation.h>
 #include <validationinterface.h>
 
-#include <list>
-#include <vector>
 
 
 static void DuplicateInputs(benchmark::Bench& bench)
diff --git a/src/bench/lockedpool.cpp b/src/bench/lockedpool.cpp
index 194175eece..61211c8162 100644
--- a/src/bench/lockedpool.cpp
+++ b/src/bench/lockedpool.cpp
@@ -6,7 +6,6 @@
 
 #include <support/lockedpool.h>
 
-#include <iostream>
 #include <vector>
 
 #define ASIZE 2048
diff --git a/src/bench/mempool_eviction.cpp b/src/bench/mempool_eviction.cpp
index 6be0fb0a4e..74460d54a0 100644
--- a/src/bench/mempool_eviction.cpp
+++ b/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)
 {
diff --git a/src/bench/poly1305.cpp b/src/bench/poly1305.cpp
index 8274949f0d..9745d3fcb1 100644
--- a/src/bench/poly1305.cpp
+++ b/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>
diff --git a/src/bench/rollingbloom.cpp b/src/bench/rollingbloom.cpp
index f3c0159347..541abe5a32 100644
--- a/src/bench/rollingbloom.cpp
+++ b/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>
diff --git a/src/bench/rpc_mempool.cpp b/src/bench/rpc_mempool.cpp
index 671cb7f0ae..f862421f0d 100644
--- a/src/bench/rpc_mempool.cpp
+++ b/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)
 {
diff --git a/src/blockencodings.h b/src/blockencodings.h
index 2f3a829796..748d51e068 100644
--- a/src/blockencodings.h
+++ b/src/blockencodings.h
@@ -7,7 +7,6 @@
 
 #include <primitives/block.h>
 
-#include <memory>
 
 class CTxMemPool;
 
diff --git a/src/compressor.cpp b/src/compressor.cpp
index b003a86ce7..568b182f4c 100644
--- a/src/compressor.cpp
+++ b/src/compressor.cpp
@@ -5,7 +5,6 @@
 
 #include <compressor.h>
 
-#include <hash.h>
 #include <pubkey.h>
 #include <script/standard.h>
 
diff --git a/src/consensus/merkle.h b/src/consensus/merkle.h
index e650436c83..972a345aed 100644
--- a/src/consensus/merkle.h
+++ b/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>
 
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 1416938c5e..622092f08c 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -7,8 +7,6 @@
 #define BITCOIN_CONSENSUS_PARAMS_H
 
 #include <uint256.h>
-#include <map>
-#include <string>
 #include <llmq/params.h>
 
 namespace Consensus {
diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp
index 2f26630a2a..ec19b39531 100644
--- a/src/crypto/aes.cpp
+++ b/src/crypto/aes.cpp
@@ -5,7 +5,6 @@
 #include <crypto/aes.h>
 #include <crypto/common.h>
 
-#include <assert.h>
 #include <string.h>
 
 extern "C" {
diff --git a/src/crypto/chacha_poly_aead.cpp b/src/crypto/chacha_poly_aead.cpp
index 259736cf1e..b73b22a2b8 100644
--- a/src/crypto/chacha_poly_aead.cpp
+++ b/src/crypto/chacha_poly_aead.cpp
@@ -4,7 +4,6 @@
 
 #include <crypto/chacha_poly_aead.h>
 
-#include <crypto/common.h>
 #include <crypto/poly1305.h>
 #include <support/cleanse.h>
 
diff --git a/src/crypto/sha256.cpp b/src/crypto/sha256.cpp
index ce36fa0445..06ab3e6495 100644
--- a/src/crypto/sha256.cpp
+++ b/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)
diff --git a/src/crypto/sha256_shani.cpp b/src/crypto/sha256_shani.cpp
index e561da42c5..7ea0c34796 100644
--- a/src/crypto/sha256_shani.cpp
+++ b/src/crypto/sha256_shani.cpp
@@ -11,7 +11,6 @@
 #include <stdint.h>
 #include <immintrin.h>
 
-#include <crypto/common.h>
 
 
 namespace {
diff --git a/src/dash-cli.cpp b/src/dash-cli.cpp
index b410d6c7ea..3d1ebce3a5 100644
--- a/src/dash-cli.cpp
+++ b/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>
diff --git a/src/dash-tx.cpp b/src/dash-tx.cpp
index 54ed089722..f1bbb619b7 100644
--- a/src/dash-tx.cpp
+++ b/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>
diff --git a/src/dash-wallet.cpp b/src/dash-wallet.cpp
index 697839197c..6d968303da 100644
--- a/src/dash-wallet.cpp
+++ b/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()
diff --git a/src/dashd.cpp b/src/dashd.cpp
index d621d57846..2d65209a7e 100644
--- a/src/dashd.cpp
+++ b/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>
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index 3e1f419aaf..0f53cd66c4 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -11,7 +11,6 @@
 #include <streams.h>
 #include <util/system.h>
 #include <util/strencodings.h>
-#include <version.h>
 
 #include <typeindex>
 
diff --git a/src/dummywallet.cpp b/src/dummywallet.cpp
index 3e52120005..44444b983e 100644
--- a/src/dummywallet.cpp
+++ b/src/dummywallet.cpp
@@ -6,8 +6,6 @@
 #include <util/system.h>
 #include <walletinitinterface.h>
 
-#include <stdio.h>
-
 class CWallet;
 
 namespace interfaces {
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index 600053ed6f..068207358f 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -6,11 +6,9 @@
 
 #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>
diff --git a/src/httprpc.h b/src/httprpc.h
index 06c8ac2026..be671e6aa5 100644
--- a/src/httprpc.h
+++ b/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.
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index 54a585327c..979b230e2b 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -23,7 +23,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <signal.h>
 
 #include <event2/thread.h>
 #include <event2/buffer.h>
diff --git a/src/httpserver.h b/src/httpserver.h
index d73a250885..3c38eb5241 100644
--- a/src/httpserver.h
+++ b/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;
diff --git a/src/index/base.h b/src/index/base.h
index 84cb9c6919..8e5107bee1 100644
--- a/src/index/base.h
+++ b/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;
diff --git a/src/interfaces/chain.cpp b/src/interfaces/chain.cpp
index 056ee0d3ba..af314c0a8c 100644
--- a/src/interfaces/chain.cpp
+++ b/src/interfaces/chain.cpp
@@ -15,13 +15,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>
diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp
index 5ae996d778..71a324a69c 100644
--- a/src/interfaces/node.cpp
+++ b/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;
diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp
index bb49f9bf73..1cdf341743 100644
--- a/src/interfaces/wallet.cpp
+++ b/src/interfaces/wallet.cpp
@@ -12,7 +12,6 @@
 #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>
@@ -32,7 +31,6 @@
 #include <wallet/rpcwallet.h>
 #include <wallet/load.h>
 #include <wallet/wallet.h>
-#include <wallet/walletutil.h>
 
 #include <memory>
 #include <string>
diff --git a/src/key_io.cpp b/src/key_io.cpp
index df89ccb14a..678750ecb7 100644
--- a/src/key_io.cpp
+++ b/src/key_io.cpp
@@ -7,7 +7,6 @@
 #include <base58.h>
 #include <bech32.h>
 #include <chainparams.h>
-#include <script/script.h>
 #include <util/strencodings.h>
 
 #include <boost/variant/apply_visitor.hpp>
diff --git a/src/miner.cpp b/src/miner.cpp
index c05f4ae853..e04e67bff3 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -20,7 +20,6 @@
 #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 +36,6 @@
 #include <masternode/payments.h>
 
 #include <algorithm>
-#include <queue>
 #include <utility>
 
 // Unconfirmed transactions in the memory pool often depend on other
diff --git a/src/net.cpp b/src/net.cpp
index 907db7dbe4..9d9697035a 100644
--- a/src/net.cpp
+++ b/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
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index e0d03c21c0..8dba3eb85b 100644
--- a/src/net_processing.cpp
+++ b/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>
diff --git a/src/netaddress.h b/src/netaddress.h
index a6f21c40aa..fb99475433 100644
--- a/src/netaddress.h
+++ b/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>
diff --git a/src/node/coinstats.cpp b/src/node/coinstats.cpp
index 641378d0e7..a2a9b920d6 100644
--- a/src/node/coinstats.cpp
+++ b/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>
diff --git a/src/node/transaction.cpp b/src/node/transaction.cpp
index da8b5ec53a..5305cb0908 100644
--- a/src/node/transaction.cpp
+++ b/src/node/transaction.cpp
@@ -5,11 +5,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>
 
diff --git a/src/node/transaction.h b/src/node/transaction.h
index 7404334001..fc4c62ae52 100644
--- a/src/node/transaction.h
+++ b/src/node/transaction.h
@@ -7,7 +7,6 @@
 
 #include <attributes.h>
 #include <primitives/transaction.h>
-#include <uint256.h>
 #include <util/error.h>
 
 /**
diff --git a/src/noui.cpp b/src/noui.cpp
index a196760da3..1009ef2ca4 100644
--- a/src/noui.cpp
+++ b/src/noui.cpp
@@ -9,8 +9,6 @@
 #include <ui_interface.h>
 #include <util/system.h>
 
-#include <cstdio>
-#include <stdint.h>
 #include <string>
 
 #include <boost/signals2/connection.hpp>
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index 63fb6c4837..cd5fd01c5d 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -7,7 +7,6 @@
 #include <policy/policy.h>
 
 #include <clientversion.h>
-#include <primitives/transaction.h>
 #include <streams.h>
 #include <txmempool.h>
 #include <util/system.h>
diff --git a/src/prevector.h b/src/prevector.h
index 5b9cd0dfb3..b263985b81 100644
--- a/src/prevector.h
+++ b/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
diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
index 38413aabbd..977580958c 100644
--- a/src/primitives/block.cpp
+++ b/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
 {
diff --git a/src/protocol.h b/src/protocol.h
index ca6ac5c7f6..f8bd10a523 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -15,7 +15,6 @@
 #include <uint256.h>
 #include <version.h>
 
-#include <atomic>
 #include <stdint.h>
 #include <string>
 
diff --git a/src/qt/bantablemodel.cpp b/src/qt/bantablemodel.cpp
index 93d2842dcf..d81a7543f8 100644
--- a/src/qt/bantablemodel.cpp
+++ b/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>
 
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index 74f169f978..c592c94ec7 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/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>
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
index 13c8a9e7bc..be73bd2e78 100644
--- a/src/qt/peertablemodel.cpp
+++ b/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>
 
diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp
index cfe8839fea..7015c27af9 100644
--- a/src/qt/signverifymessagedialog.cpp
+++ b/src/qt/signverifymessagedialog.cpp
@@ -15,7 +15,6 @@
 #include <util/validation.h> // For strMessageMagic
 #include <validation.h>
 
-#include <string>
 #include <vector>
 
 #include <QButtonGroup>
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
index 64610f88d4..b0dba5f36b 100644
--- a/src/qt/splashscreen.cpp
+++ b/src/qt/splashscreen.cpp
@@ -19,7 +19,6 @@
 #include <interfaces/wallet.h>
 #include <ui_interface.h>
 #include <util/system.h>
-#include <version.h>
 
 #include <QApplication>
 #include <QCloseEvent>
diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp
index a195ad5aa3..63293fc158 100644
--- a/src/qt/test/paymentservertests.cpp
+++ b/src/qt/test/paymentservertests.cpp
@@ -8,7 +8,6 @@
 #include <qt/test/paymentrequestdata.h>
 
 #include <amount.h>
-#include <chainparams.h>
 #include <interfaces/node.h>
 #include <random.h>
 #include <script/script.h>
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index c5a987d6e1..bb5ae999b4 100644
--- a/src/qt/transactiondesc.cpp
+++ b/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>
diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
index cac55382df..2b8263105c 100644
--- a/src/qt/walletframe.cpp
+++ b/src/qt/walletframe.cpp
@@ -11,7 +11,6 @@
 #include <qt/walletview.h>
 
 #include <cassert>
-#include <cstdio>
 
 #include <QHBoxLayout>
 #include <QLabel>
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index 37e7e7f4b4..df08e6979a 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -22,7 +22,6 @@
 #include <interfaces/wallet.h>
 #include <support/allocators/secure.h>
 
-#include <map>
 #include <vector>
 
 #include <QObject>
diff --git a/src/qt/walletmodeltransaction.h b/src/qt/walletmodeltransaction.h
index 2f01051cc3..0e4e23ecdd 100644
--- a/src/qt/walletmodeltransaction.h
+++ b/src/qt/walletmodeltransaction.h
@@ -7,7 +7,6 @@
 
 #include <qt/walletmodel.h>
 
-#include <memory>
 #include <amount.h>
 
 #include <QObject>
diff --git a/src/random.cpp b/src/random.cpp
index f5139992e3..06a52b5243 100644
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -16,7 +16,6 @@
 #include <util/time.h> // for GetTimeMicros()
 
 #include <stdlib.h>
-#include <chrono>
 #include <thread>
 
 #include <support/allocators/secure.h>
@@ -41,7 +40,6 @@
 #include <sys/sysctl.h>
 #endif
 
-#include <mutex>
 
 #if defined(__x86_64__) || defined(__amd64__) || defined(__i386__)
 #include <cpuid.h>
diff --git a/src/rest.cpp b/src/rest.cpp
index 68cbf8d190..c985319f81 100644
--- a/src/rest.cpp
+++ b/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>
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 3185917107..b296f42102 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -34,7 +34,6 @@
 #include <util/system.h>
 #include <validation.h>
 #include <validationinterface.h>
-#include <versionbitsinfo.h>
 #include <warnings.h>
 
 #include <evo/specialtx.h>
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index af5bea8bee..486b0afcc5 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -5,7 +5,6 @@
 // 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>
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index e31be9bb10..7eaf05c9ca 100644
--- a/src/rpc/net.cpp
+++ b/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>
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 55ab4845d5..49fa44b329 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/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>
@@ -25,7 +24,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>
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 26ce7f5be4..2f8f565d95 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -7,8 +7,6 @@
 #include <rpc/server.h>
 
 #include <chainparams.h>
-#include <fs.h>
-#include <key_io.h>
 #include <random.h>
 #include <rpc/util.h>
 #include <shutdown.h>
diff --git a/src/rpc/server.h b/src/rpc/server.h
index 421c3eb40f..2b1f99d495 100644
--- a/src/rpc/server.h
+++ b/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>
diff --git a/src/script/interpreter.h b/src/script/interpreter.h
index dcd98b9a56..e0977f4a16 100644
--- a/src/script/interpreter.h
+++ b/src/script/interpreter.h
@@ -11,7 +11,6 @@
 
 #include <vector>
 #include <stdint.h>
-#include <string>
 
 class CPubKey;
 class CScript;
diff --git a/src/script/ismine.cpp b/src/script/ismine.cpp
index 3d18431d4f..04739e7cbb 100644
--- a/src/script/ismine.cpp
+++ b/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;
diff --git a/src/script/sign.h b/src/script/sign.h
index 8a696ac59f..2cee6a063b 100644
--- a/src/script/sign.h
+++ b/src/script/sign.h
@@ -6,7 +6,6 @@
 #ifndef BITCOIN_SCRIPT_SIGN_H
 #define BITCOIN_SCRIPT_SIGN_H
 
-#include <boost/optional.hpp>
 #include <hash.h>
 #include <pubkey.h>
 #include <script/interpreter.h>
diff --git a/src/script/standard.h b/src/script/standard.h
index 5060da2c16..5eba8915b5 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -11,7 +11,6 @@
 
 #include <boost/variant.hpp>
 
-#include <stdint.h>
 
 static const bool DEFAULT_ACCEPT_DATACARRIER = true;
 
diff --git a/src/serialize.h b/src/serialize.h
index 719c7890ee..c99a4c2313 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -9,7 +9,6 @@
 #include <compat/endian.h>
 
 #include <algorithm>
-#include <assert.h>
 #include <atomic>
 #include <ios>
 #include <limits>
diff --git a/src/streams.h b/src/streams.h
index 319e1f50d7..fa117f9d90 100644
--- a/src/streams.h
+++ b/src/streams.h
@@ -13,8 +13,6 @@
 #include <assert.h>
 #include <ios>
 #include <limits>
-#include <map>
-#include <set>
 #include <stdint.h>
 #include <stdio.h>
 #include <string>
diff --git a/src/sync.cpp b/src/sync.cpp
index fe5b0a267c..37b846ccf2 100644
--- a/src/sync.cpp
+++ b/src/sync.cpp
@@ -13,10 +13,8 @@
 #include <util/strencodings.h>
 #include <util/threadnames.h>
 
-#include <stdio.h>
 
 #include <map>
-#include <memory>
 #include <set>
 #include <system_error>
 #include <thread>
diff --git a/src/test/bip32_tests.cpp b/src/test/bip32_tests.cpp
index 5e909ac294..a0519484b7 100644
--- a/src/test/bip32_tests.cpp
+++ b/src/test/bip32_tests.cpp
@@ -8,7 +8,6 @@
 #include <key.h>
 #include <key_io.h>
 #include <streams.h>
-#include <util/system.h>
 #include <util/strencodings.h>
 #include <test/setup_common.h>
 
diff --git a/src/test/compress_tests.cpp b/src/test/compress_tests.cpp
index deb5c6177c..d1e91fbc4b 100644
--- a/src/test/compress_tests.cpp
+++ b/src/test/compress_tests.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <compressor.h>
-#include <util/system.h>
 #include <test/setup_common.h>
 #include <script/standard.h>
 
diff --git a/src/test/policyestimator_tests.cpp b/src/test/policyestimator_tests.cpp
index 25cfd05948..c78b62f7a4 100644
--- a/src/test/policyestimator_tests.cpp
+++ b/src/test/policyestimator_tests.cpp
@@ -6,7 +6,6 @@
 #include <policy/policy.h>
 #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
index 7373928430..0dbdeaa8b5 100644
--- a/src/test/pow_tests.cpp
+++ b/src/test/pow_tests.cpp
@@ -5,7 +5,6 @@
 #include <chain.h>
 #include <chainparams.h>
 #include <pow.h>
-#include <util/system.h>
 #include <test/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/skiplist_tests.cpp b/src/test/skiplist_tests.cpp
index ca9ff38f4a..dd46af66ea 100644
--- a/src/test/skiplist_tests.cpp
+++ b/src/test/skiplist_tests.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <chain.h>
-#include <util/system.h>
 #include <test/setup_common.h>
 
 #include <vector>
diff --git a/src/test/streams_tests.cpp b/src/test/streams_tests.cpp
index 11417a7188..e67fd95fd6 100644
--- a/src/test/streams_tests.cpp
+++ b/src/test/streams_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 <random.h>
 #include <streams.h>
 #include <test/setup_common.h>
 
diff --git a/src/test/txindex_tests.cpp b/src/test/txindex_tests.cpp
index 8ae1d6f828..1ce9d5f171 100644
--- a/src/test/txindex_tests.cpp
+++ b/src/test/txindex_tests.cpp
@@ -6,7 +6,6 @@
 #include <index/txindex.h>
 #include <script/standard.h>
 #include <test/setup_common.h>
-#include <util/system.h>
 #include <util/time.h>
 #include <validation.h>
 
diff --git a/src/threadinterrupt.h b/src/threadinterrupt.h
index 1f2a1d599b..783780e73d 100644
--- a/src/threadinterrupt.h
+++ b/src/threadinterrupt.h
@@ -10,7 +10,6 @@
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
-#include <mutex>
 
 /*
     A helper class for interruptible sleeps. Calling operator() will interrupt
diff --git a/src/torcontrol.h b/src/torcontrol.h
index f4bfa24c03..4bf3aac2f0 100644
--- a/src/torcontrol.h
+++ b/src/torcontrol.h
@@ -8,7 +8,6 @@
 #ifndef BITCOIN_TORCONTROL_H
 #define BITCOIN_TORCONTROL_H
 
-#include <scheduler.h>
 
 extern const std::string DEFAULT_TOR_CONTROL;
 static const bool DEFAULT_LISTEN_ONION = true;
diff --git a/src/txdb.h b/src/txdb.h
index 25d4092087..0ea5f15044 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -12,7 +12,6 @@
 #include <primitives/block.h>
 #include <spentindex.h>
 
-#include <map>
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/src/txmempool.h b/src/txmempool.h
index abeb8f48d2..b49fc69703 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -6,7 +6,6 @@
 #ifndef BITCOIN_TXMEMPOOL_H
 #define BITCOIN_TXMEMPOOL_H
 
-#include <memory>
 #include <set>
 #include <map>
 #include <vector>
diff --git a/src/ui_interface.h b/src/ui_interface.h
index cdaccef304..e0afe235d3 100644
--- a/src/ui_interface.h
+++ b/src/ui_interface.h
@@ -8,7 +8,6 @@
 
 #include <functional>
 #include <memory>
-#include <stdint.h>
 #include <string>
 
 class CBlockIndex;
diff --git a/src/uint256.cpp b/src/uint256.cpp
index 2872901a65..13bbfb63d2 100644
--- a/src/uint256.cpp
+++ b/src/uint256.cpp
@@ -7,7 +7,6 @@
 
 #include <util/strencodings.h>
 
-#include <stdio.h>
 #include <string.h>
 
 template <unsigned int BITS>
diff --git a/src/uint256.h b/src/uint256.h
index e533bcf79e..d964f6262e 100644
--- a/src/uint256.h
+++ b/src/uint256.h
@@ -9,7 +9,6 @@
 
 #include <assert.h>
 #include <cstring>
-#include <stdexcept>
 #include <stdint.h>
 #include <string>
 #include <vector>
diff --git a/src/util/moneystr.cpp b/src/util/moneystr.cpp
index 8cf5ed7ee9..6c7ae6d024 100644
--- a/src/util/moneystr.cpp
+++ b/src/util/moneystr.cpp
@@ -5,7 +5,6 @@
 
 #include <util/moneystr.h>
 
-#include <primitives/transaction.h>
 #include <tinyformat.h>
 #include <util/strencodings.h>
 #include <util/string.h>
diff --git a/src/util/moneystr.h b/src/util/moneystr.h
index ee78217baa..2452345719 100644
--- a/src/util/moneystr.h
+++ b/src/util/moneystr.h
@@ -12,7 +12,6 @@
 #include <amount.h>
 #include <attributes.h>
 
-#include <cstdint>
 #include <string>
 
 /* Do not use these functions to represent or parse monetary amounts to or from
diff --git a/src/util/system.cpp b/src/util/system.cpp
index 79d26815fa..d73b9b0bda 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -15,7 +15,6 @@
 #include <util/getuniquepath.h>
 #include <util/strencodings.h>
 
-#include <stdarg.h>
 
 #if (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__))
 #include <pthread.h>
diff --git a/src/util/threadnames.cpp b/src/util/threadnames.cpp
index 11f68e2c19..873b9128b3 100644
--- a/src/util/threadnames.cpp
+++ b/src/util/threadnames.cpp
@@ -6,7 +6,6 @@
 #include <config/dash-config.h>
 #endif
 
-#include <atomic>
 #include <thread>
 
 #if (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__))
diff --git a/src/validation.cpp b/src/validation.cpp
index 1d5f35dcae..c24e294410 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -30,7 +30,6 @@
 #include <reverse_iterator.h>
 #include <script/script.h>
 #include <script/sigcache.h>
-#include <script/standard.h>
 #include <shutdown.h>
 #include <timedata.h>
 #include <tinyformat.h>
@@ -57,8 +56,6 @@
 
 #include <statsd_client.h>
 
-#include <future>
-#include <sstream>
 #include <string>
 
 #include <boost/algorithm/string/replace.hpp>
diff --git a/src/validation.h b/src/validation.h
index 949b07c953..17344d86a3 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -25,12 +25,10 @@
 
 #include <algorithm>
 #include <atomic>
-#include <exception>
 #include <map>
 #include <memory>
 #include <set>
 #include <stdint.h>
-#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
index 2340c468b1..6a5f01c085 100644
--- a/src/validationinterface.cpp
+++ b/src/validationinterface.cpp
@@ -11,8 +11,6 @@
 #include <util/system.h>
 #include <validation.h>
 
-#include <list>
-#include <atomic>
 #include <future>
 
 #include <boost/signals2/signal.hpp>
diff --git a/src/wallet/crypter.cpp b/src/wallet/crypter.cpp
index 7d2f9780cc..b3c0c8058a 100644
--- a/src/wallet/crypter.cpp
+++ b/src/wallet/crypter.cpp
@@ -6,11 +6,8 @@
 
 #include <crypto/aes.h>
 #include <crypto/sha512.h>
-#include <script/script.h>
-#include <script/standard.h>
 #include <util/system.h>
 
-#include <string>
 #include <vector>
 
 int CCrypter::BytesToKeySHA512AES(const std::vector<unsigned char>& chSalt, const SecureString& strKeyData, int count, unsigned char *key,unsigned char *iv) const
diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h
index aac08a379a..57d3f2fe53 100644
--- a/src/wallet/crypter.h
+++ b/src/wallet/crypter.h
@@ -9,7 +9,6 @@
 #include <serialize.h>
 #include <support/allocators/secure.h>
 
-#include <atomic>
 
 const unsigned int WALLET_CRYPTO_KEY_SIZE = 32;
 const unsigned int WALLET_CRYPTO_SALT_SIZE = 8;
diff --git a/src/wallet/db.h b/src/wallet/db.h
index 8a8b8d4867..6da950dd7f 100644
--- a/src/wallet/db.h
+++ b/src/wallet/db.h
@@ -10,9 +10,7 @@
 #include <fs.h>
 #include <serialize.h>
 #include <streams.h>
-#include <sync.h>
 #include <util/system.h>
-#include <version.h>
 
 #include <atomic>
 #include <map>
diff --git a/src/wallet/fees.cpp b/src/wallet/fees.cpp
index 8ef9ee28f5..b349938ff8 100644
--- a/src/wallet/fees.cpp
+++ b/src/wallet/fees.cpp
@@ -7,7 +7,6 @@
 
 #include <policy/policy.h>
 #include <policy/settings.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
index 8e7fbe7287..6ae08dc8f3 100644
--- a/src/wallet/init.cpp
+++ b/src/wallet/init.cpp
@@ -15,7 +15,6 @@
 #include <walletinitinterface.h>
 #include <wallet/rpcwallet.h>
 #include <wallet/wallet.h>
-#include <wallet/walletutil.h>
 
 #include <coinjoin/client.h>
 #include <coinjoin/options.h>
diff --git a/src/wallet/psbtwallet.h b/src/wallet/psbtwallet.h
index fbbfe4a01d..b20b15d05e 100644
--- a/src/wallet/psbtwallet.h
+++ b/src/wallet/psbtwallet.h
@@ -5,9 +5,7 @@
 #ifndef BITCOIN_WALLET_PSBTWALLET_H
 #define BITCOIN_WALLET_PSBTWALLET_H
 
-#include <node/transaction.h>
 #include <psbt.h>
-#include <primitives/transaction.h>
 #include <wallet/wallet.h>
 
 /**
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 8288136282..d0da697160 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -8,7 +8,6 @@
 #include <interfaces/chain.h>
 #include <key_io.h>
 #include <merkleblock.h>
-#include <rpc/server.h>
 #include <rpc/util.h>
 #include <script/descriptor.h>
 #include <script/script.h>
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 41fddaa13f..ff007dffbe 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -14,7 +14,6 @@
 #include <interfaces/chain.h>
 #include <keepass.h>
 #include <net.h>
-#include <node/transaction.h>
 #include <policy/feerate.h>
 #include <policy/fees.h>
 #include <rpc/mining.h>
@@ -47,7 +46,6 @@
 
 #include <univalue.h>
 
-#include <functional>
 
 static const std::string WALLET_ENDPOINT_BASE = "/wallet/";
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 30f1f38031..5e35249b49 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -50,7 +50,6 @@
 #include <llmq/chainlocks.h>
 
 #include <assert.h>
-#include <future>
 
 #include <boost/algorithm/string/replace.hpp>
 
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index ee9d1b4786..776834854c 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -11,10 +11,8 @@
 #include <hdchain.h>
 #include <key.h>
 
-#include <list>
 #include <stdint.h>
 #include <string>
-#include <utility>
 #include <vector>
 
 /**
diff --git a/src/wallet/wallettool.h b/src/wallet/wallettool.h
index 5b06fd1792..62c686893a 100644
--- a/src/wallet/wallettool.h
+++ b/src/wallet/wallettool.h
@@ -5,7 +5,6 @@
 #ifndef BITCOIN_WALLET_WALLETTOOL_H
 #define BITCOIN_WALLET_WALLETTOOL_H
 
-#include <script/ismine.h>
 #include <wallet/wallet.h>
 
 namespace WalletTool {
diff --git a/src/warnings.h b/src/warnings.h
index 8fe1fdeb6f..5b2a18ee47 100644
--- a/src/warnings.h
+++ b/src/warnings.h
@@ -6,7 +6,6 @@
 #ifndef BITCOIN_WARNINGS_H
 #define BITCOIN_WARNINGS_H
 
-#include <stdlib.h>
 #include <string>
 
 void SetMiscWarning(const std::string& strWarning);
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
index 9a2808dad0..e4a93d37c2 100644
--- a/src/zmq/zmqnotificationinterface.cpp
+++ b/src/zmq/zmqnotificationinterface.cpp
@@ -8,7 +8,6 @@
 
 #include <zmq.h>
 
-#include <version.h>
 #include <validation.h>
 #include <streams.h>
 #include <util/system.h>
diff --git a/src/zmq/zmqnotificationinterface.h b/src/zmq/zmqnotificationinterface.h
index 14062d81e1..935ac9992c 100644
--- a/src/zmq/zmqnotificationinterface.h
+++ b/src/zmq/zmqnotificationinterface.h
@@ -6,8 +6,6 @@
 #define BITCOIN_ZMQ_ZMQNOTIFICATIONINTERFACE_H
 
 #include <validationinterface.h>
-#include <string>
-#include <map>
 #include <list>
 #include <memory>
 

From f04cf7bf47eb52786d81e4b6197c1abf01c5179b Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Sun, 12 Dec 2021 17:38:01 -0500
Subject: [PATCH 2/2] 16659 continuation

Signed-off-by: pasta <pasta@dashboost.org>
---
 src/batchedlogger.cpp                    | 1 -
 src/bench/base58.cpp                     | 1 -
 src/bench/bech32.cpp                     | 1 -
 src/bench/bench.cpp                      | 2 --
 src/bench/bench_dash.cpp                 | 5 -----
 src/bench/block_assemble.cpp             | 1 -
 src/bench/chacha20.cpp                   | 1 -
 src/bench/checkqueue.cpp                 | 1 -
 src/bench/duplicate_inputs.cpp           | 3 ---
 src/bench/examples.cpp                   | 1 -
 src/bench/wallet_balance.cpp             | 1 -
 src/bloom.cpp                            | 3 ---
 src/consensus/params.h                   | 2 ++
 src/consensus/tx_verify.cpp              | 1 -
 src/core_read.cpp                        | 1 -
 src/core_write.cpp                       | 2 --
 src/crypto/blake.c                       | 1 -
 src/crypto/bmw.c                         | 1 -
 src/crypto/chacha_poly_aead.cpp          | 1 -
 src/crypto/cubehash.c                    | 1 -
 src/crypto/echo.c                        | 1 -
 src/crypto/luffa.c                       | 1 -
 src/crypto/sha3.cpp                      | 1 -
 src/crypto/simd.c                        | 1 -
 src/httprpc.cpp                          | 1 -
 src/httpserver.cpp                       | 5 -----
 src/interfaces/wallet.cpp                | 4 ----
 src/key_io.cpp                           | 2 --
 src/llmq/dkgsessionhandler.cpp           | 1 -
 src/llmq/dkgsessionmgr.cpp               | 1 -
 src/logging.cpp                          | 2 --
 src/masternode/node.cpp                  | 2 --
 src/miner.cpp                            | 3 ---
 src/net_processing.cpp                   | 3 ---
 src/netaddress.cpp                       | 1 -
 src/netbase.cpp                          | 3 ---
 src/node/transaction.cpp                 | 1 +
 src/noui.cpp                             | 1 -
 src/policy/fees.cpp                      | 1 -
 src/policy/policy.cpp                    | 3 ---
 src/policy/settings.cpp                  | 2 --
 src/pow.cpp                              | 1 -
 src/psbt.h                               | 1 +
 src/qt/qvalidatedlineedit.cpp            | 1 -
 src/qt/test/paymentservertests.cpp       | 1 +
 src/random.cpp                           | 2 --
 src/rpc/blockchain.cpp                   | 5 +----
 src/rpc/client.cpp                       | 1 -
 src/rpc/misc.cpp                         | 5 -----
 src/rpc/protocol.cpp                     | 2 --
 src/rpc/rawtransaction.cpp               | 4 ----
 src/rpc/rawtransaction_util.cpp          | 2 --
 src/rpc/server.cpp                       | 1 -
 src/script/script.cpp                    | 1 -
 src/script/sigcache.cpp                  | 2 --
 src/script/standard.cpp                  | 1 -
 src/test/addrman_tests.cpp               | 1 -
 src/test/allocator_tests.cpp             | 1 -
 src/test/bip39_tests.cpp                 | 1 -
 src/test/bloom_tests.cpp                 | 2 --
 src/test/checkdatasig_tests.cpp          | 1 -
 src/test/checkqueue_tests.cpp            | 1 -
 src/test/coins_tests.cpp                 | 2 --
 src/test/denialofservice_tests.cpp       | 1 -
 src/test/fuzz/tx_out.cpp                 | 1 -
 src/test/governance_validators_tests.cpp | 2 --
 src/test/miner_tests.cpp                 | 3 ---
 src/test/random_tests.cpp                | 1 -
 src/test/rpc_tests.cpp                   | 2 --
 src/test/script_p2sh_tests.cpp           | 1 -
 src/test/script_tests.cpp                | 1 -
 src/test/scriptnum_tests.cpp             | 1 -
 src/test/sighash_tests.cpp               | 3 ---
 src/test/sigopcount_tests.cpp            | 2 --
 src/test/torcontrol_tests.cpp            | 1 -
 src/test/txindex_tests.cpp               | 1 -
 src/test/txvalidationcache_tests.cpp     | 2 --
 src/test/util.cpp                        | 2 --
 src/test/validation_tests.cpp            | 1 -
 src/util/asmap.cpp                       | 1 -
 src/validation.cpp                       | 4 +---
 src/validationinterface.cpp              | 1 -
 src/wallet/db.cpp                        | 1 -
 src/wallet/fees.cpp                      | 1 -
 src/wallet/init.cpp                      | 3 ---
 src/wallet/rpcdump.cpp                   | 2 +-
 src/wallet/rpcwallet.cpp                 | 2 --
 src/wallet/test/init_tests.cpp           | 3 ---
 src/wallet/test/psbt_wallet_tests.cpp    | 1 -
 src/zmq/zmqpublishnotifier.cpp           | 2 --
 test/lint/lint-circular-dependencies.sh  | 8 +++-----
 91 files changed, 11 insertions(+), 153 deletions(-)

diff --git a/src/batchedlogger.cpp b/src/batchedlogger.cpp
index cf07b87222..aa24c03ce4 100644
--- a/src/batchedlogger.cpp
+++ b/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)
diff --git a/src/bench/base58.cpp b/src/bench/base58.cpp
index 8199decd38..6d283cfd7a 100644
--- a/src/bench/base58.cpp
+++ b/src/bench/base58.cpp
@@ -4,7 +4,6 @@
 
 #include <bench/bench.h>
 
-#include <validation.h>
 #include <base58.h>
 
 #include <array>
diff --git a/src/bench/bech32.cpp b/src/bench/bech32.cpp
index 556d8bdfe2..d2b329032c 100644
--- a/src/bench/bech32.cpp
+++ b/src/bench/bech32.cpp
@@ -4,7 +4,6 @@
 
 #include <bench/bench.h>
 
-#include <validation.h>
 #include <bech32.h>
 #include <util/strencodings.h>
 
diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
index 85fb14220a..fd9fd25ce6 100644
--- a/src/bench/bench.cpp
+++ b/src/bench/bench.cpp
@@ -10,9 +10,7 @@
 
 #include <algorithm>
 #include <assert.h>
-#include <iomanip>
 #include <iostream>
-#include <numeric>
 #include <regex>
 
 namespace {
diff --git a/src/bench/bench_dash.cpp b/src/bench/bench_dash.cpp
index 1a342c90cb..3c266c6f3b 100644
--- a/src/bench/bench_dash.cpp
+++ b/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 = ".*";
diff --git a/src/bench/block_assemble.cpp b/src/bench/block_assemble.cpp
index e3e50dab96..268c3136c2 100644
--- a/src/bench/block_assemble.cpp
+++ b/src/bench/block_assemble.cpp
@@ -5,7 +5,6 @@
 #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>
diff --git a/src/bench/chacha20.cpp b/src/bench/chacha20.cpp
index 33573a978b..913e0f8d57 100644
--- a/src/bench/chacha20.cpp
+++ b/src/bench/chacha20.cpp
@@ -4,7 +4,6 @@
 
 
 #include <bench/bench.h>
-#include <hash.h>
 #include <crypto/chacha20.h>
 
 /* Number of bytes to process per iteration */
diff --git a/src/bench/checkqueue.cpp b/src/bench/checkqueue.cpp
index 97f799fa9d..43308d24e9 100644
--- a/src/bench/checkqueue.cpp
+++ b/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>
diff --git a/src/bench/duplicate_inputs.cpp b/src/bench/duplicate_inputs.cpp
index d803ac2b56..995d4d3260 100644
--- a/src/bench/duplicate_inputs.cpp
+++ b/src/bench/duplicate_inputs.cpp
@@ -6,13 +6,10 @@
 #include <chainparams.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>
 
 
 
diff --git a/src/bench/examples.cpp b/src/bench/examples.cpp
index f167f19c50..9a990d722f 100644
--- a/src/bench/examples.cpp
+++ b/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>
diff --git a/src/bench/wallet_balance.cpp b/src/bench/wallet_balance.cpp
index 9822956a17..edb790f735 100644
--- a/src/bench/wallet_balance.cpp
+++ b/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>
diff --git a/src/bloom.cpp b/src/bloom.cpp
index 8025b5d0b3..b409b007b7 100644
--- a/src/bloom.cpp
+++ b/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
 
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 622092f08c..65a9837cc2 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -9,6 +9,8 @@
 #include <uint256.h>
 #include <llmq/params.h>
 
+#include <map>
+
 namespace Consensus {
 
 enum DeploymentPos
diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp
index 16bc47b767..23e29f5aee 100644
--- a/src/consensus/tx_verify.cpp
+++ b/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)
 {
diff --git a/src/core_read.cpp b/src/core_read.cpp
index 9debaa40dd..0f1b899d39 100644
--- a/src/core_read.cpp
+++ b/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>
 
diff --git a/src/core_write.cpp b/src/core_write.cpp
index 8313c911ad..e8580f29dc 100644
--- a/src/core_write.cpp
+++ b/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>
 
diff --git a/src/crypto/blake.c b/src/crypto/blake.c
index 0650b9cf21..5aaef2e341 100644
--- a/src/crypto/blake.c
+++ b/src/crypto/blake.c
@@ -32,7 +32,6 @@
 
 #include <stddef.h>
 #include <string.h>
-#include <limits.h>
 
 #include "sph_blake.h"
 
diff --git a/src/crypto/bmw.c b/src/crypto/bmw.c
index b89a881e80..884203787b 100644
--- a/src/crypto/bmw.c
+++ b/src/crypto/bmw.c
@@ -32,7 +32,6 @@
 
 #include <stddef.h>
 #include <string.h>
-#include <limits.h>
 
 #ifdef __cplusplus
 extern "C"{
diff --git a/src/crypto/chacha_poly_aead.cpp b/src/crypto/chacha_poly_aead.cpp
index b73b22a2b8..cd2d7b1de9 100644
--- a/src/crypto/chacha_poly_aead.cpp
+++ b/src/crypto/chacha_poly_aead.cpp
@@ -10,7 +10,6 @@
 #include <assert.h>
 #include <string.h>
 
-#include <cstdio>
 #include <limits>
 
 #ifndef HAVE_TIMINGSAFE_BCMP
diff --git a/src/crypto/cubehash.c b/src/crypto/cubehash.c
index 9e71cf388c..bf45404dd2 100644
--- a/src/crypto/cubehash.c
+++ b/src/crypto/cubehash.c
@@ -32,7 +32,6 @@
 
 #include <stddef.h>
 #include <string.h>
-#include <limits.h>
 
 #include "sph_cubehash.h"
 #ifdef __cplusplus
diff --git a/src/crypto/echo.c b/src/crypto/echo.c
index 3adf47f452..95ec4ec3f6 100644
--- a/src/crypto/echo.c
+++ b/src/crypto/echo.c
@@ -32,7 +32,6 @@
 
 #include <stddef.h>
 #include <string.h>
-#include <limits.h>
 
 #include "sph_echo.h"
 
diff --git a/src/crypto/luffa.c b/src/crypto/luffa.c
index 471651157f..1aed8ec272 100644
--- a/src/crypto/luffa.c
+++ b/src/crypto/luffa.c
@@ -32,7 +32,6 @@
 
 #include <stddef.h>
 #include <string.h>
-#include <limits.h>
 
 #include "sph_luffa.h"
 
diff --git a/src/crypto/sha3.cpp b/src/crypto/sha3.cpp
index 9c0c42fa77..b3fc7f330c 100644
--- a/src/crypto/sha3.cpp
+++ b/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>
diff --git a/src/crypto/simd.c b/src/crypto/simd.c
index f7fb8a7193..f8b5282be3 100644
--- a/src/crypto/simd.c
+++ b/src/crypto/simd.c
@@ -32,7 +32,6 @@
 
 #include <stddef.h>
 #include <string.h>
-#include <limits.h>
 
 #include "sph_simd.h"
 
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index 068207358f..4572ce99bc 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -14,7 +14,6 @@
 #include <ui_interface.h>
 #include <walletinitinterface.h>
 #include <crypto/hmac_sha256.h>
-#include <stdio.h>
 
 #include <memory>
 
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index 979b230e2b..1c63c33fd5 100644
--- a/src/httpserver.cpp
+++ b/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,13 +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 <event2/thread.h>
 #include <event2/buffer.h>
@@ -40,7 +36,6 @@
 #endif
 
 #include <thread>
-#include <mutex>
 #include <condition_variable>
 
 /** Maximum size of http request (request line + headers) */
diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp
index 1cdf341743..1b918d79a9 100644
--- a/src/interfaces/wallet.cpp
+++ b/src/interfaces/wallet.cpp
@@ -5,15 +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/fees.h>
-#include <policy/policy.h>
 #include <primitives/transaction.h>
 #include <rpc/server.h>
 #include <scheduler.h>
@@ -21,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>
diff --git a/src/key_io.cpp b/src/key_io.cpp
index 678750ecb7..16e89b4315 100644
--- a/src/key_io.cpp
+++ b/src/key_io.cpp
@@ -7,14 +7,12 @@
 #include <base58.h>
 #include <bech32.h>
 #include <chainparams.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
 {
diff --git a/src/llmq/dkgsessionhandler.cpp b/src/llmq/dkgsessionhandler.cpp
index d0af4e6225..1a79f3eaf2 100644
--- a/src/llmq/dkgsessionhandler.cpp
+++ b/src/llmq/dkgsessionhandler.cpp
@@ -15,7 +15,6 @@
 #include <masternode/node.h>
 #include <chainparams.h>
 #include <net_processing.h>
-#include <spork.h>
 
 namespace llmq
 {
diff --git a/src/llmq/dkgsessionmgr.cpp b/src/llmq/dkgsessionmgr.cpp
index 1d38a207dc..c296366fea 100644
--- a/src/llmq/dkgsessionmgr.cpp
+++ b/src/llmq/dkgsessionmgr.cpp
@@ -11,7 +11,6 @@
 #include <chainparams.h>
 #include <net_processing.h>
 #include <spork.h>
-#include <validation.h>
 
 namespace llmq
 {
diff --git a/src/logging.cpp b/src/logging.cpp
index 2ef62b32be..87c64a6d74 100644
--- a/src/logging.cpp
+++ b/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()
diff --git a/src/masternode/node.cpp b/src/masternode/node.cpp
index 81226adcae..5283ec9412 100644
--- a/src/masternode/node.cpp
+++ b/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);
diff --git a/src/miner.cpp b/src/miner.cpp
index e04e67bff3..51eb2334a5 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -9,13 +9,10 @@
 #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>
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 8dba3eb85b..0a93b80d2f 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -17,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>
@@ -26,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>
diff --git a/src/netaddress.cpp b/src/netaddress.cpp
index 6e353c08e4..e0dce09fcc 100644
--- a/src/netaddress.cpp
+++ b/src/netaddress.cpp
@@ -18,7 +18,6 @@
 #include <array>
 #include <cstdint>
 #include <ios>
-#include <iterator>
 #include <tuple>
 
 constexpr size_t CNetAddr::V1_SERIALIZATION_SIZE;
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 394c588065..cacc1eab06 100644
--- a/src/netbase.cpp
+++ b/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>
diff --git a/src/node/transaction.cpp b/src/node/transaction.cpp
index 5305cb0908..b53a1394c2 100644
--- a/src/node/transaction.cpp
+++ b/src/node/transaction.cpp
@@ -5,6 +5,7 @@
 
 #include <consensus/validation.h>
 #include <net.h>
+#include <txmempool.h>
 #include <util/validation.h>
 #include <validation.h>
 #include <validationinterface.h>
diff --git a/src/noui.cpp b/src/noui.cpp
index 1009ef2ca4..8f06a76051 100644
--- a/src/noui.cpp
+++ b/src/noui.cpp
@@ -12,7 +12,6 @@
 #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;
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index cd5fd01c5d..46b10d7cb8 100644
--- a/src/policy/fees.cpp
+++ b/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 <streams.h>
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index dbde16646a..d5e0d60296 100644
--- a/src/policy/policy.cpp
+++ b/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>
 
 
diff --git a/src/policy/settings.cpp b/src/policy/settings.cpp
index e8e1559407..8044af2881 100644
--- a/src/policy/settings.cpp
+++ b/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>
 
diff --git a/src/pow.cpp b/src/pow.cpp
index 6f6079c110..9135ebb42a 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -7,7 +7,6 @@
 
 #include <arith_uint256.h>
 #include <chain.h>
-#include <chainparams.h>
 #include <primitives/block.h>
 #include <uint256.h>
 
diff --git a/src/psbt.h b/src/psbt.h
index b6d1859ed7..5ec806d14e 100644
--- a/src/psbt.h
+++ b/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>
diff --git a/src/qt/qvalidatedlineedit.cpp b/src/qt/qvalidatedlineedit.cpp
index 43bfc5d7ab..d19a88653c 100644
--- a/src/qt/qvalidatedlineedit.cpp
+++ b/src/qt/qvalidatedlineedit.cpp
@@ -4,7 +4,6 @@
 
 #include <qt/qvalidatedlineedit.h>
 
-#include <qt/bitcoinaddressvalidator.h>
 #include <qt/guiutil.h>
 
 QValidatedLineEdit::QValidatedLineEdit(QWidget *parent) :
diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp
index 63293fc158..a195ad5aa3 100644
--- a/src/qt/test/paymentservertests.cpp
+++ b/src/qt/test/paymentservertests.cpp
@@ -8,6 +8,7 @@
 #include <qt/test/paymentrequestdata.h>
 
 #include <amount.h>
+#include <chainparams.h>
 #include <interfaces/node.h>
 #include <random.h>
 #include <script/script.h>
diff --git a/src/random.cpp b/src/random.cpp
index 06a52b5243..9e1f7be270 100644
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -22,7 +22,6 @@
 
 #ifndef WIN32
 #include <fcntl.h>
-#include <sys/time.h>
 #endif
 
 #ifdef HAVE_SYS_GETRANDOM
@@ -45,7 +44,6 @@
 #include <cpuid.h>
 #endif
 
-#include <openssl/err.h>
 #include <openssl/rand.h>
 #include <openssl/conf.h>
 
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index b296f42102..a6ef20c226 100644
--- a/src/rpc/blockchain.cpp
+++ b/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,13 +25,13 @@
 #include <script/descriptor.h>
 #include <streams.h>
 #include <sync.h>
-#include <txdb.h>
 #include <txmempool.h>
 #include <util/strencodings.h>
 #include <util/validation.h>
 #include <util/system.h>
 #include <validation.h>
 #include <validationinterface.h>
+#include <versionbitsinfo.h>
 #include <warnings.h>
 
 #include <evo/specialtx.h>
@@ -49,7 +47,6 @@
 
 #include <boost/thread/thread.hpp> // boost::thread::interrupt
 
-#include <memory>
 #include <mutex>
 #include <condition_variable>
 #include <merkleblock.h>
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 486b0afcc5..e281811dbe 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -8,7 +8,6 @@
 #include <util/system.h>
 
 #include <set>
-#include <stdint.h>
 
 class CRPCConvertParam
 {
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index df43c88b6d..e074be2b33 100644
--- a/src/rpc/misc.cpp
+++ b/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>
diff --git a/src/rpc/protocol.cpp b/src/rpc/protocol.cpp
index 6efdfe6469..c5c32385a7 100644
--- a/src/rpc/protocol.cpp
+++ b/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,
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 49fa44b329..8178e51e51 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -15,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>
@@ -34,11 +33,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>
diff --git a/src/rpc/rawtransaction_util.cpp b/src/rpc/rawtransaction_util.cpp
index 2c672d587a..2c1f35248a 100644
--- a/src/rpc/rawtransaction_util.cpp
+++ b/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>
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 2f8f565d95..d01352a475 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -11,7 +11,6 @@
 #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
index 78bc07a6f3..543887a81d 100644
--- a/src/script/script.cpp
+++ b/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)
diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp
index f4d152f989..cf10be86c2 100644
--- a/src/script/sigcache.cpp
+++ b/src/script/sigcache.cpp
@@ -5,7 +5,6 @@
 
 #include <script/sigcache.h>
 
-#include <memusage.h>
 #include <pubkey.h>
 #include <random.h>
 #include <uint256.h>
@@ -13,7 +12,6 @@
 
 #include <cuckoocache.h>
 
-#include <algorithm>
 #include <mutex>
 #include <shared_mutex>
 #include <vector>
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 3a55aebbaa..c5cb601ad3 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -7,7 +7,6 @@
 
 #include <pubkey.h>
 #include <script/script.h>
-#include <util/system.h>
 #include <util/strencodings.h>
 
 
diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
index a4c1e7d711..44c09a07c3 100644
--- a/src/test/addrman_tests.cpp
+++ b/src/test/addrman_tests.cpp
@@ -5,7 +5,6 @@
 #include <test/setup_common.h>
 #include <string>
 #include <boost/test/unit_test.hpp>
-#include <util/asmap.h>
 #include <test/data/asmap.raw.h>
 
 #include <hash.h>
diff --git a/src/test/allocator_tests.cpp b/src/test/allocator_tests.cpp
index 30124faebe..74214c0d41 100644
--- a/src/test/allocator_tests.cpp
+++ b/src/test/allocator_tests.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <util/memory.h>
-#include <util/system.h>
 
 #include <test/setup_common.h>
 
diff --git a/src/test/bip39_tests.cpp b/src/test/bip39_tests.cpp
index 99187fabc0..5024cc4262 100644
--- a/src/test/bip39_tests.cpp
+++ b/src/test/bip39_tests.cpp
@@ -6,7 +6,6 @@
 
 #include <key.h>
 #include <key_io.h>
-#include <util/system.h>
 #include <util/strencodings.h>
 #include <test/setup_common.h>
 #include <bip39.h>
diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp
index 9a34c4b26c..6d48623a6d 100644
--- a/src/test/bloom_tests.cpp
+++ b/src/test/bloom_tests.cpp
@@ -9,11 +9,9 @@
 #include <key_io.h>
 #include <merkleblock.h>
 #include <primitives/block.h>
-#include <random.h>
 #include <serialize.h>
 #include <streams.h>
 #include <uint256.h>
-#include <util/system.h>
 #include <util/strencodings.h>
 #include <test/setup_common.h>
 
diff --git a/src/test/checkdatasig_tests.cpp b/src/test/checkdatasig_tests.cpp
index fb151d214e..4f38b284de 100644
--- a/src/test/checkdatasig_tests.cpp
+++ b/src/test/checkdatasig_tests.cpp
@@ -11,7 +11,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <array>
-#include <bitset>
 
 typedef std::vector<uint8_t> valtype;
 typedef std::vector<valtype> stacktype;
diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp
index 9f04e3f552..29ac5fde99 100644
--- a/src/test/checkqueue_tests.cpp
+++ b/src/test/checkqueue_tests.cpp
@@ -4,7 +4,6 @@
 
 #include <sync.h>
 #include <util/memory.h>
-#include <util/system.h>
 #include <util/time.h>
 
 #include <test/setup_common.h>
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index 50a2c2c3a2..a0214545ff 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_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 <attributes.h>
 #include <clientversion.h>
 #include <coins.h>
 #include <consensus/validation.h>
@@ -12,7 +11,6 @@
 #include <uint256.h>
 #include <undo.h>
 #include <util/strencodings.h>
-#include <validation.h>
 
 #include <map>
 #include <vector>
diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp
index 2f85acc71c..58d8ab88bb 100644
--- a/src/test/denialofservice_tests.cpp
+++ b/src/test/denialofservice_tests.cpp
@@ -11,7 +11,6 @@
 #include <net_processing.h>
 #include <pow.h>
 #include <script/sign.h>
-#include <serialize.h>
 #include <util/memory.h>
 #include <util/system.h>
 #include <util/time.h>
diff --git a/src/test/fuzz/tx_out.cpp b/src/test/fuzz/tx_out.cpp
index aa1338d5ba..9bb7086aa3 100644
--- a/src/test/fuzz/tx_out.cpp
+++ b/src/test/fuzz/tx_out.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 <consensus/validation.h>
 #include <core_memusage.h>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
diff --git a/src/test/governance_validators_tests.cpp b/src/test/governance_validators_tests.cpp
index 7ed1a76162..d1b156424d 100644
--- a/src/test/governance_validators_tests.cpp
+++ b/src/test/governance_validators_tests.cpp
@@ -8,8 +8,6 @@
 
 #include <test/setup_common.h>
 
-#include <iostream>
-#include <fstream>
 #include <string>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index c0bc361e08..4735b719fe 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -3,17 +3,14 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <chainparams.h>
-#include <coins.h>
 #include <consensus/consensus.h>
 #include <consensus/merkle.h>
 #include <consensus/tx_verify.h>
 #include <consensus/validation.h>
-#include <masternode/payments.h>
 #include <miner.h>
 #include <policy/policy.h>
 #include <pow.h>
 #include <script/standard.h>
-#include <txmempool.h>
 #include <uint256.h>
 #include <util/strencodings.h>
 #include <util/system.h>
diff --git a/src/test/random_tests.cpp b/src/test/random_tests.cpp
index 7c2fc4f205..37f0056f8d 100644
--- a/src/test/random_tests.cpp
+++ b/src/test/random_tests.cpp
@@ -8,7 +8,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <random>
 #include <algorithm>
 
 BOOST_FIXTURE_TEST_SUITE(random_tests, BasicTestingSetup)
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
index 01f4da5b08..566b03e3d7 100644
--- a/src/test/rpc_tests.cpp
+++ b/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>
 #include <util/time.h>
 
diff --git a/src/test/script_p2sh_tests.cpp b/src/test/script_p2sh_tests.cpp
index 6c5481f871..a3cdf924a0 100644
--- a/src/test/script_p2sh_tests.cpp
+++ b/src/test/script_p2sh_tests.cpp
@@ -10,7 +10,6 @@
 #include <policy/policy.h>
 #include <script/script.h>
 #include <script/script_error.h>
-#include <policy/settings.h>
 #include <script/sign.h>
 #include <script/ismine.h>
 #include <test/setup_common.h>
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 90fa5567f6..549ecb04a9 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -10,7 +10,6 @@
 #include <script/script.h>
 #include <script/script_error.h>
 #include <script/sign.h>
-#include <util/system.h>
 #include <util/strencodings.h>
 #include <rpc/util.h>
 #include <test/setup_common.h>
diff --git a/src/test/scriptnum_tests.cpp b/src/test/scriptnum_tests.cpp
index e56f88f034..25ecb22a83 100644
--- a/src/test/scriptnum_tests.cpp
+++ b/src/test/scriptnum_tests.cpp
@@ -7,7 +7,6 @@
 #include <test/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
-#include <limits.h>
 #include <stdint.h>
 
 BOOST_FIXTURE_TEST_SUITE(scriptnum_tests, BasicTestingSetup)
diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
index 60da8f8765..ff6fe00e56 100644
--- a/src/test/sighash_tests.cpp
+++ b/src/test/sighash_tests.cpp
@@ -11,12 +11,9 @@
 #include <serialize.h>
 #include <streams.h>
 #include <test/setup_common.h>
-#include <util/system.h>
 #include <util/strencodings.h>
 #include <version.h>
 
-#include <iostream>
-
 #include <boost/test/unit_test.hpp>
 
 #include <univalue.h>
diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp
index 520502fc9b..c9f2064328 100644
--- a/src/test/sigopcount_tests.cpp
+++ b/src/test/sigopcount_tests.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 <consensus/consensus.h>
-#include <consensus/tx_verify.h>
 #include <pubkey.h>
 #include <key.h>
 #include <script/script.h>
diff --git a/src/test/torcontrol_tests.cpp b/src/test/torcontrol_tests.cpp
index 6d8459f5b1..d846062d9b 100644
--- a/src/test/torcontrol_tests.cpp
+++ b/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>
 
diff --git a/src/test/txindex_tests.cpp b/src/test/txindex_tests.cpp
index 1ce9d5f171..0479431c43 100644
--- a/src/test/txindex_tests.cpp
+++ b/src/test/txindex_tests.cpp
@@ -7,7 +7,6 @@
 #include <script/standard.h>
 #include <test/setup_common.h>
 #include <util/time.h>
-#include <validation.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp
index 433fc4b396..4341bb2976 100644
--- a/src/test/txvalidationcache_tests.cpp
+++ b/src/test/txvalidationcache_tests.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <consensus/validation.h>
-#include <key.h>
 #include <validation.h>
 #include <txmempool.h>
 #include <script/standard.h>
@@ -11,7 +10,6 @@
 #include <test/setup_common.h>
 #include <core_io.h>
 #include <keystore.h>
-#include <policy/policy.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/util.cpp b/src/test/util.cpp
index aaa6b5b49c..964d08b08e 100644
--- a/src/test/util.cpp
+++ b/src/test/util.cpp
@@ -12,9 +12,7 @@
 #include <pow.h>
 #include <scheduler.h>
 #include <script/standard.h>
-#include <txdb.h>
 #include <validation.h>
-#include <validationinterface.h>
 #ifdef ENABLE_WALLET
 #include <wallet/wallet.h>
 #endif
diff --git a/src/test/validation_tests.cpp b/src/test/validation_tests.cpp
index 44b00d2c74..ac7ffb7474 100644
--- a/src/test/validation_tests.cpp
+++ b/src/test/validation_tests.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <net.h>
-#include <validation.h>
 
 #include <test/setup_common.h>
 
diff --git a/src/util/asmap.cpp b/src/util/asmap.cpp
index 60bd27bf90..473977b710 100644
--- a/src/util/asmap.cpp
+++ b/src/util/asmap.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <vector>
-#include <assert.h>
 #include <crypto/common.h>
 
 namespace {
diff --git a/src/validation.cpp b/src/validation.cpp
index c24e294410..33538cc50a 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -23,7 +23,6 @@
 #include <logging/timer.h>
 #include <policy/fees.h>
 #include <policy/policy.h>
-#include <policy/settings.h>
 #include <pow.h>
 #include <primitives/block.h>
 #include <primitives/transaction.h>
@@ -38,7 +37,6 @@
 #include <ui_interface.h>
 #include <uint256.h>
 #include <undo.h>
-#include <util/moneystr.h>
 #include <util/strencodings.h>
 #include <util/validation.h>
 #include <util/system.h>
@@ -59,7 +57,7 @@
 #include <string>
 
 #include <boost/algorithm/string/replace.hpp>
-#include <boost/thread.hpp>
+#include <boost/thread.hpp> // Required for boost::this_thread::interruption_point();
 
 #if defined(NDEBUG)
 # error "Dash Core cannot be compiled without assertions."
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
index 6a5f01c085..17ebf2345a 100644
--- a/src/validationinterface.cpp
+++ b/src/validationinterface.cpp
@@ -8,7 +8,6 @@
 #include <primitives/block.h>
 #include <scheduler.h>
 #include <txmempool.h>
-#include <util/system.h>
 #include <validation.h>
 
 #include <future>
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
index 4807b78bcd..2b3c88a6a3 100644
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -5,7 +5,6 @@
 
 #include <wallet/db.h>
 
-#include <addrman.h>
 #include <hash.h>
 #include <protocol.h>
 #include <util/strencodings.h>
diff --git a/src/wallet/fees.cpp b/src/wallet/fees.cpp
index b349938ff8..8efa74cc36 100644
--- a/src/wallet/fees.cpp
+++ b/src/wallet/fees.cpp
@@ -6,7 +6,6 @@
 #include <wallet/fees.h>
 
 #include <policy/policy.h>
-#include <policy/settings.h>
 #include <validation.h>
 #include <wallet/coincontrol.h>
 #include <wallet/wallet.h>
diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp
index 6ae08dc8f3..72ca7234bc 100644
--- a/src/wallet/init.cpp
+++ b/src/wallet/init.cpp
@@ -13,14 +13,11 @@
 #include <util/moneystr.h>
 #include <validation.h>
 #include <walletinitinterface.h>
-#include <wallet/rpcwallet.h>
 #include <wallet/wallet.h>
 
 #include <coinjoin/client.h>
 #include <coinjoin/options.h>
 
-#include <functional>
-
 class WalletInit : public WalletInitInterface {
 public:
 
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index d0da697160..6d03018109 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -8,6 +8,7 @@
 #include <interfaces/chain.h>
 #include <key_io.h>
 #include <merkleblock.h>
+#include <rpc/server.h>
 #include <rpc/util.h>
 #include <script/descriptor.h>
 #include <script/script.h>
@@ -28,7 +29,6 @@
 
 #include <univalue.h>
 
-
 int64_t static DecodeDumpTime(const std::string &str) {
     static const boost::posix_time::ptime epoch = boost::posix_time::from_time_t(0);
     static const std::locale loc(std::locale::classic(),
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index ff007dffbe..6ddbb710f5 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -5,7 +5,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <amount.h>
-#include <chain.h>
 #include <chainparams.h>
 #include <consensus/validation.h>
 #include <core_io.h>
@@ -13,7 +12,6 @@
 #include <init.h>
 #include <interfaces/chain.h>
 #include <keepass.h>
-#include <net.h>
 #include <policy/feerate.h>
 #include <policy/fees.h>
 #include <rpc/mining.h>
diff --git a/src/wallet/test/init_tests.cpp b/src/wallet/test/init_tests.cpp
index 5e5e24a8c2..0e6927e55b 100644
--- a/src/wallet/test/init_tests.cpp
+++ b/src/wallet/test/init_tests.cpp
@@ -5,12 +5,9 @@
 #include <boost/test/unit_test.hpp>
 
 #include <noui.h>
-#include <test/setup_common.h>
 #include <util/system.h>
 #include <wallet/test/init_test_fixture.h>
 
-#include <init.h>
-#include <walletinitinterface.h>
 #include <wallet/wallet.h>
 
 
diff --git a/src/wallet/test/psbt_wallet_tests.cpp b/src/wallet/test/psbt_wallet_tests.cpp
index eca300694d..1345830659 100644
--- a/src/wallet/test/psbt_wallet_tests.cpp
+++ b/src/wallet/test/psbt_wallet_tests.cpp
@@ -9,7 +9,6 @@
 #include <wallet/wallet.h>
 
 #include <boost/test/unit_test.hpp>
-#include <test/setup_common.h>
 #include <wallet/test/wallet_test_fixture.h>
 
 BOOST_FIXTURE_TEST_SUITE(psbt_wallet_tests, WalletTestingSetup)
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
index 806af29a8a..eb710b64f8 100644
--- a/src/zmq/zmqpublishnotifier.cpp
+++ b/src/zmq/zmqpublishnotifier.cpp
@@ -6,9 +6,7 @@
 
 #include <chain.h>
 #include <chainparams.h>
-#include <rpc/server.h>
 #include <streams.h>
-#include <util/system.h>
 #include <validation.h>
 #include <zmq/zmqutil.h>
 
diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh
index 02feca84be..0050c1cc85 100755
--- a/test/lint/lint-circular-dependencies.sh
+++ b/test/lint/lint-circular-dependencies.sh
@@ -28,8 +28,6 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "wallet/fees -> wallet/wallet -> wallet/fees"
     "wallet/wallet -> wallet/walletdb -> wallet/wallet"
     "wallet/coincontrol -> wallet/wallet -> wallet/coincontrol"
-    "policy/fees -> policy/policy -> validation -> policy/fees"
-    "policy/policy -> validation -> policy/policy"
     "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/addressbookpage"
     "txmempool -> validation -> validationinterface -> txmempool"
     "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/receivecoinsdialog -> qt/addressbookpage"
@@ -85,10 +83,7 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "logging -> util/system -> stacktraces -> logging"
     "coinjoin/client -> coinjoin/util -> wallet/wallet -> coinjoin/client"
     "qt/appearancewidget -> qt/guiutil -> qt/optionsdialog -> qt/appearancewidget"
-    "qt/bitcoinaddressvalidator -> qt/guiutil -> qt/qvalidatedlineedit -> qt/bitcoinaddressvalidator"
     "qt/guiutil -> qt/optionsdialog -> qt/optionsmodel -> qt/guiutil"
-    "bloom -> evo/cbtx -> evo/simplifiedmns -> merkleblock -> bloom"
-    "bloom -> evo/cbtx -> llmq/blockprocessor -> net -> bloom"
     "evo/deterministicmns -> evo/simplifiedmns -> llmq/blockprocessor -> llmq/debug -> evo/deterministicmns"
     "evo/deterministicmns -> evo/simplifiedmns -> llmq/blockprocessor -> net_processing -> evo/deterministicmns"
     "evo/specialtx -> llmq/blockprocessor -> net_processing -> txmempool -> evo/specialtx"
@@ -106,6 +101,9 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "evo/deterministicmns -> llmq/utils -> net -> evo/deterministicmns"
     "evo/deterministicmns -> llmq/utils -> net -> masternode/sync -> evo/deterministicmns"
     "evo/mnhftx -> evo/specialtx -> evo/mnhftx"
+    "policy/fees -> txmempool -> validation -> policy/fees"
+    "bloom -> evo/specialtx -> llmq/blockprocessor -> net -> bloom"
+    "bloom -> evo/specialtx -> llmq/blockprocessor -> net_processing -> merkleblock -> bloom"
 )
 
 EXIT_CODE=0