From fab0e834b8cf906c286ebbeed86eca8d65854f75 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Mon, 26 Aug 2024 17:27:54 +0200
Subject: [PATCH] bench: [refactor] iwyu

---
 src/bench/addrman.cpp                   |  6 +++++
 src/bench/base58.cpp                    |  5 +++--
 src/bench/bech32.cpp                    |  4 +---
 src/bench/bench.cpp                     |  7 +++++-
 src/bench/bench.h                       |  5 +++--
 src/bench/bench_bitcoin.cpp             |  7 +++---
 src/bench/bip324_ecdh.cpp               |  2 +-
 src/bench/block_assemble.cpp            | 12 ++++++----
 src/bench/ccoins_caching.cpp            |  5 +++++
 src/bench/chacha20.cpp                  |  5 +++++
 src/bench/checkblock.cpp                | 11 +++++++++-
 src/bench/checkblockindex.cpp           |  2 ++
 src/bench/checkqueue.cpp                |  4 +++-
 src/bench/cluster_linearize.cpp         |  8 +++++--
 src/bench/coin_selection.cpp            | 15 ++++++++++++-
 src/bench/crypto_hash.cpp               |  5 ++++-
 src/bench/data.cpp                      |  2 ++
 src/bench/descriptors.cpp               |  7 +++++-
 src/bench/disconnected_transactions.cpp | 11 +++++++++-
 src/bench/duplicate_inputs.cpp          | 15 ++++++++++++-
 src/bench/ellswift.cpp                  |  7 +++++-
 src/bench/gcs_filter.cpp                |  5 +++++
 src/bench/hashpadding.cpp               |  2 +-
 src/bench/index_blockfilter.cpp         | 22 +++++++++++++++----
 src/bench/load_external.cpp             | 15 +++++++++++--
 src/bench/lockedpool.cpp                |  3 ++-
 src/bench/logging.cpp                   |  4 +++-
 src/bench/mempool_eviction.cpp          | 11 +++++++++-
 src/bench/mempool_stress.cpp            | 11 ++++++++--
 src/bench/merkle_root.cpp               |  3 ++-
 src/bench/peer_eviction.cpp             |  5 ++---
 src/bench/poly1305.cpp                  |  5 ++++-
 src/bench/pool.cpp                      |  4 ++++
 src/bench/prevector.cpp                 |  8 ++++---
 src/bench/random.cpp                    |  2 ++
 src/bench/readblock.cpp                 | 13 ++++++++---
 src/bench/rollingbloom.cpp              |  2 ++
 src/bench/rpc_blockchain.cpp            | 14 +++++++++---
 src/bench/rpc_mempool.cpp               | 11 +++++++---
 src/bench/sign_transaction.cpp          | 10 +++++++--
 src/bench/strencodings.cpp              |  3 +++
 src/bench/verify_script.cpp             | 11 ++++++++--
 src/bench/wallet_balance.cpp            | 16 ++++++++++----
 src/bench/wallet_create.cpp             | 17 ++++++++++++---
 src/bench/wallet_create_tx.cpp          | 29 +++++++++++++++++++++++--
 src/bench/wallet_ismine.cpp             | 19 +++++++++++-----
 src/bench/wallet_loading.cpp            | 24 +++++++++++---------
 src/bench/xor.cpp                       |  2 +-
 48 files changed, 332 insertions(+), 84 deletions(-)

diff --git a/src/bench/addrman.cpp b/src/bench/addrman.cpp
index f044feebba..c0ef7b2279 100644
--- a/src/bench/addrman.cpp
+++ b/src/bench/addrman.cpp
@@ -4,12 +4,18 @@
 
 #include <addrman.h>
 #include <bench/bench.h>
+#include <compat/compat.h>
+#include <netaddress.h>
 #include <netbase.h>
 #include <netgroup.h>
+#include <protocol.h>
 #include <random.h>
+#include <span.h>
+#include <uint256.h>
 #include <util/check.h>
 #include <util/time.h>
 
+#include <cstring>
 #include <optional>
 #include <vector>
 
diff --git a/src/bench/base58.cpp b/src/bench/base58.cpp
index 78748bc5bd..f078c33964 100644
--- a/src/bench/base58.cpp
+++ b/src/bench/base58.cpp
@@ -2,11 +2,12 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <bench/bench.h>
-
 #include <base58.h>
+#include <bench/bench.h>
+#include <span.h>
 
 #include <array>
+#include <cstring>
 #include <vector>
 
 
diff --git a/src/bench/bech32.cpp b/src/bench/bech32.cpp
index 9922653766..afb9ce8999 100644
--- a/src/bench/bech32.cpp
+++ b/src/bench/bech32.cpp
@@ -2,12 +2,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <bench/bench.h>
-
 #include <bech32.h>
+#include <bench/bench.h>
 #include <util/strencodings.h>
 
-#include <string>
 #include <vector>
 
 
diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
index 733f8085ca..a2dbb11888 100644
--- a/src/bench/bench.cpp
+++ b/src/bench/bench.cpp
@@ -4,16 +4,21 @@
 
 #include <bench/bench.h>
 
-#include <test/util/setup_common.h>
+#include <test/util/setup_common.h> // IWYU pragma: keep
+#include <tinyformat.h>
 #include <util/fs.h>
 #include <util/string.h>
 
 #include <chrono>
+#include <compare>
 #include <fstream>
 #include <functional>
 #include <iostream>
 #include <map>
+#include <ratio>
 #include <regex>
+#include <set>
+#include <stdexcept>
 #include <string>
 #include <vector>
 
diff --git a/src/bench/bench.h b/src/bench/bench.h
index 6065ddf3fc..f0705f4fed 100644
--- a/src/bench/bench.h
+++ b/src/bench/bench.h
@@ -5,17 +5,18 @@
 #ifndef BITCOIN_BENCH_BENCH_H
 #define BITCOIN_BENCH_BENCH_H
 
+#include <bench/nanobench.h> // IWYU pragma: export
 #include <util/fs.h>
 #include <util/macros.h>
 
 #include <chrono>
+#include <cstdint>
 #include <functional>
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
-#include <bench/nanobench.h> // IWYU pragma: export
-
 /*
  * Usage:
 
diff --git a/src/bench/bench_bitcoin.cpp b/src/bench/bench_bitcoin.cpp
index a1b880e40b..555dca7d59 100644
--- a/src/bench/bench_bitcoin.cpp
+++ b/src/bench/bench_bitcoin.cpp
@@ -3,15 +3,16 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-
-#include <clientversion.h>
 #include <common/args.h>
 #include <crypto/sha256.h>
+#include <tinyformat.h>
 #include <util/fs.h>
-#include <util/strencodings.h>
+#include <util/string.h>
 
 #include <chrono>
 #include <cstdint>
+#include <cstdlib>
+#include <exception>
 #include <iostream>
 #include <sstream>
 #include <vector>
diff --git a/src/bench/bip324_ecdh.cpp b/src/bench/bip324_ecdh.cpp
index 88f3932ad8..e6a614dadf 100644
--- a/src/bench/bip324_ecdh.cpp
+++ b/src/bench/bip324_ecdh.cpp
@@ -3,12 +3,12 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-
 #include <key.h>
 #include <pubkey.h>
 #include <random.h>
 #include <span.h>
 
+#include <algorithm>
 #include <array>
 #include <cstddef>
 
diff --git a/src/bench/block_assemble.cpp b/src/bench/block_assemble.cpp
index ba8ec16119..4005701cae 100644
--- a/src/bench/block_assemble.cpp
+++ b/src/bench/block_assemble.cpp
@@ -3,17 +3,21 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-#include <consensus/validation.h>
-#include <crypto/sha256.h>
+#include <consensus/consensus.h>
 #include <node/miner.h>
+#include <primitives/transaction.h>
 #include <random.h>
+#include <script/script.h>
+#include <sync.h>
 #include <test/util/mining.h>
 #include <test/util/script.h>
 #include <test/util/setup_common.h>
-#include <txmempool.h>
 #include <validation.h>
 
-
+#include <array>
+#include <cassert>
+#include <cstddef>
+#include <memory>
 #include <vector>
 
 static void AssembleBlock(benchmark::Bench& bench)
diff --git a/src/bench/ccoins_caching.cpp b/src/bench/ccoins_caching.cpp
index 05b2f5435c..351861536c 100644
--- a/src/bench/ccoins_caching.cpp
+++ b/src/bench/ccoins_caching.cpp
@@ -4,10 +4,15 @@
 
 #include <bench/bench.h>
 #include <coins.h>
+#include <consensus/amount.h>
+#include <key.h>
 #include <policy/policy.h>
+#include <primitives/transaction.h>
+#include <script/script.h>
 #include <script/signingprovider.h>
 #include <test/util/transaction_utils.h>
 
+#include <cassert>
 #include <vector>
 
 // Microbenchmark for simple accesses to a CCoinsViewCache database. Note from
diff --git a/src/bench/chacha20.cpp b/src/bench/chacha20.cpp
index e0bb07d8be..f154d8c6be 100644
--- a/src/bench/chacha20.cpp
+++ b/src/bench/chacha20.cpp
@@ -6,6 +6,11 @@
 #include <bench/bench.h>
 #include <crypto/chacha20.h>
 #include <crypto/chacha20poly1305.h>
+#include <span.h>
+
+#include <cstddef>
+#include <cstdint>
+#include <vector>
 
 /* Number of bytes to process per iteration */
 static const uint64_t BUFFER_SIZE_TINY  = 64;
diff --git a/src/bench/checkblock.cpp b/src/bench/checkblock.cpp
index b81878006c..580265fc52 100644
--- a/src/bench/checkblock.cpp
+++ b/src/bench/checkblock.cpp
@@ -4,14 +4,23 @@
 
 #include <bench/bench.h>
 #include <bench/data.h>
-
 #include <chainparams.h>
 #include <common/args.h>
 #include <consensus/validation.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
+#include <serialize.h>
+#include <span.h>
 #include <streams.h>
 #include <util/chaintype.h>
 #include <validation.h>
 
+#include <cassert>
+#include <cstddef>
+#include <memory>
+#include <optional>
+#include <vector>
+
 // These are the two major time-sinks which happen after we have fully received
 // a block off the wire, but before we can relay the block on to peers using
 // compact block relay.
diff --git a/src/bench/checkblockindex.cpp b/src/bench/checkblockindex.cpp
index e8a848dbd4..a5c152b387 100644
--- a/src/bench/checkblockindex.cpp
+++ b/src/bench/checkblockindex.cpp
@@ -6,6 +6,8 @@
 #include <test/util/setup_common.h>
 #include <validation.h>
 
+#include <memory>
+
 static void CheckBlockIndex(benchmark::Bench& bench)
 {
     auto testing_setup{MakeNoLogFileContext<TestChain100Setup>()};
diff --git a/src/bench/checkqueue.cpp b/src/bench/checkqueue.cpp
index c973fe9f71..d1454f3634 100644
--- a/src/bench/checkqueue.cpp
+++ b/src/bench/checkqueue.cpp
@@ -7,9 +7,11 @@
 #include <common/system.h>
 #include <key.h>
 #include <prevector.h>
-#include <pubkey.h>
 #include <random.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <utility>
 #include <vector>
 
 static const size_t BATCHES = 101;
diff --git a/src/bench/cluster_linearize.cpp b/src/bench/cluster_linearize.cpp
index 269648f4e2..de85741909 100644
--- a/src/bench/cluster_linearize.cpp
+++ b/src/bench/cluster_linearize.cpp
@@ -3,9 +3,13 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-
-#include <util/bitset.h>
 #include <cluster_linearize.h>
+#include <util/bitset.h>
+
+#include <algorithm>
+#include <cassert>
+#include <cstdint>
+#include <vector>
 
 using namespace cluster_linearize;
 
diff --git a/src/bench/coin_selection.cpp b/src/bench/coin_selection.cpp
index 171c61c46f..a752f73610 100644
--- a/src/bench/coin_selection.cpp
+++ b/src/bench/coin_selection.cpp
@@ -3,15 +3,28 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
+#include <consensus/amount.h>
 #include <interfaces/chain.h>
 #include <node/context.h>
+#include <outputtype.h>
+#include <policy/feerate.h>
 #include <policy/policy.h>
+#include <primitives/transaction.h>
+#include <random.h>
+#include <sync.h>
+#include <util/result.h>
 #include <wallet/coinselection.h>
 #include <wallet/spend.h>
-#include <wallet/wallet.h>
 #include <wallet/test/util.h>
+#include <wallet/transaction.h>
+#include <wallet/wallet.h>
 
+#include <cassert>
+#include <map>
+#include <memory>
 #include <set>
+#include <utility>
+#include <vector>
 
 using node::NodeContext;
 using wallet::AttemptSelection;
diff --git a/src/bench/crypto_hash.cpp b/src/bench/crypto_hash.cpp
index 2551ff3593..65da942ad7 100644
--- a/src/bench/crypto_hash.cpp
+++ b/src/bench/crypto_hash.cpp
@@ -11,11 +11,14 @@
 #include <crypto/sha3.h>
 #include <crypto/sha512.h>
 #include <crypto/siphash.h>
-#include <hash.h>
 #include <random.h>
+#include <span.h>
 #include <tinyformat.h>
 #include <uint256.h>
 
+#include <cstdint>
+#include <vector>
+
 /* Number of bytes to hash per iteration */
 static const uint64_t BUFFER_SIZE = 1000*1000;
 
diff --git a/src/bench/data.cpp b/src/bench/data.cpp
index 35558b3aa7..8c5bb13f75 100644
--- a/src/bench/data.cpp
+++ b/src/bench/data.cpp
@@ -4,6 +4,8 @@
 
 #include <bench/data.h>
 
+#include <iterator>
+
 namespace benchmark {
 namespace data {
 
diff --git a/src/bench/descriptors.cpp b/src/bench/descriptors.cpp
index 5d6bcb8ce8..474ce1ee69 100644
--- a/src/bench/descriptors.cpp
+++ b/src/bench/descriptors.cpp
@@ -4,11 +4,16 @@
 
 #include <bench/bench.h>
 #include <key.h>
-#include <pubkey.h>
 #include <script/descriptor.h>
+#include <script/script.h>
+#include <script/signingprovider.h>
 
+#include <cassert>
+#include <cstdint>
+#include <memory>
 #include <string>
 #include <utility>
+#include <vector>
 
 static void ExpandDescriptor(benchmark::Bench& bench)
 {
diff --git a/src/bench/disconnected_transactions.cpp b/src/bench/disconnected_transactions.cpp
index f48175d472..7c3c34bbbc 100644
--- a/src/bench/disconnected_transactions.cpp
+++ b/src/bench/disconnected_transactions.cpp
@@ -5,9 +5,18 @@
 #include <bench/bench.h>
 #include <kernel/disconnected_transactions.h>
 #include <primitives/block.h>
-#include <test/util/random.h>
+#include <primitives/transaction.h>
+#include <script/script.h>
 #include <test/util/setup_common.h>
 
+#include <algorithm>
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
+#include <iterator>
+#include <memory>
+#include <vector>
+
 constexpr size_t BLOCK_VTX_COUNT{4000};
 constexpr size_t BLOCK_VTX_COUNT_10PERCENT{400};
 
diff --git a/src/bench/duplicate_inputs.cpp b/src/bench/duplicate_inputs.cpp
index b56054ae89..9f22fa3646 100644
--- a/src/bench/duplicate_inputs.cpp
+++ b/src/bench/duplicate_inputs.cpp
@@ -3,15 +3,28 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
+#include <chain.h>
 #include <chainparams.h>
+#include <consensus/consensus.h>
 #include <consensus/merkle.h>
 #include <consensus/validation.h>
 #include <pow.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
 #include <random.h>
+#include <script/script.h>
+#include <sync.h>
 #include <test/util/setup_common.h>
-#include <txmempool.h>
+#include <uint256.h>
 #include <validation.h>
 
+#include <cassert>
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 
 static void DuplicateInputs(benchmark::Bench& bench)
 {
diff --git a/src/bench/ellswift.cpp b/src/bench/ellswift.cpp
index 4780db8e1c..4dfef0e9c5 100644
--- a/src/bench/ellswift.cpp
+++ b/src/bench/ellswift.cpp
@@ -3,9 +3,14 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-
 #include <key.h>
+#include <pubkey.h>
 #include <random.h>
+#include <span.h>
+#include <uint256.h>
+
+#include <algorithm>
+#include <cassert>
 
 static void EllSwiftCreate(benchmark::Bench& bench)
 {
diff --git a/src/bench/gcs_filter.cpp b/src/bench/gcs_filter.cpp
index 0af4ee98fe..e6cc3d4d54 100644
--- a/src/bench/gcs_filter.cpp
+++ b/src/bench/gcs_filter.cpp
@@ -4,6 +4,11 @@
 
 #include <bench/bench.h>
 #include <blockfilter.h>
+#include <uint256.h>
+
+#include <cstdint>
+#include <utility>
+#include <vector>
 
 static GCSFilter::ElementSet GenerateGCSTestElements()
 {
diff --git a/src/bench/hashpadding.cpp b/src/bench/hashpadding.cpp
index e9d2c25fe3..cca5c07506 100644
--- a/src/bench/hashpadding.cpp
+++ b/src/bench/hashpadding.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-#include <hash.h>
+#include <crypto/sha256.h>
 #include <random.h>
 #include <uint256.h>
 
diff --git a/src/bench/index_blockfilter.cpp b/src/bench/index_blockfilter.cpp
index 5e0bfbfea6..18cd4b6f5a 100644
--- a/src/bench/index_blockfilter.cpp
+++ b/src/bench/index_blockfilter.cpp
@@ -2,14 +2,28 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
-#include <bench/bench.h>
-
 #include <addresstype.h>
+#include <bench/bench.h>
+#include <blockfilter.h>
+#include <chain.h>
+#include <index/base.h>
 #include <index/blockfilterindex.h>
-#include <node/chainstate.h>
-#include <node/context.h>
+#include <interfaces/chain.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
+#include <pubkey.h>
+#include <script/script.h>
+#include <span.h>
+#include <sync.h>
 #include <test/util/setup_common.h>
+#include <uint256.h>
 #include <util/strencodings.h>
+#include <util/time.h>
+#include <validation.h>
+
+#include <cassert>
+#include <memory>
+#include <vector>
 
 // Very simple block filter index sync benchmark, only using coinbase outputs.
 static void BlockFilterIndexSync(benchmark::Bench& bench)
diff --git a/src/bench/load_external.cpp b/src/bench/load_external.cpp
index fba1233901..2ed5a3979d 100644
--- a/src/bench/load_external.cpp
+++ b/src/bench/load_external.cpp
@@ -5,11 +5,22 @@
 #include <bench/bench.h>
 #include <bench/data.h>
 #include <chainparams.h>
-#include <clientversion.h>
+#include <flatfile.h>
+#include <node/blockstorage.h>
+#include <span.h>
+#include <streams.h>
 #include <test/util/setup_common.h>
-#include <util/chaintype.h>
+#include <uint256.h>
+#include <util/fs.h>
 #include <validation.h>
 
+#include <cstdint>
+#include <cstdio>
+#include <map>
+#include <memory>
+#include <stdexcept>
+#include <vector>
+
 /**
  * The LoadExternalBlockFile() function is used during -reindex and -loadblock.
  *
diff --git a/src/bench/lockedpool.cpp b/src/bench/lockedpool.cpp
index 6851ed0bd8..5f39ddc41b 100644
--- a/src/bench/lockedpool.cpp
+++ b/src/bench/lockedpool.cpp
@@ -3,9 +3,10 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-
 #include <support/lockedpool.h>
 
+#include <cstddef>
+#include <cstdint>
 #include <vector>
 
 #define ASIZE 2048
diff --git a/src/bench/logging.cpp b/src/bench/logging.cpp
index 8a745a0ba7..66faec00fd 100644
--- a/src/bench/logging.cpp
+++ b/src/bench/logging.cpp
@@ -5,7 +5,9 @@
 #include <bench/bench.h>
 #include <logging.h>
 #include <test/util/setup_common.h>
-#include <util/chaintype.h>
+
+#include <functional>
+#include <vector>
 
 // All but 2 of the benchmarks should have roughly similar performance:
 //
diff --git a/src/bench/mempool_eviction.cpp b/src/bench/mempool_eviction.cpp
index 1a9b013277..84f873d183 100644
--- a/src/bench/mempool_eviction.cpp
+++ b/src/bench/mempool_eviction.cpp
@@ -3,10 +3,19 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-#include <kernel/mempool_entry.h>
+#include <consensus/amount.h>
+#include <kernel/cs_main.h>
 #include <policy/policy.h>
+#include <primitives/transaction.h>
+#include <script/script.h>
+#include <sync.h>
 #include <test/util/setup_common.h>
 #include <txmempool.h>
+#include <util/check.h>
+
+#include <cstdint>
+#include <memory>
+#include <vector>
 
 
 static void AddTx(const CTransactionRef& tx, const CAmount& nFee, CTxMemPool& pool) EXCLUSIVE_LOCKS_REQUIRED(cs_main, pool.cs)
diff --git a/src/bench/mempool_stress.cpp b/src/bench/mempool_stress.cpp
index 3c82f55c19..67f689e4ea 100644
--- a/src/bench/mempool_stress.cpp
+++ b/src/bench/mempool_stress.cpp
@@ -3,16 +3,23 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-#include <kernel/mempool_entry.h>
+#include <consensus/amount.h>
 #include <policy/policy.h>
+#include <primitives/transaction.h>
 #include <random.h>
+#include <script/script.h>
+#include <sync.h>
 #include <test/util/setup_common.h>
 #include <txmempool.h>
-#include <util/chaintype.h>
 #include <validation.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <vector>
 
+class CCoinsViewCache;
+
 static void AddTx(const CTransactionRef& tx, CTxMemPool& pool) EXCLUSIVE_LOCKS_REQUIRED(cs_main, pool.cs)
 {
     int64_t nTime = 0;
diff --git a/src/bench/merkle_root.cpp b/src/bench/merkle_root.cpp
index 55409335bd..98ce197ea5 100644
--- a/src/bench/merkle_root.cpp
+++ b/src/bench/merkle_root.cpp
@@ -3,11 +3,12 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-
 #include <consensus/merkle.h>
 #include <random.h>
 #include <uint256.h>
 
+#include <vector>
+
 static void MerkleRoot(benchmark::Bench& bench)
 {
     FastRandomContext rng(true);
diff --git a/src/bench/peer_eviction.cpp b/src/bench/peer_eviction.cpp
index e04f3c403c..5b08cc758b 100644
--- a/src/bench/peer_eviction.cpp
+++ b/src/bench/peer_eviction.cpp
@@ -3,13 +3,12 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-#include <net.h>
 #include <netaddress.h>
+#include <node/eviction.h>
 #include <random.h>
 #include <test/util/net.h>
-#include <test/util/setup_common.h>
 
-#include <algorithm>
+#include <chrono>
 #include <functional>
 #include <vector>
 
diff --git a/src/bench/poly1305.cpp b/src/bench/poly1305.cpp
index be0e5f2c2d..f58afe9845 100644
--- a/src/bench/poly1305.cpp
+++ b/src/bench/poly1305.cpp
@@ -5,9 +5,12 @@
 
 #include <bench/bench.h>
 #include <crypto/poly1305.h>
-
 #include <span.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <vector>
+
 /* Number of bytes to process per iteration */
 static constexpr uint64_t BUFFER_SIZE_TINY  = 64;
 static constexpr uint64_t BUFFER_SIZE_SMALL = 256;
diff --git a/src/bench/pool.cpp b/src/bench/pool.cpp
index b2a5f8debf..40b098f54c 100644
--- a/src/bench/pool.cpp
+++ b/src/bench/pool.cpp
@@ -5,7 +5,11 @@
 #include <bench/bench.h>
 #include <support/allocators/pool.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <functional>
 #include <unordered_map>
+#include <utility>
 
 template <typename Map>
 void BenchFillClearMap(benchmark::Bench& bench, Map& map)
diff --git a/src/bench/prevector.cpp b/src/bench/prevector.cpp
index 2524e215e4..9b83c42693 100644
--- a/src/bench/prevector.cpp
+++ b/src/bench/prevector.cpp
@@ -3,11 +3,13 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <prevector.h>
-#include <serialize.h>
-#include <streams.h>
-#include <type_traits>
 
 #include <bench/bench.h>
+#include <serialize.h>
+#include <streams.h>
+
+#include <type_traits>
+#include <vector>
 
 struct nontrivial_t {
     int x{-1};
diff --git a/src/bench/random.cpp b/src/bench/random.cpp
index cff215d5a7..c2aa66850a 100644
--- a/src/bench/random.cpp
+++ b/src/bench/random.cpp
@@ -5,7 +5,9 @@
 #include <bench/bench.h>
 #include <random.h>
 
+#include <algorithm>
 #include <cstdint>
+#include <iterator>
 #include <numeric>
 
 namespace {
diff --git a/src/bench/readblock.cpp b/src/bench/readblock.cpp
index 2b2bfe069e..0b88663db6 100644
--- a/src/bench/readblock.cpp
+++ b/src/bench/readblock.cpp
@@ -4,14 +4,21 @@
 
 #include <bench/bench.h>
 #include <bench/data.h>
-
-#include <consensus/validation.h>
+#include <flatfile.h>
 #include <node/blockstorage.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
+#include <serialize.h>
+#include <span.h>
 #include <streams.h>
 #include <test/util/setup_common.h>
-#include <util/chaintype.h>
 #include <validation.h>
 
+#include <cassert>
+#include <cstdint>
+#include <memory>
+#include <vector>
+
 static FlatFilePos WriteBlockToDisk(ChainstateManager& chainman)
 {
     DataStream stream{benchmark::data::block413567};
diff --git a/src/bench/rollingbloom.cpp b/src/bench/rollingbloom.cpp
index de76a87278..6b3e1c434e 100644
--- a/src/bench/rollingbloom.cpp
+++ b/src/bench/rollingbloom.cpp
@@ -6,7 +6,9 @@
 #include <bench/bench.h>
 #include <common/bloom.h>
 #include <crypto/common.h>
+#include <span.h>
 
+#include <cstdint>
 #include <vector>
 
 static void RollingBloom(benchmark::Bench& bench)
diff --git a/src/bench/rpc_blockchain.cpp b/src/bench/rpc_blockchain.cpp
index 713853e8c5..54356598e7 100644
--- a/src/bench/rpc_blockchain.cpp
+++ b/src/bench/rpc_blockchain.cpp
@@ -4,14 +4,22 @@
 
 #include <bench/bench.h>
 #include <bench/data.h>
-
+#include <chain.h>
+#include <core_io.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
 #include <rpc/blockchain.h>
+#include <serialize.h>
+#include <span.h>
 #include <streams.h>
 #include <test/util/setup_common.h>
-#include <util/chaintype.h>
+#include <uint256.h>
+#include <univalue.h>
 #include <validation.h>
 
-#include <univalue.h>
+#include <cstddef>
+#include <memory>
+#include <vector>
 
 namespace {
 
diff --git a/src/bench/rpc_mempool.cpp b/src/bench/rpc_mempool.cpp
index a55aa0c794..6e8757bbd5 100644
--- a/src/bench/rpc_mempool.cpp
+++ b/src/bench/rpc_mempool.cpp
@@ -3,14 +3,19 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
+#include <consensus/amount.h>
 #include <kernel/cs_main.h>
-#include <kernel/mempool_entry.h>
+#include <primitives/transaction.h>
 #include <rpc/mempool.h>
+#include <script/script.h>
+#include <sync.h>
 #include <test/util/setup_common.h>
 #include <txmempool.h>
-#include <util/chaintype.h>
-
 #include <univalue.h>
+#include <util/check.h>
+
+#include <memory>
+#include <vector>
 
 
 static void AddTx(const CTransactionRef& tx, const CAmount& fee, CTxMemPool& pool) EXCLUSIVE_LOCKS_REQUIRED(cs_main, pool.cs)
diff --git a/src/bench/sign_transaction.cpp b/src/bench/sign_transaction.cpp
index 6f28f581af..7b2a75942c 100644
--- a/src/bench/sign_transaction.cpp
+++ b/src/bench/sign_transaction.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 <bench/bench.h>
 #include <addresstype.h>
+#include <bench/bench.h>
 #include <coins.h>
 #include <key.h>
 #include <primitives/transaction.h>
@@ -11,10 +11,16 @@
 #include <script/interpreter.h>
 #include <script/script.h>
 #include <script/sign.h>
-#include <uint256.h>
+#include <script/signingprovider.h>
+#include <span.h>
 #include <test/util/random.h>
+#include <uint256.h>
 #include <util/translation.h>
 
+#include <cassert>
+#include <map>
+#include <vector>
+
 enum class InputType {
     P2WPKH, // segwitv0, witness-pubkey-hash (ECDSA signature)
     P2TR,   // segwitv1, taproot key-path spend (Schnorr signature)
diff --git a/src/bench/strencodings.cpp b/src/bench/strencodings.cpp
index 16d14278a7..72eb6b442b 100644
--- a/src/bench/strencodings.cpp
+++ b/src/bench/strencodings.cpp
@@ -4,8 +4,11 @@
 
 #include <bench/bench.h>
 #include <bench/data.h>
+#include <span.h>
 #include <util/strencodings.h>
 
+#include <vector>
+
 static void HexStrBench(benchmark::Bench& bench)
 {
     auto const& data = benchmark::data::block413567;
diff --git a/src/bench/verify_script.cpp b/src/bench/verify_script.cpp
index f38aa49a23..8d7e92a055 100644
--- a/src/bench/verify_script.cpp
+++ b/src/bench/verify_script.cpp
@@ -3,13 +3,20 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
+#include <hash.h>
 #include <key.h>
-#include <script/script.h>
+#include <primitives/transaction.h>
+#include <pubkey.h>
 #include <script/interpreter.h>
-#include <streams.h>
+#include <script/script.h>
+#include <span.h>
 #include <test/util/transaction_utils.h>
+#include <uint256.h>
 
 #include <array>
+#include <cassert>
+#include <cstdint>
+#include <vector>
 
 // Microbenchmark for verification of a basic P2WPKH script. Can be easily
 // modified to measure performance of other types of scripts.
diff --git a/src/bench/wallet_balance.cpp b/src/bench/wallet_balance.cpp
index 7a10b167a6..8d3f7f9673 100644
--- a/src/bench/wallet_balance.cpp
+++ b/src/bench/wallet_balance.cpp
@@ -4,16 +4,24 @@
 
 #include <bench/bench.h>
 #include <interfaces/chain.h>
-#include <node/chainstate.h>
-#include <node/context.h>
+#include <kernel/chainparams.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
+#include <sync.h>
 #include <test/util/mining.h>
 #include <test/util/setup_common.h>
-#include <wallet/test/util.h>
-#include <validationinterface.h>
+#include <uint256.h>
+#include <util/time.h>
+#include <validation.h>
 #include <wallet/receive.h>
+#include <wallet/test/util.h>
 #include <wallet/wallet.h>
+#include <wallet/walletutil.h>
 
+#include <cassert>
+#include <memory>
 #include <optional>
+#include <string>
 
 namespace wallet {
 static void WalletBalance(benchmark::Bench& bench, const bool set_dirty, const bool add_mine)
diff --git a/src/bench/wallet_create.cpp b/src/bench/wallet_create.cpp
index 1adced1e99..43b5b5c91e 100644
--- a/src/bench/wallet_create.cpp
+++ b/src/bench/wallet_create.cpp
@@ -2,14 +2,25 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
-#include <config/bitcoin-config.h> // IWYU pragma: keep
-
 #include <bench/bench.h>
-#include <node/context.h>
+#include <config/bitcoin-config.h> // IWYU pragma: keep
 #include <random.h>
+#include <support/allocators/secure.h>
 #include <test/util/setup_common.h>
+#include <uint256.h>
+#include <util/fs.h>
+#include <util/translation.h>
 #include <wallet/context.h>
+#include <wallet/db.h>
 #include <wallet/wallet.h>
+#include <wallet/walletutil.h>
+
+#include <cassert>
+#include <memory>
+#include <optional>
+#include <string>
+#include <utility>
+#include <vector>
 
 namespace wallet {
 static void WalletCreate(benchmark::Bench& bench, bool encrypted)
diff --git a/src/bench/wallet_create_tx.cpp b/src/bench/wallet_create_tx.cpp
index 84e02d2a26..3c4b2f4f83 100644
--- a/src/bench/wallet_create_tx.cpp
+++ b/src/bench/wallet_create_tx.cpp
@@ -2,17 +2,42 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
+#include <addresstype.h>
 #include <bench/bench.h>
+#include <chain.h>
 #include <chainparams.h>
-#include <wallet/coincontrol.h>
+#include <consensus/amount.h>
+#include <consensus/consensus.h>
 #include <consensus/merkle.h>
+#include <interfaces/chain.h>
 #include <kernel/chain.h>
-#include <node/context.h>
+#include <node/blockstorage.h>
+#include <outputtype.h>
+#include <policy/feerate.h>
+#include <primitives/block.h>
+#include <primitives/transaction.h>
+#include <script/script.h>
+#include <sync.h>
 #include <test/util/setup_common.h>
+#include <uint256.h>
+#include <util/result.h>
+#include <util/time.h>
 #include <validation.h>
+#include <versionbits.h>
+#include <wallet/coincontrol.h>
+#include <wallet/coinselection.h>
 #include <wallet/spend.h>
 #include <wallet/test/util.h>
 #include <wallet/wallet.h>
+#include <wallet/walletutil.h>
+
+#include <cassert>
+#include <cstdint>
+#include <map>
+#include <memory>
+#include <optional>
+#include <utility>
+#include <vector>
 
 using wallet::CWallet;
 using wallet::CreateMockableWalletDatabase;
diff --git a/src/bench/wallet_ismine.cpp b/src/bench/wallet_ismine.cpp
index 753404b526..d6dd5bc44d 100644
--- a/src/bench/wallet_ismine.cpp
+++ b/src/bench/wallet_ismine.cpp
@@ -2,20 +2,29 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <config/bitcoin-config.h> // IWYU pragma: keep
+#include <addresstype.h>
 #include <bench/bench.h>
-#include <interfaces/chain.h>
+#include <config/bitcoin-config.h> // IWYU pragma: keep
 #include <key.h>
 #include <key_io.h>
-#include <node/context.h>
+#include <script/descriptor.h>
+#include <script/script.h>
+#include <script/signingprovider.h>
+#include <sync.h>
 #include <test/util/setup_common.h>
-#include <util/translation.h>
-#include <validationinterface.h>
 #include <wallet/context.h>
+#include <wallet/db.h>
 #include <wallet/test/util.h>
+#include <wallet/types.h>
 #include <wallet/wallet.h>
 #include <wallet/walletutil.h>
 
+#include <cassert>
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <utility>
+
 namespace wallet {
 static void WalletIsMine(benchmark::Bench& bench, bool legacy_wallet, int num_combo = 0)
 {
diff --git a/src/bench/wallet_loading.cpp b/src/bench/wallet_loading.cpp
index 02582deda4..03459d37c1 100644
--- a/src/bench/wallet_loading.cpp
+++ b/src/bench/wallet_loading.cpp
@@ -2,21 +2,25 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <config/bitcoin-config.h> // IWYU pragma: keep
-
+#include <addresstype.h>
 #include <bench/bench.h>
-#include <interfaces/chain.h>
-#include <node/context.h>
-#include <test/util/mining.h>
+#include <config/bitcoin-config.h> // IWYU pragma: keep
+#include <consensus/amount.h>
+#include <outputtype.h>
+#include <primitives/transaction.h>
 #include <test/util/setup_common.h>
-#include <wallet/test/util.h>
-#include <util/translation.h>
-#include <validationinterface.h>
+#include <util/check.h>
 #include <wallet/context.h>
-#include <wallet/receive.h>
+#include <wallet/db.h>
+#include <wallet/test/util.h>
+#include <wallet/transaction.h>
 #include <wallet/wallet.h>
+#include <wallet/walletutil.h>
 
-#include <optional>
+#include <cstdint>
+#include <memory>
+#include <utility>
+#include <vector>
 
 namespace wallet{
 static void AddTx(CWallet& wallet)
diff --git a/src/bench/xor.cpp b/src/bench/xor.cpp
index edda74214a..fc9dc5d172 100644
--- a/src/bench/xor.cpp
+++ b/src/bench/xor.cpp
@@ -3,8 +3,8 @@
 // file COPYING or https://opensource.org/license/mit/.
 
 #include <bench/bench.h>
-
 #include <random.h>
+#include <span.h>
 #include <streams.h>
 
 #include <cstddef>