diff --git a/src/addrman.cpp b/src/addrman.cpp
index df8b131857..b548a7872a 100644
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@@ -7,7 +7,6 @@
 
 #include <hash.h>
 #include <logging.h>
-#include <streams.h>
 #include <serialize.h>
 
 int CAddrInfo::GetTriedBucket(const uint256& nKey, const std::vector<bool> &asmap) const
diff --git a/src/arith_uint256.cpp b/src/arith_uint256.cpp
index f4cd70255a..04d54d1ad5 100644
--- a/src/arith_uint256.cpp
+++ b/src/arith_uint256.cpp
@@ -6,7 +6,6 @@
 #include <arith_uint256.h>
 
 #include <uint256.h>
-#include <util/strencodings.h>
 #include <crypto/common.h>
 
 
diff --git a/src/bench/rpc_mempool.cpp b/src/bench/rpc_mempool.cpp
index f862421f0d..5cb2ce78cc 100644
--- a/src/bench/rpc_mempool.cpp
+++ b/src/bench/rpc_mempool.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-#include <policy/policy.h>
 #include <rpc/blockchain.h>
 #include <txmempool.h>
 
diff --git a/src/consensus/merkle.cpp b/src/consensus/merkle.cpp
index e52c05d40a..8698d6864a 100644
--- a/src/consensus/merkle.cpp
+++ b/src/consensus/merkle.cpp
@@ -4,7 +4,6 @@
 
 #include <consensus/merkle.h>
 #include <hash.h>
-#include <util/strencodings.h>
 
 /*     WARNING! If you're reading this because you're learning about crypto
        and/or designing a new system that will use merkle trees, keep in mind
diff --git a/src/core_write.cpp b/src/core_write.cpp
index ba35a821b8..e465dc09d4 100644
--- a/src/core_write.cpp
+++ b/src/core_write.cpp
@@ -12,7 +12,6 @@
 #include <serialize.h>
 #include <streams.h>
 #include <univalue.h>
-#include <util/moneystr.h>
 #include <util/strencodings.h>
 
 #include <spentindex.h>
diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp
index ec19b39531..0dd48e1023 100644
--- a/src/crypto/aes.cpp
+++ b/src/crypto/aes.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <crypto/aes.h>
-#include <crypto/common.h>
 
 #include <string.h>
 
diff --git a/src/crypto/sha256_avx2.cpp b/src/crypto/sha256_avx2.cpp
index 068e0e5ff6..90a72516a4 100644
--- a/src/crypto/sha256_avx2.cpp
+++ b/src/crypto/sha256_avx2.cpp
@@ -3,7 +3,6 @@
 #include <stdint.h>
 #include <immintrin.h>
 
-#include <crypto/sha256.h>
 #include <crypto/common.h>
 
 namespace sha256d64_avx2 {
diff --git a/src/crypto/sha256_sse41.cpp b/src/crypto/sha256_sse41.cpp
index adca870e2d..fc79f46f7f 100644
--- a/src/crypto/sha256_sse41.cpp
+++ b/src/crypto/sha256_sse41.cpp
@@ -3,7 +3,6 @@
 #include <stdint.h>
 #include <immintrin.h>
 
-#include <crypto/sha256.h>
 #include <crypto/common.h>
 
 namespace sha256d64_sse41 {
diff --git a/src/dash-wallet.cpp b/src/dash-wallet.cpp
index 6d968303da..ee3027d9a2 100644
--- a/src/dash-wallet.cpp
+++ b/src/dash-wallet.cpp
@@ -8,7 +8,6 @@
 
 #include <chainparams.h>
 #include <chainparamsbase.h>
-#include <consensus/consensus.h>
 #include <logging.h>
 #include <util/system.h>
 #include <util/strencodings.h>
diff --git a/src/dashd.cpp b/src/dashd.cpp
index 2d65209a7e..c0efa23484 100644
--- a/src/dashd.cpp
+++ b/src/dashd.cpp
@@ -13,15 +13,11 @@
 #include <compat.h>
 #include <init.h>
 #include <interfaces/chain.h>
-#include <rpc/server.h>
 #include <noui.h>
 #include <shutdown.h>
 #include <util/system.h>
-#include <httpserver.h>
-#include <httprpc.h>
 #include <util/strencodings.h>
 #include <util/threadnames.h>
-#include <walletinitinterface.h>
 #include <stacktraces.h>
 
 #include <stdio.h>
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index 4572ce99bc..e501765f6f 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -8,7 +8,6 @@
 #include <httpserver.h>
 #include <rpc/protocol.h>
 #include <rpc/server.h>
-#include <random.h>
 #include <util/system.h>
 #include <util/strencodings.h>
 #include <ui_interface.h>
diff --git a/src/init.cpp b/src/init.cpp
index 61ec56e95f..1605391ae4 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -70,7 +70,6 @@
 #include <messagesigner.h>
 #include <netfulfilledman.h>
 #include <spork.h>
-#include <warnings.h>
 #include <walletinitinterface.h>
 
 #include <evo/deterministicmns.h>
diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp
index 737bbc2461..73c8f1df82 100644
--- a/src/interfaces/node.cpp
+++ b/src/interfaces/node.cpp
@@ -26,7 +26,6 @@
 #include <policy/settings.h>
 #include <primitives/block.h>
 #include <rpc/server.h>
-#include <scheduler.h>
 #include <shutdown.h>
 #include <sync.h>
 #include <txmempool.h>
diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp
index 2ae98a6936..2a5fe32d8e 100644
--- a/src/interfaces/wallet.cpp
+++ b/src/interfaces/wallet.cpp
@@ -9,11 +9,8 @@
 #include <consensus/validation.h>
 #include <interfaces/chain.h>
 #include <interfaces/handler.h>
-#include <net.h>
 #include <policy/fees.h>
 #include <primitives/transaction.h>
-#include <rpc/server.h>
-#include <scheduler.h>
 #include <script/ismine.h>
 #include <script/standard.h>
 #include <support/allocators/secure.h>
diff --git a/src/key.cpp b/src/key.cpp
index acf3cf2e72..9331ced257 100644
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -5,7 +5,6 @@
 
 #include <key.h>
 
-#include <arith_uint256.h>
 #include <crypto/common.h>
 #include <crypto/hmac_sha512.h>
 #include <random.h>
diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp
index 41c1fcfc07..bd73dc4157 100644
--- a/src/merkleblock.cpp
+++ b/src/merkleblock.cpp
@@ -7,7 +7,6 @@
 
 #include <hash.h>
 #include <consensus/consensus.h>
-#include <util/strencodings.h>
 
 
 std::vector<unsigned char> BitsToBytes(const std::vector<bool>& bits)
diff --git a/src/miner.cpp b/src/miner.cpp
index 51eb2334a5..094c61ff08 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -21,7 +21,6 @@
 #include <util/system.h>
 #include <util/moneystr.h>
 #include <util/validation.h>
-#include <validationinterface.h>
 
 #include <evo/specialtx.h>
 #include <evo/cbtx.h>
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 2e607c6d2e..56e135fa3a 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -28,7 +28,6 @@
 #include <index/txindex.h>
 #include <txmempool.h>
 #include <util/system.h>
-#include <util/moneystr.h>
 #include <util/strencodings.h>
 #include <util/validation.h>
 
diff --git a/src/netbase.cpp b/src/netbase.cpp
index bb8c9e2785..3a040251fd 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -6,7 +6,6 @@
 #include <netbase.h>
 
 #include <sync.h>
-#include <uint256.h>
 #include <tinyformat.h>
 #include <util/system.h>
 #include <util/strencodings.h>
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index d5e0d60296..d373094245 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -9,7 +9,6 @@
 
 #include <coins.h>
 #include <policy/settings.h>
-#include <util/strencodings.h>
 
 
 CAmount GetDustThreshold(const CTxOut& txout, const CFeeRate& dustRelayFeeIn)
diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
index 977580958c..c47c5142d4 100644
--- a/src/primitives/block.cpp
+++ b/src/primitives/block.cpp
@@ -8,7 +8,6 @@
 #include <hash.h>
 #include <streams.h>
 #include <tinyformat.h>
-#include <util/strencodings.h>
 
 uint256 CBlockHeader::GetHash() const
 {
diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp
index c97b682dad..1010a99217 100644
--- a/src/qt/addressbookpage.cpp
+++ b/src/qt/addressbookpage.cpp
@@ -11,7 +11,6 @@
 #include <qt/forms/ui_addressbookpage.h>
 
 #include <qt/addresstablemodel.h>
-#include <qt/bitcoingui.h>
 #include <qt/csvmodelwriter.h>
 #include <qt/editaddressdialog.h>
 #include <qt/guiutil.h>
diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp
index dd689f587e..07f2c5c22d 100644
--- a/src/qt/addresstablemodel.cpp
+++ b/src/qt/addresstablemodel.cpp
@@ -8,7 +8,6 @@
 #include <qt/guiutil.h>
 #include <qt/walletmodel.h>
 
-#include <interfaces/node.h>
 #include <key_io.h>
 
 #include <algorithm>
diff --git a/src/qt/bantablemodel.cpp b/src/qt/bantablemodel.cpp
index d81a7543f8..19e905b84a 100644
--- a/src/qt/bantablemodel.cpp
+++ b/src/qt/bantablemodel.cpp
@@ -5,8 +5,6 @@
 #include <qt/bantablemodel.h>
 
 #include <qt/clientmodel.h>
-#include <qt/guiconstants.h>
-#include <qt/guiutil.h>
 
 #include <interfaces/node.h>
 
diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp
index f30ec7a7b6..60281e5684 100644
--- a/src/qt/bitcoinunits.cpp
+++ b/src/qt/bitcoinunits.cpp
@@ -5,7 +5,6 @@
 
 #include <qt/bitcoinunits.h>
 #include <chainparams.h>
-#include <primitives/transaction.h>
 
 #include <QSettings>
 #include <QStringList>
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index bf400d8ae6..0d9207c3d2 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -12,19 +12,13 @@
 
 #include <evo/deterministicmns.h>
 
-#include <chain.h>
-#include <chainparams.h>
 #include <clientversion.h>
 #include <governance/object.h>
 #include <interfaces/handler.h>
 #include <interfaces/node.h>
 #include <net.h>
 #include <netbase.h>
-#include <txmempool.h>
-#include <ui_interface.h>
 #include <util/system.h>
-#include <validation.h>
-#include <warnings.h>
 
 #include <stdint.h>
 
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index c592c94ec7..7bda8d3bac 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -11,19 +11,15 @@
 #include <qt/forms/ui_coincontroldialog.h>
 
 #include <qt/addresstablemodel.h>
-#include <base58.h>
 #include <qt/bitcoinunits.h>
 #include <qt/guiutil.h>
 #include <qt/optionsmodel.h>
-#include <txmempool.h>
 #include <qt/walletmodel.h>
 
 #include <wallet/coincontrol.h>
 #include <interfaces/node.h>
 #include <key_io.h>
 #include <policy/policy.h>
-#include <validation.h> // For mempool
-#include <wallet/fees.h>
 #include <wallet/wallet.h>
 
 #include <QApplication>
diff --git a/src/qt/dash.cpp b/src/qt/dash.cpp
index 1330239998..8ea38903f8 100644
--- a/src/qt/dash.cpp
+++ b/src/qt/dash.cpp
@@ -31,14 +31,10 @@
 #include <interfaces/handler.h>
 #include <interfaces/node.h>
 #include <noui.h>
-#include <rpc/server.h>
 #include <stacktraces.h>
 #include <ui_interface.h>
 #include <uint256.h>
 #include <util/system.h>
-#include <warnings.h>
-
-#include <walletinitinterface.h>
 
 #include <memory>
 #include <stdint.h>
diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp
index 4ee82be96e..321763bad0 100644
--- a/src/qt/receivecoinsdialog.cpp
+++ b/src/qt/receivecoinsdialog.cpp
@@ -5,9 +5,7 @@
 #include <qt/receivecoinsdialog.h>
 #include <qt/forms/ui_receivecoinsdialog.h>
 
-#include <qt/addressbookpage.h>
 #include <qt/addresstablemodel.h>
-#include <qt/bitcoinunits.h>
 #include <qt/optionsmodel.h>
 #include <qt/receiverequestdialog.h>
 #include <qt/recentrequeststablemodel.h>
diff --git a/src/qt/test/addressbooktests.cpp b/src/qt/test/addressbooktests.cpp
index d6cc9cb6b6..8a59db1ad7 100644
--- a/src/qt/test/addressbooktests.cpp
+++ b/src/qt/test/addressbooktests.cpp
@@ -4,8 +4,6 @@
 
 #include <interfaces/chain.h>
 #include <interfaces/node.h>
-#include <qt/addressbookpage.h>
-#include <qt/addresstablemodel.h>
 #include <qt/editaddressdialog.h>
 #include <qt/optionsmodel.h>
 #include <qt/qvalidatedlineedit.h>
diff --git a/src/qt/test/apptests.cpp b/src/qt/test/apptests.cpp
index 95c15d1d99..dc761cda5b 100644
--- a/src/qt/test/apptests.cpp
+++ b/src/qt/test/apptests.cpp
@@ -5,7 +5,6 @@
 #include <qt/test/apptests.h>
 
 #include <chainparams.h>
-#include <init.h>
 #include <key.h>
 #include <qt/dash.h>
 #include <qt/bitcoingui.h>
@@ -19,9 +18,6 @@
 #if defined(HAVE_CONFIG_H)
 #include <config/dash-config.h>
 #endif
-#ifdef ENABLE_WALLET
-#include <wallet/db.h>
-#endif
 
 #include <QAction>
 #include <QEventLoop>
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
index 65f71cb3f5..2763777b7b 100644
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -4,11 +4,7 @@
 
 #include <qt/test/rpcnestedtests.h>
 
-#include <chainparams.h>
-#include <consensus/validation.h>
 #include <interfaces/node.h>
-#include <validation.h>
-#include <rpc/register.h>
 #include <rpc/server.h>
 #include <qt/rpcconsole.h>
 #include <test/setup_common.h>
diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp
index 8e4c35e92d..2289115d0d 100644
--- a/src/qt/test/wallettests.cpp
+++ b/src/qt/test/wallettests.cpp
@@ -2,10 +2,8 @@
 #include <qt/test/util.h>
 
 #include <coinjoin/client.h>
-#include <init.h>
 #include <interfaces/chain.h>
 #include <interfaces/node.h>
-#include <base58.h>
 #include <qt/bitcoinamountfield.h>
 #include <qt/clientmodel.h>
 #include <qt/optionsmodel.h>
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index 07a469cb55..8501e6dfb5 100644
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -6,11 +6,8 @@
 #include <qt/transactionrecord.h>
 
 #include <chain.h>
-#include <consensus/consensus.h>
 #include <interfaces/wallet.h>
 #include <interfaces/node.h>
-#include <timedata.h>
-#include <validation.h>
 
 #include <stdint.h>
 
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index 2b09ce2f6c..c9d9ed19f6 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -12,11 +12,8 @@
 
 #include <core_io.h>
 #include <interfaces/handler.h>
-#include <interfaces/node.h>
-#include <sync.h>
 #include <uint256.h>
 #include <util/system.h>
-#include <validation.h>
 
 #include <algorithm>
 
diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
index 599c46df9a..40efe0dbf7 100644
--- a/src/qt/utilitydialog.cpp
+++ b/src/qt/utilitydialog.cpp
@@ -12,17 +12,13 @@
 #include <qt/forms/ui_helpmessagedialog.h>
 
 #include <qt/bitcoingui.h>
-#include <qt/clientmodel.h>
-#include <qt/guiconstants.h>
 #include <qt/guiutil.h>
-#include <qt/intro.h>
 #ifdef ENABLE_BIP70
 #include <qt/paymentrequestplus.h>
 #endif
 
 #include <clientversion.h>
 #include <init.h>
-#include <interfaces/node.h>
 #include <util/system.h>
 #include <util/strencodings.h>
 
diff --git a/src/qt/walletmodeltransaction.cpp b/src/qt/walletmodeltransaction.cpp
index 8bc3cc2463..0818fb7c9f 100644
--- a/src/qt/walletmodeltransaction.cpp
+++ b/src/qt/walletmodeltransaction.cpp
@@ -8,7 +8,6 @@
 
 #include <qt/walletmodeltransaction.h>
 
-#include <interfaces/node.h>
 #include <key_io.h>
 
 WalletModelTransaction::WalletModelTransaction(const QList<SendCoinsRecipient> &_recipients) :
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 94d9419d6d..b0151dc7ec 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -10,7 +10,6 @@
 #include <httpserver.h>
 #include <key_io.h>
 #include <net.h>
-#include <netbase.h>
 #include <rpc/blockchain.h>
 #include <rpc/server.h>
 #include <rpc/util.h>
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 4c30fb9b59..0883cb56d3 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -6,7 +6,6 @@
 #include <rpc/server.h>
 
 #include <banman.h>
-#include <chainparams.h>
 #include <clientversion.h>
 #include <core_io.h>
 #include <net.h>
@@ -18,7 +17,6 @@
 #include <rpc/util.h>
 #include <sync.h>
 #include <timedata.h>
-#include <ui_interface.h>
 #include <util/strencodings.h>
 #include <util/system.h>
 #include <validation.h>
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 551e60723c..f5f1cd0a92 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -12,7 +12,6 @@
 #include <core_io.h>
 #include <index/txindex.h>
 #include <init.h>
-#include <interfaces/chain.h>
 #include <key_io.h>
 #include <keystore.h>
 #include <merkleblock.h>
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 4c30aa469d..bf97ddf247 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -7,7 +7,6 @@
 #include <rpc/server.h>
 
 #include <chainparams.h>
-#include <random.h>
 #include <rpc/util.h>
 #include <shutdown.h>
 #include <sync.h>
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index c5cb601ad3..d17ca43c93 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -7,7 +7,6 @@
 
 #include <pubkey.h>
 #include <script/script.h>
-#include <util/strencodings.h>
 
 
 typedef std::vector<unsigned char> valtype;
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index d8d1454762..44c1d14505 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -4,7 +4,6 @@
 
 #include <clientversion.h>
 #include <coins.h>
-#include <consensus/validation.h>
 #include <script/standard.h>
 #include <streams.h>
 #include <test/setup_common.h>
diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp
index 58d8ab88bb..aacd1b90c6 100644
--- a/src/test/denialofservice_tests.cpp
+++ b/src/test/denialofservice_tests.cpp
@@ -9,7 +9,6 @@
 #include <keystore.h>
 #include <net.h>
 #include <net_processing.h>
-#include <pow.h>
 #include <script/sign.h>
 #include <util/memory.h>
 #include <util/system.h>
diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp
index 574af78d35..c4a29ac0c8 100644
--- a/src/test/multisig_tests.cpp
+++ b/src/test/multisig_tests.cpp
@@ -9,7 +9,6 @@
 #include <script/script_error.h>
 #include <script/interpreter.h>
 #include <script/sign.h>
-#include <script/ismine.h>
 #include <tinyformat.h>
 #include <uint256.h>
 #include <test/setup_common.h>
diff --git a/src/test/script_p2sh_tests.cpp b/src/test/script_p2sh_tests.cpp
index a3cdf924a0..9f2cbbd758 100644
--- a/src/test/script_p2sh_tests.cpp
+++ b/src/test/script_p2sh_tests.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <consensus/tx_verify.h>
-#include <core_io.h>
 #include <key.h>
 #include <keystore.h>
 #include <validation.h>
diff --git a/src/test/setup_common.cpp b/src/test/setup_common.cpp
index 4f85ab3a18..0d1531c235 100644
--- a/src/test/setup_common.cpp
+++ b/src/test/setup_common.cpp
@@ -20,7 +20,6 @@
 #include <rpc/server.h>
 #include <script/sigcache.h>
 #include <streams.h>
-#include <ui_interface.h>
 #include <txdb.h>
 #include <util/memory.h>
 #include <util/strencodings.h>
diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp
index 4341bb2976..fd1dc9f55b 100644
--- a/src/test/txvalidationcache_tests.cpp
+++ b/src/test/txvalidationcache_tests.cpp
@@ -8,7 +8,6 @@
 #include <script/standard.h>
 #include <script/sign.h>
 #include <test/setup_common.h>
-#include <core_io.h>
 #include <keystore.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/util.cpp b/src/test/util.cpp
index 964d08b08e..d31fc26845 100644
--- a/src/test/util.cpp
+++ b/src/test/util.cpp
@@ -6,11 +6,9 @@
 
 #include <chainparams.h>
 #include <consensus/merkle.h>
-#include <consensus/validation.h>
 #include <key_io.h>
 #include <miner.h>
 #include <pow.h>
-#include <scheduler.h>
 #include <script/standard.h>
 #include <validation.h>
 #ifdef ENABLE_WALLET
diff --git a/src/timedata.cpp b/src/timedata.cpp
index 28013bce20..88be0d39af 100644
--- a/src/timedata.cpp
+++ b/src/timedata.cpp
@@ -12,7 +12,6 @@
 #include <sync.h>
 #include <ui_interface.h>
 #include <util/system.h>
-#include <util/strencodings.h>
 #include <warnings.h>
 
 
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 8615214bf4..d893430a14 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -5,8 +5,6 @@
 
 #include <txdb.h>
 
-#include <chainparams.h>
-#include <hash.h>
 #include <random.h>
 #include <pow.h>
 #include <shutdown.h>
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 362b6abd36..155fd02731 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -13,8 +13,6 @@
 #include <policy/fees.h>
 #include <policy/settings.h>
 #include <reverse_iterator.h>
-#include <streams.h>
-#include <timedata.h>
 #include <util/system.h>
 #include <util/moneystr.h>
 #include <util/time.h>
diff --git a/src/ui_interface.cpp b/src/ui_interface.cpp
index 4627768746..99a061c458 100644
--- a/src/ui_interface.cpp
+++ b/src/ui_interface.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <ui_interface.h>
-#include <util/system.h>
 
 #include <boost/signals2/last_value.hpp>
 #include <boost/signals2/signal.hpp>
diff --git a/src/util/system.cpp b/src/util/system.cpp
index 6da750290a..4609b263d5 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -9,8 +9,6 @@
 #include <support/allocators/secure.h>
 #include <chainparamsbase.h>
 #include <ctpl_stl.h>
-#include <random.h>
-#include <serialize.h>
 #include <stacktraces.h>
 #include <util/getuniquepath.h>
 #include <util/strencodings.h>
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
index ecbe92779a..1bb69324f9 100644
--- a/src/validationinterface.cpp
+++ b/src/validationinterface.cpp
@@ -8,7 +8,6 @@
 #include <primitives/block.h>
 #include <scheduler.h>
 #include <txmempool.h>
-#include <validation.h>
 
 #include <future>
 
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
index 76d8deb756..4ac6b07788 100644
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -5,10 +5,7 @@
 
 #include <wallet/db.h>
 
-#include <hash.h>
-#include <protocol.h>
 #include <util/strencodings.h>
-#include <wallet/walletutil.h>
 
 #include <stdint.h>
 
diff --git a/src/wallet/fees.cpp b/src/wallet/fees.cpp
index faa5523f04..038d7030ef 100644
--- a/src/wallet/fees.cpp
+++ b/src/wallet/fees.cpp
@@ -5,8 +5,6 @@
 
 #include <wallet/fees.h>
 
-#include <policy/policy.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 af8cbf53a4..47d7d2a999 100644
--- a/src/wallet/init.cpp
+++ b/src/wallet/init.cpp
@@ -6,7 +6,6 @@
 #include <init.h>
 #include <interfaces/chain.h>
 #include <net.h>
-#include <scheduler.h>
 #include <util/error.h>
 #include <util/system.h>
 #include <util/moneystr.h>
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 86913c8adf..c092c1f01c 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -18,7 +18,6 @@
 #include <rpc/server.h>
 #include <rpc/util.h>
 #include <script/descriptor.h>
-#include <timedata.h>
 #include <util/fees.h>
 #include <util/system.h>
 #include <util/moneystr.h>
diff --git a/src/wallet/test/init_tests.cpp b/src/wallet/test/init_tests.cpp
index 0e6927e55b..77b4fe8099 100644
--- a/src/wallet/test/init_tests.cpp
+++ b/src/wallet/test/init_tests.cpp
@@ -8,9 +8,6 @@
 #include <util/system.h>
 #include <wallet/test/init_test_fixture.h>
 
-#include <wallet/wallet.h>
-
-
 BOOST_FIXTURE_TEST_SUITE(init_tests, InitWalletDirTestingSetup)
 
 BOOST_AUTO_TEST_CASE(walletinit_verify_walletdir_default)
diff --git a/src/wallet/test/psbt_wallet_tests.cpp b/src/wallet/test/psbt_wallet_tests.cpp
index 1345830659..0e2daeb0fa 100644
--- a/src/wallet/test/psbt_wallet_tests.cpp
+++ b/src/wallet/test/psbt_wallet_tests.cpp
@@ -5,7 +5,6 @@
 #include <key_io.h>
 #include <util/strencodings.h>
 #include <wallet/psbtwallet.h>
-#include <wallet/rpcwallet.h>
 #include <wallet/wallet.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/wallet/test/wallet_test_fixture.cpp b/src/wallet/test/wallet_test_fixture.cpp
index c4b8389958..f6db519621 100644
--- a/src/wallet/test/wallet_test_fixture.cpp
+++ b/src/wallet/test/wallet_test_fixture.cpp
@@ -4,8 +4,6 @@
 
 #include <wallet/test/wallet_test_fixture.h>
 
-#include <rpc/server.h>
-#include <wallet/rpcwallet.h>
 
 WalletTestingSetup::WalletTestingSetup(const std::string& chainName)
     : TestingSetup(chainName),
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index a6b54a22b0..79ec2bb140 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -17,7 +17,6 @@
 #include <key.h>
 #include <key_io.h>
 #include <keystore.h>
-#include <net.h>
 #include <policy/fees.h>
 #include <policy/policy.h>
 #include <policy/settings.h>
@@ -25,8 +24,6 @@
 #include <primitives/transaction.h>
 #include <script/script.h>
 #include <script/sign.h>
-#include <shutdown.h>
-#include <timedata.h>
 #include <txmempool.h>
 #include <util/error.h>
 #include <util/fees.h>
diff --git a/src/wallet/wallettool.cpp b/src/wallet/wallettool.cpp
index bf92784704..5ded126522 100644
--- a/src/wallet/wallettool.cpp
+++ b/src/wallet/wallettool.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <base58.h>
 #include <fs.h>
 #include <interfaces/chain.h>
 #include <util/system.h>
diff --git a/src/warnings.cpp b/src/warnings.cpp
index 0a06f45989..bf3039bc69 100644
--- a/src/warnings.cpp
+++ b/src/warnings.cpp
@@ -4,7 +4,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <sync.h>
-#include <clientversion.h>
 #include <util/system.h>
 #include <warnings.h>
 #include <hash.h>
diff --git a/src/zmq/zmqabstractnotifier.cpp b/src/zmq/zmqabstractnotifier.cpp
index 3b51e87fbe..9b451e189c 100644
--- a/src/zmq/zmqabstractnotifier.cpp
+++ b/src/zmq/zmqabstractnotifier.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <zmq/zmqabstractnotifier.h>
-#include <util/system.h>
 
 #include <cassert>
 
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
index e4a93d37c2..6578fb9fb5 100644
--- a/src/zmq/zmqnotificationinterface.cpp
+++ b/src/zmq/zmqnotificationinterface.cpp
@@ -9,7 +9,6 @@
 #include <zmq.h>
 
 #include <validation.h>
-#include <streams.h>
 #include <util/system.h>
 
 CZMQNotificationInterface::CZMQNotificationInterface() : pcontext(nullptr)
diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh
index 15907f9010..fd7e3de7e0 100755
--- a/test/lint/lint-circular-dependencies.sh
+++ b/test/lint/lint-circular-dependencies.sh
@@ -12,7 +12,6 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "chainparamsbase -> util/system -> chainparamsbase"
     "index/txindex -> validation -> index/txindex"
     "policy/fees -> txmempool -> policy/fees"
-    "policy/policy -> policy/settings -> policy/policy"
     "qt/addresstablemodel -> qt/walletmodel -> qt/addresstablemodel"
     "qt/bantablemodel -> qt/clientmodel -> qt/bantablemodel"
     "qt/bitcoingui -> qt/utilitydialog -> qt/bitcoingui"
@@ -24,15 +23,10 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "qt/transactiontablemodel -> qt/walletmodel -> qt/transactiontablemodel"
     "qt/walletmodel -> qt/walletmodeltransaction -> qt/walletmodel"
     "txmempool -> validation -> txmempool"
-    "validation -> validationinterface -> validation"
     "wallet/fees -> wallet/wallet -> wallet/fees"
     "wallet/wallet -> wallet/walletdb -> wallet/wallet"
     "wallet/coincontrol -> wallet/wallet -> wallet/coincontrol"
-    "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/addressbookpage"
     "txmempool -> validation -> validationinterface -> txmempool"
-    "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/receivecoinsdialog -> qt/addressbookpage"
-    "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/signverifymessagedialog -> qt/addressbookpage"
-    "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/sendcoinsdialog -> qt/sendcoinsentry -> qt/addressbookpage"
     # Dash
     "coinjoin/server -> net_processing -> coinjoin/server"
     "evo/cbtx -> evo/simplifiedmns -> evo/cbtx"
@@ -65,7 +59,6 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "llmq/signing -> net_processing -> llmq/signing"
     "llmq/signing_shares -> net_processing -> llmq/signing_shares"
     "logging -> util/system -> logging"
-    "logging -> util/system -> random -> logging"
     "masternode/payments -> validation -> masternode/payments"
     "net -> netmessagemaker -> net"
     "net_processing -> spork -> net_processing"
@@ -79,9 +72,9 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "core_io -> evo/cbtx -> evo/simplifiedmns -> core_io"
     "evo/simplifiedmns -> llmq/blockprocessor -> net_processing -> evo/simplifiedmns"
     "llmq/dkgsession -> llmq/dkgsessionmgr -> llmq/dkgsessionhandler -> llmq/dkgsession"
-    "logging -> util/system -> random -> logging"
     "logging -> util/system -> sync -> logging"
     "logging -> util/system -> stacktraces -> logging"
+    "logging -> util/system -> util/getuniquepath -> random -> logging"
     "coinjoin/client -> coinjoin/util -> wallet/wallet -> coinjoin/client"
     "qt/appearancewidget -> qt/guiutil -> qt/optionsdialog -> qt/appearancewidget"
     "qt/guiutil -> qt/optionsdialog -> qt/optionsmodel -> qt/guiutil"
@@ -103,6 +96,7 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "evo/deterministicmns -> llmq/utils -> net -> masternode/sync -> evo/deterministicmns"
     "evo/mnhftx -> evo/specialtx -> evo/mnhftx"
     "policy/fees -> txmempool -> validation -> policy/fees"
+    "policy/policy -> policy/settings -> policy/policy"
     "bloom -> evo/specialtx -> llmq/blockprocessor -> net -> bloom"
     "bloom -> evo/specialtx -> llmq/blockprocessor -> net_processing -> merkleblock -> bloom"
 )