diff --git a/src/evo/creditpool.cpp b/src/evo/creditpool.cpp
index 876b9bfb3a..374f45792c 100644
--- a/src/evo/creditpool.cpp
+++ b/src/evo/creditpool.cpp
@@ -6,6 +6,7 @@
 
 #include <evo/assetlocktx.h>
 #include <evo/cbtx.h>
+#include <evo/evodb.h>
 #include <evo/specialtx.h>
 
 #include <chain.h>
diff --git a/src/evo/creditpool.h b/src/evo/creditpool.h
index 479cc77879..9f3034cbcf 100644
--- a/src/evo/creditpool.h
+++ b/src/evo/creditpool.h
@@ -8,7 +8,6 @@
 #include <coins.h>
 
 #include <evo/assetlocktx.h>
-#include <evo/evodb.h>
 
 #include <saltedhasher.h>
 #include <serialize.h>
@@ -23,6 +22,7 @@
 class BlockManager;
 class CBlockIndex;
 class BlockValidationState;
+class CEvoDB;
 class TxValidationState;
 namespace Consensus {
 struct Params;
diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 158de1ad78..9ad5253e97 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -2,6 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <evo/evodb.h>
 #include <evo/deterministicmns.h>
 #include <evo/dmn_types.h>
 #include <evo/dmnstate.h>
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index 7d035fc2eb..ac27530526 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -8,10 +8,10 @@
 #include <evo/dmnstate.h>
 
 #include <arith_uint256.h>
+#include <clientversion.h>
 #include <consensus/params.h>
 #include <crypto/common.h>
 #include <evo/dmn_types.h>
-#include <evo/evodb.h>
 #include <evo/providertx.h>
 #include <saltedhasher.h>
 #include <scheduler.h>
@@ -30,6 +30,7 @@ class CBlock;
 class CBlockIndex;
 class CChainState;
 class CConnman;
+class CEvoDB;
 class TxValidationState;
 
 extern RecursiveMutex cs_main;
diff --git a/src/evo/mnhftx.cpp b/src/evo/mnhftx.cpp
index 22b95062b1..d495def879 100644
--- a/src/evo/mnhftx.cpp
+++ b/src/evo/mnhftx.cpp
@@ -4,6 +4,7 @@
 
 #include <consensus/validation.h>
 #include <deploymentstatus.h>
+#include <evo/evodb.h>
 #include <evo/mnhftx.h>
 #include <evo/specialtx.h>
 #include <llmq/commitment.h>
diff --git a/src/init.cpp b/src/init.cpp
index 18decacf04..f7a7feed72 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -90,6 +90,7 @@
 #include <spork.h>
 #include <walletinitinterface.h>
 
+#include <evo/evodb.h>
 #include <evo/chainhelper.h>
 #include <evo/creditpool.h>
 #include <evo/deterministicmns.h>
diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp
index 6fc79b82a1..6ce748c8da 100644
--- a/src/llmq/quorums.cpp
+++ b/src/llmq/quorums.cpp
@@ -11,10 +11,12 @@
 #include <llmq/params.h>
 #include <llmq/utils.h>
 
+#include <evo/evodb.h>
 #include <evo/specialtx.h>
 #include <evo/deterministicmns.h>
 
 #include <chainparams.h>
+#include <dbwrapper.h>
 #include <masternode/node.h>
 #include <masternode/sync.h>
 #include <net.h>
@@ -230,6 +232,11 @@ CQuorumManager::CQuorumManager(CBLSWorker& _blsWorker, CChainState& chainstate,
     MigrateOldQuorumDB(_evoDb);
 }
 
+CQuorumManager::~CQuorumManager()
+{
+    Stop();
+}
+
 void CQuorumManager::Start()
 {
     int workerCount = std::thread::hardware_concurrency() / 2;
diff --git a/src/llmq/quorums.h b/src/llmq/quorums.h
index be377e357f..4756011e14 100644
--- a/src/llmq/quorums.h
+++ b/src/llmq/quorums.h
@@ -14,7 +14,6 @@
 #include <bls/bls.h>
 #include <bls/bls_worker.h>
 
-#include <evo/evodb.h>
 #include <net_types.h>
 #include <gsl/pointers.h>
 
@@ -26,8 +25,11 @@ class CActiveMasternodeManager;
 class CBlockIndex;
 class CChainState;
 class CConnman;
+class CDataStream;
 class CDeterministicMN;
 class CDeterministicMNManager;
+class CDBWrapper;
+class CEvoDB;
 class CMasternodeSync;
 class CNode;
 class CSporkManager;
@@ -258,7 +260,7 @@ public:
                    CDKGSessionManager& _dkgManager, CEvoDB& _evoDb, CQuorumBlockProcessor& _quorumBlockProcessor,
                    const CActiveMasternodeManager* const mn_activeman, const CMasternodeSync& mn_sync,
                    const CSporkManager& sporkman, bool unit_tests, bool wipe);
-    ~CQuorumManager() { Stop(); };
+    ~CQuorumManager();
 
     void Start();
     void Stop();
diff --git a/src/llmq/snapshot.cpp b/src/llmq/snapshot.cpp
index 1224eae2d7..7b349fb31d 100644
--- a/src/llmq/snapshot.cpp
+++ b/src/llmq/snapshot.cpp
@@ -4,6 +4,7 @@
 
 #include <llmq/snapshot.h>
 
+#include <evo/evodb.h>
 #include <evo/simplifiedmns.h>
 #include <evo/specialtx.h>
 
diff --git a/src/llmq/snapshot.h b/src/llmq/snapshot.h
index b108e3f8ff..4113e255cc 100644
--- a/src/llmq/snapshot.h
+++ b/src/llmq/snapshot.h
@@ -5,7 +5,6 @@
 #ifndef BITCOIN_LLMQ_SNAPSHOT_H
 #define BITCOIN_LLMQ_SNAPSHOT_H
 
-#include <evo/evodb.h>
 #include <evo/simplifiedmns.h>
 #include <llmq/commitment.h>
 #include <llmq/params.h>
@@ -20,6 +19,7 @@
 class CBlockIndex;
 class CDeterministicMN;
 class CDeterministicMNList;
+class CEvoDb;
 
 namespace llmq {
 class CQuorumBlockProcessor;