diff --git a/ci/dash/lint-tidy.sh b/ci/dash/lint-tidy.sh
index d417d0009b90..9899718039e1 100755
--- a/ci/dash/lint-tidy.sh
+++ b/ci/dash/lint-tidy.sh
@@ -21,10 +21,17 @@ fi
 cd "${BASE_ROOT_DIR}/build-ci/dashcore-${BUILD_TARGET}"
 iwyu_tool.py \
   "src/compat" \
+  "src/dbwrapper.cpp" \
   "src/init" \
+  "src/node/chainstate.cpp" \
+  "src/policy/feerate.cpp" \
+  "src/policy/packages.cpp" \
+  "src/policy/settings.cpp" \
+  "src/primitives/transaction.cpp" \
   "src/rpc/fees.cpp" \
   "src/rpc/signmessage.cpp" \
   "src/test/fuzz/txorphan.cpp" \
+  "src/threadinterrupt.cpp" \
   "src/util/bip32.cpp" \
   "src/util/bytevectorhash.cpp" \
   "src/util/check.cpp" \
diff --git a/src/bench/checkblock.cpp b/src/bench/checkblock.cpp
index 5e987bcefc66..b5e866d3a1b7 100644
--- a/src/bench/checkblock.cpp
+++ b/src/bench/checkblock.cpp
@@ -9,6 +9,7 @@
 #include <consensus/validation.h>
 #include <stats/client.h>
 #include <streams.h>
+#include <util/system.h>
 #include <validation.h>
 
 #include <memory>
diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
index 87adcb254418..c4d9cf615faa 100644
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -4,15 +4,26 @@
 
 #include <dbwrapper.h>
 
-#include <memory>
+#include <fs.h>
+#include <logging.h>
 #include <random.h>
+#include <util/strencodings.h>
+#include <util/system.h>
 
+#include <algorithm>
+#include <cassert>
+#include <cstdarg>
+#include <cstdint>
+#include <cstdio>
 #include <leveldb/cache.h>
+#include <leveldb/db.h>
 #include <leveldb/env.h>
 #include <leveldb/filter_policy.h>
 #include <leveldb/helpers/memenv/memenv.h>
-#include <stdint.h>
-#include <algorithm>
+#include <leveldb/iterator.h>
+#include <leveldb/options.h>
+#include <leveldb/status.h>
+#include <memory>
 #include <optional>
 
 class CBitcoinLevelDBLogger : public leveldb::Logger {
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index 91f5bae74fc1..fea0ce67cdb0 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -5,18 +5,38 @@
 #ifndef BITCOIN_DBWRAPPER_H
 #define BITCOIN_DBWRAPPER_H
 
+#include <assert.h>
 #include <clientversion.h>
 #include <fs.h>
+#include <logging.h>
 #include <serialize.h>
 #include <span.h>
 #include <streams.h>
-#include <util/strencodings.h>
-#include <util/system.h>
 
-#include <typeindex>
+#include <sys/types.h>
 
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <exception>
 #include <leveldb/db.h>
+#include <leveldb/iterator.h>
+#include <leveldb/options.h>
+#include <leveldb/slice.h>
+#include <leveldb/status.h>
 #include <leveldb/write_batch.h>
+#include <map>
+#include <memory>
+#include <set>
+#include <stdexcept>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+namespace leveldb {
+class Env;
+}
 
 static const size_t DBWRAPPER_PREALLOC_KEY_SIZE = 64;
 static const size_t DBWRAPPER_PREALLOC_VALUE_SIZE = 1024;
diff --git a/src/evo/evodb.cpp b/src/evo/evodb.cpp
index b1396e9ef423..32d7e2475533 100644
--- a/src/evo/evodb.cpp
+++ b/src/evo/evodb.cpp
@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <evo/evodb.h>
+#include <util/system.h>
 
 #include <uint256.h>
 
diff --git a/src/evo/specialtxman.cpp b/src/evo/specialtxman.cpp
index 45d022b7acda..35d3fe14bc43 100644
--- a/src/evo/specialtxman.cpp
+++ b/src/evo/specialtxman.cpp
@@ -11,6 +11,7 @@
 #include <hash.h>
 #include <primitives/block.h>
 #include <util/irange.h>
+#include <util/system.h>
 #include <validation.h>
 
 #include <chainlock/chainlock.h>
diff --git a/src/index/base.cpp b/src/index/base.cpp
index c3368088c44c..d585cac6dd53 100644
--- a/src/index/base.cpp
+++ b/src/index/base.cpp
@@ -8,6 +8,7 @@
 #include <node/interface_ui.h>
 #include <shutdown.h>
 #include <tinyformat.h>
+#include <util/system.h>
 #include <util/thread.h>
 #include <util/translation.h>
 #include <validation.h>
diff --git a/src/index/blockfilterindex.cpp b/src/index/blockfilterindex.cpp
index c0cf84e51285..35781403ba29 100644
--- a/src/index/blockfilterindex.cpp
+++ b/src/index/blockfilterindex.cpp
@@ -9,6 +9,7 @@
 #include <index/blockfilterindex.h>
 #include <node/blockstorage.h>
 #include <serialize.h>
+#include <util/system.h>
 
 using node::UndoReadFromDisk;
 
diff --git a/src/index/coinstatsindex.cpp b/src/index/coinstatsindex.cpp
index 457590ec9c3f..6bf43e28f7db 100644
--- a/src/index/coinstatsindex.cpp
+++ b/src/index/coinstatsindex.cpp
@@ -10,6 +10,7 @@
 #include <serialize.h>
 #include <txdb.h>
 #include <undo.h>
+#include <util/system.h>
 #include <validation.h>
 #include <util/check.h>
 
diff --git a/src/init/common.cpp b/src/init/common.cpp
index 8ca786eaa045..fc1cc551aa1b 100644
--- a/src/init/common.cpp
+++ b/src/init/common.cpp
@@ -16,6 +16,7 @@
 #include <node/interface_ui.h>
 #include <random.h>
 #include <tinyformat.h>
+#include <util/time.h>
 #include <util/string.h>
 #include <util/system.h>
 #include <util/translation.h>
diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp
index 555cef21a831..fa44b04d17f8 100644
--- a/src/node/chainstate.cpp
+++ b/src/node/chainstate.cpp
@@ -4,19 +4,35 @@
 
 #include <node/chainstate.h>
 
+#include <chain.h>
+#include <coins.h>
 #include <chainparamsbase.h>
 #include <consensus/params.h>
 #include <deploymentstatus.h>
 #include <node/blockstorage.h>
+#include <sync.h>
+#include <threadsafety.h>
+#include <tinyformat.h>
+#include <txdb.h>
+#include <txmempool.h>
+#include <uint256.h>
+#include <util/translation.h>
 #include <validation.h>
 
+#include <bls/bls.h>
 #include <evo/chainhelper.h>
 #include <evo/creditpool.h>
 #include <evo/deterministicmns.h>
 #include <evo/evodb.h>
 #include <evo/mnhftx.h>
+#include <gsl/pointers.h>
 #include <llmq/context.h>
 
+#include <atomic>
+#include <cassert>
+#include <memory>
+#include <vector>
+
 namespace node {
 std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
                                                      ChainstateManager& chainman,
diff --git a/src/policy/packages.h b/src/policy/packages.h
index 47c6717b0330..997056a61471 100644
--- a/src/policy/packages.h
+++ b/src/policy/packages.h
@@ -5,7 +5,6 @@
 #ifndef BITCOIN_POLICY_PACKAGES_H
 #define BITCOIN_POLICY_PACKAGES_H
 
-#include <consensus/consensus.h>
 #include <consensus/validation.h>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index f3062ce00740..b45e81fa6e88 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -12,13 +12,12 @@
 #include <serialize.h>
 #include <uint256.h>
 
-#include <cstddef>
+#include <algorithm>
 #include <cstdint>
-#include <ios>
+#include <iterator>
 #include <limits>
 #include <memory>
 #include <string>
-#include <tuple>
 #include <utility>
 #include <vector>
 
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index 0cd82261e3f5..32ace0a1a275 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -23,11 +23,12 @@
 #include <netbase.h>
 #include <txdb.h> // for -dbcache defaults
 #include <util/strencodings.h>
+#include <util/system.h>
 #include <util/underlying.h>
 
-#include <QButtonGroup>
 #include <chrono>
 
+#include <QButtonGroup>
 #include <QDataWidgetMapper>
 #include <QDir>
 #include <QIntValidator>
diff --git a/src/rpc/mempool.cpp b/src/rpc/mempool.cpp
index 75512672c6fa..2d15eeae2fdb 100644
--- a/src/rpc/mempool.cpp
+++ b/src/rpc/mempool.cpp
@@ -16,6 +16,8 @@
 #include <univalue.h>
 #include <util/moneystr.h>
 #include <validation.h>
+#include <util/system.h>
+#include <util/time.h>
 
 #include <instantsend/instantsend.h>
 #include <llmq/context.h>
diff --git a/src/txdb.h b/src/txdb.h
index 2c812300dfad..493be625128f 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -9,6 +9,7 @@
 #include <coins.h>
 #include <dbwrapper.h>
 #include <spentindex.h>
+#include <sync.h>
 #include <timestampindex.h>
 
 #include <memory>
diff --git a/src/util/bip32.cpp b/src/util/bip32.cpp
index c8864d9bedd7..796af4a5442f 100644
--- a/src/util/bip32.cpp
+++ b/src/util/bip32.cpp
@@ -6,7 +6,6 @@
 #include <util/bip32.h>
 #include <util/strencodings.h>
 
-#include <algorithm>
 #include <cstdint>
 #include <cstdio>
 #include <sstream>
diff --git a/src/util/check.cpp b/src/util/check.cpp
index 77032c8753f0..047cd4b1b3f7 100644
--- a/src/util/check.cpp
+++ b/src/util/check.cpp
@@ -13,7 +13,6 @@
 
 #include <cstdio>
 #include <cstdlib>
-#include <string>
 
 
 NonFatalCheckError::NonFatalCheckError(const char* msg, const char* file, int line, const char* func)