diff --git a/src/init.cpp b/src/init.cpp
index 56debdd2452..1f4537a975d 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -34,8 +34,8 @@
 #include <net_processing.h>
 #include <netbase.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/miner.h>
 #include <node/ui_interface.h>
diff --git a/src/node/caches.h b/src/node/caches.h
index 437e7d10e57..200f0b85b8e 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 35d4b4cc8c1..7cb452a910f 100644
--- a/src/node/chainstate.cpp
+++ b/src/node/chainstate.cpp
@@ -4,9 +4,9 @@
 
 #include <node/chainstate.h>
 
-#include <consensus/params.h> // for Consensus::Params
-#include <node/blockstorage.h> // for CleanupBlockRevFiles, fHavePruned, fReindex
-#include <validation.h> // for a lot of things
+#include <consensus/params.h>
+#include <node/blockstorage.h>
+#include <validation.h>
 
 std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
                                                      ChainstateManager& chainman,
diff --git a/src/node/chainstate.h b/src/node/chainstate.h
index c3b8baf7fc7..11278a09911 100644
--- a/src/node/chainstate.h
+++ b/src/node/chainstate.h
@@ -5,9 +5,9 @@
 #ifndef BITCOIN_NODE_CHAINSTATE_H
 #define BITCOIN_NODE_CHAINSTATE_H
 
-#include <cstdint> // for int64_t
-#include <functional> // for std::function
-#include <optional> // for std::optional
+#include <cstdint>
+#include <functional>
+#include <optional>
 
 class ChainstateManager;
 namespace Consensus {
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index 628cedac190..d0be9fe73a2 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -17,8 +17,8 @@
 #include <net_processing.h>
 #include <node/miner.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 <policy/fees.h>
 #include <pow.h>
 #include <rpc/blockchain.h>
@@ -26,7 +26,7 @@
 #include <rpc/server.h>
 #include <scheduler.h>
 #include <script/sigcache.h>
-#include <shutdown.h> // for ShutdownRequested
+#include <shutdown.h>
 #include <streams.h>
 #include <txdb.h>
 #include <util/strencodings.h>