diff --git a/src/addrdb.cpp b/src/addrdb.cpp
index 5db632c7e1e..14baf1a643d 100644
--- a/src/addrdb.cpp
+++ b/src/addrdb.cpp
@@ -14,7 +14,6 @@
 #include <common/settings.h>
 #include <cstdint>
 #include <hash.h>
-#include <logging.h>
 #include <logging/timer.h>
 #include <netbase.h>
 #include <netgroup.h>
@@ -24,6 +23,7 @@
 #include <univalue.h>
 #include <util/fs.h>
 #include <util/fs_helpers.h>
+#include <util/log.h>
 #include <util/syserror.h>
 #include <util/translation.h>
 
diff --git a/src/addrman.cpp b/src/addrman.cpp
index d3dae59ae79..92178f30089 100644
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@@ -9,7 +9,6 @@
 #include <addrman_impl.h>
 
 #include <hash.h>
-#include <logging.h>
 #include <logging/timer.h>
 #include <netaddress.h>
 #include <protocol.h>
@@ -19,6 +18,7 @@
 #include <tinyformat.h>
 #include <uint256.h>
 #include <util/check.h>
+#include <util/log.h>
 #include <util/time.h>
 
 #include <cmath>
diff --git a/src/addrman_impl.h b/src/addrman_impl.h
index c1716f891d6..88ee92e1b04 100644
--- a/src/addrman_impl.h
+++ b/src/addrman_impl.h
@@ -5,13 +5,13 @@
 #ifndef BITCOIN_ADDRMAN_IMPL_H
 #define BITCOIN_ADDRMAN_IMPL_H
 
-#include <logging.h>
 #include <logging/timer.h>
 #include <netaddress.h>
 #include <protocol.h>
 #include <serialize.h>
 #include <sync.h>
 #include <uint256.h>
+#include <util/log.h>
 #include <util/time.h>
 
 #include <cstdint>
diff --git a/src/banman.cpp b/src/banman.cpp
index 3c1f64e2263..54789f8d7d4 100644
--- a/src/banman.cpp
+++ b/src/banman.cpp
@@ -6,10 +6,10 @@
 #include <banman.h>
 
 #include <common/system.h>
-#include <logging.h>
 #include <netaddress.h>
 #include <node/interface_ui.h>
 #include <sync.h>
+#include <util/log.h>
 #include <util/time.h>
 #include <util/translation.h>
 
diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index 064e0853748..c2846539bdb 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -9,10 +9,10 @@
 #include <consensus/validation.h>
 #include <crypto/sha256.h>
 #include <crypto/siphash.h>
-#include <logging.h>
 #include <random.h>
 #include <streams.h>
 #include <txmempool.h>
+#include <util/log.h>
 #include <validation.h>
 
 #include <unordered_map>
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 32c3bff7348..290b54261f0 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -9,9 +9,9 @@
 #include <common/args.h>
 #include <consensus/params.h>
 #include <deploymentinfo.h>
-#include <logging.h>
 #include <tinyformat.h>
 #include <util/chaintype.h>
+#include <util/log.h>
 #include <util/strencodings.h>
 #include <util/string.h>
 
diff --git a/src/common/args.cpp b/src/common/args.cpp
index 12e0f26ed21..e842ab7edb1 100644
--- a/src/common/args.cpp
+++ b/src/common/args.cpp
@@ -7,7 +7,6 @@
 
 #include <chainparamsbase.h>
 #include <common/settings.h>
-#include <logging.h>
 #include <sync.h>
 #include <tinyformat.h>
 #include <univalue.h>
@@ -15,6 +14,7 @@
 #include <util/check.h>
 #include <util/fs.h>
 #include <util/fs_helpers.h>
+#include <util/log.h>
 #include <util/strencodings.h>
 #include <util/string.h>
 
diff --git a/src/common/config.cpp b/src/common/config.cpp
index a05c20d6f8f..cc7ffd59537 100644
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -5,12 +5,12 @@
 #include <common/args.h>
 
 #include <common/settings.h>
-#include <logging.h>
 #include <sync.h>
 #include <tinyformat.h>
 #include <univalue.h>
 #include <util/chaintype.h>
 #include <util/fs.h>
+#include <util/log.h>
 #include <util/string.h>
 
 #include <algorithm>
diff --git a/src/common/init.cpp b/src/common/init.cpp
index 7a1d664c659..5c9742bec47 100644
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -5,9 +5,9 @@
 #include <chainparams.h>
 #include <common/args.h>
 #include <common/init.h>
-#include <logging.h>
 #include <tinyformat.h>
 #include <util/fs.h>
+#include <util/log.h>
 #include <util/translation.h>
 
 #include <algorithm>
diff --git a/src/common/netif.cpp b/src/common/netif.cpp
index 8c0c4fa0832..af69b8d13a1 100644
--- a/src/common/netif.cpp
+++ b/src/common/netif.cpp
@@ -6,9 +6,9 @@
 
 #include <common/netif.h>
 
-#include <logging.h>
 #include <netbase.h>
 #include <util/check.h>
+#include <util/log.h>
 #include <util/sock.h>
 #include <util/syserror.h>
 
diff --git a/src/common/pcp.cpp b/src/common/pcp.cpp
index a640b823f9c..22c42477322 100644
--- a/src/common/pcp.cpp
+++ b/src/common/pcp.cpp
@@ -7,12 +7,12 @@
 #include <atomic>
 #include <common/netif.h>
 #include <crypto/common.h>
-#include <logging.h>
 #include <netaddress.h>
 #include <netbase.h>
 #include <random.h>
 #include <span.h>
 #include <util/check.h>
+#include <util/log.h>
 #include <util/readwritefile.h>
 #include <util/sock.h>
 #include <util/strencodings.h>
diff --git a/src/common/system.cpp b/src/common/system.cpp
index 08c0c692711..ca7b857d983 100644
--- a/src/common/system.cpp
+++ b/src/common/system.cpp
@@ -7,7 +7,7 @@
 
 #include <common/system.h>
 
-#include <logging.h>
+#include <util/log.h>
 #include <util/string.h>
 #include <util/time.h>
 
diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
index fde8e8e44f8..e31586c416b 100644
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -14,7 +14,6 @@
 #include <leveldb/slice.h>
 #include <leveldb/status.h>
 #include <leveldb/write_batch.h>
-#include <logging.h>
 #include <random.h>
 #include <serialize.h>
 #include <span.h>
diff --git a/src/dummywallet.cpp b/src/dummywallet.cpp
index 24952fea197..27e23800521 100644
--- a/src/dummywallet.cpp
+++ b/src/dummywallet.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <common/args.h>
-#include <logging.h>
+#include <util/log.h>
 #include <walletinitinterface.h>
 
 class ArgsManager;
diff --git a/src/headerssync.cpp b/src/headerssync.cpp
index 039e7f68e8a..633ffef53ad 100644
--- a/src/headerssync.cpp
+++ b/src/headerssync.cpp
@@ -4,9 +4,9 @@
 
 #include <headerssync.h>
 
-#include <logging.h>
 #include <pow.h>
 #include <util/check.h>
+#include <util/log.h>
 #include <util/time.h>
 #include <util/vector.h>
 
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index 9a076996656..9a6b8eb0b2e 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -7,12 +7,12 @@
 #include <common/args.h>
 #include <crypto/hmac_sha256.h>
 #include <httpserver.h>
-#include <logging.h>
 #include <netaddress.h>
 #include <rpc/protocol.h>
 #include <rpc/server.h>
 #include <util/fs.h>
 #include <util/fs_helpers.h>
+#include <util/log.h>
 #include <util/strencodings.h>
 #include <util/string.h>
 #include <walletinitinterface.h>
diff --git a/src/i2p.cpp b/src/i2p.cpp
index 04093ea1007..8fbf24e1cba 100644
--- a/src/i2p.cpp
+++ b/src/i2p.cpp
@@ -8,7 +8,6 @@
 #include <compat/endian.h>
 #include <crypto/sha256.h>
 #include <i2p.h>
-#include <logging.h>
 #include <netaddress.h>
 #include <netbase.h>
 #include <random.h>
@@ -16,6 +15,7 @@
 #include <sync.h>
 #include <tinyformat.h>
 #include <util/fs.h>
+#include <util/log.h>
 #include <util/readwritefile.h>
 #include <util/sock.h>
 #include <util/strencodings.h>
diff --git a/src/index/db_key.h b/src/index/db_key.h
index b7334c81e41..7c31f8afb8a 100644
--- a/src/index/db_key.h
+++ b/src/index/db_key.h
@@ -7,9 +7,9 @@
 
 #include <dbwrapper.h>
 #include <interfaces/types.h>
-#include <logging.h>
 #include <serialize.h>
 #include <uint256.h>
+#include <util/log.h>
 
 #include <cstdint>
 #include <ios>
diff --git a/src/interfaces/node.h b/src/interfaces/node.h
index f6d8209f072..ad6298e621f 100644
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@@ -7,12 +7,12 @@
 
 #include <common/settings.h>
 #include <consensus/amount.h>
-#include <logging.h>
 #include <net.h>
 #include <net_types.h>
 #include <netaddress.h>
 #include <netbase.h>
 #include <support/allocators/secure.h>
+#include <util/log.h>
 #include <util/translation.h>
 
 #include <cstddef>
diff --git a/src/ipc/capnp/protocol.cpp b/src/ipc/capnp/protocol.cpp
index e68ce872fba..e39c5039da9 100644
--- a/src/ipc/capnp/protocol.cpp
+++ b/src/ipc/capnp/protocol.cpp
@@ -10,10 +10,10 @@
 #include <ipc/exception.h>
 #include <ipc/protocol.h>
 #include <kj/async.h>
-#include <logging.h>
 #include <mp/proxy-io.h>
 #include <mp/proxy-types.h>
 #include <mp/util.h>
+#include <util/log.h>
 #include <util/threadnames.h>
 
 #include <cassert>
diff --git a/src/ipc/interfaces.cpp b/src/ipc/interfaces.cpp
index 1171f706487..32febd35526 100644
--- a/src/ipc/interfaces.cpp
+++ b/src/ipc/interfaces.cpp
@@ -9,9 +9,9 @@
 #include <ipc/capnp/protocol.h>
 #include <ipc/process.h>
 #include <ipc/protocol.h>
-#include <logging.h>
 #include <tinyformat.h>
 #include <util/fs.h>
+#include <util/log.h>
 
 #include <csignal>
 #include <cstdio>
diff --git a/src/ipc/process.cpp b/src/ipc/process.cpp
index e89414be8e9..b60718e9931 100644
--- a/src/ipc/process.cpp
+++ b/src/ipc/process.cpp
@@ -4,10 +4,10 @@
 
 #include <ipc/process.h>
 #include <ipc/protocol.h>
-#include <logging.h>
 #include <mp/util.h>
 #include <tinyformat.h>
 #include <util/fs.h>
+#include <util/log.h>
 #include <util/strencodings.h>
 #include <util/syserror.h>
 
diff --git a/src/ipc/test/ipc_test.cpp b/src/ipc/test/ipc_test.cpp
index 31607299ae7..46366cef1f0 100644
--- a/src/ipc/test/ipc_test.cpp
+++ b/src/ipc/test/ipc_test.cpp
@@ -3,16 +3,16 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <interfaces/init.h>
+#include <ipc/capnp/mining.capnp.h>
 #include <ipc/capnp/protocol.h>
 #include <ipc/process.h>
 #include <ipc/protocol.h>
-#include <logging.h>
-#include <mp/proxy-types.h>
-#include <ipc/capnp/mining.capnp.h>
 #include <ipc/test/ipc_test.capnp.h>
 #include <ipc/test/ipc_test.capnp.proxy.h>
 #include <ipc/test/ipc_test.h>
+#include <mp/proxy-types.h>
 #include <tinyformat.h>
+#include <util/log.h>
 #include <validation.h>
 
 #include <future>
diff --git a/src/mapport.cpp b/src/mapport.cpp
index 43918ebf101..358956fafd4 100644
--- a/src/mapport.cpp
+++ b/src/mapport.cpp
@@ -8,11 +8,11 @@
 #include <common/netif.h>
 #include <common/pcp.h>
 #include <common/system.h>
-#include <logging.h>
 #include <net.h>
 #include <netaddress.h>
 #include <netbase.h>
 #include <random.h>
+#include <util/log.h>
 #include <util/thread.h>
 #include <util/threadinterrupt.h>
 
diff --git a/src/net_types.cpp b/src/net_types.cpp
index 15a122a7bbd..339d698a80c 100644
--- a/src/net_types.cpp
+++ b/src/net_types.cpp
@@ -4,10 +4,10 @@
 
 #include <net_types.h>
 
-#include <logging.h>
 #include <netaddress.h>
 #include <netbase.h>
 #include <univalue.h>
+#include <util/log.h>
 
 static const char* BANMAN_JSON_VERSION_KEY{"version"};
 
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 5434ec9f14c..cea6fa29489 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -8,9 +8,9 @@
 #include <netbase.h>
 
 #include <compat/compat.h>
-#include <logging.h>
 #include <sync.h>
 #include <tinyformat.h>
+#include <util/log.h>
 #include <util/sock.h>
 #include <util/strencodings.h>
 #include <util/string.h>
diff --git a/src/netgroup.cpp b/src/netgroup.cpp
index 9b0d4d8d3c2..69fbef3ef22 100644
--- a/src/netgroup.cpp
+++ b/src/netgroup.cpp
@@ -5,9 +5,9 @@
 #include <netgroup.h>
 
 #include <hash.h>
-#include <logging.h>
 #include <uint256.h>
 #include <util/asmap.h>
+#include <util/log.h>
 
 #include <cstddef>
 
diff --git a/src/node/caches.cpp b/src/node/caches.cpp
index 3b9e609f367..cbd69fb0bc8 100644
--- a/src/node/caches.cpp
+++ b/src/node/caches.cpp
@@ -9,10 +9,10 @@
 #include <index/txindex.h>
 #include <index/txospenderindex.h>
 #include <kernel/caches.h>
-#include <logging.h>
 #include <node/interface_ui.h>
 #include <tinyformat.h>
 #include <util/byte_units.h>
+#include <util/log.h>
 
 #include <algorithm>
 #include <string>
diff --git a/src/node/chainstatemanager_args.cpp b/src/node/chainstatemanager_args.cpp
index bf91a750c14..46a12bf21ed 100644
--- a/src/node/chainstatemanager_args.cpp
+++ b/src/node/chainstatemanager_args.cpp
@@ -7,12 +7,12 @@
 #include <arith_uint256.h>
 #include <common/args.h>
 #include <common/system.h>
-#include <logging.h>
 #include <node/coins_view_args.h>
 #include <node/database_args.h>
 #include <tinyformat.h>
 #include <uint256.h>
 #include <util/byte_units.h>
+#include <util/log.h>
 #include <util/result.h>
 #include <util/strencodings.h>
 #include <util/translation.h>
diff --git a/src/node/kernel_notifications.cpp b/src/node/kernel_notifications.cpp
index ab0e5ccb69e..66b77da5d1c 100644
--- a/src/node/kernel_notifications.cpp
+++ b/src/node/kernel_notifications.cpp
@@ -11,11 +11,11 @@
 #include <common/system.h>
 #include <kernel/context.h>
 #include <kernel/warning.h>
-#include <logging.h>
 #include <node/abort.h>
 #include <node/interface_ui.h>
 #include <node/warnings.h>
 #include <util/check.h>
+#include <util/log.h>
 #include <util/signalinterrupt.h>
 #include <util/strencodings.h>
 #include <util/string.h>
diff --git a/src/node/mempool_args.cpp b/src/node/mempool_args.cpp
index d5ff50be96b..f0f7308bcef 100644
--- a/src/node/mempool_args.cpp
+++ b/src/node/mempool_args.cpp
@@ -11,11 +11,11 @@
 #include <common/messages.h>
 #include <consensus/amount.h>
 #include <kernel/chainparams.h>
-#include <logging.h>
 #include <policy/feerate.h>
 #include <policy/policy.h>
 #include <tinyformat.h>
 #include <txgraph.h>
+#include <util/log.h>
 #include <util/moneystr.h>
 #include <util/translation.h>
 
diff --git a/src/node/mempool_persist.cpp b/src/node/mempool_persist.cpp
index dcb05267edd..00f5306e218 100644
--- a/src/node/mempool_persist.cpp
+++ b/src/node/mempool_persist.cpp
@@ -6,7 +6,6 @@
 
 #include <clientversion.h>
 #include <consensus/amount.h>
-#include <logging.h>
 #include <primitives/transaction.h>
 #include <random.h>
 #include <serialize.h>
@@ -16,6 +15,7 @@
 #include <uint256.h>
 #include <util/fs.h>
 #include <util/fs_helpers.h>
+#include <util/log.h>
 #include <util/obfuscation.h>
 #include <util/signalinterrupt.h>
 #include <util/syserror.h>
diff --git a/src/node/miner.cpp b/src/node/miner.cpp
index 7ea8d10b730..04f9e6e174a 100644
--- a/src/node/miner.cpp
+++ b/src/node/miner.cpp
@@ -15,13 +15,13 @@
 #include <consensus/tx_verify.h>
 #include <consensus/validation.h>
 #include <deploymentstatus.h>
-#include <logging.h>
 #include <node/context.h>
 #include <node/kernel_notifications.h>
 #include <policy/feerate.h>
 #include <policy/policy.h>
 #include <pow.h>
 #include <primitives/transaction.h>
+#include <util/log.h>
 #include <util/moneystr.h>
 #include <util/signalinterrupt.h>
 #include <util/time.h>
diff --git a/src/node/minisketchwrapper.cpp b/src/node/minisketchwrapper.cpp
index 37089d56a7c..079990b4428 100644
--- a/src/node/minisketchwrapper.cpp
+++ b/src/node/minisketchwrapper.cpp
@@ -4,7 +4,7 @@
 
 #include <node/minisketchwrapper.h>
 
-#include <logging.h>
+#include <util/log.h>
 #include <util/time.h>
 
 #include <minisketch.h>
diff --git a/src/node/timeoffsets.cpp b/src/node/timeoffsets.cpp
index 002c00d2455..e1a6bf71987 100644
--- a/src/node/timeoffsets.cpp
+++ b/src/node/timeoffsets.cpp
@@ -2,11 +2,11 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <logging.h>
 #include <node/timeoffsets.h>
 #include <node/warnings.h>
 #include <sync.h>
 #include <tinyformat.h>
+#include <util/log.h>
 #include <util/time.h>
 #include <util/translation.h>
 
diff --git a/src/node/txdownloadman_impl.cpp b/src/node/txdownloadman_impl.cpp
index 91bc7f3bcbd..3198fb17e64 100644
--- a/src/node/txdownloadman_impl.cpp
+++ b/src/node/txdownloadman_impl.cpp
@@ -7,8 +7,8 @@
 
 #include <chain.h>
 #include <consensus/validation.h>
-#include <logging.h>
 #include <txmempool.h>
+#include <util/log.h>
 #include <validation.h>
 #include <validationinterface.h>
 
diff --git a/src/node/txorphanage.cpp b/src/node/txorphanage.cpp
index ca7eb20470a..de96d6ac2ca 100644
--- a/src/node/txorphanage.cpp
+++ b/src/node/txorphanage.cpp
@@ -5,12 +5,12 @@
 #include <node/txorphanage.h>
 
 #include <consensus/validation.h>
-#include <logging.h>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
 #include <util/feefrac.h>
-#include <util/time.h>
 #include <util/hasher.h>
+#include <util/log.h>
+#include <util/time.h>
 
 #include <boost/multi_index/indexed_by.hpp>
 #include <boost/multi_index/ordered_index.hpp>
diff --git a/src/node/txreconciliation.cpp b/src/node/txreconciliation.cpp
index 2333181cead..9a1f640f5a4 100644
--- a/src/node/txreconciliation.cpp
+++ b/src/node/txreconciliation.cpp
@@ -5,8 +5,8 @@
 #include <node/txreconciliation.h>
 
 #include <common/system.h>
-#include <logging.h>
 #include <util/check.h>
+#include <util/log.h>
 
 #include <unordered_map>
 #include <variant>
diff --git a/src/noui.cpp b/src/noui.cpp
index 6f33b22728d..12ebc401c7f 100644
--- a/src/noui.cpp
+++ b/src/noui.cpp
@@ -6,8 +6,8 @@
 #include <noui.h>
 
 #include <btcsignals.h>
-#include <logging.h>
 #include <node/interface_ui.h>
+#include <util/log.h>
 #include <util/translation.h>
 
 #include <string>
diff --git a/src/policy/fees/block_policy_estimator.cpp b/src/policy/fees/block_policy_estimator.cpp
index 84941b6edfd..748c49bcdc6 100644
--- a/src/policy/fees/block_policy_estimator.cpp
+++ b/src/policy/fees/block_policy_estimator.cpp
@@ -8,7 +8,6 @@
 #include <common/system.h>
 #include <consensus/amount.h>
 #include <kernel/mempool_entry.h>
-#include <logging.h>
 #include <policy/feerate.h>
 #include <primitives/transaction.h>
 #include <random.h>
@@ -18,6 +17,7 @@
 #include <tinyformat.h>
 #include <uint256.h>
 #include <util/fs.h>
+#include <util/log.h>
 #include <util/serfloat.h>
 #include <util/syserror.h>
 #include <util/time.h>
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 0b89c605b9c..bf42f78da04 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -15,7 +15,6 @@
 #include <interfaces/handler.h>
 #include <interfaces/init.h>
 #include <interfaces/node.h>
-#include <logging.h>
 #include <node/context.h>
 #include <node/interface_ui.h>
 #include <noui.h>
@@ -33,6 +32,7 @@
 #include <qt/winshutdownmonitor.h>
 #include <uint256.h>
 #include <util/exception.h>
+#include <util/log.h>
 #include <util/string.h>
 #include <util/threadnames.h>
 #include <util/translation.h>
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index d9c97d85297..79c1911549c 100644
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -14,8 +14,8 @@
 #include <interfaces/node.h>
 #include <interfaces/wallet.h>
 #include <key_io.h>
-#include <logging.h>
 #include <policy/policy.h>
+#include <util/log.h>
 #include <validation.h>
 
 #include <cstdint>
diff --git a/src/script/signingprovider.cpp b/src/script/signingprovider.cpp
index 19596544495..b680d18c2c6 100644
--- a/src/script/signingprovider.cpp
+++ b/src/script/signingprovider.cpp
@@ -7,7 +7,7 @@
 #include <script/interpreter.h>
 #include <script/signingprovider.h>
 
-#include <logging.h>
+#include <util/log.h>
 
 const SigningProvider& DUMMY_SIGNING_PROVIDER = SigningProvider();
 
diff --git a/src/test/util/chainstate.h b/src/test/util/chainstate.h
index db11d5657d6..48a3381a687 100644
--- a/src/test/util/chainstate.h
+++ b/src/test/util/chainstate.h
@@ -6,13 +6,13 @@
 #define BITCOIN_TEST_UTIL_CHAINSTATE_H
 
 #include <clientversion.h>
-#include <logging.h>
 #include <node/context.h>
 #include <node/utxo_snapshot.h>
 #include <rpc/blockchain.h>
 #include <test/util/setup_common.h>
 #include <util/byte_units.h>
 #include <util/fs.h>
+#include <util/log.h>
 #include <validation.h>
 
 #include <univalue.h>
diff --git a/src/test/util/random.cpp b/src/test/util/random.cpp
index 90ddf66ca41..2df7de465ef 100644
--- a/src/test/util/random.cpp
+++ b/src/test/util/random.cpp
@@ -4,10 +4,10 @@
 
 #include <test/util/random.h>
 
-#include <logging.h>
 #include <random.h>
 #include <uint256.h>
 #include <util/check.h>
+#include <util/log.h>
 
 #include <cstdlib>
 #include <iostream>
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index 0893596d37d..5393ba7fb9b 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -10,7 +10,6 @@
 #include <common/args.h>
 #include <compat/compat.h>
 #include <crypto/hmac_sha256.h>
-#include <logging.h>
 #include <net.h>
 #include <netaddress.h>
 #include <netbase.h>
@@ -18,6 +17,7 @@
 #include <tinyformat.h>
 #include <util/check.h>
 #include <util/fs.h>
+#include <util/log.h>
 #include <util/readwritefile.h>
 #include <util/strencodings.h>
 #include <util/string.h>
diff --git a/src/wallet/coinselection.cpp b/src/wallet/coinselection.cpp
index 1d9db426f6b..4b164469a48 100644
--- a/src/wallet/coinselection.cpp
+++ b/src/wallet/coinselection.cpp
@@ -8,9 +8,9 @@
 #include <consensus/amount.h>
 #include <consensus/consensus.h>
 #include <interfaces/chain.h>
-#include <logging.h>
 #include <policy/feerate.h>
 #include <util/check.h>
+#include <util/log.h>
 #include <util/moneystr.h>
 
 #include <numeric>
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
index cad3d7b57e7..3af0f1ca41a 100644
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -5,8 +5,8 @@
 
 #include <chainparams.h>
 #include <common/args.h>
-#include <logging.h>
 #include <util/fs.h>
+#include <util/log.h>
 #include <wallet/db.h>
 
 #include <algorithm>
diff --git a/src/wallet/migrate.cpp b/src/wallet/migrate.cpp
index 1869a456671..004f5b31442 100644
--- a/src/wallet/migrate.cpp
+++ b/src/wallet/migrate.cpp
@@ -4,8 +4,8 @@
 
 #include <compat/byteswap.h>
 #include <crypto/common.h>
-#include <logging.h>
 #include <streams.h>
+#include <util/log.h>
 #include <util/translation.h>
 #include <wallet/migrate.h>
 
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index 8a1c0a45a56..fc82ad53301 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -4,7 +4,6 @@
 
 #include <hash.h>
 #include <key_io.h>
-#include <logging.h>
 #include <node/types.h>
 #include <outputtype.h>
 #include <script/descriptor.h>
@@ -13,6 +12,7 @@
 #include <script/solver.h>
 #include <util/bip32.h>
 #include <util/check.h>
+#include <util/log.h>
 #include <util/strencodings.h>
 #include <util/string.h>
 #include <util/time.h>
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
index 4ac09add62b..d07c84a2072 100644
--- a/src/wallet/scriptpubkeyman.h
+++ b/src/wallet/scriptpubkeyman.h
@@ -10,13 +10,13 @@
 #include <common/messages.h>
 #include <common/signmessage.h>
 #include <common/types.h>
-#include <logging.h>
 #include <musig.h>
 #include <node/types.h>
 #include <psbt.h>
 #include <script/descriptor.h>
 #include <script/script.h>
 #include <script/signingprovider.h>
+#include <util/log.h>
 #include <util/result.h>
 #include <util/time.h>
 #include <wallet/crypter.h>
diff --git a/src/wallet/sqlite.cpp b/src/wallet/sqlite.cpp
index 03adc7ec95e..f098020ac2d 100644
--- a/src/wallet/sqlite.cpp
+++ b/src/wallet/sqlite.cpp
@@ -8,10 +8,10 @@
 
 #include <chainparams.h>
 #include <crypto/common.h>
-#include <logging.h>
 #include <sync.h>
 #include <util/check.h>
 #include <util/fs_helpers.h>
+#include <util/log.h>
 #include <util/strencodings.h>
 #include <util/translation.h>
 #include <wallet/db.h>
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index d25c39128b2..8d80347136d 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -6,6 +6,7 @@
 #include <wallet/wallet.h>
 
 #include <bitcoin-build-config.h> // IWYU pragma: keep
+
 #include <addresstype.h>
 #include <blockfilter.h>
 #include <chain.h>
@@ -26,7 +27,6 @@
 #include <kernel/types.h>
 #include <key.h>
 #include <key_io.h>
-#include <logging.h>
 #include <node/types.h>
 #include <outputtype.h>
 #include <policy/feerate.h>
@@ -55,6 +55,7 @@
 #include <util/check.h>
 #include <util/fs.h>
 #include <util/fs_helpers.h>
+#include <util/log.h>
 #include <util/moneystr.h>
 #include <util/result.h>
 #include <util/string.h>
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 9cd78258454..bbe27627f92 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -12,7 +12,6 @@
 #include <interfaces/chain.h>
 #include <interfaces/handler.h>
 #include <kernel/cs_main.h>
-#include <logging.h>
 #include <node/types.h>
 #include <outputtype.h>
 #include <policy/feerate.h>
@@ -26,6 +25,7 @@
 #include <uint256.h>
 #include <util/fs.h>
 #include <util/hasher.h>
+#include <util/log.h>
 #include <util/result.h>
 #include <util/string.h>
 #include <util/time.h>
diff --git a/src/wallet/walletutil.cpp b/src/wallet/walletutil.cpp
index 93d4b1ac483..85249f63275 100644
--- a/src/wallet/walletutil.cpp
+++ b/src/wallet/walletutil.cpp
@@ -7,7 +7,7 @@
 #include <chainparams.h>
 #include <common/args.h>
 #include <key_io.h>
-#include <logging.h>
+#include <util/log.h>
 
 namespace wallet {
 fs::path GetWalletDir()
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
index 9efb3eb75ed..8bfeba0dbfd 100644
--- a/src/zmq/zmqnotificationinterface.cpp
+++ b/src/zmq/zmqnotificationinterface.cpp
@@ -7,11 +7,11 @@
 #include <common/args.h>
 #include <kernel/mempool_entry.h>
 #include <kernel/types.h>
-#include <logging.h>
 #include <netbase.h>
 #include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <util/check.h>
+#include <util/log.h>
 #include <zmq/zmqabstractnotifier.h>
 #include <zmq/zmqpublishnotifier.h>
 #include <zmq/zmqutil.h>
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
index 61b65a1317a..07763a073d7 100644
--- a/src/zmq/zmqpublishnotifier.cpp
+++ b/src/zmq/zmqpublishnotifier.cpp
@@ -6,7 +6,6 @@
 
 #include <chain.h>
 #include <crypto/common.h>
-#include <logging.h>
 #include <netaddress.h>
 #include <netbase.h>
 #include <primitives/transaction.h>
@@ -14,6 +13,7 @@
 #include <streams.h>
 #include <uint256.h>
 #include <util/check.h>
+#include <util/log.h>
 #include <zmq/zmqutil.h>
 
 #include <zmq.h>
diff --git a/src/zmq/zmqutil.cpp b/src/zmq/zmqutil.cpp
index f491988ce55..5e334c03d49 100644
--- a/src/zmq/zmqutil.cpp
+++ b/src/zmq/zmqutil.cpp
@@ -4,7 +4,7 @@
 
 #include <zmq/zmqutil.h>
 
-#include <logging.h>
+#include <util/log.h>
 
 #include <zmq.h>