diff --git a/src/common/interfaces.cpp b/src/common/interfaces.cpp
index de028f9ca25..b501493d6bf 100644
--- a/src/common/interfaces.cpp
+++ b/src/common/interfaces.cpp
@@ -2,9 +2,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <btcsignals.h>
 #include <interfaces/echo.h>
 #include <interfaces/handler.h>
+#include <util/btcsignals.h>
 
 #include <memory>
 #include <utility>
diff --git a/src/init.cpp b/src/init.cpp
index da58efe74c4..a2277728280 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -7,13 +7,10 @@
 
 #include <init.h>
 
-#include <kernel/checks.h>
-
 #include <addrdb.h>
 #include <addrman.h>
 #include <banman.h>
 #include <blockfilter.h>
-#include <btcsignals.h>
 #include <chain.h>
 #include <chainparams.h>
 #include <chainparamsbase.h>
@@ -42,6 +39,7 @@
 #include <kernel/blockmanager_opts.h>
 #include <kernel/caches.h>
 #include <kernel/chainstatemanager_opts.h>
+#include <kernel/checks.h>
 #include <kernel/context.h>
 #include <kernel/notifications_interface.h>
 #include <key.h>
@@ -87,6 +85,7 @@
 #include <uint256.h>
 #include <util/asmap.h>
 #include <util/batchpriority.h>
+#include <util/btcsignals.h>
 #include <util/chaintype.h>
 #include <util/check.h>
 #include <util/fs.h>
diff --git a/src/node/interface_ui.cpp b/src/node/interface_ui.cpp
index c80c2902efd..a9a3da2b551 100644
--- a/src/node/interface_ui.cpp
+++ b/src/node/interface_ui.cpp
@@ -4,7 +4,7 @@
 
 #include <node/interface_ui.h>
 
-#include <btcsignals.h>
+#include <util/btcsignals.h>
 #include <util/string.h>
 #include <util/translation.h>
 
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index 2f68f414f0d..ac64876c2a7 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -6,7 +6,6 @@
 
 #include <banman.h>
 #include <blockfilter.h>
-#include <btcsignals.h>
 #include <chain.h>
 #include <chainparams.h>
 #include <coins.h>
@@ -60,6 +59,7 @@
 #include <txmempool.h>
 #include <uint256.h>
 #include <univalue.h>
+#include <util/btcsignals.h>
 #include <util/check.h>
 #include <util/result.h>
 #include <util/signalinterrupt.h>
diff --git a/src/noui.cpp b/src/noui.cpp
index ee61a0991d6..b9c9e78bbde 100644
--- a/src/noui.cpp
+++ b/src/noui.cpp
@@ -5,8 +5,8 @@
 
 #include <noui.h>
 
-#include <btcsignals.h>
 #include <node/interface_ui.h>
+#include <util/btcsignals.h>
 #include <util/log.h>
 #include <util/translation.h>
 
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 47790eb3abd..40a60a26f04 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -6,7 +6,6 @@
 
 #include <qt/bitcoin.h>
 
-#include <btcsignals.h>
 #include <chainparams.h>
 #include <common/args.h>
 #include <common/init.h>
@@ -31,6 +30,7 @@
 #include <qt/utilitydialog.h>
 #include <qt/winshutdownmonitor.h>
 #include <uint256.h>
+#include <util/btcsignals.h>
 #include <util/exception.h>
 #include <util/log.h>
 #include <util/string.h>
diff --git a/src/test/btcsignals_tests.cpp b/src/test/btcsignals_tests.cpp
index dd7fcb9b3bd..d6122896801 100644
--- a/src/test/btcsignals_tests.cpp
+++ b/src/test/btcsignals_tests.cpp
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <btcsignals.h>
 #include <test/util/setup_common.h>
+#include <util/btcsignals.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/btcsignals.h b/src/util/btcsignals.h
similarity index 98%
rename from src/btcsignals.h
rename to src/util/btcsignals.h
index b990fb9d8ea..1da40298662 100644
--- a/src/btcsignals.h
+++ b/src/util/btcsignals.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_BTCSIGNALS_H
-#define BITCOIN_BTCSIGNALS_H
+#ifndef BITCOIN_UTIL_BTCSIGNALS_H
+#define BITCOIN_UTIL_BTCSIGNALS_H
 
 #include <sync.h>
 
@@ -258,4 +258,4 @@ public:
 
 } // namespace btcsignals
 
-#endif // BITCOIN_BTCSIGNALS_H
+#endif // BITCOIN_UTIL_BTCSIGNALS_H
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
index 9a5554d94b0..6cebae052bf 100644
--- a/src/wallet/scriptpubkeyman.h
+++ b/src/wallet/scriptpubkeyman.h
@@ -6,7 +6,6 @@
 #define BITCOIN_WALLET_SCRIPTPUBKEYMAN_H
 
 #include <addresstype.h>
-#include <btcsignals.h>
 #include <common/messages.h>
 #include <common/signmessage.h>
 #include <common/types.h>
@@ -16,6 +15,7 @@
 #include <script/descriptor.h>
 #include <script/script.h>
 #include <script/signingprovider.h>
+#include <util/btcsignals.h>
 #include <util/hasher.h>
 #include <util/log.h>
 #include <util/result.h>
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 54bc60f5c40..8056b59e1bc 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -7,7 +7,6 @@
 #define BITCOIN_WALLET_WALLET_H
 
 #include <addresstype.h>
-#include <btcsignals.h>
 #include <consensus/amount.h>
 #include <interfaces/chain.h>
 #include <interfaces/handler.h>
@@ -23,6 +22,7 @@
 #include <sync.h>
 #include <tinyformat.h>
 #include <uint256.h>
+#include <util/btcsignals.h>
 #include <util/fs.h>
 #include <util/hasher.h>
 #include <util/log.h>