From b389d0bba3cf0c3f1766def00818011c84df88a7 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Thu, 3 Jul 2025 01:57:21 +0700
Subject: [PATCH 1/2] refactor: drop several circular dependencies by removing
 unused headers

These unused headers has been found by running iwyu linter
---
 src/logging.cpp                         | 1 -
 src/qt/guiutil.cpp                      | 1 -
 src/wallet/wallet.cpp                   | 1 -
 test/lint/lint-circular-dependencies.py | 9 ---------
 4 files changed, 12 deletions(-)

diff --git a/src/logging.cpp b/src/logging.cpp
index da099cc1cebb..2d98525a3a2a 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -6,7 +6,6 @@
 #include <fs.h>
 #include <logging.h>
 #include <util/string.h>
-#include <util/system.h>
 #include <util/threadnames.h>
 #include <util/time.h>
 
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index a462726a5f33..1fcc3ca040d0 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -9,7 +9,6 @@
 #include <qt/bitcoinaddressvalidator.h>
 #include <qt/bitcoingui.h>
 #include <qt/bitcoinunits.h>
-#include <qt/optionsdialog.h>
 #include <qt/qvalidatedlineedit.h>
 #include <qt/sendcoinsrecipient.h>
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index eafb8a6cdd3e..6979c5d49fae 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -42,7 +42,6 @@
 #include <wallet/coincontrol.h>
 #include <wallet/coinselection.h>
 #include <wallet/context.h>
-#include <wallet/fees.h>
 #include <warnings.h>
 
 #include <coinjoin/common.h>
diff --git a/test/lint/lint-circular-dependencies.py b/test/lint/lint-circular-dependencies.py
index 723aaf239545..aa60522a8c69 100755
--- a/test/lint/lint-circular-dependencies.py
+++ b/test/lint/lint-circular-dependencies.py
@@ -19,7 +19,6 @@
     "qt/addresstablemodel -> qt/walletmodel -> qt/addresstablemodel",
     "qt/recentrequeststablemodel -> qt/walletmodel -> qt/recentrequeststablemodel",
     "qt/transactiontablemodel -> qt/walletmodel -> qt/transactiontablemodel",
-    "wallet/fees -> wallet/wallet -> wallet/fees",
     "wallet/wallet -> wallet/walletdb -> wallet/wallet",
     "node/coinstats -> validation -> node/coinstats",
     # Dash
@@ -59,21 +58,13 @@
     "llmq/signing -> llmq/signing_shares -> llmq/signing",
     "llmq/signing -> net_processing -> llmq/signing",
     "llmq/signing_shares -> net_processing -> llmq/signing_shares",
-    "logging -> util/system -> logging",
-    "logging -> util/system -> stacktraces -> logging",
-    "logging -> util/system -> sync -> logging",
-    "logging -> util/system -> sync -> logging/timer -> logging",
-    "logging -> util/system -> util/getuniquepath -> random -> logging",
     "masternode/payments -> validation -> masternode/payments",
     "net -> netmessagemaker -> net",
     "net_processing -> spork -> net_processing",
     "netaddress -> netbase -> netaddress",
     "qt/appearancewidget -> qt/guiutil -> qt/appearancewidget",
-    "qt/appearancewidget -> qt/guiutil -> qt/optionsdialog -> qt/appearancewidget",
     "qt/bitcoinaddressvalidator -> qt/guiutil -> qt/bitcoinaddressvalidator",
     "qt/bitcoingui -> qt/guiutil -> qt/bitcoingui",
-    "qt/guiutil -> qt/optionsdialog -> qt/guiutil",
-    "qt/guiutil -> qt/optionsdialog -> qt/optionsmodel -> qt/guiutil",
     "qt/guiutil -> qt/qvalidatedlineedit -> qt/guiutil",
     "wallet/coinjoin -> wallet/receive -> wallet/coinjoin",
 )

From 9aa039c3ca3dc1fc7ce4732b2ea7d1c2f5569926 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Thu, 3 Jul 2025 02:35:56 +0700
Subject: [PATCH 2/2] refactor: removed multiple unused includes; added some
 must-have headers

It improves compilation time insignificantly (1minute out of 98minutes,  assuming 1 core compilation, 1% improvement)
---
 src/bls/bls_worker.cpp                           |  1 -
 src/coinjoin/client.cpp                          |  4 +---
 src/coinjoin/coinjoin.cpp                        |  4 ----
 src/coinjoin/interfaces.cpp                      |  3 ---
 src/coinjoin/server.cpp                          |  2 --
 src/coinjoin/util.cpp                            |  2 --
 src/dsnotificationinterface.cpp                  |  2 --
 src/evo/chainhelper.cpp                          |  2 +-
 src/evo/deterministicmns.cpp                     |  1 -
 src/evo/dmnstate.cpp                             |  4 ----
 src/evo/mnauth.cpp                               |  3 ---
 src/evo/mnauth.h                                 |  3 +++
 src/evo/simplifiedmns.cpp                        |  1 -
 src/evo/specialtxman.cpp                         |  2 --
 src/governance/classes.cpp                       |  5 -----
 src/governance/classes.h                         |  4 ++++
 src/governance/common.cpp                        |  1 -
 src/governance/exceptions.cpp                    |  1 -
 src/governance/governance.cpp                    |  1 -
 src/governance/object.cpp                        |  1 -
 src/governance/vote.cpp                          |  7 ++-----
 src/llmq/chainlocks.cpp                          |  6 ++----
 src/llmq/commitment.h                            |  1 +
 src/llmq/context.cpp                             |  6 ++----
 src/llmq/dkgsession.cpp                          |  7 ++-----
 src/llmq/dkgsessionmgr.cpp                       |  1 -
 src/llmq/ehf_signals.cpp                         |  5 +----
 src/llmq/quorums.cpp                             | 10 ++++------
 src/llmq/signing.cpp                             |  4 ----
 src/llmq/snapshot.cpp                            |  7 +------
 src/llmq/utils.cpp                               |  2 +-
 src/masternode/meta.cpp                          |  2 --
 src/masternode/node.cpp                          |  2 --
 src/masternode/payments.cpp                      |  1 -
 src/masternode/sync.cpp                          |  2 --
 src/masternode/utils.cpp                         |  1 -
 src/netfulfilledman.cpp                          |  1 -
 src/qt/governancelist.cpp                        |  3 ---
 src/qt/masternodelist.cpp                        |  2 --
 src/rpc/coinjoin.cpp                             |  3 ---
 src/rpc/evo.cpp                                  |  6 ------
 src/rpc/governance.cpp                           |  4 ----
 src/rpc/masternode.cpp                           |  5 -----
 src/rpc/quorums.cpp                              |  1 -
 src/saltedhasher.cpp                             |  2 --
 src/spork.cpp                                    |  2 --
 src/stats/client.cpp                             |  2 +-
 src/test/block_reward_reallocation_tests.cpp     |  3 ---
 src/test/dynamic_activation_thresholds_tests.cpp |  3 ---
 src/test/evo_deterministicmns_tests.cpp          |  3 ---
 src/test/evo_mnhf_tests.cpp                      |  1 -
 src/test/evo_utils_tests.cpp                     |  5 +----
 src/wallet/hdchain.cpp                           |  1 -
 53 files changed, 27 insertions(+), 131 deletions(-)

diff --git a/src/bls/bls_worker.cpp b/src/bls/bls_worker.cpp
index 31f657320569..8041d14fc511 100644
--- a/src/bls/bls_worker.cpp
+++ b/src/bls/bls_worker.cpp
@@ -4,7 +4,6 @@
 
 #include <bls/bls_worker.h>
 #include <hash.h>
-#include <serialize.h>
 
 #include <util/ranges.h>
 #include <util/system.h>
diff --git a/src/coinjoin/client.cpp b/src/coinjoin/client.cpp
index 9eab45fb862f..35593152c8b2 100644
--- a/src/coinjoin/client.cpp
+++ b/src/coinjoin/client.cpp
@@ -7,7 +7,6 @@
 #include <chain.h>
 #include <chainparams.h>
 #include <coinjoin/options.h>
-#include <consensus/validation.h>
 #include <core_io.h>
 #include <evo/deterministicmns.h>
 #include <masternode/meta.h>
@@ -25,10 +24,9 @@
 #include <version.h>
 #include <wallet/coincontrol.h>
 #include <wallet/coinjoin.h>
-#include <wallet/fees.h>
+#include <wallet/coinselection.h>
 #include <wallet/receive.h>
 #include <wallet/spend.h>
-#include <walletinitinterface.h>
 
 #include <memory>
 #include <univalue.h>
diff --git a/src/coinjoin/coinjoin.cpp b/src/coinjoin/coinjoin.cpp
index 698d53e71859..641a1e7c02d3 100644
--- a/src/coinjoin/coinjoin.cpp
+++ b/src/coinjoin/coinjoin.cpp
@@ -7,14 +7,10 @@
 #include <bls/bls.h>
 #include <chain.h>
 #include <chainparams.h>
-#include <consensus/validation.h>
-#include <governance/common.h>
 #include <instantsend/instantsend.h>
 #include <llmq/chainlocks.h>
 #include <masternode/node.h>
 #include <masternode/sync.h>
-#include <messagesigner.h>
-#include <netmessagemaker.h>
 #include <txmempool.h>
 #include <util/moneystr.h>
 #include <util/system.h>
diff --git a/src/coinjoin/interfaces.cpp b/src/coinjoin/interfaces.cpp
index a434d023a801..98091b694c12 100644
--- a/src/coinjoin/interfaces.cpp
+++ b/src/coinjoin/interfaces.cpp
@@ -9,11 +9,8 @@
 #include <coinjoin/options.h>
 #include <node/context.h>
 #include <util/check.h>
-#include <wallet/wallet.h>
 #include <walletinitinterface.h>
 
-#include <univalue.h>
-
 #include <memory>
 #include <string>
 
diff --git a/src/coinjoin/server.cpp b/src/coinjoin/server.cpp
index 01a8266916ee..a90df185ef1a 100644
--- a/src/coinjoin/server.cpp
+++ b/src/coinjoin/server.cpp
@@ -4,7 +4,6 @@
 
 #include <coinjoin/server.h>
 
-#include <consensus/validation.h>
 #include <core_io.h>
 #include <evo/deterministicmns.h>
 #include <masternode/meta.h>
@@ -21,7 +20,6 @@
 #include <util/ranges.h>
 #include <util/system.h>
 #include <validation.h>
-#include <version.h>
 
 #include <univalue.h>
 
diff --git a/src/coinjoin/util.cpp b/src/coinjoin/util.cpp
index 647793c87fac..7b777c0311b8 100644
--- a/src/coinjoin/util.cpp
+++ b/src/coinjoin/util.cpp
@@ -3,10 +3,8 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <coinjoin/util.h>
-#include <net.h>
 #include <policy/fees.h>
 #include <policy/policy.h>
-#include <script/sign.h>
 #include <util/translation.h>
 #include <wallet/fees.h>
 #include <wallet/spend.h>
diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
index 04c0a742b635..a83d36c47143 100644
--- a/src/dsnotificationinterface.cpp
+++ b/src/dsnotificationinterface.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 <chainparams.h>
 #include <coinjoin/coinjoin.h>
 #ifdef ENABLE_WALLET
 #include <coinjoin/client.h>
@@ -11,7 +10,6 @@
 #include <dsnotificationinterface.h>
 #include <governance/governance.h>
 #include <masternode/sync.h>
-#include <net_processing.h>
 #include <validation.h>
 
 #include <evo/deterministicmns.h>
diff --git a/src/evo/chainhelper.cpp b/src/evo/chainhelper.cpp
index 4014bb79335c..bda004ab14b3 100644
--- a/src/evo/chainhelper.cpp
+++ b/src/evo/chainhelper.cpp
@@ -4,7 +4,7 @@
 
 #include <evo/chainhelper.h>
 
-#include <consensus/params.h>
+#include <chainparams.h>
 #include <evo/specialtxman.h>
 #include <instantsend/instantsend.h>
 #include <instantsend/lock.h>
diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 4554944b41ba..004f6eb0e554 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -11,7 +11,6 @@
 #include <evo/specialtx.h>
 #include <index/txindex.h>
 
-#include <base58.h>
 #include <chainparams.h>
 #include <coins.h>
 #include <consensus/validation.h>
diff --git a/src/evo/dmnstate.cpp b/src/evo/dmnstate.cpp
index 6734c9671a27..dae0db688e4e 100644
--- a/src/evo/dmnstate.cpp
+++ b/src/evo/dmnstate.cpp
@@ -3,14 +3,10 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <evo/dmnstate.h>
-#include <evo/providertx.h>
 
-#include <chainparams.h>
-#include <consensus/validation.h>
 #include <script/standard.h>
 
 #include <univalue.h>
-#include <messagesigner.h>
 
 std::string CDeterministicMNState::ToString() const
 {
diff --git a/src/evo/mnauth.cpp b/src/evo/mnauth.cpp
index eb55888580e5..0358a2f0db99 100644
--- a/src/evo/mnauth.cpp
+++ b/src/evo/mnauth.cpp
@@ -5,7 +5,6 @@
 #include <evo/mnauth.h>
 
 #include <bls/bls.h>
-#include <chain.h>
 #include <chainparams.h>
 #include <evo/deterministicmns.h>
 #include <llmq/utils.h>
@@ -13,10 +12,8 @@
 #include <masternode/node.h>
 #include <masternode/sync.h>
 #include <net.h>
-#include <net_types.h>
 #include <netmessagemaker.h>
 #include <util/time.h>
-#include <validation.h>
 
 void CMNAuth::PushMNAUTH(CNode& peer, CConnman& connman, const CActiveMasternodeManager& mn_activeman)
 {
diff --git a/src/evo/mnauth.h b/src/evo/mnauth.h
index a28771813b80..d883f8900fd8 100644
--- a/src/evo/mnauth.h
+++ b/src/evo/mnauth.h
@@ -8,6 +8,9 @@
 #include <bls/bls.h>
 #include <protocol.h>
 #include <serialize.h>
+#include <uint256.h>
+
+#include <string_view>
 
 class CActiveMasternodeManager;
 class CBlockIndex;
diff --git a/src/evo/simplifiedmns.cpp b/src/evo/simplifiedmns.cpp
index 3b2fd600e7a7..b84f2e98bf00 100644
--- a/src/evo/simplifiedmns.cpp
+++ b/src/evo/simplifiedmns.cpp
@@ -9,7 +9,6 @@
 #include <evo/netinfo.h>
 #include <key_io.h>
 #include <logging.h>
-#include <pubkey.h>
 #include <serialize.h>
 #include <sync.h>
 #include <univalue.h>
diff --git a/src/evo/specialtxman.cpp b/src/evo/specialtxman.cpp
index 07481112a3d4..162446a14d99 100644
--- a/src/evo/specialtxman.cpp
+++ b/src/evo/specialtxman.cpp
@@ -13,9 +13,7 @@
 #include <evo/creditpool.h>
 #include <evo/deterministicmns.h>
 #include <evo/mnhftx.h>
-#include <evo/providertx.h>
 #include <evo/simplifiedmns.h>
-#include <hash.h>
 #include <llmq/blockprocessor.h>
 #include <llmq/chainlocks.h>
 #include <llmq/clsig.h>
diff --git a/src/governance/classes.cpp b/src/governance/classes.cpp
index 62be337be3d1..7df1c6843254 100644
--- a/src/governance/classes.cpp
+++ b/src/governance/classes.cpp
@@ -5,18 +5,13 @@
 #include <governance/classes.h>
 
 #include <chainparams.h>
-#include <consensus/validation.h>
 #include <core_io.h>
-#include <deploymentstatus.h>
 #include <key_io.h>
 #include <primitives/transaction.h>
 #include <script/standard.h>
-#include <util/moneystr.h>
 #include <util/strencodings.h>
-#include <util/time.h>
 #include <util/underlying.h>
 #include <validation.h>
-#include <versionbits.h>
 
 #include <univalue.h>
 
diff --git a/src/governance/classes.h b/src/governance/classes.h
index 030ae5f0502a..50c7f1e2ef9c 100644
--- a/src/governance/classes.h
+++ b/src/governance/classes.h
@@ -10,6 +10,10 @@
 #include <script/standard.h>
 #include <uint256.h>
 
+#include <memory>
+#include <string>
+#include <vector>
+
 class CChain;
 class CSuperblock;
 class CTxOut;
diff --git a/src/governance/common.cpp b/src/governance/common.cpp
index 81d1b3f1c0c7..30d000384024 100644
--- a/src/governance/common.cpp
+++ b/src/governance/common.cpp
@@ -5,7 +5,6 @@
 #include <governance/common.h>
 
 #include <util/strencodings.h>
-#include <util/underlying.h>
 #include <hash.h>
 #include <univalue.h>
 
diff --git a/src/governance/exceptions.cpp b/src/governance/exceptions.cpp
index f6ecc0e75f29..453266c100c6 100644
--- a/src/governance/exceptions.cpp
+++ b/src/governance/exceptions.cpp
@@ -6,7 +6,6 @@
 #include <tinyformat.h>
 
 #include <iostream>
-#include <sstream>
 
 std::ostream& operator<<(std::ostream& os, governance_exception_type_enum_t eType)
 {
diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index d2ca46cffd74..04982906f6fc 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -7,7 +7,6 @@
 #include <chain.h>
 #include <chainparams.h>
 #include <common/bloom.h>
-#include <consensus/validation.h>
 #include <deploymentstatus.h>
 #include <evo/deterministicmns.h>
 #include <flat-database.h>
diff --git a/src/governance/object.cpp b/src/governance/object.cpp
index 839d7d118f3c..cb2f19c9f014 100644
--- a/src/governance/object.cpp
+++ b/src/governance/object.cpp
@@ -14,7 +14,6 @@
 #include <masternode/meta.h>
 #include <masternode/node.h>
 #include <masternode/sync.h>
-#include <messagesigner.h>
 #include <net_processing.h>
 #include <timedata.h>
 #include <util/time.h>
diff --git a/src/governance/vote.cpp b/src/governance/vote.cpp
index e96d250a469e..57c6e5d69ffd 100644
--- a/src/governance/vote.cpp
+++ b/src/governance/vote.cpp
@@ -2,21 +2,18 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <evo/dmn_types.h>
 #include <governance/vote.h>
 
 #include <bls/bls.h>
 #include <chainparams.h>
-#include <key.h>
+#include <evo/deterministicmns.h>
+#include <evo/dmn_types.h>
 #include <masternode/node.h>
 #include <masternode/sync.h>
 #include <messagesigner.h>
 #include <net_processing.h>
 #include <timedata.h>
 #include <util/string.h>
-#include <util/system.h>
-
-#include <evo/deterministicmns.h>
 
 std::string CGovernanceVoting::ConvertOutcomeToString(vote_outcome_enum_t nOutcome)
 {
diff --git a/src/llmq/chainlocks.cpp b/src/llmq/chainlocks.cpp
index 43836b68378b..8e8917180ae8 100644
--- a/src/llmq/chainlocks.cpp
+++ b/src/llmq/chainlocks.cpp
@@ -3,10 +3,12 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <llmq/chainlocks.h>
+#include <llmq/quorums.h>
 
 #include <chain.h>
 #include <chainparams.h>
 #include <consensus/validation.h>
+#include <instantsend/instantsend.h>
 #include <masternode/sync.h>
 #include <node/blockstorage.h>
 #include <node/interface_ui.h>
@@ -20,10 +22,6 @@
 #include <validation.h>
 #include <validationinterface.h>
 
-#include <instantsend/instantsend.h>
-#include <llmq/quorums.h>
-#include <llmq/signing_shares.h>
-
 using node::ReadBlockFromDisk;
 
 // Forward declaration to break dependency over node/transaction.h
diff --git a/src/llmq/commitment.h b/src/llmq/commitment.h
index ca55131c9665..c2b79d07ca5a 100644
--- a/src/llmq/commitment.h
+++ b/src/llmq/commitment.h
@@ -15,6 +15,7 @@
 #include <gsl/pointers.h>
 #include <univalue.h>
 
+#include <algorithm>
 #include <limits>
 #include <memory>
 #include <string>
diff --git a/src/llmq/context.cpp b/src/llmq/context.cpp
index 7b3d31a1fc77..87ed6f4709fe 100644
--- a/src/llmq/context.cpp
+++ b/src/llmq/context.cpp
@@ -4,13 +4,10 @@
 
 #include <llmq/context.h>
 
-#include <dbwrapper.h>
-#include <validation.h>
-
+#include <bls/bls_worker.h>
 #include <instantsend/instantsend.h>
 #include <llmq/blockprocessor.h>
 #include <llmq/chainlocks.h>
-#include <llmq/commitment.h>
 #include <llmq/debug.h>
 #include <llmq/dkgsessionmgr.h>
 #include <llmq/ehf_signals.h>
@@ -18,6 +15,7 @@
 #include <llmq/signing.h>
 #include <llmq/signing_shares.h>
 #include <llmq/snapshot.h>
+#include <validation.h>
 
 LLMQContext::LLMQContext(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CEvoDB& evo_db,
                          CMasternodeMetaMan& mn_metaman, CMNHFManager& mnhfman, CSporkManager& sporkman,
diff --git a/src/llmq/dkgsession.cpp b/src/llmq/dkgsession.cpp
index 481c69eb9dae..2fb687772808 100644
--- a/src/llmq/dkgsession.cpp
+++ b/src/llmq/dkgsession.cpp
@@ -10,21 +10,18 @@
 #include <llmq/options.h>
 #include <llmq/utils.h>
 
-#include <evo/deterministicmns.h>
-#include <evo/specialtx.h>
-
 #include <batchedlogger.h>
 #include <chainparams.h>
 #include <cxxtimer.hpp>
 #include <deploymentstatus.h>
+#include <evo/deterministicmns.h>
 #include <logging.h>
 #include <masternode/meta.h>
 #include <masternode/node.h>
-#include <netmessagemaker.h>
 #include <util/irange.h>
 #include <util/underlying.h>
 
-#include <univalue.h>
+#include <array>
 #include <atomic>
 #include <memory>
 
diff --git a/src/llmq/dkgsessionmgr.cpp b/src/llmq/dkgsessionmgr.cpp
index f0169b86b713..6386d9487ab4 100644
--- a/src/llmq/dkgsessionmgr.cpp
+++ b/src/llmq/dkgsessionmgr.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <llmq/debug.h>
 #include <llmq/dkgsessionmgr.h>
 #include <llmq/options.h>
 #include <llmq/params.h>
diff --git a/src/llmq/ehf_signals.cpp b/src/llmq/ehf_signals.cpp
index 3272acb8a166..91eb293ace9c 100644
--- a/src/llmq/ehf_signals.cpp
+++ b/src/llmq/ehf_signals.cpp
@@ -4,15 +4,12 @@
 
 #include <llmq/ehf_signals.h>
 #include <llmq/quorums.h>
-#include <llmq/signing_shares.h>
 #include <llmq/commitment.h>
 
-#include <evo/mnhftx.h>
-#include <evo/specialtx.h>
-
 #include <chainparams.h>
 #include <consensus/validation.h>
 #include <deploymentstatus.h>
+#include <evo/mnhftx.h>
 #include <index/txindex.h> // g_txindex
 #include <primitives/transaction.h>
 #include <validation.h>
diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp
index de1b3815c59b..2f05b9d6c814 100644
--- a/src/llmq/quorums.cpp
+++ b/src/llmq/quorums.cpp
@@ -5,23 +5,21 @@
 #include <llmq/quorums.h>
 #include <llmq/commitment.h>
 #include <llmq/blockprocessor.h>
-#include <llmq/dkgsession.h>
 #include <llmq/dkgsessionmgr.h>
 #include <llmq/options.h>
 #include <llmq/params.h>
 #include <llmq/utils.h>
 
-#include <evo/deterministicmns.h>
-#include <evo/evodb.h>
-#include <evo/specialtx.h>
-
+#include <bls/bls.h>
+#include <bls/bls_ies.h>
 #include <chainparams.h>
 #include <dbwrapper.h>
+#include <evo/deterministicmns.h>
+#include <evo/evodb.h>
 #include <masternode/node.h>
 #include <masternode/sync.h>
 #include <net.h>
 #include <netmessagemaker.h>
-#include <univalue.h>
 #include <util/irange.h>
 #include <util/time.h>
 #include <util/underlying.h>
diff --git a/src/llmq/signing.cpp b/src/llmq/signing.cpp
index 154d5af7d032..f543cd399087 100644
--- a/src/llmq/signing.cpp
+++ b/src/llmq/signing.cpp
@@ -5,7 +5,6 @@
 #include <llmq/signing.h>
 
 #include <llmq/commitment.h>
-#include <llmq/options.h>
 #include <llmq/quorums.h>
 #include <llmq/signing_shares.h>
 
@@ -16,10 +15,7 @@
 #include <hash.h>
 #include <masternode/node.h>
 #include <net_processing.h>
-#include <netmessagemaker.h>
-#include <scheduler.h>
 #include <streams.h>
-#include <util/irange.h>
 #include <util/thread.h>
 #include <util/time.h>
 #include <util/underlying.h>
diff --git a/src/llmq/snapshot.cpp b/src/llmq/snapshot.cpp
index b0097798e409..ca4969e39b0d 100644
--- a/src/llmq/snapshot.cpp
+++ b/src/llmq/snapshot.cpp
@@ -4,17 +4,12 @@
 
 #include <llmq/snapshot.h>
 
+#include <chainparams.h>
 #include <evo/evodb.h>
 #include <evo/simplifiedmns.h>
 #include <evo/smldiff.h>
-#include <evo/specialtx.h>
-
 #include <llmq/blockprocessor.h>
 #include <llmq/commitment.h>
-
-#include <base58.h>
-#include <chainparams.h>
-#include <serialize.h>
 #include <univalue.h>
 #include <validation.h>
 
diff --git a/src/llmq/utils.cpp b/src/llmq/utils.cpp
index b64b573c88a7..bb042d9bd98b 100644
--- a/src/llmq/utils.cpp
+++ b/src/llmq/utils.cpp
@@ -7,10 +7,10 @@
 #include <llmq/options.h>
 #include <llmq/snapshot.h>
 
+#include <bls/bls.h>
 #include <chainparams.h>
 #include <deploymentstatus.h>
 #include <evo/deterministicmns.h>
-#include <evo/evodb.h>
 #include <masternode/meta.h>
 #include <net.h>
 #include <random.h>
diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index 3cc3ffbb5932..bb657b1dac89 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -8,8 +8,6 @@
 #include <univalue.h>
 #include <util/time.h>
 
-#include <sstream>
-
 const std::string MasternodeMetaStore::SERIALIZATION_VERSION_STRING = "CMasternodeMetaMan-Version-3";
 
 CMasternodeMetaMan::CMasternodeMetaMan() :
diff --git a/src/masternode/node.cpp b/src/masternode/node.cpp
index e582b8ee4efc..5399ab47ba14 100644
--- a/src/masternode/node.cpp
+++ b/src/masternode/node.cpp
@@ -12,8 +12,6 @@
 #include <netbase.h>
 #include <protocol.h>
 #include <util/check.h>
-#include <validation.h>
-#include <warnings.h>
 
 namespace {
 bool GetLocal(CService& addr, const CNetAddr* paddrPeer)
diff --git a/src/masternode/payments.cpp b/src/masternode/payments.cpp
index c21e90bfa16b..ee589b694ef6 100644
--- a/src/masternode/payments.cpp
+++ b/src/masternode/payments.cpp
@@ -5,7 +5,6 @@
 #include <masternode/payments.h>
 
 #include <chain.h>
-#include <chainparams.h>
 #include <consensus/amount.h>
 #include <deploymentstatus.h>
 #include <evo/deterministicmns.h>
diff --git a/src/masternode/sync.cpp b/src/masternode/sync.cpp
index 419d9b78ac03..c653778fd401 100644
--- a/src/masternode/sync.cpp
+++ b/src/masternode/sync.cpp
@@ -14,8 +14,6 @@
 #include <util/translation.h>
 #include <validation.h>
 
-class CMasternodeSync;
-
 CMasternodeSync::CMasternodeSync(CConnman& _connman, CNetFulfilledRequestManager& netfulfilledman) :
     nTimeAssetSyncStarted(GetTime()),
     nTimeLastBumped(GetTime()),
diff --git a/src/masternode/utils.cpp b/src/masternode/utils.cpp
index a145cd9403c9..2988b3ffe801 100644
--- a/src/masternode/utils.cpp
+++ b/src/masternode/utils.cpp
@@ -11,7 +11,6 @@
 #include <masternode/sync.h>
 #include <net.h>
 #include <shutdown.h>
-#include <validation.h>
 #include <util/ranges.h>
 #include <coinjoin/context.h>
 
diff --git a/src/netfulfilledman.cpp b/src/netfulfilledman.cpp
index 7bcbdb626127..8e68dca02db7 100644
--- a/src/netfulfilledman.cpp
+++ b/src/netfulfilledman.cpp
@@ -6,7 +6,6 @@
 #include <flat-database.h>
 #include <netfulfilledman.h>
 #include <shutdown.h>
-#include <util/system.h>
 
 CNetFulfilledRequestManager::CNetFulfilledRequestManager() :
     m_db{std::make_unique<db_type>("netfulfilled.dat", "magicFulfilledCache")}
diff --git a/src/qt/governancelist.cpp b/src/qt/governancelist.cpp
index 157690e24733..643a234d6894 100644
--- a/src/qt/governancelist.cpp
+++ b/src/qt/governancelist.cpp
@@ -7,15 +7,12 @@
 
 #include <chainparams.h>
 #include <chainparamsbase.h>
-#include <clientversion.h>
-#include <coins.h>
 #include <evo/deterministicmns.h>
 #include <governance/governance.h>
 #include <governance/vote.h>
 #include <interfaces/node.h>
 #include <interfaces/wallet.h>
 #include <key_io.h>
-#include <netbase.h>
 #include <qt/clientmodel.h>
 #include <qt/guiutil.h>
 #include <qt/optionsmodel.h>
diff --git a/src/qt/masternodelist.cpp b/src/qt/masternodelist.cpp
index 779c7e6a11ee..e34b9ac7eba7 100644
--- a/src/qt/masternodelist.cpp
+++ b/src/qt/masternodelist.cpp
@@ -7,10 +7,8 @@
 
 #include <evo/deterministicmns.h>
 #include <qt/clientmodel.h>
-#include <clientversion.h>
 #include <coins.h>
 #include <qt/guiutil.h>
-#include <netbase.h>
 #include <qt/walletmodel.h>
 
 #include <univalue.h>
diff --git a/src/rpc/coinjoin.cpp b/src/rpc/coinjoin.cpp
index 2a2605ca032d..539972428e7d 100644
--- a/src/rpc/coinjoin.cpp
+++ b/src/rpc/coinjoin.cpp
@@ -5,13 +5,10 @@
 #include <coinjoin/context.h>
 #include <coinjoin/server.h>
 #include <node/context.h>
-#include <rpc/blockchain.h>
 #include <rpc/server.h>
 #include <rpc/server_util.h>
 #include <rpc/util.h>
 #include <util/check.h>
-#include <util/strencodings.h>
-#include <validation.h>
 #include <wallet/receive.h>
 #include <wallet/rpc/util.h>
 #include <walletinitinterface.h>
diff --git a/src/rpc/evo.cpp b/src/rpc/evo.cpp
index 60cc1a62c02c..87c141b56790 100644
--- a/src/rpc/evo.cpp
+++ b/src/rpc/evo.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 <bls/bls.h>
 #include <chainparams.h>
 #include <consensus/validation.h>
@@ -16,19 +15,14 @@
 #include <evo/specialtx.h>
 #include <evo/specialtxman.h>
 #include <index/txindex.h>
-#include <llmq/blockprocessor.h>
 #include <llmq/context.h>
 #include <masternode/meta.h>
-#include <messagesigner.h>
-#include <netbase.h>
 #include <node/context.h>
-#include <rpc/blockchain.h>
 #include <rpc/evo_util.h>
 #include <rpc/server.h>
 #include <rpc/server_util.h>
 #include <rpc/util.h>
 #include <util/check.h>
-#include <util/moneystr.h>
 #include <util/translation.h>
 #include <validation.h>
 #include <wallet/rpc/util.h>
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index ec2fa75a0f95..dad086aed8c3 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -13,17 +13,13 @@
 #include <index/txindex.h>
 #include <masternode/node.h>
 #include <masternode/sync.h>
-#include <messagesigner.h>
-#include <net.h>
 #include <node/context.h>
-#include <rpc/blockchain.h>
 #include <rpc/server.h>
 #include <rpc/server_util.h>
 #include <rpc/util.h>
 #include <timedata.h>
 #include <util/check.h>
 #include <util/strencodings.h>
-#include <util/system.h>
 #include <validation.h>
 #include <wallet/rpc/util.h>
 
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 266845d3e90d..3dcf92e29496 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -6,7 +6,6 @@
 #include <evo/assetlocktx.h>
 #include <evo/chainhelper.h>
 #include <evo/deterministicmns.h>
-#include <governance/classes.h>
 #include <index/txindex.h>
 #include <node/blockstorage.h>
 #include <node/context.h>
@@ -15,7 +14,6 @@
 #include <masternode/payments.h>
 #include <net.h>
 #include <netbase.h>
-#include <rpc/blockchain.h>
 #include <rpc/server.h>
 #include <rpc/server_util.h>
 #include <rpc/util.h>
@@ -31,9 +29,6 @@
 #include <wallet/wallet.h>
 #endif // ENABLE_WALLET
 
-#include <fstream>
-#include <iomanip>
-
 using node::GetTransaction;
 using node::NodeContext;
 using node::ReadBlockFromDisk;
diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
index c8bfd6cd0128..18283aa8a4bd 100644
--- a/src/rpc/quorums.cpp
+++ b/src/rpc/quorums.cpp
@@ -7,7 +7,6 @@
 #include <index/txindex.h>
 #include <net_processing.h>
 #include <node/context.h>
-#include <rpc/blockchain.h>
 #include <rpc/server.h>
 #include <rpc/server_util.h>
 #include <rpc/util.h>
diff --git a/src/saltedhasher.cpp b/src/saltedhasher.cpp
index b947eb9eaf06..5eaab82f3a1c 100644
--- a/src/saltedhasher.cpp
+++ b/src/saltedhasher.cpp
@@ -5,8 +5,6 @@
 #include <saltedhasher.h>
 #include <random.h>
 
-#include <limits>
-
 SaltedHasherBase::SaltedHasherBase() : k0(GetRand<uint64_t>()), k1(GetRand<uint64_t>()) {}
 
 SaltedHasherBase StaticSaltedHasher::s;
diff --git a/src/spork.cpp b/src/spork.cpp
index 3bf9c5302b7a..0c6e7fd0d09d 100644
--- a/src/spork.cpp
+++ b/src/spork.cpp
@@ -5,7 +5,6 @@
 #include <spork.h>
 
 #include <chainparams.h>
-#include <consensus/params.h>
 #include <flat-database.h>
 #include <key_io.h>
 #include <logging.h>
@@ -13,7 +12,6 @@
 #include <net.h>
 #include <net_processing.h>
 #include <netmessagemaker.h>
-#include <primitives/block.h>
 #include <protocol.h>
 #include <script/standard.h>
 #include <timedata.h>
diff --git a/src/stats/client.cpp b/src/stats/client.cpp
index 633dd425caad..7eb3c962c7dd 100644
--- a/src/stats/client.cpp
+++ b/src/stats/client.cpp
@@ -6,11 +6,11 @@
 
 #include <stats/client.h>
 
+#include <logging.h>
 #include <stats/rawsender.h>
 #include <util/system.h>
 
 #include <cmath>
-#include <cstdio>
 #include <random>
 
 namespace {
diff --git a/src/test/block_reward_reallocation_tests.cpp b/src/test/block_reward_reallocation_tests.cpp
index 7afb4888db8c..26f203de4a5e 100644
--- a/src/test/block_reward_reallocation_tests.cpp
+++ b/src/test/block_reward_reallocation_tests.cpp
@@ -6,10 +6,7 @@
 
 #include <bls/bls.h>
 #include <chainparams.h>
-#include <consensus/validation.h>
 #include <deploymentstatus.h>
-#include <messagesigner.h>
-#include <netbase.h>
 #include <node/miner.h>
 #include <node/transaction.h>
 #include <script/interpreter.h>
diff --git a/src/test/dynamic_activation_thresholds_tests.cpp b/src/test/dynamic_activation_thresholds_tests.cpp
index f8684be042b8..27a6170e9ee4 100644
--- a/src/test/dynamic_activation_thresholds_tests.cpp
+++ b/src/test/dynamic_activation_thresholds_tests.cpp
@@ -5,11 +5,8 @@
 #include <test/util/setup_common.h>
 
 #include <chainparams.h>
-#include <consensus/validation.h>
 #include <deploymentstatus.h>
 #include <node/miner.h>
-#include <script/interpreter.h>
-#include <spork.h>
 #include <validation.h>
 #include <versionbits.h>
 
diff --git a/src/test/evo_deterministicmns_tests.cpp b/src/test/evo_deterministicmns_tests.cpp
index 7c786443e775..06e97f8b669b 100644
--- a/src/test/evo_deterministicmns_tests.cpp
+++ b/src/test/evo_deterministicmns_tests.cpp
@@ -4,7 +4,6 @@
 
 #include <test/util/setup_common.h>
 
-#include <base58.h>
 #include <chainparams.h>
 #include <consensus/validation.h>
 #include <deploymentstatus.h>
@@ -12,10 +11,8 @@
 #include <evo/providertx.h>
 #include <evo/simplifiedmns.h>
 #include <evo/specialtx.h>
-#include <instantsend/instantsend.h>
 #include <llmq/context.h>
 #include <messagesigner.h>
-#include <netbase.h>
 #include <node/transaction.h>
 #include <policy/policy.h>
 #include <script/interpreter.h>
diff --git a/src/test/evo_mnhf_tests.cpp b/src/test/evo_mnhf_tests.cpp
index 97635e956396..43000f5c5a41 100644
--- a/src/test/evo_mnhf_tests.cpp
+++ b/src/test/evo_mnhf_tests.cpp
@@ -9,7 +9,6 @@
 #include <llmq/context.h>
 #include <primitives/transaction.h>
 #include <uint256.h>
-#include <util/strencodings.h>
 #include <util/string.h>
 #include <validation.h>
 
diff --git a/src/test/evo_utils_tests.cpp b/src/test/evo_utils_tests.cpp
index b2aeeb85fcdc..9b0eb1a6e140 100644
--- a/src/test/evo_utils_tests.cpp
+++ b/src/test/evo_utils_tests.cpp
@@ -4,11 +4,8 @@
 
 #include <test/util/setup_common.h>
 
-#include <llmq/params.h>
-#include <llmq/options.h>
-
 #include <chainparams.h>
-
+#include <llmq/options.h>
 #include <validation.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/wallet/hdchain.cpp b/src/wallet/hdchain.cpp
index 0695fda02694..538d89692aab 100644
--- a/src/wallet/hdchain.cpp
+++ b/src/wallet/hdchain.cpp
@@ -5,7 +5,6 @@
 
 #include <wallet/bip39.h>
 #include <chainparams.h>
-#include <key_io.h>
 #include <tinyformat.h>
 #include <util/system.h>