diff --git a/src/chain.h b/src/chain.h
index f9121fb8615..fa165a4aa73 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -11,15 +11,20 @@
 #include <flatfile.h>
 #include <kernel/cs_main.h>
 #include <primitives/block.h>
+#include <serialize.h>
 #include <sync.h>
 #include <uint256.h>
 #include <util/time.h>
 
+#include <algorithm>
+#include <cassert>
+#include <cstdint>
+#include <string>
 #include <vector>
 
 /**
  * Maximum amount of time that a block timestamp is allowed to exceed the
- * current network-adjusted time before the block will be accepted.
+ * current time before the block will be accepted.
  */
 static constexpr int64_t MAX_FUTURE_BLOCK_TIME = 2 * 60 * 60;
 
diff --git a/src/headerssync.cpp b/src/headerssync.cpp
index e1dfe104832..e14de004f54 100644
--- a/src/headerssync.cpp
+++ b/src/headerssync.cpp
@@ -5,8 +5,8 @@
 #include <headerssync.h>
 #include <logging.h>
 #include <pow.h>
-#include <timedata.h>
 #include <util/check.h>
+#include <util/time.h>
 #include <util/vector.h>
 
 // The two constants below are computed using the simulation script in
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 1cf72771b54..c8da9277634 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -41,12 +41,12 @@
 #include <txrequest.h>
 #include <util/check.h>
 #include <util/strencodings.h>
+#include <util/time.h>
 #include <util/trace.h>
 #include <validation.h>
 
 #include <algorithm>
 #include <atomic>
-#include <chrono>
 #include <future>
 #include <memory>
 #include <optional>
diff --git a/src/node/miner.cpp b/src/node/miner.cpp
index 89498fb976d..87f40e993f2 100644
--- a/src/node/miner.cpp
+++ b/src/node/miner.cpp
@@ -20,8 +20,8 @@
 #include <policy/policy.h>
 #include <pow.h>
 #include <primitives/transaction.h>
-#include <timedata.h>
 #include <util/moneystr.h>
+#include <util/time.h>
 #include <validation.h>
 
 #include <algorithm>
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 4050cb1996c..f1abfb6396c 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -27,11 +27,11 @@
 #include <script/descriptor.h>
 #include <script/script.h>
 #include <script/signingprovider.h>
-#include <timedata.h>
 #include <txmempool.h>
 #include <univalue.h>
 #include <util/strencodings.h>
 #include <util/string.h>
+#include <util/time.h>
 #include <util/translation.h>
 #include <validation.h>
 #include <validationinterface.h>
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index 342d2514ed0..d50af4c175b 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -12,7 +12,6 @@
 #include <policy/policy.h>
 #include <test/util/random.h>
 #include <test/util/txmempool.h>
-#include <timedata.h>
 #include <txmempool.h>
 #include <uint256.h>
 #include <util/strencodings.h>
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index f8facad8830..9f587d7ec0b 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -44,7 +44,6 @@
 #include <test/util/net.h>
 #include <test/util/random.h>
 #include <test/util/txmempool.h>
-#include <timedata.h>
 #include <txdb.h>
 #include <txmempool.h>
 #include <util/chaintype.h>
diff --git a/src/test/validation_chainstatemanager_tests.cpp b/src/test/validation_chainstatemanager_tests.cpp
index 5f298b562b1..a33e71d50ee 100644
--- a/src/test/validation_chainstatemanager_tests.cpp
+++ b/src/test/validation_chainstatemanager_tests.cpp
@@ -15,7 +15,6 @@
 #include <test/util/random.h>
 #include <test/util/setup_common.h>
 #include <test/util/validation.h>
-#include <timedata.h>
 #include <uint256.h>
 #include <validation.h>
 #include <validationinterface.h>
diff --git a/src/timedata.h b/src/timedata.h
index 90428d071ce..3e76f80452d 100644
--- a/src/timedata.h
+++ b/src/timedata.h
@@ -5,11 +5,8 @@
 #ifndef BITCOIN_TIMEDATA_H
 #define BITCOIN_TIMEDATA_H
 
-#include <util/time.h>
-
 #include <algorithm>
 #include <cassert>
-#include <chrono>
 #include <cstdint>
 #include <vector>
 
diff --git a/src/validation.cpp b/src/validation.cpp
index 1302eb84fa6..caa4ff3115c 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2188,7 +2188,7 @@ bool Chainstate::ConnectBlock(const CBlock& block, BlockValidationState& state,
     // Also, currently the rule against blocks more than 2 hours in the future
     // is enforced in ContextualCheckBlockHeader(); we wouldn't want to
     // re-enforce that rule here (at least until we make it impossible for
-    // m_adjusted_time_callback() to go backward).
+    // the clock to go backward).
     if (!CheckBlock(block, state, params.GetConsensus(), !fJustCheck, !fJustCheck)) {
         if (state.GetResult() == BlockValidationResult::BLOCK_MUTATED) {
             // We don't write down blocks to disk if they may have been