refactor: use iwyu analyzer to break circular dependencies

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>

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>

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>

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>
 

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>
 

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>

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>

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>

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>

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
 {

src/evo/mnauth.cpp

@@ -5,18 +5,15 @@
 #include <evo/mnauth.h>
 
 #include <bls/bls.h>
-#include <chain.h>
 #include <chainparams.h>
 #include <evo/deterministicmns.h>
 #include <llmq/utils.h>
 #include <masternode/meta.h>
 #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)
 {

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;

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>

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>

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>
 

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;

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>
 

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)
 {

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>

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>

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)
 {

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

src/llmq/commitment.h

@@ -15,6 +15,7 @@
 #include <gsl/pointers.h>
 #include <univalue.h>
 
+#include <algorithm>
 #include <limits>
 #include <memory>
 #include <string>

src/llmq/context.cpp

@@ -4,20 +4,18 @@
 
 #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>
 #include <llmq/quorums.h>
 #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,

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>
 

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>

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>

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>