diff --git a/src/init.cpp b/src/init.cpp
index 23632d288d..98da55a3c7 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -38,8 +38,8 @@
 #include <netbase.h>
 #include <netgroup.h>
 #include <node/blockstorage.h>
-#include <node/caches.h> // for CalculateCacheSizes
-#include <node/chainstate.h> // for LoadChainstate
+#include <node/caches.h>
+#include <node/chainstate.h>
 #include <node/context.h>
 #include <node/ui_interface.h>
 #include <node/txreconciliation.h>
diff --git a/src/node/caches.h b/src/node/caches.h
index 437e7d10e5..200f0b85b8 100644
--- a/src/node/caches.h
+++ b/src/node/caches.h
@@ -5,8 +5,8 @@
 #ifndef BITCOIN_NODE_CACHES_H
 #define BITCOIN_NODE_CACHES_H
 
-#include <cstddef> // for size_t
-#include <cstdint> // for int64_t
+#include <cstddef>
+#include <cstdint>
 
 class ArgsManager;
 
diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp
index f831d11eb5..9ddca485ec 100644
--- a/src/node/chainstate.cpp
+++ b/src/node/chainstate.cpp
@@ -4,20 +4,20 @@
 
 #include <node/chainstate.h>
 
-#include <consensus/params.h> // for Consensus::Params
-#include <deploymentstatus.h> // for DeploymentActiveAfter
-#include <node/blockstorage.h> // for CleanupBlockRevFiles, fHavePruned, fReindex
-#include <validation.h> // for a lot of things
+#include <consensus/params.h>
+#include <deploymentstatus.h>
+#include <node/blockstorage.h>
+#include <validation.h>
 
-#include <evo/chainhelper.h> // for CChainstateHelper
-#include <evo/creditpool.h> // for CCreditPoolManager
-#include <evo/deterministicmns.h> // for CDeterministicMNManager
-#include <evo/evodb.h> // for CEvoDB
-#include <evo/mnhftx.h> // for CMNHFManager
-#include <llmq/chainlocks.h> // for llmq::chainLocksHandler
-#include <llmq/context.h> // for LLMQContext
-#include <llmq/instantsend.h> // for llmq::quorumInstantSendManager
-#include <llmq/snapshot.h> // for llmq::quorumSnapshotManager
+#include <evo/chainhelper.h>
+#include <evo/creditpool.h>
+#include <evo/deterministicmns.h>
+#include <evo/evodb.h>
+#include <evo/mnhftx.h>
+#include <llmq/chainlocks.h>
+#include <llmq/context.h>
+#include <llmq/instantsend.h>
+#include <llmq/snapshot.h>
 
 std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
                                                      ChainstateManager& chainman,
diff --git a/src/node/chainstate.h b/src/node/chainstate.h
index e85c4a7a76..42a92afdf5 100644
--- a/src/node/chainstate.h
+++ b/src/node/chainstate.h
@@ -5,11 +5,11 @@
 #ifndef BITCOIN_NODE_CHAINSTATE_H
 #define BITCOIN_NODE_CHAINSTATE_H
 
-#include <cstdint> // for int64_t
-#include <functional> // for std::function
-#include <memory> // for std::unique_ptr
-#include <optional> // for std::optional
-#include <string> // for std::string
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <optional>
+#include <string>
 
 class CActiveMasternodeManager;
 class CChainstateHelper;
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index 21d0e5c724..edf088a039 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -30,8 +30,8 @@
 #include <net.h>
 #include <net_processing.h>
 #include <noui.h>
-#include <node/blockstorage.h> // for fReindex, fPruneMode
-#include <node/chainstate.h> // for LoadChainstate
+#include <node/blockstorage.h>
+#include <node/chainstate.h>
 #include <node/miner.h>
 #include <policy/fees.h>
 #include <pow.h>
@@ -40,7 +40,7 @@
 #include <rpc/server.h>
 #include <scheduler.h>
 #include <script/sigcache.h>
-#include <shutdown.h> // for ShutdownRequested
+#include <shutdown.h>
 #include <spork.h>
 #include <stats/client.h>
 #include <streams.h>