diff --git a/src/evo/assetlocktx.h b/src/evo/assetlocktx.h
index 1e9a666d50..531183fd0a 100644
--- a/src/evo/assetlocktx.h
+++ b/src/evo/assetlocktx.h
@@ -6,9 +6,9 @@
 #define BITCOIN_EVO_ASSETLOCKTX_H
 
 #include <bls/bls_ies.h>
-#include <primitives/transaction.h>
+#include <consensus/amount.h>
 #include <gsl/pointers.h>
-
+#include <primitives/transaction.h>
 #include <serialize.h>
 #include <univalue.h>
 
diff --git a/src/evo/cbtx.cpp b/src/evo/cbtx.cpp
index 48baccd9d9..a9a5abe762 100644
--- a/src/evo/cbtx.cpp
+++ b/src/evo/cbtx.cpp
@@ -20,6 +20,7 @@
 #include <deploymentstatus.h>
 #include <validation.h>
 
+
 bool CheckCbTx(const CTransaction& tx, const CBlockIndex* pindexPrev, TxValidationState& state)
 {
     if (tx.nType != TRANSACTION_COINBASE) {
@@ -448,7 +449,7 @@ std::string CCbTx::ToString() const
         creditPoolBalance / COIN, creditPoolBalance % COIN);
 }
 
-std::optional<CCbTx> GetCoinbaseTx(const CBlockIndex* pindex)
+std::optional<std::pair<CBLSSignature, uint32_t>> GetNonNullCoinbaseChainlock(const CBlockIndex* pindex)
 {
     if (pindex == nullptr) {
         return std::nullopt;
@@ -464,20 +465,14 @@ std::optional<CCbTx> GetCoinbaseTx(const CBlockIndex* pindex)
         return std::nullopt;
     }
 
-    CTransactionRef cbTx = block.vtx[0];
-    return GetTxPayload<CCbTx>(*cbTx);
-}
-
-std::optional<std::pair<CBLSSignature, uint32_t>> GetNonNullCoinbaseChainlock(const CBlockIndex* pindex)
-{
-    auto opt_cbtx = GetCoinbaseTx(pindex);
+    const CTransactionRef cbTx = block.vtx[0];
+    const auto opt_cbtx = GetTxPayload<CCbTx>(*cbTx);
 
     if (!opt_cbtx.has_value()) {
         return std::nullopt;
     }
 
-    CCbTx& cbtx = opt_cbtx.value();
-
+    const CCbTx& cbtx = opt_cbtx.value();
     if (cbtx.nVersion < CCbTx::Version::CLSIG_AND_BALANCE) {
         return std::nullopt;
     }
diff --git a/src/evo/cbtx.h b/src/evo/cbtx.h
index dccfb56212..cb8ab1f92c 100644
--- a/src/evo/cbtx.h
+++ b/src/evo/cbtx.h
@@ -100,7 +100,6 @@ bool CheckCbTxBestChainlock(const CBlock& block, const CBlockIndex* pindexPrev,
 bool CalcCbTxBestChainlock(const llmq::CChainLocksHandler& chainlock_handler, const CBlockIndex* pindexPrev,
                            uint32_t& bestCLHeightDiff, CBLSSignature& bestCLSignature);
 
-std::optional<CCbTx> GetCoinbaseTx(const CBlockIndex* pindex);
 std::optional<std::pair<CBLSSignature, uint32_t>> GetNonNullCoinbaseChainlock(const CBlockIndex* pindex);
 
 #endif // BITCOIN_EVO_CBTX_H
diff --git a/src/evo/creditpool.h b/src/evo/creditpool.h
index dfb3004f8e..5da980df65 100644
--- a/src/evo/creditpool.h
+++ b/src/evo/creditpool.h
@@ -5,10 +5,7 @@
 #ifndef BITCOIN_EVO_CREDITPOOL_H
 #define BITCOIN_EVO_CREDITPOOL_H
 
-#include <coins.h>
-
-#include <evo/assetlocktx.h>
-
+#include <consensus/amount.h>
 #include <saltedhasher.h>
 #include <serialize.h>
 #include <sync.h>
@@ -16,10 +13,13 @@
 #include <unordered_lru_cache.h>
 #include <util/ranges_set.h>
 
+#include <evo/assetlocktx.h>
+
 #include <optional>
 #include <unordered_set>
 
 class BlockManager;
+class CBlock;
 class CBlockIndex;
 class BlockValidationState;
 class CEvoDB;
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index c8a3020283..52119350f1 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -29,6 +29,7 @@
 class CBlock;
 class CBlockIndex;
 class CChainState;
+class CCoinsViewCache;
 class CConnman;
 class CEvoDB;
 class TxValidationState;
diff --git a/src/evo/dmnstate.h b/src/evo/dmnstate.h
index 0a0f62316d..acee5c2b49 100644
--- a/src/evo/dmnstate.h
+++ b/src/evo/dmnstate.h
@@ -5,12 +5,12 @@
 #ifndef BITCOIN_EVO_DMNSTATE_H
 #define BITCOIN_EVO_DMNSTATE_H
 
-#include <crypto/common.h>
 #include <bls/bls.h>
-#include <pubkey.h>
-#include <netaddress.h>
-#include <script/script.h>
+#include <crypto/sha256.h>
 #include <evo/providertx.h>
+#include <netaddress.h>
+#include <pubkey.h>
+#include <script/script.h>
 
 #include <memory>
 #include <utility>
diff --git a/src/evo/mnauth.h b/src/evo/mnauth.h
index 6de79a8bcf..3ecff64a4c 100644
--- a/src/evo/mnauth.h
+++ b/src/evo/mnauth.h
@@ -14,16 +14,12 @@ class CBlockIndex;
 class CChain;
 class CConnman;
 class CDataStream;
-class CDeterministicMN;
 class CDeterministicMNList;
 class CDeterministicMNListDiff;
-class CDeterministicMNManager;
 class CMasternodeMetaMan;
 class CMasternodeSync;
 class CNode;
 
-class UniValue;
-
 enum ServiceFlags : uint64_t;
 
 /**
diff --git a/src/evo/mnhftx.h b/src/evo/mnhftx.h
index 2f759c5724..eb92f1db82 100644
--- a/src/evo/mnhftx.h
+++ b/src/evo/mnhftx.h
@@ -7,14 +7,12 @@
 
 #include <bls/bls.h>
 #include <gsl/pointers.h>
-#include <primitives/transaction.h>
 #include <sync.h>
 #include <threadsafety.h>
 #include <univalue.h>
 
 #include <optional>
 #include <saltedhasher.h>
-#include <unordered_map>
 #include <unordered_lru_cache.h>
 #include <versionbits.h>
 
@@ -22,6 +20,7 @@ class BlockValidationState;
 class CBlock;
 class CBlockIndex;
 class CEvoDB;
+class CTransaction;
 class ChainstateManager;
 class TxValidationState;
 namespace llmq {
diff --git a/src/evo/providertx.h b/src/evo/providertx.h
index 86f78e79a6..5734ead944 100644
--- a/src/evo/providertx.h
+++ b/src/evo/providertx.h
@@ -17,8 +17,6 @@
 #include <univalue.h>
 #include <util/underlying.h>
 
-class CBlockIndex;
-class CCoinsViewCache;
 class TxValidationState;
 
 class CProRegTx
diff --git a/src/evo/simplifiedmns.h b/src/evo/simplifiedmns.h
index 0cfd5603d9..1a43e17c27 100644
--- a/src/evo/simplifiedmns.h
+++ b/src/evo/simplifiedmns.h
@@ -6,18 +6,22 @@
 #define BITCOIN_EVO_SIMPLIFIEDMNS_H
 
 #include <bls/bls.h>
-#include <evo/deterministicmns.h>
 #include <evo/dmn_types.h>
 #include <merkleblock.h>
 #include <netaddress.h>
 #include <pubkey.h>
+#include <sync.h>
+#include <threadsafety.h>
 
 class UniValue;
 class CBlockIndex;
-class CDeterministicMNList;
 class CDeterministicMN;
+class CDeterministicMNList;
+class CDeterministicMNManager;
 class ChainstateManager;
 
+extern RecursiveMutex cs_main;
+
 namespace llmq {
 class CFinalCommitment;
 class CQuorumBlockProcessor;
diff --git a/src/evo/specialtx.h b/src/evo/specialtx.h
index 1de481104c..55a53a4175 100644
--- a/src/evo/specialtx.h
+++ b/src/evo/specialtx.h
@@ -11,7 +11,6 @@
 #include <uint256.h>
 #include <version.h>
 
-#include <string_view>
 #include <optional>
 #include <vector>
 
diff --git a/src/evo/specialtxman.h b/src/evo/specialtxman.h
index 2a21d948cd..c2148942a4 100644
--- a/src/evo/specialtxman.h
+++ b/src/evo/specialtxman.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_EVO_SPECIALTXMAN_H
 #define BITCOIN_EVO_SPECIALTXMAN_H
 
-#include <primitives/transaction.h>
+#include <consensus/amount.h>
 #include <sync.h>
 #include <threadsafety.h>
 
@@ -17,6 +17,7 @@ class CBlockIndex;
 class CCoinsViewCache;
 class CCreditPoolManager;
 class CDeterministicMNManager;
+class CTransaction;
 class ChainstateManager;
 class CMNHFManager;
 class TxValidationState;
diff --git a/src/llmq/blockprocessor.h b/src/llmq/blockprocessor.h
index 0e0aec4b90..da5dea17fb 100644
--- a/src/llmq/blockprocessor.h
+++ b/src/llmq/blockprocessor.h
@@ -7,9 +7,7 @@
 
 #include <unordered_lru_cache.h>
 
-#include <chain.h>
-#include <consensus/params.h>
-#include <primitives/block.h>
+#include <llmq/params.h>
 #include <protocol.h>
 #include <saltedhasher.h>
 #include <sync.h>
@@ -19,9 +17,10 @@
 #include <optional>
 
 class BlockValidationState;
+class CBlock;
+class CBlockIndex;
 class CChain;
 class CChainState;
-class CConnman;
 class CDataStream;
 class CDeterministicMNManager;
 class CEvoDB;
diff --git a/src/llmq/chainlocks.h b/src/llmq/chainlocks.h
index 9ad681d002..04c080453b 100644
--- a/src/llmq/chainlocks.h
+++ b/src/llmq/chainlocks.h
@@ -7,11 +7,10 @@
 
 #include <llmq/clsig.h>
 
-#include <crypto/common.h>
+#include <crypto/common.h> // For ReadLE64
 #include <llmq/signing.h>
-#include <net.h>
+#include <net.h> // For NodeId
 #include <net_types.h>
-#include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <saltedhasher.h>
 #include <sync.h>
@@ -21,10 +20,10 @@
 #include <atomic>
 #include <map>
 #include <unordered_map>
-#include <unordered_set>
 
-class CChainState;
+class CBlock;
 class CBlockIndex;
+class CChainState;
 class CMasternodeSync;
 class CScheduler;
 class CSporkManager;
diff --git a/src/llmq/commitment.h b/src/llmq/commitment.h
index 692e80a6e8..ba3153a69a 100644
--- a/src/llmq/commitment.h
+++ b/src/llmq/commitment.h
@@ -6,16 +6,20 @@
 #define BITCOIN_LLMQ_COMMITMENT_H
 
 #include <bls/bls.h>
-#include <consensus/params.h>
+#include <llmq/params.h>
 #include <primitives/transaction.h>
 #include <util/irange.h>
 #include <util/strencodings.h>
 #include <util/underlying.h>
 
 #include <gsl/pointers.h>
-
 #include <univalue.h>
 
+#include <limits>
+#include <memory>
+#include <string>
+#include <vector>
+
 class CBlockIndex;
 class CDeterministicMNManager;
 class ChainstateManager;
diff --git a/src/llmq/context.h b/src/llmq/context.h
index ed889092ff..de0a76a0bc 100644
--- a/src/llmq/context.h
+++ b/src/llmq/context.h
@@ -12,7 +12,6 @@ class CBLSWorker;
 class CConnman;
 class ChainstateManager;
 class CDeterministicMNManager;
-class CDBWrapper;
 class CEvoDB;
 class CMasternodeMetaMan;
 class CMasternodeSync;
diff --git a/src/llmq/dkgsession.h b/src/llmq/dkgsession.h
index 72cf7f714b..b92db5646a 100644
--- a/src/llmq/dkgsession.h
+++ b/src/llmq/dkgsession.h
@@ -22,7 +22,6 @@ class CConnman;
 class CDeterministicMN;
 class CMasternodeMetaMan;
 class CSporkManager;
-class UniValue;
 
 using CDeterministicMNCPtr = std::shared_ptr<const CDeterministicMN>;
 
diff --git a/src/llmq/dkgsessionhandler.h b/src/llmq/dkgsessionhandler.h
index 9abd982efe..31ae25b047 100644
--- a/src/llmq/dkgsessionhandler.h
+++ b/src/llmq/dkgsessionhandler.h
@@ -5,21 +5,28 @@
 #ifndef BITCOIN_LLMQ_DKGSESSIONHANDLER_H
 #define BITCOIN_LLMQ_DKGSESSIONHANDLER_H
 
-#include <ctpl_stl.h>
-#include <net.h>
+#include <net.h> // for NodeId
 
 #include <gsl/pointers.h>
 
 #include <atomic>
+#include <list>
 #include <map>
+#include <memory>
 #include <optional>
+#include <set>
+#include <string>
+#include <thread>
+#include <vector>
 
 class CActiveMasternodeManager;
-class CBlockIndex;
 class CBLSWorker;
+class CBlockIndex;
 class CChainState;
+class CConnman;
 class CDeterministicMNManager;
 class CMasternodeMetaMan;
+class CNode;
 class CSporkManager;
 class PeerManager;
 
diff --git a/src/llmq/dkgsessionmgr.cpp b/src/llmq/dkgsessionmgr.cpp
index 1743f0376c..04ae1d9166 100644
--- a/src/llmq/dkgsessionmgr.cpp
+++ b/src/llmq/dkgsessionmgr.cpp
@@ -18,6 +18,11 @@
 #include <util/underlying.h>
 #include <validation.h>
 
+static bool IsQuorumDKGEnabled(const CSporkManager& sporkman)
+{
+    return sporkman.IsSporkActive(SPORK_17_QUORUM_DKG_ENABLED);
+}
+
 namespace llmq
 {
 static const std::string DB_VVEC = "qdkg_V";
@@ -515,9 +520,4 @@ void CDKGSessionManager::CleanupOldContributions() const
     }
 }
 
-bool IsQuorumDKGEnabled(const CSporkManager& sporkman)
-{
-    return sporkman.IsSporkActive(SPORK_17_QUORUM_DKG_ENABLED);
-}
-
 } // namespace llmq
diff --git a/src/llmq/dkgsessionmgr.h b/src/llmq/dkgsessionmgr.h
index 8c1ddea339..1586e1262d 100644
--- a/src/llmq/dkgsessionmgr.h
+++ b/src/llmq/dkgsessionmgr.h
@@ -104,8 +104,6 @@ private:
     void MigrateDKG();
     void CleanupCache() const;
 };
-
-bool IsQuorumDKGEnabled(const CSporkManager& sporkman);
 } // namespace llmq
 
 #endif // BITCOIN_LLMQ_DKGSESSIONMGR_H
diff --git a/src/llmq/instantsend.h b/src/llmq/instantsend.h
index d08522436f..defafa5cf2 100644
--- a/src/llmq/instantsend.h
+++ b/src/llmq/instantsend.h
@@ -6,14 +6,13 @@
 #define BITCOIN_LLMQ_INSTANTSEND_H
 
 #include <llmq/signing.h>
-#include <unordered_lru_cache.h>
 
-#include <chain.h>
-#include <coins.h>
+#include <consensus/params.h>
 #include <net_types.h>
 #include <primitives/transaction.h>
 #include <threadinterrupt.h>
 #include <txmempool.h>
+#include <unordered_lru_cache.h>
 
 #include <gsl/pointers.h>
 
@@ -21,6 +20,7 @@
 #include <unordered_map>
 #include <unordered_set>
 
+class CBlockIndex;
 class CChainState;
 class CDBWrapper;
 class CMasternodeSync;
@@ -365,7 +365,7 @@ public:
     bool IsInstantSendMempoolSigningEnabled() const;
     bool RejectConflictingBlocks() const;
 };
-
+// TODO: split CInstantSendManager and  CInstantSendLock to 2 files
 extern std::unique_ptr<CInstantSendManager> quorumInstantSendManager;
 
 } // namespace llmq
diff --git a/src/llmq/quorums.h b/src/llmq/quorums.h
index ad6d22c304..fac31afb02 100644
--- a/src/llmq/quorums.h
+++ b/src/llmq/quorums.h
@@ -5,17 +5,16 @@
 #ifndef BITCOIN_LLMQ_QUORUMS_H
 #define BITCOIN_LLMQ_QUORUMS_H
 
-#include <chain.h>
-#include <consensus/params.h>
-#include <saltedhasher.h>
-#include <threadinterrupt.h>
-#include <unordered_lru_cache.h>
+#include <llmq/params.h>
 
 #include <bls/bls.h>
 #include <bls/bls_worker.h>
-#include <protocol.h>
-
+#include <ctpl_stl.h>
 #include <gsl/pointers.h>
+#include <protocol.h>
+#include <saltedhasher.h>
+#include <threadinterrupt.h>
+#include <unordered_lru_cache.h>
 
 #include <atomic>
 #include <map>
@@ -23,6 +22,7 @@
 
 class CActiveMasternodeManager;
 class CBlockIndex;
+class CChain;
 class CChainState;
 class CConnman;
 class CDataStream;
diff --git a/src/llmq/signing.h b/src/llmq/signing.h
index 540157f347..cd63cc9b34 100644
--- a/src/llmq/signing.h
+++ b/src/llmq/signing.h
@@ -6,14 +6,13 @@
 #define BITCOIN_LLMQ_SIGNING_H
 
 #include <bls/bls.h>
-#include <consensus/params.h>
 #include <gsl/pointers.h>
+#include <llmq/params.h>
 #include <protocol.h>
 #include <random.h>
 #include <saltedhasher.h>
 #include <sync.h>
 #include <threadinterrupt.h>
-#include <univalue.h>
 #include <unordered_lru_cache.h>
 
 #include <unordered_map>
@@ -27,6 +26,7 @@ class CDBWrapper;
 class CInv;
 class CNode;
 class PeerManager;
+class UniValue;
 
 using NodeId = int64_t;
 
diff --git a/src/llmq/signing_shares.h b/src/llmq/signing_shares.h
index 9f6d8a2e6b..0715ec3050 100644
--- a/src/llmq/signing_shares.h
+++ b/src/llmq/signing_shares.h
@@ -5,25 +5,29 @@
 #ifndef BITCOIN_LLMQ_SIGNING_SHARES_H
 #define BITCOIN_LLMQ_SIGNING_SHARES_H
 
-#include <bls/bls.h>
 #include <llmq/signing.h>
-#include <net.h>
+
+#include <bls/bls.h>
 #include <random.h>
 #include <saltedhasher.h>
 #include <serialize.h>
-#include <threadinterrupt.h>
 #include <sync.h>
+#include <threadinterrupt.h>
 #include <uint256.h>
 
 #include <atomic>
+#include <limits>
+#include <memory>
 #include <optional>
+#include <string>
 #include <thread>
 #include <unordered_map>
 #include <utility>
+#include <vector>
 
+class CNode;
+class CConnman;
 class CDeterministicMN;
-class CEvoDB;
-class CScheduler;
 class CSporkManager;
 class PeerManager;
 
diff --git a/src/llmq/snapshot.h b/src/llmq/snapshot.h
index 1551789f37..f02698704a 100644
--- a/src/llmq/snapshot.h
+++ b/src/llmq/snapshot.h
@@ -10,16 +10,16 @@
 #include <llmq/params.h>
 #include <saltedhasher.h>
 #include <serialize.h>
-#include <univalue.h>
+#include <sync.h>
+#include <threadsafety.h>
 #include <unordered_lru_cache.h>
 #include <util/irange.h>
 
 #include <optional>
 
 class CBlockIndex;
-class CDeterministicMN;
-class CDeterministicMNList;
-class CEvoDb;
+class CEvoDB;
+class UniValue;
 
 namespace llmq {
 class CQuorumBlockProcessor;
diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index a6308fea60..c8499c5cb6 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -5,6 +5,7 @@
 #include <masternode/meta.h>
 
 #include <flat-database.h>
+#include <univalue.h>
 #include <util/time.h>
 
 #include <sstream>
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index 14870afa63..72eb844bb1 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -7,14 +7,17 @@
 
 #include <serialize.h>
 #include <sync.h>
+#include <threadsafety.h>
 #include <uint256.h>
 
-#include <univalue.h>
-
 #include <atomic>
+#include <map>
 #include <memory>
+#include <vector>
 
 class CConnman;
+class UniValue;
+
 template<typename T>
 class CFlatDB;