From 7b7839001548140b79a475959fdecf7b1017dad7 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>
Date: Mon, 25 Oct 2021 09:55:34 -0400
Subject: [PATCH] refactor: Include adjustments (#4526)

* include adjustments

* fix macOs build failure

Signed-off-by: pasta <pasta@dashboost.org>

* expcitly include array in spork.h

* sort includes in most files
---
 src/coinjoin/client.cpp                 |  7 +++---
 src/coinjoin/coinjoin.cpp               | 21 +++++++++-------
 src/coinjoin/coinjoin.h                 |  7 +++---
 src/dash-tx.cpp                         |  1 +
 src/evo/mnauth.cpp                      |  3 ++-
 src/evo/providertx.cpp                  |  6 ++---
 src/evo/simplifiedmns.cpp               |  3 ++-
 src/evo/simplifiedmns.h                 |  3 ++-
 src/evo/specialtx.cpp                   |  5 ++--
 src/evo/specialtx.h                     |  1 +
 src/flat-database.h                     |  1 -
 src/governance/classes.cpp              |  1 +
 src/governance/governance.cpp           |  4 ++--
 src/governance/object.cpp               |  3 ++-
 src/governance/vote.cpp                 |  1 +
 src/key_io.cpp                          |  1 +
 src/key_io.h                            |  3 ++-
 src/llmq/chainlocks.cpp                 |  1 +
 src/llmq/chainlocks.h                   |  6 ++---
 src/llmq/dkgsession.h                   |  1 +
 src/llmq/instantsend.cpp                |  5 ++--
 src/llmq/signing.cpp                    |  3 ++-
 src/llmq/signing_shares.cpp             |  7 +++---
 src/llmq/signing_shares.h               |  6 ++++-
 src/llmq/utils.cpp                      | 24 +++++++++++++++----
 src/llmq/utils.h                        |  9 +------
 src/masternode/node.cpp                 |  1 +
 src/masternode/node.h                   |  2 +-
 src/masternode/payments.cpp             | 19 ++++++++++-----
 src/masternode/payments.h               |  9 +++++++
 src/masternode/sync.cpp                 |  8 ++++---
 src/masternode/sync.h                   |  1 +
 src/qt/sendcoinsdialog.cpp              |  1 +
 src/rpc/governance.cpp                  |  9 +++----
 src/rpc/masternode.cpp                  |  5 ++--
 src/rpc/misc.cpp                        |  1 +
 src/rpc/rawtransaction.cpp              |  1 +
 src/rpc/rpcevo.cpp                      | 23 ++++++++----------
 src/rpc/server.cpp                      |  1 +
 src/spork.cpp                           |  9 ++++++-
 src/spork.h                             | 32 ++++++++++++++++---------
 src/test/evo_deterministicmns_tests.cpp | 17 ++++++-------
 src/test/key_io_tests.cpp               |  1 +
 src/wallet/rpcwallet.cpp                |  1 +
 src/wallet/wallet.cpp                   |  1 +
 test/lint/lint-circular-dependencies.sh |  5 ++--
 46 files changed, 175 insertions(+), 105 deletions(-)

diff --git a/src/coinjoin/client.cpp b/src/coinjoin/client.cpp
index bb0104f438..53fcda8b52 100644
--- a/src/coinjoin/client.cpp
+++ b/src/coinjoin/client.cpp
@@ -5,18 +5,19 @@
 #include <coinjoin/client.h>
 #include <coinjoin/options.h>
 
+#include <chainparams.h>
 #include <consensus/validation.h>
 #include <core_io.h>
 #include <evo/deterministicmns.h>
-#include <masternode/sync.h>
 #include <masternode/meta.h>
-#include <netmessagemaker.h>
+#include <masternode/sync.h>
 #include <net_processing.h>
+#include <netmessagemaker.h>
 #include <script/sign.h>
 #include <shutdown.h>
 #include <txmempool.h>
-#include <util/system.h>
 #include <util/moneystr.h>
+#include <util/system.h>
 #include <validation.h>
 #include <version.h>
 #include <wallet/coincontrol.h>
diff --git a/src/coinjoin/coinjoin.cpp b/src/coinjoin/coinjoin.cpp
index ad8911d615..de7bac827b 100644
--- a/src/coinjoin/coinjoin.cpp
+++ b/src/coinjoin/coinjoin.cpp
@@ -4,21 +4,21 @@
 
 #include <coinjoin/coinjoin.h>
 
-#include <core_io.h>
-#include <consensus/validation.h>
+#include <bls/bls.h>
 #include <chain.h>
+#include <chainparams.h>
+#include <consensus/validation.h>
+#include <core_io.h>
+#include <llmq/chainlocks.h>
+#include <llmq/instantsend.h>
+#include <masternode/node.h>
+#include <masternode/sync.h>
 #include <messagesigner.h>
 #include <netmessagemaker.h>
 #include <txmempool.h>
-#include <util/system.h>
 #include <util/moneystr.h>
+#include <util/system.h>
 #include <validation.h>
-#include <bls/bls.h>
-#include <masternode/node.h>
-#include <masternode/sync.h>
-
-#include <llmq/instantsend.h>
-#include <llmq/chainlocks.h>
 
 #include <string>
 
@@ -612,3 +612,6 @@ void CCoinJoin::BlockDisconnected(const std::shared_ptr<const CBlock>& pblock, c
         UpdateDSTXConfirmedHeight(tx, -1);
     }
 }
+
+int CCoinJoin::GetMinPoolParticipants() { return Params().PoolMinParticipants(); }
+int CCoinJoin::GetMaxPoolParticipants() { return Params().PoolMaxParticipants(); }
diff --git a/src/coinjoin/coinjoin.h b/src/coinjoin/coinjoin.h
index 45510eb8f4..1f9bb07a27 100644
--- a/src/coinjoin/coinjoin.h
+++ b/src/coinjoin/coinjoin.h
@@ -5,7 +5,8 @@
 #ifndef BITCOIN_COINJOIN_COINJOIN_H
 #define BITCOIN_COINJOIN_COINJOIN_H
 
-#include <chainparams.h>
+#include <netaddress.h>
+#include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <sync.h>
 #include <timedata.h>
@@ -424,8 +425,8 @@ public:
     static std::string GetMessageByID(PoolMessage nMessageID);
 
     /// Get the minimum/maximum number of participants for the pool
-    static int GetMinPoolParticipants() { return Params().PoolMinParticipants(); }
-    static int GetMaxPoolParticipants() { return Params().PoolMaxParticipants(); }
+    static int GetMinPoolParticipants();
+    static int GetMaxPoolParticipants();
 
     static CAmount GetMaxPoolAmount() { return vecStandardDenominations.empty() ? 0 : COINJOIN_ENTRY_MAX_SIZE * vecStandardDenominations.front(); }
 
diff --git a/src/dash-tx.cpp b/src/dash-tx.cpp
index ff31a7852c..ef87ec2ba8 100644
--- a/src/dash-tx.cpp
+++ b/src/dash-tx.cpp
@@ -6,6 +6,7 @@
 #include <config/dash-config.h>
 #endif
 
+#include <chainparams.h>
 #include <clientversion.h>
 #include <coins.h>
 #include <consensus/consensus.h>
diff --git a/src/evo/mnauth.cpp b/src/evo/mnauth.cpp
index 45229a8dc4..279962e52c 100644
--- a/src/evo/mnauth.cpp
+++ b/src/evo/mnauth.cpp
@@ -4,10 +4,11 @@
 
 #include <evo/mnauth.h>
 
+#include <chainparams.h>
 #include <evo/deterministicmns.h>
 #include <llmq/utils.h>
-#include <masternode/node.h>
 #include <masternode/meta.h>
+#include <masternode/node.h>
 #include <masternode/sync.h>
 #include <net.h>
 #include <net_processing.h>
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index 7f17d55e8f..35d34211d5 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -2,15 +2,15 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <evo/deterministicmns.h>
 #include <evo/providertx.h>
-#include <evo/specialtx.h>
-#include <messagesigner.h>
 
 #include <chainparams.h>
 #include <coins.h>
 #include <consensus/validation.h>
+#include <evo/deterministicmns.h>
+#include <evo/specialtx.h>
 #include <hash.h>
+#include <messagesigner.h>
 #include <script/standard.h>
 #include <validation.h>
 
diff --git a/src/evo/simplifiedmns.cpp b/src/evo/simplifiedmns.cpp
index fa6532e328..91828bb21a 100644
--- a/src/evo/simplifiedmns.cpp
+++ b/src/evo/simplifiedmns.cpp
@@ -2,12 +2,13 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <evo/simplifiedmns.h>
+
 #include <evo/cbtx.h>
 #include <core_io.h>
 #include <evo/deterministicmns.h>
 #include <llmq/blockprocessor.h>
 #include <llmq/commitment.h>
-#include <evo/simplifiedmns.h>
 #include <evo/specialtx.h>
 
 #include <pubkey.h>
diff --git a/src/evo/simplifiedmns.h b/src/evo/simplifiedmns.h
index 3381f55d10..b604e39b28 100644
--- a/src/evo/simplifiedmns.h
+++ b/src/evo/simplifiedmns.h
@@ -6,11 +6,12 @@
 #define BITCOIN_EVO_SIMPLIFIEDMNS_H
 
 #include <bls/bls.h>
-
 #include <merkleblock.h>
+#include <netaddress.h>
 #include <pubkey.h>
 
 class UniValue;
+class CBlockIndex;
 class CDeterministicMNList;
 class CDeterministicMN;
 
diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
index 987cf69ccb..c0cfd5c03a 100644
--- a/src/evo/specialtx.cpp
+++ b/src/evo/specialtx.cpp
@@ -2,16 +2,15 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <evo/specialtx.h>
+
 #include <chainparams.h>
 #include <consensus/validation.h>
 #include <hash.h>
 #include <primitives/block.h>
 #include <validation.h>
-
 #include <evo/cbtx.h>
 #include <evo/deterministicmns.h>
-#include <evo/specialtx.h>
-
 #include <llmq/commitment.h>
 #include <llmq/blockprocessor.h>
 
diff --git a/src/evo/specialtx.h b/src/evo/specialtx.h
index 4838737693..87a3ea4f81 100644
--- a/src/evo/specialtx.h
+++ b/src/evo/specialtx.h
@@ -5,6 +5,7 @@
 #ifndef BITCOIN_EVO_SPECIALTX_H
 #define BITCOIN_EVO_SPECIALTX_H
 
+#include <primitives/transaction.h>
 #include <streams.h>
 #include <sync.h>
 #include <threadsafety.h>
diff --git a/src/flat-database.h b/src/flat-database.h
index ad30d7bd58..2257b7de14 100644
--- a/src/flat-database.h
+++ b/src/flat-database.h
@@ -5,7 +5,6 @@
 #ifndef BITCOIN_FLAT_DATABASE_H
 #define BITCOIN_FLAT_DATABASE_H
 
-#include <chainparams.h>
 #include <clientversion.h>
 #include <fs.h>
 #include <hash.h>
diff --git a/src/governance/classes.cpp b/src/governance/classes.cpp
index 97e4be6fdd..a682c0c096 100644
--- a/src/governance/classes.cpp
+++ b/src/governance/classes.cpp
@@ -4,6 +4,7 @@
 
 #include <governance/classes.h>
 
+#include <chainparams.h>
 #include <core_io.h>
 #include <governance/governance.h>
 #include <key_io.h>
diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index b3996b20ab..d1fd99d98a 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -6,7 +6,9 @@
 
 #include <bloom.h>
 #include <chain.h>
+#include <chainparams.h>
 #include <consensus/validation.h>
+#include <evo/deterministicmns.h>
 #include <governance/classes.h>
 #include <governance/validators.h>
 #include <masternode/meta.h>
@@ -18,8 +20,6 @@
 #include <shutdown.h>
 #include <spork.h>
 
-#include <evo/deterministicmns.h>
-
 CGovernanceManager governance;
 
 int nSubmittedFinalBudget;
diff --git a/src/governance/object.cpp b/src/governance/object.cpp
index 25831e7721..28c9c87154 100644
--- a/src/governance/object.cpp
+++ b/src/governance/object.cpp
@@ -4,10 +4,11 @@
 
 #include <governance/object.h>
 
+#include <chainparams.h>
 #include <core_io.h>
 #include <evo/deterministicmns.h>
-#include <governance/validators.h>
 #include <governance/governance.h>
+#include <governance/validators.h>
 #include <masternode/meta.h>
 #include <masternode/sync.h>
 #include <messagesigner.h>
diff --git a/src/governance/vote.cpp b/src/governance/vote.cpp
index 709032b521..4fd7bf038e 100644
--- a/src/governance/vote.cpp
+++ b/src/governance/vote.cpp
@@ -5,6 +5,7 @@
 #include <governance/vote.h>
 
 #include <bls/bls.h>
+#include <chainparams.h>
 #include <key.h>
 #include <masternode/sync.h>
 #include <messagesigner.h>
diff --git a/src/key_io.cpp b/src/key_io.cpp
index 9548016a50..df89ccb14a 100644
--- a/src/key_io.cpp
+++ b/src/key_io.cpp
@@ -6,6 +6,7 @@
 
 #include <base58.h>
 #include <bech32.h>
+#include <chainparams.h>
 #include <script/script.h>
 #include <util/strencodings.h>
 
diff --git a/src/key_io.h b/src/key_io.h
index d75b5b31c8..edd0a0b7bc 100644
--- a/src/key_io.h
+++ b/src/key_io.h
@@ -6,13 +6,14 @@
 #ifndef BITCOIN_KEY_IO_H
 #define BITCOIN_KEY_IO_H
 
-#include <chainparams.h>
 #include <key.h>
 #include <pubkey.h>
 #include <script/standard.h>
 
 #include <string>
 
+class CChainParams;
+
 CKey DecodeSecret(const std::string& str);
 std::string EncodeSecret(const CKey& key);
 
diff --git a/src/llmq/chainlocks.cpp b/src/llmq/chainlocks.cpp
index fbe87933a0..afda84351c 100644
--- a/src/llmq/chainlocks.cpp
+++ b/src/llmq/chainlocks.cpp
@@ -8,6 +8,7 @@
 #include <llmq/utils.h>
 
 #include <chain.h>
+#include <chainparams.h>
 #include <consensus/validation.h>
 #include <masternode/sync.h>
 #include <net_processing.h>
diff --git a/src/llmq/chainlocks.h b/src/llmq/chainlocks.h
index a190a716c1..85538353eb 100644
--- a/src/llmq/chainlocks.h
+++ b/src/llmq/chainlocks.h
@@ -6,11 +6,11 @@
 #define BITCOIN_LLMQ_CHAINLOCKS_H
 
 #include <bls/bls.h>
-#include <llmq/signing.h>
-
-#include <chainparams.h>
 #include <crypto/common.h>
+#include <llmq/signing.h>
 #include <net.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
 #include <saltedhasher.h>
 #include <streams.h>
 #include <sync.h>
diff --git a/src/llmq/dkgsession.h b/src/llmq/dkgsession.h
index 9e8b718dbb..ac3d38776c 100644
--- a/src/llmq/dkgsession.h
+++ b/src/llmq/dkgsession.h
@@ -13,6 +13,7 @@
 #include <llmq/utils.h>
 
 class UniValue;
+class CInv;
 
 namespace llmq
 {
diff --git a/src/llmq/instantsend.cpp b/src/llmq/instantsend.cpp
index 8e9788bdcd..9a80beff20 100644
--- a/src/llmq/instantsend.cpp
+++ b/src/llmq/instantsend.cpp
@@ -2,9 +2,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <llmq/instantsend.h>
+
 #include <llmq/chainlocks.h>
 #include <llmq/quorums.h>
-#include <llmq/instantsend.h>
 #include <llmq/utils.h>
 #include <llmq/commitment.h>
 
@@ -21,8 +22,6 @@
 
 #include <cxxtimer.hpp>
 
-#include <boost/algorithm/string/replace.hpp>
-
 namespace llmq
 {
 
diff --git a/src/llmq/signing.cpp b/src/llmq/signing.cpp
index 5c0f80f75d..6a407575af 100644
--- a/src/llmq/signing.cpp
+++ b/src/llmq/signing.cpp
@@ -2,9 +2,10 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <llmq/signing.h>
+
 #include <llmq/quorums.h>
 #include <llmq/commitment.h>
-#include <llmq/signing.h>
 #include <llmq/utils.h>
 #include <llmq/signing_shares.h>
 
diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index a5a08e9fee..085912eecb 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -2,16 +2,17 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <llmq/signing_shares.h>
+
 #include <llmq/quorums.h>
 #include <llmq/commitment.h>
 #include <llmq/signing.h>
-#include <llmq/signing_shares.h>
 #include <llmq/utils.h>
 
-
+#include <bls/bls_batchverifier.h>
+#include <chainparams.h>
 #include <evo/deterministicmns.h>
 #include <masternode/node.h>
-#include <bls/bls_batchverifier.h>
 #include <net_processing.h>
 #include <netmessagemaker.h>
 #include <spork.h>
diff --git a/src/llmq/signing_shares.h b/src/llmq/signing_shares.h
index e894a3e515..6e0b954a5a 100644
--- a/src/llmq/signing_shares.h
+++ b/src/llmq/signing_shares.h
@@ -5,7 +5,8 @@
 #ifndef BITCOIN_LLMQ_SIGNING_SHARES_H
 #define BITCOIN_LLMQ_SIGNING_SHARES_H
 
-#include <chainparams.h>
+#include <bls/bls.h>
+#include <llmq/signing.h>
 #include <net.h>
 #include <random.h>
 #include <saltedhasher.h>
@@ -20,6 +21,9 @@
 class CEvoDB;
 class CScheduler;
 
+class CDeterministicMN;
+using CDeterministicMNCPtr = std::shared_ptr<const CDeterministicMN>;
+
 namespace llmq
 {
 // <signHash, quorumMember>
diff --git a/src/llmq/utils.cpp b/src/llmq/utils.cpp
index 9dfac89351..1f8e7ea10c 100644
--- a/src/llmq/utils.cpp
+++ b/src/llmq/utils.cpp
@@ -2,21 +2,23 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <llmq/quorums.h>
-#include <llmq/commitment.h>
 #include <llmq/utils.h>
 
+#include <llmq/quorums.h>
+#include <llmq/commitment.h>
+
 #include <bls/bls.h>
+#include <chainparams.h>
 #include <evo/deterministicmns.h>
 #include <evo/evodb.h>
-#include <chainparams.h>
+#include <masternode/meta.h>
+#include <net.h>
 #include <random.h>
 #include <spork.h>
+#include <timedata.h>
 #include <validation.h>
 #include <versionbits.h>
 
-#include <masternode/meta.h>
-
 namespace llmq
 {
 
@@ -397,6 +399,18 @@ std::map<Consensus::LLMQType, QvvecSyncMode> CLLMQUtils::GetEnabledQuorumVvecSyn
     return mapQuorumVvecSyncEntries;
 }
 
+template <typename CacheType>
+void CLLMQUtils::InitQuorumsCache(CacheType& cache)
+{
+    for (auto& llmq : Params().GetConsensus().llmqs) {
+        cache.emplace(std::piecewise_construct, std::forward_as_tuple(llmq.first),
+                      std::forward_as_tuple(llmq.second.signingActiveQuorumCount + 1));
+    }
+}
+template void CLLMQUtils::InitQuorumsCache<std::map<Consensus::LLMQType, unordered_lru_cache<uint256, bool, StaticSaltedHasher>>>(std::map<Consensus::LLMQType, unordered_lru_cache<uint256, bool, StaticSaltedHasher>>& cache);
+template void CLLMQUtils::InitQuorumsCache<std::map<Consensus::LLMQType, unordered_lru_cache<uint256, std::vector<CQuorumCPtr>, StaticSaltedHasher>>>(std::map<Consensus::LLMQType, unordered_lru_cache<uint256, std::vector<CQuorumCPtr>, StaticSaltedHasher>>& cache);
+template void CLLMQUtils::InitQuorumsCache<std::map<Consensus::LLMQType, unordered_lru_cache<uint256, std::shared_ptr<llmq::CQuorum>, StaticSaltedHasher, 0ul, 0ul>, std::less<Consensus::LLMQType>, std::allocator<std::pair<Consensus::LLMQType const, unordered_lru_cache<uint256, std::shared_ptr<llmq::CQuorum>, StaticSaltedHasher, 0ul, 0ul>>>>>(std::map<Consensus::LLMQType, unordered_lru_cache<uint256, std::shared_ptr<llmq::CQuorum>, StaticSaltedHasher, 0ul, 0ul>, std::less<Consensus::LLMQType>, std::allocator<std::pair<Consensus::LLMQType const, unordered_lru_cache<uint256, std::shared_ptr<llmq::CQuorum>, StaticSaltedHasher, 0ul, 0ul>>>>&);
+
 const Consensus::LLMQParams& GetLLMQParams(Consensus::LLMQType llmqType)
 {
     return Params().GetConsensus().llmqs.at(llmqType);
diff --git a/src/llmq/utils.h b/src/llmq/utils.h
index 98c8993e7c..501987d4d5 100644
--- a/src/llmq/utils.h
+++ b/src/llmq/utils.h
@@ -12,7 +12,6 @@
 #include <random.h>
 #include <sync.h>
 #include <dbwrapper.h>
-#include <chainparams.h>
 #include <versionbits.h>
 
 class CBlockIndex;
@@ -113,13 +112,7 @@ public:
         return HexStr(vBytes);
     }
     template <typename CacheType>
-    static void InitQuorumsCache(CacheType& cache)
-    {
-        for (auto& llmq : Params().GetConsensus().llmqs) {
-            cache.emplace(std::piecewise_construct, std::forward_as_tuple(llmq.first),
-                                                    std::forward_as_tuple(llmq.second.signingActiveQuorumCount + 1));
-        }
-    }
+    static void InitQuorumsCache(CacheType& cache);
 };
 
 const Consensus::LLMQParams& GetLLMQParams(const Consensus::LLMQType llmqType);
diff --git a/src/masternode/node.cpp b/src/masternode/node.cpp
index 219fcf219c..81226adcae 100644
--- a/src/masternode/node.cpp
+++ b/src/masternode/node.cpp
@@ -6,6 +6,7 @@
 
 #include <evo/deterministicmns.h>
 
+#include <chainparams.h>
 #include <net.h>
 #include <netbase.h>
 #include <protocol.h>
diff --git a/src/masternode/node.h b/src/masternode/node.h
index 0b1baf4df7..db1e46f9fb 100644
--- a/src/masternode/node.h
+++ b/src/masternode/node.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_MASTERNODE_NODE_H
 #define BITCOIN_MASTERNODE_NODE_H
 
-#include <chainparams.h>
+#include <netaddress.h>
 #include <primitives/transaction.h>
 #include <validationinterface.h>
 
diff --git a/src/masternode/payments.cpp b/src/masternode/payments.cpp
index bf58772f3a..4a6609c816 100644
--- a/src/masternode/payments.cpp
+++ b/src/masternode/payments.cpp
@@ -2,14 +2,21 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <evo/deterministicmns.h>
-#include <governance/governance.h>
-#include <governance/classes.h>
-#include <masternode/node.h>
 #include <masternode/payments.h>
+
+#include <amount.h>
+#include <chain.h>
+#include <chainparams.h>
+#include <evo/deterministicmns.h>
+#include <governance/classes.h>
+#include <governance/governance.h>
+#include <key_io.h>
+#include <logging.h>
 #include <masternode/sync.h>
-#include <netfulfilledman.h>
-#include <netmessagemaker.h>
+#include <primitives/block.h>
+#include <script/standard.h>
+#include <tinyformat.h>
+#include <util/system.h>
 #include <validation.h>
 
 #include <string>
diff --git a/src/masternode/payments.h b/src/masternode/payments.h
index 0d82d0685f..25672f76e0 100644
--- a/src/masternode/payments.h
+++ b/src/masternode/payments.h
@@ -5,7 +5,16 @@
 #ifndef BITCOIN_MASTERNODE_PAYMENTS_H
 #define BITCOIN_MASTERNODE_PAYMENTS_H
 
+#include <amount.h>
+
+#include <string>
+#include <vector>
+
 class CMasternodePayments;
+class CBlock;
+class CTransaction;
+class CMutableTransaction;
+class CTxOut;
 
 /// TODO: all 4 functions do not belong here really, they should be refactored/moved somewhere (main.cpp ?)
 bool IsBlockValueValid(const CBlock& block, int nBlockHeight, CAmount blockReward, std::string& strErrorRet);
diff --git a/src/masternode/sync.cpp b/src/masternode/sync.cpp
index 71dc233c94..64e694dff9 100644
--- a/src/masternode/sync.cpp
+++ b/src/masternode/sync.cpp
@@ -2,14 +2,16 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <governance/governance.h>
-#include <validation.h>
 #include <masternode/sync.h>
+
+#include <chainparams.h>
+#include <evo/deterministicmns.h>
+#include <governance/governance.h>
 #include <netfulfilledman.h>
 #include <netmessagemaker.h>
 #include <shutdown.h>
 #include <ui_interface.h>
-#include <evo/deterministicmns.h>
+#include <validation.h>
 
 class CMasternodeSync;
 CMasternodeSync masternodeSync;
diff --git a/src/masternode/sync.h b/src/masternode/sync.h
index cd22d7adb4..88c2db24f8 100644
--- a/src/masternode/sync.h
+++ b/src/masternode/sync.h
@@ -5,6 +5,7 @@
 #define BITCOIN_MASTERNODE_SYNC_H
 
 #include <atomic>
+#include <string>
 
 class CMasternodeSync;
 class CBlockIndex;
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 419027c350..7dc2658b9c 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -18,6 +18,7 @@
 #include <qt/optionsmodel.h>
 #include <qt/sendcoinsentry.h>
 
+#include <chainparams.h>
 #include <interfaces/node.h>
 #include <key_io.h>
 #include <wallet/coincontrol.h>
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index c2b2b9d052..a8f3e71893 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -2,21 +2,22 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <chainparams.h>
 #include <consensus/validation.h>
 #include <core_io.h>
 #include <evo/deterministicmns.h>
-#include <governance/governance.h>
-#include <governance/vote.h>
 #include <governance/classes.h>
+#include <governance/governance.h>
 #include <governance/validators.h>
+#include <governance/vote.h>
 #include <index/txindex.h>
-#include <txmempool.h>
 #include <masternode/node.h>
 #include <masternode/sync.h>
 #include <messagesigner.h>
 #include <net.h>
-#include <rpc/util.h>
 #include <rpc/server.h>
+#include <rpc/util.h>
+#include <txmempool.h>
 #include <util/system.h>
 #include <validation.h>
 #include <wallet/rpcwallet.h>
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index f852e227a0..8a11dc91e6 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -2,6 +2,7 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <chainparams.h>
 #include <evo/deterministicmns.h>
 #include <governance/classes.h>
 #include <index/txindex.h>
@@ -9,8 +10,9 @@
 #include <masternode/payments.h>
 #include <net.h>
 #include <netbase.h>
-#include <rpc/util.h>
 #include <rpc/server.h>
+#include <rpc/util.h>
+#include <univalue.h>
 #include <validation.h>
 #include <wallet/coincontrol.h>
 #include <wallet/rpcwallet.h>
@@ -20,7 +22,6 @@
 
 #include <fstream>
 #include <iomanip>
-#include <univalue.h>
 
 static UniValue masternodelist(const JSONRPCRequest& request);
 
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 708e800d51..9a4f9a2021 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -5,6 +5,7 @@
 // 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>
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index a4c715019c..3a250778d8 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -5,6 +5,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <chain.h>
+#include <chainparams.h>
 #include <coins.h>
 #include <compat/byteswap.h>
 #include <consensus/validation.h>
diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 7414046f01..e6df6a3423 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -3,12 +3,20 @@
 // 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>
 #include <core_io.h>
+#include <evo/providertx.h>
+#include <evo/deterministicmns.h>
+#include <evo/simplifiedmns.h>
+#include <evo/specialtx.h>
 #include <index/txindex.h>
+#include <masternode/meta.h>
 #include <messagesigner.h>
-#include <rpc/util.h>
+#include <netbase.h>
 #include <rpc/server.h>
+#include <rpc/util.h>
 #include <txmempool.h>
 #include <util/moneystr.h>
 #include <util/validation.h>
@@ -16,21 +24,10 @@
 
 #ifdef ENABLE_WALLET
 #include <wallet/coincontrol.h>
-#include <wallet/wallet.h>
 #include <wallet/rpcwallet.h>
+#include <wallet/wallet.h>
 #endif//ENABLE_WALLET
 
-#include <netbase.h>
-
-#include <evo/specialtx.h>
-#include <evo/providertx.h>
-#include <evo/deterministicmns.h>
-#include <evo/simplifiedmns.h>
-
-#include <bls/bls.h>
-
-#include <masternode/meta.h>
-
 #ifdef ENABLE_WALLET
 extern UniValue signrawtransaction(const JSONRPCRequest& request);
 extern UniValue sendrawtransaction(const JSONRPCRequest& request);
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index b73696f4ad..80cf9fc556 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -6,6 +6,7 @@
 
 #include <rpc/server.h>
 
+#include <chainparams.h>
 #include <fs.h>
 #include <key_io.h>
 #include <random.h>
diff --git a/src/spork.cpp b/src/spork.cpp
index 850fdecc14..c70edf498a 100644
--- a/src/spork.cpp
+++ b/src/spork.cpp
@@ -5,11 +5,18 @@
 #include <spork.h>
 
 #include <chainparams.h>
+#include <consensus/params.h>
 #include <key_io.h>
-#include <validation.h>
+#include <logging.h>
 #include <messagesigner.h>
+#include <net.h>
 #include <net_processing.h>
 #include <netmessagemaker.h>
+#include <primitives/block.h>
+#include <protocol.h>
+#include <script/standard.h>
+#include <timedata.h>
+#include <validation.h>
 
 #include <string>
 
diff --git a/src/spork.h b/src/spork.h
index 381af253e2..b113981b83 100644
--- a/src/spork.h
+++ b/src/spork.h
@@ -6,12 +6,22 @@
 #define BITCOIN_SPORK_H
 
 #include <hash.h>
-#include <net.h>
-#include <saltedhasher.h>
-#include <util/strencodings.h>
 #include <key.h>
+#include <net.h>
+#include <pubkey.h>
+#include <saltedhasher.h>
+#include <sync.h>
+#include <uint256.h>
 
+#include <array>
+#include <string>
+#include <string_view>
 #include <unordered_map>
+#include <vector>
+
+class CConnman;
+class CNode;
+class CDataStream;
 
 class CSporkMessage;
 class CSporkManager;
@@ -52,14 +62,14 @@ struct CSporkDef
 };
 
 #define MAKE_SPORK_DEF(name, defaultValue) CSporkDef{name, defaultValue, #name}
-[[maybe_unused]] static constexpr std::array sporkDefs = {
-        MAKE_SPORK_DEF(SPORK_2_INSTANTSEND_ENABLED,            4070908800ULL), // OFF
-        MAKE_SPORK_DEF(SPORK_3_INSTANTSEND_BLOCK_FILTERING,    4070908800ULL), // OFF
-        MAKE_SPORK_DEF(SPORK_9_SUPERBLOCKS_ENABLED,            4070908800ULL), // OFF
-        MAKE_SPORK_DEF(SPORK_17_QUORUM_DKG_ENABLED,            4070908800ULL), // OFF
-        MAKE_SPORK_DEF(SPORK_19_CHAINLOCKS_ENABLED,            4070908800ULL), // OFF
-        MAKE_SPORK_DEF(SPORK_21_QUORUM_ALL_CONNECTED,          4070908800ULL), // OFF
-        MAKE_SPORK_DEF(SPORK_23_QUORUM_POSE,                   4070908800ULL), // OFF
+[[maybe_unused]] static constexpr std::array<CSporkDef, 7> sporkDefs = {
+    MAKE_SPORK_DEF(SPORK_2_INSTANTSEND_ENABLED,            4070908800ULL), // OFF
+    MAKE_SPORK_DEF(SPORK_3_INSTANTSEND_BLOCK_FILTERING,    4070908800ULL), // OFF
+    MAKE_SPORK_DEF(SPORK_9_SUPERBLOCKS_ENABLED,            4070908800ULL), // OFF
+    MAKE_SPORK_DEF(SPORK_17_QUORUM_DKG_ENABLED,            4070908800ULL), // OFF
+    MAKE_SPORK_DEF(SPORK_19_CHAINLOCKS_ENABLED,            4070908800ULL), // OFF
+    MAKE_SPORK_DEF(SPORK_21_QUORUM_ALL_CONNECTED,          4070908800ULL), // OFF
+    MAKE_SPORK_DEF(SPORK_23_QUORUM_POSE,                   4070908800ULL), // OFF
 };
 #undef MAKE_SPORK_DEF
 extern CSporkManager sporkManager;
diff --git a/src/test/evo_deterministicmns_tests.cpp b/src/test/evo_deterministicmns_tests.cpp
index 273c9a2cbb..4919c0f159 100644
--- a/src/test/evo_deterministicmns_tests.cpp
+++ b/src/test/evo_deterministicmns_tests.cpp
@@ -4,18 +4,19 @@
 
 #include <test/test_dash.h>
 
-#include <consensus/validation.h>
-#include <script/interpreter.h>
-#include <script/standard.h>
-#include <script/sign.h>
-#include <validation.h>
 #include <base58.h>
-#include <netbase.h>
-#include <messagesigner.h>
-#include <policy/policy.h>
+#include <chainparams.h>
+#include <consensus/validation.h>
 #include <keystore.h>
+#include <messagesigner.h>
+#include <netbase.h>
+#include <policy/policy.h>
+#include <script/interpreter.h>
+#include <script/sign.h>
+#include <script/standard.h>
 #include <spork.h>
 #include <txmempool.h>
+#include <validation.h>
 
 #include <evo/specialtx.h>
 #include <evo/providertx.h>
diff --git a/src/test/key_io_tests.cpp b/src/test/key_io_tests.cpp
index 5435ea9666..3008b27693 100644
--- a/src/test/key_io_tests.cpp
+++ b/src/test/key_io_tests.cpp
@@ -5,6 +5,7 @@
 #include <test/data/key_io_invalid.json.h>
 #include <test/data/key_io_valid.json.h>
 
+#include <chainparams.h>
 #include <key.h>
 #include <key_io.h>
 #include <script/script.h>
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index fc367df062..81bc0007ca 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -6,6 +6,7 @@
 
 #include <amount.h>
 #include <chain.h>
+#include <chainparams.h>
 #include <consensus/validation.h>
 #include <core_io.h>
 #include <httpserver.h>
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 31ae109a20..b4687389ff 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -7,6 +7,7 @@
 #include <wallet/wallet.h>
 
 #include <chain.h>
+#include <chainparams.h>
 #include <wallet/coinselection.h>
 #include <consensus/consensus.h>
 #include <consensus/validation.h>
diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh
index 870079b229..c20f010003 100755
--- a/test/lint/lint-circular-dependencies.sh
+++ b/test/lint/lint-circular-dependencies.sh
@@ -101,11 +101,10 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "evo/deterministicmns -> validationinterface -> txmempool -> evo/deterministicmns"
     "llmq/chainlocks -> llmq/instantsend -> validation -> llmq/chainlocks"
     "evo/deterministicmns -> evo/simplifiedmns -> llmq/blockprocessor -> net_processing -> masternode/payments -> evo/deterministicmns"
-    "evo/deterministicmns -> evo/simplifiedmns -> llmq/blockprocessor -> net_processing -> masternode/payments -> masternode/node -> evo/deterministicmns"
-    "evo/deterministicmns -> evo/simplifiedmns -> llmq/blockprocessor -> net -> masternode/sync -> evo/deterministicmns"
     "governance/governance -> net_processing -> masternode/payments -> governance/governance"
-    "evo/deterministicmns -> evo/simplifiedmns -> llmq/blockprocessor -> net -> evo/deterministicmns"
     "coinjoin/coinjoin -> llmq/chainlocks -> net -> coinjoin/coinjoin"
+    "evo/deterministicmns -> llmq/utils -> net -> evo/deterministicmns"
+    "evo/deterministicmns -> llmq/utils -> net -> masternode/sync -> evo/deterministicmns"
 )
 
 EXIT_CODE=0