diff --git a/src/evo/cbtx.cpp b/src/evo/cbtx.cpp
index de75db2439..87c82ce576 100644
--- a/src/evo/cbtx.cpp
+++ b/src/evo/cbtx.cpp
@@ -9,9 +9,9 @@
 #include <evo/simplifiedmns.h>
 #include <evo/specialtx.h>
 
+#include <chain.h>
 #include <chainparams.h>
 #include <consensus/merkle.h>
-#include <validation.h>
 
 bool CheckCbTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index 05496c55f4..b5b921eed4 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -8,7 +8,6 @@
 
 #include <chainparams.h>
 #include <clientversion.h>
-#include <core_io.h>
 #include <hash.h>
 #include <messagesigner.h>
 #include <script/standard.h>
diff --git a/src/privatesend/privatesend.cpp b/src/privatesend/privatesend.cpp
index 8cc19cb7f3..be7f99a33f 100644
--- a/src/privatesend/privatesend.cpp
+++ b/src/privatesend/privatesend.cpp
@@ -4,10 +4,8 @@
 
 #include <privatesend/privatesend.h>
 
-#include <masternode/activemasternode.h>
+#include <core_io.h>
 #include <consensus/validation.h>
-#include <masternode/masternode-payments.h>
-#include <masternode/masternode-sync.h>
 #include <messagesigner.h>
 #include <netmessagemaker.h>
 #include <script/sign.h>
@@ -16,6 +14,9 @@
 #include <utilmoneystr.h>
 #include <validation.h>
 
+#include <masternode/activemasternode.h>
+#include <masternode/masternode-sync.h>
+
 #include <llmq/quorums_instantsend.h>
 #include <llmq/quorums_chainlocks.h>
 
diff --git a/src/stacktraces.cpp b/src/stacktraces.cpp
index ec432a68ba..67b76cac86 100644
--- a/src/stacktraces.cpp
+++ b/src/stacktraces.cpp
@@ -8,9 +8,9 @@
 
 #include <stacktraces.h>
 #include <fs.h>
+#include <logging.h>
 #include <random.h>
 #include <streams.h>
-#include <util.h>
 #include <utilstrencodings.h>
 
 #include <mutex>
diff --git a/src/validation.cpp b/src/validation.cpp
index fb74ccb2bf..7e6c797fe6 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -7,7 +7,6 @@
 #include <validation.h>
 
 #include <arith_uint256.h>
-#include <blockencodings.h>
 #include <chain.h>
 #include <chainparams.h>
 #include <checkpoints.h>
diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh
index b8d105b49b..6f128967a0 100755
--- a/test/lint/lint-circular-dependencies.sh
+++ b/test/lint/lint-circular-dependencies.sh
@@ -11,7 +11,7 @@ export LC_ALL=C
 EXPECTED_CIRCULAR_DEPENDENCIES=(
     "chainparamsbase -> util -> chainparamsbase"
     "checkpoints -> validation -> checkpoints"
-    "index/txindex -> validation -> index/txindex"
+    # "index/txindex -> validation -> index/txindex"
     "policy/fees -> txmempool -> policy/fees"
     "policy/policy -> validation -> policy/policy"
     "qt/addresstablemodel -> qt/walletmodel -> qt/addresstablemodel"
@@ -22,25 +22,136 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "qt/clientmodel -> qt/peertablemodel -> qt/clientmodel"
     "qt/paymentserver -> qt/walletmodel -> qt/paymentserver"
     "qt/recentrequeststablemodel -> qt/walletmodel -> qt/recentrequeststablemodel"
-    "qt/sendcoinsdialog -> qt/walletmodel -> qt/sendcoinsdialog"
     "qt/transactiontablemodel -> qt/walletmodel -> qt/transactiontablemodel"
     "qt/walletmodel -> qt/walletmodeltransaction -> qt/walletmodel"
     "rpc/rawtransaction -> wallet/rpcwallet -> rpc/rawtransaction"
     "txmempool -> validation -> txmempool"
     "validation -> validationinterface -> validation"
-    "wallet/coincontrol -> wallet/wallet -> wallet/coincontrol"
     "wallet/fees -> wallet/wallet -> wallet/fees"
     "wallet/rpcwallet -> wallet/wallet -> wallet/rpcwallet"
     "wallet/wallet -> wallet/walletdb -> wallet/wallet"
     "policy/fees -> policy/policy -> validation -> policy/fees"
-    "policy/rbf -> txmempool -> validation -> policy/rbf"
     "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/addressbookpage"
-    "qt/guiutil -> qt/walletmodel -> qt/optionsmodel -> qt/guiutil"
     "txmempool -> validation -> validationinterface -> txmempool"
     "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/receivecoinsdialog -> qt/addressbookpage"
     "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/signverifymessagedialog -> qt/addressbookpage"
-    "qt/guiutil -> qt/walletmodel -> qt/optionsmodel -> qt/intro -> qt/guiutil"
     "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/sendcoinsdialog -> qt/sendcoinsentry -> qt/addressbookpage"
+    # Dash
+    "evo/cbtx -> evo/simplifiedmns -> evo/cbtx"
+    "evo/cbtx -> evo/specialtx -> evo/cbtx"
+    "evo/deterministicmns -> evo/providertx -> evo/deterministicmns"
+    "evo/deterministicmns -> evo/simplifiedmns -> evo/deterministicmns"
+    "evo/deterministicmns -> evo/specialtx -> evo/deterministicmns"
+    "evo/deterministicmns -> llmq/quorums_commitment -> evo/deterministicmns"
+    "evo/deterministicmns -> llmq/quorums_utils -> evo/deterministicmns"
+    "evo/deterministicmns -> validation -> evo/deterministicmns"
+    "evo/mnauth -> net_processing -> evo/mnauth"
+    "evo/providertx -> validation -> evo/providertx"
+    "evo/specialtx -> llmq/quorums_blockprocessor -> evo/specialtx"
+    "evo/specialtx -> llmq/quorums_commitment -> evo/specialtx"
+    "evo/specialtx -> validation -> evo/specialtx"
+    "governance/governance -> governance/governance-classes -> governance/governance"
+    "governance/governance -> governance/governance-object -> governance/governance"
+    "governance/governance -> init -> governance/governance"
+    "governance/governance -> masternode/masternode-sync -> governance/governance"
+    "governance/governance -> net_processing -> governance/governance"
+    "governance/governance-object -> governance/governance-validators -> governance/governance-object"
+    "governance/governance-object -> governance/governance-vote -> governance/governance-object"
+    "governance/governance-object -> validationinterface -> governance/governance-object"
+    "init -> masternode/masternode-sync -> init"
+    "init -> masternode/masternode-utils -> init"
+    "init -> net_processing -> init"
+    "init -> netfulfilledman -> init"
+    "init -> privatesend/privatesend-server -> init"
+    "init -> rpc/server -> init"
+    "init -> txdb -> init"
+    "init -> validation -> init"
+    "init -> validationinterface -> init"
+    "llmq/quorums -> llmq/quorums_init -> llmq/quorums"
+    "llmq/quorums -> llmq/quorums_utils -> llmq/quorums"
+    "llmq/quorums_blockprocessor -> net_processing -> llmq/quorums_blockprocessor"
+    "llmq/quorums_chainlocks -> llmq/quorums_instantsend -> llmq/quorums_chainlocks"
+    "llmq/quorums_chainlocks -> net_processing -> llmq/quorums_chainlocks"
+    "llmq/quorums_chainlocks -> validation -> llmq/quorums_chainlocks"
+    "llmq/quorums_dkgsessionmgr -> net_processing -> llmq/quorums_dkgsessionmgr"
+    "llmq/quorums_instantsend -> net_processing -> llmq/quorums_instantsend"
+    "llmq/quorums_instantsend -> txmempool -> llmq/quorums_instantsend"
+    "llmq/quorums_instantsend -> validation -> llmq/quorums_instantsend"
+    "llmq/quorums_instantsend -> wallet/wallet -> llmq/quorums_instantsend"
+    "llmq/quorums_signing -> llmq/quorums_signing_shares -> llmq/quorums_signing"
+    "llmq/quorums_signing -> net_processing -> llmq/quorums_signing"
+    "llmq/quorums_signing_shares -> net_processing -> llmq/quorums_signing_shares"
+    "logging -> util -> logging"
+    "masternode/masternode-payments -> net_processing -> masternode/masternode-payments"
+    "masternode/masternode-payments -> validation -> masternode/masternode-payments"
+    "masternode/masternode-sync -> net -> masternode/masternode-sync"
+    "net -> netmessagemaker -> net"
+    "net_processing -> privatesend/privatesend-server -> net_processing"
+    "net_processing -> spork -> net_processing"
+    "netaddress -> netbase -> netaddress"
+    "qt/appearancewidget -> qt/guiutil -> qt/appearancewidget"
+    "qt/bitcoinaddressvalidator -> qt/guiutil -> qt/bitcoinaddressvalidator"
+    "qt/bitcoingui -> qt/guiutil -> qt/bitcoingui"
+    "qt/guiutil -> qt/optionsdialog -> qt/guiutil"
+    "qt/guiutil -> qt/qvalidatedlineedit -> qt/guiutil"
+    "core_io -> evo/cbtx -> evo/deterministicmns -> core_io"
+    "core_io -> evo/cbtx -> evo/simplifiedmns -> core_io"
+    "dsnotificationinterface -> governance/governance -> init -> dsnotificationinterface"
+    "evo/cbtx -> evo/deterministicmns -> validation -> evo/cbtx"
+    "evo/deterministicmns -> validationinterface -> governance/governance-vote -> evo/deterministicmns"
+    "evo/deterministicmns -> llmq/quorums_utils -> masternode/masternode-meta -> evo/deterministicmns"
+    "evo/deterministicmns -> llmq/quorums_utils -> net -> evo/deterministicmns"
+    "evo/simplifiedmns -> llmq/quorums_blockprocessor -> net_processing -> evo/simplifiedmns"
+    "governance/governance-classes -> init -> masternode/masternode-payments -> governance/governance-classes"
+    "httprpc -> httpserver -> init -> httprpc"
+    "httpserver -> init -> httpserver"
+    "init -> llmq/quorums_init -> llmq/quorums_signing -> init"
+    "init -> llmq/quorums_init -> llmq/quorums_signing_shares -> init"
+    "init -> masternode/masternode-utils -> privatesend/privatesend-client -> init"
+    "llmq/quorums -> llmq/quorums_init -> llmq/quorums_chainlocks -> llmq/quorums"
+    "llmq/quorums -> llmq/quorums_init -> llmq/quorums_signing -> llmq/quorums"
+    "llmq/quorums -> llmq/quorums_init -> llmq/quorums_signing_shares -> llmq/quorums"
+    "llmq/quorums_blockprocessor -> net_processing -> llmq/quorums_init -> llmq/quorums_blockprocessor"
+    "llmq/quorums_chainlocks -> net_processing -> llmq/quorums_init -> llmq/quorums_chainlocks"
+    "llmq/quorums_chainlocks -> net -> privatesend/privatesend -> llmq/quorums_chainlocks"
+    "llmq/quorums_chainlocks -> net_processing -> validationinterface -> llmq/quorums_chainlocks"
+    "llmq/quorums_chainlocks -> llmq/quorums_instantsend -> wallet/wallet -> llmq/quorums_chainlocks"
+    "llmq/quorums_dkgsession -> llmq/quorums_dkgsessionmgr -> llmq/quorums_dkgsessionhandler -> llmq/quorums_dkgsession"
+    "llmq/quorums_dkgsessionhandler -> llmq/quorums_init -> llmq/quorums_dkgsessionmgr -> llmq/quorums_dkgsessionhandler"
+    "llmq/quorums_dkgsessionmgr -> net_processing -> llmq/quorums_init -> llmq/quorums_dkgsessionmgr"
+    "llmq/quorums_init -> llmq/quorums_instantsend -> net_processing -> llmq/quorums_init"
+    "llmq/quorums_instantsend -> wallet/wallet -> privatesend/privatesend -> llmq/quorums_instantsend"
+    "llmq/quorums_instantsend -> net_processing -> privatesend/privatesend-server -> llmq/quorums_instantsend"
+    "llmq/quorums_instantsend -> net_processing -> validationinterface -> llmq/quorums_instantsend"
+    "logging -> util -> random -> logging"
+    "logging -> util -> sync -> logging"
+    "logging -> util -> stacktraces -> logging"
+    "masternode/activemasternode -> net -> privatesend/privatesend -> masternode/activemasternode"
+    "masternode/masternode-payments -> net_processing -> privatesend/privatesend-client -> masternode/masternode-payments"
+    "masternode/masternode-sync -> net -> privatesend/privatesend -> masternode/masternode-sync"
+    "net -> privatesend/privatesend -> spork -> net"
+    "privatesend/privatesend-client -> privatesend/privatesend-util -> wallet/wallet -> privatesend/privatesend-client"
+    "qt/appearancewidget -> qt/guiutil -> qt/optionsdialog -> qt/appearancewidget"
+    "qt/bitcoinaddressvalidator -> qt/guiutil -> qt/qvalidatedlineedit -> qt/bitcoinaddressvalidator"
+    "qt/guiutil -> qt/optionsdialog -> qt/optionsmodel -> qt/guiutil"
+    "bloom -> evo/cbtx -> evo/simplifiedmns -> merkleblock -> bloom"
+    "bloom -> evo/cbtx -> llmq/quorums_blockprocessor -> net -> bloom"
+    "evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> llmq/quorums_debug -> evo/deterministicmns"
+    "evo/deterministicmns -> validationinterface -> governance/governance-vote -> masternode/masternode-sync -> evo/deterministicmns"
+    "evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net_processing -> evo/deterministicmns"
+    "evo/specialtx -> llmq/quorums_blockprocessor -> net_processing -> txmempool -> evo/specialtx"
+    "governance/governance-vote -> masternode/masternode-sync -> validation -> validationinterface -> governance/governance-vote"
+    "init -> llmq/quorums_init -> llmq/quorums_instantsend -> wallet/wallet -> init"
+    "core_io -> evo/cbtx -> llmq/quorums_blockprocessor -> net -> privatesend/privatesend -> core_io"
+    "core_io -> evo/cbtx -> llmq/quorums_blockprocessor -> net_processing -> privatesend/privatesend-client -> core_io"
+    "core_io -> evo/cbtx -> llmq/quorums_blockprocessor -> net_processing -> privatesend/privatesend-server -> core_io"
+    "evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net_processing -> privatesend/privatesend-client -> evo/deterministicmns"
+    "evo/providertx -> evo/specialtx -> llmq/quorums_blockprocessor -> net_processing -> txmempool -> evo/providertx"
+    "governance/governance -> init -> llmq/quorums_init -> llmq/quorums_instantsend -> wallet/wallet -> governance/governance"
+    "evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net_processing -> privatesend/privatesend-server -> masternode/activemasternode -> evo/deterministicmns"
+    "evo/providertx -> evo/specialtx -> llmq/quorums_blockprocessor -> net_processing -> privatesend/privatesend-server -> masternode/activemasternode -> evo/providertx"
+    "evo/providertx -> evo/specialtx -> llmq/quorums_blockprocessor -> net_processing -> privatesend/privatesend-client -> privatesend/privatesend-util -> wallet/wallet -> evo/providertx"
+    "core_io -> evo/cbtx -> llmq/quorums_blockprocessor -> net_processing -> privatesend/privatesend-client -> privatesend/privatesend-util -> wallet/wallet -> governance/governance-object -> core_io"
 )
 
 EXIT_CODE=0