diff --git a/src/index/base.h b/src/index/base.h
index d8fd8566933..63f60be0349 100644
--- a/src/index/base.h
+++ b/src/index/base.h
@@ -9,7 +9,7 @@
 #include <dbwrapper.h>
 #include <interfaces/chain.h>
 #include <kernel/cs_main.h>
-#include <threadsafety.h>
+#include <sync.h>
 #include <uint256.h>
 #include <util/fs.h>
 #include <util/threadinterrupt.h>
diff --git a/src/net_processing.h b/src/net_processing.h
index 6339852327b..d2050d8f3d7 100644
--- a/src/net_processing.h
+++ b/src/net_processing.h
@@ -11,7 +11,6 @@
 #include <node/txorphanage.h>
 #include <private_broadcast.h>
 #include <protocol.h>
-#include <threadsafety.h>
 #include <uint256.h>
 #include <util/expected.h>
 #include <validationinterface.h>
diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp
index ff3de298227..0738c00aef8 100644
--- a/src/node/chainstate.cpp
+++ b/src/node/chainstate.cpp
@@ -11,7 +11,6 @@
 #include <kernel/caches.h>
 #include <node/blockstorage.h>
 #include <sync.h>
-#include <threadsafety.h>
 #include <tinyformat.h>
 #include <txdb.h>
 #include <uint256.h>
diff --git a/src/node/kernel_notifications.h b/src/node/kernel_notifications.h
index b90248bf0ab..b152e7a476a 100644
--- a/src/node/kernel_notifications.h
+++ b/src/node/kernel_notifications.h
@@ -8,7 +8,6 @@
 #include <kernel/notifications_interface.h>
 
 #include <sync.h>
-#include <threadsafety.h>
 #include <uint256.h>
 
 #include <atomic>
diff --git a/src/policy/fees/block_policy_estimator.h b/src/policy/fees/block_policy_estimator.h
index 026bf1eb842..f015bd5b683 100644
--- a/src/policy/fees/block_policy_estimator.h
+++ b/src/policy/fees/block_policy_estimator.h
@@ -9,7 +9,6 @@
 #include <policy/feerate.h>
 #include <random.h>
 #include <sync.h>
-#include <threadsafety.h>
 #include <uint256.h>
 #include <util/fs.h>
 #include <validationinterface.h>
diff --git a/src/policy/rbf.h b/src/policy/rbf.h
index ad8a2dbfa3b..0ba646ca8d1 100644
--- a/src/policy/rbf.h
+++ b/src/policy/rbf.h
@@ -7,7 +7,7 @@
 
 #include <consensus/amount.h>
 #include <primitives/transaction.h>
-#include <threadsafety.h>
+#include <sync.h>
 #include <txmempool.h>
 #include <util/feefrac.h>
 
diff --git a/src/private_broadcast.h b/src/private_broadcast.h
index 286344248d9..fec61907dd3 100644
--- a/src/private_broadcast.h
+++ b/src/private_broadcast.h
@@ -9,7 +9,6 @@
 #include <primitives/transaction.h>
 #include <primitives/transaction_identifier.h>
 #include <sync.h>
-#include <threadsafety.h>
 #include <util/time.h>
 
 #include <optional>
diff --git a/src/rpc/blockchain.h b/src/rpc/blockchain.h
index efb06ac2d29..53f6a804f99 100644
--- a/src/rpc/blockchain.h
+++ b/src/rpc/blockchain.h
@@ -9,7 +9,6 @@
 #include <core_io.h>
 #include <streams.h>
 #include <sync.h>
-#include <threadsafety.h>
 #include <util/fs.h>
 #include <validation.h>
 
diff --git a/src/scheduler.h b/src/scheduler.h
index 79b8afd2ada..5d4affb0ab8 100644
--- a/src/scheduler.h
+++ b/src/scheduler.h
@@ -7,7 +7,6 @@
 
 #include <attributes.h>
 #include <sync.h>
-#include <threadsafety.h>
 #include <util/task_runner.h>
 
 #include <chrono>
diff --git a/src/sync.h b/src/sync.h
index 00fdaae942b..123184d44f6 100644
--- a/src/sync.h
+++ b/src/sync.h
@@ -6,6 +6,8 @@
 #ifndef BITCOIN_SYNC_H
 #define BITCOIN_SYNC_H
 
+// This header declares threading primitives compatible with Clang
+// Thread Safety Analysis and provides appropriate annotation macros.
 #include <threadsafety.h> // IWYU pragma: export
 #include <util/macros.h>
 
diff --git a/src/test/fuzz/util/net.h b/src/test/fuzz/util/net.h
index 862153ab26f..36393811624 100644
--- a/src/test/fuzz/util/net.h
+++ b/src/test/fuzz/util/net.h
@@ -13,10 +13,10 @@
 #include <node/connection_types.h>
 #include <node/eviction.h>
 #include <protocol.h>
+#include <sync.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/util.h>
 #include <test/util/net.h>
-#include <threadsafety.h>
 #include <util/asmap.h>
 #include <util/sock.h>
 
diff --git a/src/util/stdmutex.h b/src/util/stdmutex.h
index 4c3c0cec5ed..7a3e3039546 100644
--- a/src/util/stdmutex.h
+++ b/src/util/stdmutex.h
@@ -6,6 +6,8 @@
 #ifndef BITCOIN_UTIL_STDMUTEX_H
 #define BITCOIN_UTIL_STDMUTEX_H
 
+// This header declares threading primitives compatible with Clang
+// Thread Safety Analysis and provides appropriate annotation macros.
 #include <threadsafety.h> // IWYU pragma: export
 
 #include <mutex>
diff --git a/src/util/threadinterrupt.h b/src/util/threadinterrupt.h
index 84ced9277aa..9cac330e3d2 100644
--- a/src/util/threadinterrupt.h
+++ b/src/util/threadinterrupt.h
@@ -6,7 +6,6 @@
 #define BITCOIN_UTIL_THREADINTERRUPT_H
 
 #include <sync.h>
-#include <threadsafety.h>
 
 #include <atomic>
 #include <chrono>