diff --git a/src/addrdb.cpp b/src/addrdb.cpp
--- a/src/addrdb.cpp
+++ b/src/addrdb.cpp
@@ -8,7 +8,6 @@
 #include <addrman.h>
 #include <chainparams.h>
 #include <clientversion.h>
-#include <fs.h>
 #include <hash.h>
 #include <random.h>
 #include <streams.h>
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -14,7 +14,6 @@
 #include <util/system.h>
 
 #include <cassert>
-#include <memory>
 
 static CBlock CreateGenesisBlock(const char *pszTimestamp,
                                  const CScript &genesisOutputScript,
diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
--- a/src/chainparamsbase.cpp
+++ b/src/chainparamsbase.cpp
@@ -9,7 +9,6 @@
 #include <util/system.h>
 
 #include <cassert>
-#include <memory>
 
 const std::string CBaseChainParams::MAIN = "main";
 const std::string CBaseChainParams::TESTNET = "test";
diff --git a/src/clientversion.cpp b/src/clientversion.cpp
--- a/src/clientversion.cpp
+++ b/src/clientversion.cpp
@@ -6,8 +6,6 @@
 
 #include <tinyformat.h>
 
-#include <string>
-
 /**
  * Name of client reported in the 'version' message. Report the same name
  * for both bitcoind and bitcoin-qt, to make it harder for attackers to
diff --git a/src/coins.cpp b/src/coins.cpp
--- a/src/coins.cpp
+++ b/src/coins.cpp
@@ -6,12 +6,9 @@
 
 #include <consensus/consensus.h>
 #include <logging.h>
-#include <memusage.h>
 #include <random.h>
 #include <version.h>
 
-#include <cassert>
-
 bool CCoinsView::GetCoin(const COutPoint &outpoint, Coin &coin) const {
     return false;
 }
diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -4,9 +4,7 @@
 
 #include <dbwrapper.h>
 
-#include <fs.h>
 #include <random.h>
-#include <util/system.h>
 
 #include <leveldb/cache.h>
 #include <leveldb/env.h>
diff --git a/src/feerate.cpp b/src/feerate.cpp
--- a/src/feerate.cpp
+++ b/src/feerate.cpp
@@ -6,7 +6,6 @@
 
 #include <feerate.h>
 
-#include <amount.h>
 #include <tinyformat.h>
 
 CFeeRate::CFeeRate(const Amount nFeePaid, size_t nBytes_) {
diff --git a/src/fs.cpp b/src/fs.cpp
--- a/src/fs.cpp
+++ b/src/fs.cpp
@@ -7,7 +7,6 @@
 
 #ifndef WIN32
 #include <fcntl.h>
-#include <string>
 #include <sys/file.h>
 #include <sys/utsname.h>
 #else
diff --git a/src/hash.cpp b/src/hash.cpp
--- a/src/hash.cpp
+++ b/src/hash.cpp
@@ -4,7 +4,6 @@
 
 #include <hash.h>
 
-#include <crypto/common.h>
 #include <crypto/hmac_sha512.h>
 
 inline uint32_t ROTL32(uint32_t x, int8_t r) {
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -7,9 +7,7 @@
 #include <chainparams.h>
 #include <config.h>
 #include <crypto/hmac_sha256.h>
-#include <httpserver.h>
 #include <rpc/protocol.h>
-#include <rpc/server.h>
 #include <ui_interface.h>
 #include <util/strencodings.h>
 #include <util/system.h>
diff --git a/src/init.cpp b/src/init.cpp
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -53,7 +53,6 @@
 #include <txmempool.h>
 #include <ui_interface.h>
 #include <util/moneystr.h>
-#include <util/system.h>
 #include <util/threadnames.h>
 #include <util/translation.h>
 #include <util/validation.h>
@@ -80,7 +79,6 @@
 #endif
 #include <cstdint>
 #include <cstdio>
-#include <memory>
 
 static const bool DEFAULT_PROXYRANDOMIZE = true;
 static const bool DEFAULT_REST_ENABLE = false;
diff --git a/src/interfaces/chain.cpp b/src/interfaces/chain.cpp
--- a/src/interfaces/chain.cpp
+++ b/src/interfaces/chain.cpp
@@ -18,7 +18,6 @@
 #include <policy/settings.h>
 #include <primitives/block.h>
 #include <primitives/blockhash.h>
-#include <primitives/transaction.h>
 #include <rpc/protocol.h>
 #include <rpc/server.h>
 #include <shutdown.h>
@@ -31,7 +30,6 @@
 #include <validation.h>
 #include <validationinterface.h>
 
-#include <memory>
 #include <utility>
 
 namespace interfaces {
diff --git a/src/interfaces/handler.cpp b/src/interfaces/handler.cpp
--- a/src/interfaces/handler.cpp
+++ b/src/interfaces/handler.cpp
@@ -7,7 +7,6 @@
 #include <util/system.h>
 
 #include <boost/signals2/connection.hpp>
-#include <memory>
 #include <utility>
 
 namespace interfaces {
diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp
--- a/src/interfaces/wallet.cpp
+++ b/src/interfaces/wallet.cpp
@@ -23,11 +23,6 @@
 #include <wallet/rpcwallet.h>
 #include <wallet/wallet.h>
 
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
 namespace interfaces {
 namespace {
 
diff --git a/src/key.cpp b/src/key.cpp
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -7,7 +7,6 @@
 
 #include <crypto/common.h>
 #include <crypto/hmac_sha512.h>
-#include <pubkey.h>
 #include <random.h>
 
 #include <secp256k1.h>
diff --git a/src/logging.cpp b/src/logging.cpp
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -9,8 +9,6 @@
 #include <util/threadnames.h>
 #include <util/time.h>
 
-#include <mutex>
-
 bool fLogIPs = DEFAULT_LOGIPS;
 const char *const DEFAULT_DEBUGLOGFILE = "debug.log";
 
diff --git a/src/miner.cpp b/src/miner.cpp
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -22,7 +22,6 @@
 #include <pow.h>
 #include <primitives/transaction.h>
 #include <timedata.h>
-#include <txmempool.h>
 #include <util/moneystr.h>
 #include <util/system.h>
 #include <util/validation.h>
diff --git a/src/net.cpp b/src/net.cpp
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -10,13 +10,10 @@
 #include <net.h>
 
 #include <banman.h>
-#include <chainparams.h>
 #include <clientversion.h>
 #include <config.h>
 #include <consensus/consensus.h>
 #include <crypto/sha256.h>
-#include <hash.h>
-#include <net_permissions.h>
 #include <netbase.h>
 #include <scheduler.h>
 #include <ui_interface.h>
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -16,7 +16,6 @@
 #include <consensus/validation.h>
 #include <hash.h>
 #include <merkleblock.h>
-#include <net.h>
 #include <netbase.h>
 #include <netmessagemaker.h>
 #include <policy/fees.h>
@@ -32,7 +31,6 @@
 #include <util/system.h>
 #include <util/validation.h>
 #include <validation.h>
-#include <validationinterface.h>
 
 #include <memory>
 
diff --git a/src/netaddress.cpp b/src/netaddress.cpp
--- a/src/netaddress.cpp
+++ b/src/netaddress.cpp
@@ -3,12 +3,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifdef HAVE_CONFIG_H
-#include <config/bitcoin-config.h>
-#endif
+#include <netaddress.h>
 
 #include <hash.h>
-#include <netaddress.h>
 #include <tinyformat.h>
 #include <util/strencodings.h>
 
diff --git a/src/node/coinstats.cpp b/src/node/coinstats.cpp
--- a/src/node/coinstats.cpp
+++ b/src/node/coinstats.cpp
@@ -8,7 +8,6 @@
 #include <coins.h>
 #include <hash.h>
 #include <serialize.h>
-#include <uint256.h>
 #include <util/system.h>
 #include <validation.h>
 
diff --git a/src/noui.cpp b/src/noui.cpp
--- a/src/noui.cpp
+++ b/src/noui.cpp
@@ -12,8 +12,6 @@
 #include <boost/signals2/connection.hpp>
 #include <boost/signals2/signal.hpp>
 
-#include <string>
-
 /** Store connections so we can disconnect them when suppressing output */
 boost::signals2::connection noui_ThreadSafeMessageBoxConn;
 boost::signals2::connection noui_ThreadSafeQuestionConn;
diff --git a/src/outputtype.cpp b/src/outputtype.cpp
--- a/src/outputtype.cpp
+++ b/src/outputtype.cpp
@@ -8,11 +8,8 @@
 #include <pubkey.h>
 #include <script/script.h>
 #include <script/sign.h>
-#include <script/signingprovider.h>
-#include <script/standard.h>
 
 #include <cassert>
-#include <string>
 
 static const std::string OUTPUT_TYPE_STRING_LEGACY = "legacy";
 
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -4,10 +4,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <amount.h>
-#include <feerate.h>
 #include <policy/fees.h>
 
+#include <feerate.h>
+
 FeeFilterRounder::FeeFilterRounder(const CFeeRate &minIncrementalFee) {
     Amount minFeeLimit = std::max(SATOSHI, minIncrementalFee.GetFeePerK() / 2);
     feeset.insert(Amount::zero());
diff --git a/src/policy/settings.cpp b/src/policy/settings.cpp
--- a/src/policy/settings.cpp
+++ b/src/policy/settings.cpp
@@ -6,7 +6,6 @@
 #include <policy/settings.h>
 
 #include <feerate.h>
-#include <policy/policy.h>
 
 bool fIsBareMultisigStd = DEFAULT_PERMIT_BAREMULTISIG;
 CFeeRate dustRelayFee = CFeeRate(DUST_RELAY_TX_FEE);
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -2,10 +2,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#if defined(HAVE_CONFIG_H)
-#include <config/bitcoin-config.h>
-#endif
-
 #include <qt/bitcoin.h>
 
 #include <chainparams.h>
@@ -35,7 +31,6 @@
 #include <qt/walletcontroller.h>
 #endif
 
-#include <QApplication>
 #include <QDebug>
 #include <QLibraryInfo>
 #include <QLocale>
@@ -57,8 +52,6 @@
 #endif
 #endif
 
-#include <memory>
-
 // Declare meta types used for QMetaObject::invokeMethod
 Q_DECLARE_METATYPE(bool *)
 Q_DECLARE_METATYPE(Amount)
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -2,10 +2,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#if defined(HAVE_CONFIG_H)
-#include <config/bitcoin-config.h>
-#endif
-
 #include <qt/bitcoingui.h>
 
 #include <chain.h>
@@ -24,7 +20,6 @@
 #include <qt/networkstyle.h>
 #include <qt/notificator.h>
 #include <qt/openuridialog.h>
-#include <qt/optionsdialog.h>
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>
 #include <qt/rpcconsole.h>
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -29,9 +29,7 @@
 #include <QFlags>
 #include <QIcon>
 #include <QSettings>
-#include <QString>
 #include <QTreeWidget>
-#include <QTreeWidgetItem>
 
 QList<Amount> CoinControlDialog::payAmounts;
 bool CoinControlDialog::fSubtractFeeFromAmount = false;
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -6,7 +6,6 @@
 
 #include <cashaddrenc.h>
 #include <chainparams.h>
-#include <fs.h>
 #include <interfaces/node.h>
 #include <key_io.h>
 #include <policy/policy.h>
diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp
--- a/src/qt/notificator.cpp
+++ b/src/qt/notificator.cpp
@@ -6,7 +6,6 @@
 
 #include <QApplication>
 #include <QByteArray>
-#include <QIcon>
 #include <QImageWriter>
 #include <QMessageBox>
 #include <QMetaType>
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -8,7 +8,6 @@
 
 #include <qt/optionsmodel.h>
 
-#include <amount.h>
 #include <interfaces/node.h>
 #include <net.h>
 #include <netbase.h>
diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp
--- a/src/qt/paymentrequestplus.cpp
+++ b/src/qt/paymentrequestplus.cpp
@@ -8,7 +8,6 @@
 
 #include <qt/paymentrequestplus.h>
 
-#include <script/script.h>
 #include <util/system.h>
 
 #include <openssl/x509_vfy.h>
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -2,10 +2,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#if defined(HAVE_CONFIG_H)
-#include <config/bitcoin-config.h>
-#endif
-
 #include <qt/paymentserver.h>
 
 #include <cashaddrenc.h>
diff --git a/src/qt/platformstyle.cpp b/src/qt/platformstyle.cpp
--- a/src/qt/platformstyle.cpp
+++ b/src/qt/platformstyle.cpp
@@ -6,10 +6,8 @@
 
 #include <QApplication>
 #include <QColor>
-#include <QIcon>
 #include <QImage>
 #include <QPalette>
-#include <QPixmap>
 
 static const struct {
     const char *platformId;
diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp
--- a/src/qt/receivecoinsdialog.cpp
+++ b/src/qt/receivecoinsdialog.cpp
@@ -8,7 +8,6 @@
 #include <qt/receivecoinsdialog.h>
 
 #include <qt/addresstablemodel.h>
-#include <qt/guiutil.h>
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>
 #include <qt/receiverequestdialog.h>
@@ -17,7 +16,6 @@
 
 #include <QAction>
 #include <QCursor>
-#include <QItemSelection>
 #include <QMessageBox>
 #include <QScrollBar>
 #include <QTextDocument>
diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp
--- a/src/qt/receiverequestdialog.cpp
+++ b/src/qt/receiverequestdialog.cpp
@@ -10,7 +10,6 @@
 #include <qt/guiconstants.h>
 #include <qt/guiutil.h>
 #include <qt/optionsmodel.h>
-#include <qt/walletmodel.h>
 
 #include <QClipboard>
 #include <QDrag>
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -15,7 +15,6 @@
 #include <qt/bantablemodel.h>
 #include <qt/clientmodel.h>
 #include <qt/forms/ui_debugwindow.h>
-#include <qt/guiutil.h>
 #include <qt/platformstyle.h>
 #include <qt/walletmodel.h>
 #include <rpc/client.h>
@@ -39,7 +38,6 @@
 #include <QSettings>
 #include <QSignalMapper>
 #include <QStringList>
-#include <QThread>
 #include <QTime>
 #include <QTimer>
 
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -26,11 +26,9 @@
 #include <wallet/fees.h>
 #include <wallet/wallet.h>
 
-#include <QMessageBox>
 #include <QScrollBar>
 #include <QSettings>
 #include <QTextDocument>
-#include <QTimer>
 
 SendCoinsDialog::SendCoinsDialog(const PlatformStyle *_platformStyle,
                                  WalletModel *_model, QWidget *parent)
diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
--- a/src/qt/sendcoinsentry.cpp
+++ b/src/qt/sendcoinsentry.cpp
@@ -15,7 +15,6 @@
 #include <qt/guiutil.h>
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>
-#include <qt/walletmodel.h>
 
 #include <QApplication>
 #include <QClipboard>
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
--- a/src/qt/splashscreen.cpp
+++ b/src/qt/splashscreen.cpp
@@ -24,8 +24,6 @@
 #include <QRadialGradient>
 #include <QScreen>
 
-#include <memory>
-
 SplashScreen::SplashScreen(interfaces::Node &node,
                            const NetworkStyle *networkStyle)
     : QWidget(nullptr), curAlignment(0), m_node(node) {
diff --git a/src/qt/test/apptests.cpp b/src/qt/test/apptests.cpp
--- a/src/qt/test/apptests.cpp
+++ b/src/qt/test/apptests.cpp
@@ -46,8 +46,6 @@
 #include <QtTest/QtTestGui>
 // clang-format on
 
-#include <string>
-
 namespace {
 //! Call getblockchaininfo RPC and check first field of JSON output.
 void TestRpcCommand(RPCConsole *console) {
diff --git a/src/qt/transactionfilterproxy.cpp b/src/qt/transactionfilterproxy.cpp
--- a/src/qt/transactionfilterproxy.cpp
+++ b/src/qt/transactionfilterproxy.cpp
@@ -7,8 +7,6 @@
 #include <qt/transactionrecord.h>
 #include <qt/transactiontablemodel.h>
 
-#include <QDateTime>
-
 #include <cstdlib>
 
 // Earliest date that can be represented (far in the past)
diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -8,7 +8,6 @@
 #include <qt/bitcoinunits.h>
 #include <qt/csvmodelwriter.h>
 #include <qt/editaddressdialog.h>
-#include <qt/guiutil.h>
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>
 #include <qt/transactiondescdialog.h>
diff --git a/src/qt/walletcontroller.cpp b/src/qt/walletcontroller.cpp
--- a/src/qt/walletcontroller.cpp
+++ b/src/qt/walletcontroller.cpp
@@ -8,9 +8,7 @@
 #include <interfaces/node.h>
 
 #include <QApplication>
-#include <QMessageBox>
 #include <QMutexLocker>
-#include <QThread>
 #include <QWindow>
 
 #include <algorithm>
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -2,10 +2,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#if defined(HAVE_CONFIG_H)
-#include <config/bitcoin-config.h>
-#endif
-
 #include <qt/walletmodel.h>
 
 #include <cashaddrenc.h>
diff --git a/src/randomenv.cpp b/src/randomenv.cpp
--- a/src/randomenv.cpp
+++ b/src/randomenv.cpp
@@ -11,7 +11,6 @@
 
 #include <clientversion.h>
 #include <compat/cpuid.h>
-#include <crypto/sha512.h>
 #include <support/cleanse.h>
 #include <util/time.h> // for GetTime()
 #ifdef WIN32
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -25,7 +25,6 @@
 #include <rpc/util.h>
 #include <script/descriptor.h>
 #include <streams.h>
-#include <sync.h>
 #include <txdb.h>
 #include <txmempool.h>
 #include <undo.h>
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -9,8 +9,6 @@
 #include <cstdint>
 #include <set>
 
-#include <univalue.h>
-
 class CRPCConvertParam {
 public:
     std::string methodName; //!< method whose params want conversion
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -31,10 +31,7 @@
 #include <validationinterface.h>
 #include <warnings.h>
 
-#include <univalue.h>
-
 #include <cstdint>
-#include <memory>
 
 /**
  * Return average network hashes per second based on the last 'lookup' blocks,
diff --git a/src/rpc/request.cpp b/src/rpc/request.cpp
--- a/src/rpc/request.cpp
+++ b/src/rpc/request.cpp
@@ -12,8 +12,6 @@
 #include <util/strencodings.h>
 #include <util/system.h>
 
-#include <univalue.h>
-
 /**
  * JSON-RPC protocol.  Bitcoin speaks version 1.0 for maximum compatibility, but
  * uses JSON-RPC 1.1/2.0 standards for parts of the 1.0 standard that were
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -11,9 +11,6 @@
 #include <shutdown.h>
 #include <sync.h>
 #include <util/strencodings.h>
-#include <util/system.h>
-
-#include <univalue.h>
 
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
--- a/src/rpc/util.cpp
+++ b/src/rpc/util.cpp
@@ -11,8 +11,6 @@
 #include <util/strencodings.h>
 #include <util/string.h>
 
-#include <univalue.h>
-
 #include <tuple>
 
 #include <boost/variant/static_visitor.hpp>
diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp
--- a/src/script/descriptor.cpp
+++ b/src/script/descriptor.cpp
@@ -8,7 +8,6 @@
 #include <config.h>
 #include <key_io.h>
 #include <pubkey.h>
-#include <script/script.h>
 #include <script/standard.h>
 #include <span.h>
 #include <util/bip32.h>
@@ -17,7 +16,6 @@
 
 #include <memory>
 #include <string>
-#include <vector>
 
 namespace {
 
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -9,11 +9,9 @@
 #include <crypto/ripemd160.h>
 #include <crypto/sha1.h>
 #include <crypto/sha256.h>
-#include <primitives/transaction.h>
 #include <pubkey.h>
 #include <script/bitfield.h>
 #include <script/script.h>
-#include <script/script_flags.h>
 #include <script/sigencoding.h>
 #include <uint256.h>
 #include <util/bitmanip.h>
diff --git a/src/script/signingprovider.cpp b/src/script/signingprovider.cpp
--- a/src/script/signingprovider.cpp
+++ b/src/script/signingprovider.cpp
@@ -5,10 +5,7 @@
 
 #include <script/keyorigin.h>
 #include <script/signingprovider.h>
-#include <script/standard.h>
 
-#include <key.h>
-#include <pubkey.h>
 #include <util/system.h>
 
 const SigningProvider &DUMMY_SIGNING_PROVIDER = SigningProvider();
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -6,7 +6,6 @@
 #include <script/standard.h>
 
 #include <crypto/sha256.h>
-#include <pubkey.h>
 #include <script/script.h>
 
 typedef std::vector<uint8_t> valtype;
diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp
--- a/src/support/lockedpool.cpp
+++ b/src/support/lockedpool.cpp
@@ -27,7 +27,6 @@
 #endif
 
 #include <algorithm>
-#include <memory>
 #ifdef ARENA_DEBUG
 #include <iomanip>
 #include <iostream>
diff --git a/src/test/gen/crypto_gen.cpp b/src/test/gen/crypto_gen.cpp
--- a/src/test/gen/crypto_gen.cpp
+++ b/src/test/gen/crypto_gen.cpp
@@ -3,10 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #include <test/gen/crypto_gen.h>
 
-#include <key.h>
-
-#include <rapidcheck/Gen.h>
-#include <rapidcheck/gen/Arbitrary.h>
 #include <rapidcheck/gen/Container.h>
 #include <rapidcheck/gen/Predicate.h>
 
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -10,16 +10,12 @@
 #include <consensus/consensus.h>
 #include <consensus/validation.h>
 #include <crypto/sha256.h>
-#include <fs.h>
 #include <init.h>
-#include <key.h>
 #include <logging.h>
 #include <miner.h>
 #include <net.h>
 #include <noui.h>
 #include <pow.h>
-#include <pubkey.h>
-#include <random.h>
 #include <rpc/blockchain.h>
 #include <rpc/register.h>
 #include <rpc/server.h>
diff --git a/src/threadinterrupt.cpp b/src/threadinterrupt.cpp
--- a/src/threadinterrupt.cpp
+++ b/src/threadinterrupt.cpp
@@ -5,8 +5,6 @@
 
 #include <threadinterrupt.h>
 
-#include <sync.h>
-
 CThreadInterrupt::CThreadInterrupt() : flag(false) {}
 
 CThreadInterrupt::operator bool() const {
diff --git a/src/uint256.cpp b/src/uint256.cpp
--- a/src/uint256.cpp
+++ b/src/uint256.cpp
@@ -7,8 +7,6 @@
 
 #include <util/strencodings.h>
 
-#include <cstring>
-
 template <unsigned int BITS>
 base_blob<BITS>::base_blob(const std::vector<uint8_t> &vch) {
     assert(vch.size() == sizeof(data));
diff --git a/src/util/system.cpp b/src/util/system.cpp
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -3,17 +3,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#if defined(HAVE_CONFIG_H)
-#include <config/bitcoin-config.h>
-#endif
-
-#include <fs.h>
 #include <util/system.h>
 
 #include <chainparamsbase.h>
-#include <fs.h>
 #include <util/strencodings.h>
-#include <util/time.h>
 #include <util/translation.h>
 
 #include <univalue.h>
diff --git a/src/util/url.cpp b/src/util/url.cpp
--- a/src/util/url.cpp
+++ b/src/util/url.cpp
@@ -6,7 +6,6 @@
 
 #include <cstdlib>
 #include <event2/http.h>
-#include <string>
 
 std::string urlDecode(const std::string &urlEncoded) {
     std::string res;
diff --git a/src/validation.cpp b/src/validation.cpp
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -14,13 +14,10 @@
 #include <checkqueue.h>
 #include <config.h>
 #include <consensus/activation.h>
-#include <consensus/consensus.h>
 #include <consensus/merkle.h>
 #include <consensus/tx_check.h>
 #include <consensus/tx_verify.h>
 #include <consensus/validation.h>
-#include <flatfile.h>
-#include <fs.h>
 #include <hash.h>
 #include <index/txindex.h>
 #include <minerfund.h>
@@ -54,7 +51,6 @@
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/thread.hpp> // boost::this_thread::interruption_point() (mingw)
 
-#include <atomic>
 #include <string>
 #include <thread>
 
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -5,9 +5,7 @@
 
 #include <wallet/db.h>
 
-#include <fs.h>
 #include <util/strencodings.h>
-#include <util/system.h>
 #include <util/translation.h>
 
 #include <boost/thread.hpp> // boost::this_thread::interruption_point() (mingw)
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -23,8 +23,6 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include <univalue.h>
-
 #include <cstdint>
 #include <tuple>
 
diff --git a/src/wallet/test/wallet_test_fixture.cpp b/src/wallet/test/wallet_test_fixture.cpp
--- a/src/wallet/test/wallet_test_fixture.cpp
+++ b/src/wallet/test/wallet_test_fixture.cpp
@@ -7,7 +7,6 @@
 #include <chainparams.h>
 #include <validationinterface.h>
 #include <wallet/rpcdump.h>
-#include <wallet/wallet.h>
 
 WalletTestingSetup::WalletTestingSetup(const std::string &chainName)
     : TestingSetup(chainName),
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -12,7 +12,6 @@
 #include <consensus/consensus.h>
 #include <consensus/validation.h>
 #include <fs.h>
-#include <interfaces/chain.h>
 #include <interfaces/wallet.h>
 #include <key.h>
 #include <key_io.h>
@@ -27,21 +26,17 @@
 #include <script/sighashtype.h>
 #include <script/sign.h>
 #include <script/signingprovider.h>
-#include <ui_interface.h>
 #include <util/bip32.h>
 #include <util/error.h>
 #include <util/moneystr.h>
-#include <util/system.h>
 #include <util/translation.h>
 #include <util/validation.h>
 #include <validation.h>
 #include <wallet/coincontrol.h>
-#include <wallet/coinselection.h>
 #include <wallet/fees.h>
 
 #include <boost/algorithm/string/replace.hpp>
 
-#include <algorithm>
 #include <cassert>
 
 const std::map<uint64_t, std::string> WALLET_FLAG_CAVEATS{
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -19,7 +19,6 @@
 #include <wallet/wallet.h>
 
 #include <atomic>
-#include <string>
 
 //
 // WalletBatch