From 6183942513789fb3dc94fa02a097744b149bb69a Mon Sep 17 00:00:00 2001
From: Brandon Odiwuor <brandon.odiwuor@gmail.com>
Date: Sat, 4 Apr 2026 23:22:29 +0300
Subject: [PATCH] ci, iwyu: Fix warnings in src/scripts and treat them as error

---
 ci/test/03_test_script.sh      |  2 +-
 src/bench/verify_script.cpp    |  1 +
 src/core_io.cpp                |  1 +
 src/kernel/bitcoinkernel.cpp   |  1 +
 src/kernel/chainparams.cpp     |  1 +
 src/psbt.h                     |  1 +
 src/script/descriptor.cpp      | 24 ++++++++++++++++++++----
 src/script/descriptor.h        | 16 +++++++++++++---
 src/script/interpreter.cpp     | 10 ++++++++++
 src/script/interpreter.h       | 13 +++++++------
 src/script/miniscript.cpp      |  8 ++++----
 src/script/miniscript.h        | 29 ++++++++++++++++-------------
 src/script/parsing.cpp         |  2 --
 src/script/parsing.h           |  3 +--
 src/script/script.cpp          |  1 +
 src/script/script.h            |  5 +++--
 src/script/sigcache.cpp        |  2 +-
 src/script/sigcache.h          |  6 ++++--
 src/script/sign.cpp            | 16 +++++++++++++++-
 src/script/sign.h              | 20 +++++++++++++-------
 src/script/signingprovider.cpp |  9 +++++++--
 src/script/signingprovider.h   | 14 +++++++++++++-
 src/script/solver.cpp          |  6 +++---
 src/script/solver.h            |  4 ++--
 src/signet.cpp                 |  1 +
 src/test/script_tests.cpp      | 17 ++++++++---------
 src/wallet/feebumper.cpp       |  4 +++-
 src/wallet/rpc/wallet.cpp      |  4 +++-
 src/wallet/scriptpubkeyman.cpp |  4 +++-
 src/wallet/scriptpubkeyman.h   |  2 ++
 src/wallet/walletdb.h          |  1 +
 31 files changed, 160 insertions(+), 68 deletions(-)

diff --git a/ci/test/03_test_script.sh b/ci/test/03_test_script.sh
index b3ab1729853..980583d00b5 100755
--- a/ci/test/03_test_script.sh
+++ b/ci/test/03_test_script.sh
@@ -229,7 +229,7 @@ fi
 
 if [[ "${RUN_IWYU}" == true ]]; then
   # TODO: Consider enforcing IWYU across the entire codebase.
-  FILES_WITH_ENFORCED_IWYU="/src/(((crypto|index|kernel|primitives|univalue/(lib|test)|util|zmq)/.*|bench/(block_assemble|connectblock)|common/license_info|node/(blockstorage|interfaces|miner|mining_args|utxo_snapshot)|rpc/mining|clientversion|core_io|signet|init)\\.cpp)"
+  FILES_WITH_ENFORCED_IWYU="/src/(((crypto|index|kernel|primitives|script|univalue/(lib|test)|util|zmq)/.*|bench/(block_assemble|connectblock)|common/license_info|node/(blockstorage|interfaces|miner|mining_args|utxo_snapshot)|rpc/mining|clientversion|core_io|signet|init)\\.cpp)"
   jq --arg patterns "$FILES_WITH_ENFORCED_IWYU" 'map(select(.file | test($patterns)))' "${BASE_BUILD_DIR}/compile_commands.json" > "${BASE_BUILD_DIR}/compile_commands_iwyu_errors.json"
   jq --arg patterns "$FILES_WITH_ENFORCED_IWYU" 'map(select(.file | test($patterns) | not))' "${BASE_BUILD_DIR}/compile_commands.json" > "${BASE_BUILD_DIR}/compile_commands_iwyu_warnings.json"
 
diff --git a/src/bench/verify_script.cpp b/src/bench/verify_script.cpp
index 8f07fd34fd1..63a9544ad98 100644
--- a/src/bench/verify_script.cpp
+++ b/src/bench/verify_script.cpp
@@ -4,6 +4,7 @@
 
 #include <addresstype.h>
 #include <bench/bench.h>
+#include <coins.h>
 #include <key.h>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
diff --git a/src/core_io.cpp b/src/core_io.cpp
index 584f823bae2..3650d70810a 100644
--- a/src/core_io.cpp
+++ b/src/core_io.cpp
@@ -11,6 +11,7 @@
 #include <consensus/validation.h>
 #include <crypto/hex_base.h>
 #include <key_io.h>
+#include <prevector.h>
 #include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <script/descriptor.h>
diff --git a/src/kernel/bitcoinkernel.cpp b/src/kernel/bitcoinkernel.cpp
index 0a315ff39b3..ed0301cff57 100644
--- a/src/kernel/bitcoinkernel.cpp
+++ b/src/kernel/bitcoinkernel.cpp
@@ -24,6 +24,7 @@
 #include <primitives/transaction.h>
 #include <script/interpreter.h>
 #include <script/script.h>
+#include <script/verify_flags.h>
 #include <serialize.h>
 #include <streams.h>
 #include <sync.h>
diff --git a/src/kernel/chainparams.cpp b/src/kernel/chainparams.cpp
index 969a838cd22..240c617894c 100644
--- a/src/kernel/chainparams.cpp
+++ b/src/kernel/chainparams.cpp
@@ -16,6 +16,7 @@
 #include <primitives/transaction.h>
 #include <script/interpreter.h>
 #include <script/script.h>
+#include <script/verify_flags.h>
 #include <uint256.h>
 #include <util/chaintype.h>
 #include <util/log.h>
diff --git a/src/psbt.h b/src/psbt.h
index de57b5698c0..b0177a3e555 100644
--- a/src/psbt.h
+++ b/src/psbt.h
@@ -6,6 +6,7 @@
 #define BITCOIN_PSBT_H
 
 #include <common/types.h>
+#include <musig.h>
 #include <node/transaction.h>
 #include <policy/feerate.h>
 #include <primitives/transaction.h>
diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp
index 67770ada78e..3b73a40ccef 100644
--- a/src/script/descriptor.cpp
+++ b/src/script/descriptor.cpp
@@ -4,29 +4,45 @@
 
 #include <script/descriptor.h>
 
+#include <addresstype.h>
+#include <attributes.h>
+#include <consensus/consensus.h>
+#include <crypto/hex_base.h>
+#include <crypto/sha256.h>
 #include <hash.h>
+#include <key.h>
 #include <key_io.h>
-#include <pubkey.h>
 #include <musig.h>
+#include <primitives/transaction.h>
+#include <pubkey.h>
+#include <script/interpreter.h>
+#include <script/keyorigin.h>
 #include <script/miniscript.h>
 #include <script/parsing.h>
 #include <script/script.h>
 #include <script/signingprovider.h>
 #include <script/solver.h>
+#include <serialize.h>
+#include <tinyformat.h>
 #include <uint256.h>
-
-#include <common/args.h>
-#include <span.h>
 #include <util/bip32.h>
 #include <util/check.h>
 #include <util/strencodings.h>
+#include <util/string.h>
 #include <util/vector.h>
 
 #include <algorithm>
+#include <iterator>
+#include <map>
 #include <memory>
 #include <numeric>
 #include <optional>
+#include <span>
+#include <stdexcept>
 #include <string>
+#include <tuple>
+#include <unordered_set>
+#include <utility>
 #include <vector>
 
 using util::Split;
diff --git a/src/script/descriptor.h b/src/script/descriptor.h
index 0f1e799e8f1..25dafca3a3b 100644
--- a/src/script/descriptor.h
+++ b/src/script/descriptor.h
@@ -6,13 +6,23 @@
 #define BITCOIN_SCRIPT_DESCRIPTOR_H
 
 #include <outputtype.h>
-#include <script/script.h>
-#include <script/sign.h>
-#include <script/signingprovider.h>
+#include <pubkey.h>
+#include <uint256.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <optional>
+#include <set>
+#include <string>
+#include <string_view>
+#include <unordered_map>
 #include <vector>
 
+class CScript;
+class SigningProvider;
+struct FlatSigningProvider;
+
 using ExtPubKeyMap = std::unordered_map<uint32_t, CExtPubKey>;
 
 /** Cache for single descriptor's derived extended pubkeys */
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 443714ceeda..98b16eca6bc 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -8,11 +8,21 @@
 #include <crypto/ripemd160.h>
 #include <crypto/sha1.h>
 #include <crypto/sha256.h>
+#include <prevector.h>
 #include <pubkey.h>
 #include <script/script.h>
+#include <serialize.h>
+#include <span.h>
 #include <tinyformat.h>
 #include <uint256.h>
 
+#include <algorithm>
+#include <cassert>
+#include <compare>
+#include <cstring>
+#include <limits>
+#include <stdexcept>
+
 typedef std::vector<unsigned char> valtype;
 
 namespace {
diff --git a/src/script/interpreter.h b/src/script/interpreter.h
index cbb137e09ef..ff63a73f0fc 100644
--- a/src/script/interpreter.h
+++ b/src/script/interpreter.h
@@ -9,21 +9,22 @@
 #include <consensus/amount.h>
 #include <hash.h>
 #include <primitives/transaction.h>
-#include <script/script_error.h> // IWYU pragma: export
-#include <script/verify_flags.h> // IWYU pragma: export
-#include <span.h>
+#include <script/script.h>
+#include <script/script_error.h>
+#include <script/verify_flags.h>
 #include <uint256.h>
 
 #include <cstddef>
 #include <cstdint>
+#include <map>
 #include <optional>
+#include <span>
+#include <string>
+#include <utility>
 #include <vector>
 
 class CPubKey;
-class CScript;
-class CScriptNum;
 class XOnlyPubKey;
-struct CScriptWitness;
 
 /** Signature hash types/flags */
 enum
diff --git a/src/script/miniscript.cpp b/src/script/miniscript.cpp
index 6dc154a8a26..81160883db2 100644
--- a/src/script/miniscript.cpp
+++ b/src/script/miniscript.cpp
@@ -2,17 +2,17 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <limits>
-#include <vector>
+#include <script/miniscript.h>
 
 #include <primitives/transaction.h>
-#include <script/miniscript.h>
 #include <script/script.h>
 #include <script/solver.h>
-#include <span.h>
 #include <util/check.h>
 #include <util/vector.h>
 
+#include <limits>
+#include <vector>
+
 namespace miniscript {
 namespace internal {
 
diff --git a/src/script/miniscript.h b/src/script/miniscript.h
index f2b9cdc4576..1e25a30e3e9 100644
--- a/src/script/miniscript.h
+++ b/src/script/miniscript.h
@@ -5,33 +5,36 @@
 #ifndef BITCOIN_SCRIPT_MINISCRIPT_H
 #define BITCOIN_SCRIPT_MINISCRIPT_H
 
+#include <consensus/consensus.h>
+#include <crypto/hex_base.h>
+#include <policy/policy.h>
+#include <script/interpreter.h>
+#include <script/parsing.h>
+#include <script/script.h>
+#include <serialize.h>
+#include <util/check.h>
+#include <util/strencodings.h>
+#include <util/string.h>
+#include <util/vector.h>
+
 #include <algorithm>
 #include <compare>
 #include <concepts>
 #include <cstdint>
 #include <cstdlib>
 #include <functional>
-#include <iterator>
 #include <memory>
 #include <optional>
 #include <set>
+#include <span>
 #include <stdexcept>
+#include <string>
+#include <string_view>
 #include <tuple>
 #include <utility>
+#include <variant>
 #include <vector>
 
-#include <consensus/consensus.h>
-#include <policy/policy.h>
-#include <script/interpreter.h>
-#include <script/parsing.h>
-#include <script/script.h>
-#include <serialize.h>
-#include <span.h>
-#include <util/check.h>
-#include <util/strencodings.h>
-#include <util/string.h>
-#include <util/vector.h>
-
 namespace miniscript {
 
 /** This type encapsulates the miniscript type system properties.
diff --git a/src/script/parsing.cpp b/src/script/parsing.cpp
index dd79f67e58e..598bb17fced 100644
--- a/src/script/parsing.cpp
+++ b/src/script/parsing.cpp
@@ -4,8 +4,6 @@
 
 #include <script/parsing.h>
 
-#include <span.h>
-
 #include <algorithm>
 #include <cstddef>
 #include <string>
diff --git a/src/script/parsing.h b/src/script/parsing.h
index 462a42e7b5e..1c504f36961 100644
--- a/src/script/parsing.h
+++ b/src/script/parsing.h
@@ -5,8 +5,7 @@
 #ifndef BITCOIN_SCRIPT_PARSING_H
 #define BITCOIN_SCRIPT_PARSING_H
 
-#include <span.h>
-
+#include <span>
 #include <string>
 
 namespace script {
diff --git a/src/script/script.cpp b/src/script/script.cpp
index 3f764aaf214..4097d13d2c4 100644
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -11,6 +11,7 @@
 #include <uint256.h>
 #include <util/hash_type.h>
 
+#include <compare>
 #include <string>
 
 CScriptID::CScriptID(const CScript& in) : BaseHash(Hash160(in)) {}
diff --git a/src/script/script.h b/src/script/script.h
index 674034c65d0..e0112cc386e 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -8,14 +8,15 @@
 
 #include <attributes.h>
 #include <crypto/common.h>
-#include <prevector.h> // IWYU pragma: export
+#include <prevector.h>
 #include <serialize.h>
 #include <uint256.h>
 #include <util/hash_type.h>
 
 #include <cassert>
+#include <cstddef>
 #include <cstdint>
-#include <cstring>
+#include <iterator>
 #include <limits>
 #include <span>
 #include <stdexcept>
diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp
index 90d1c845c36..c6fcc8f8eb6 100644
--- a/src/script/sigcache.cpp
+++ b/src/script/sigcache.cpp
@@ -9,12 +9,12 @@
 #include <pubkey.h>
 #include <random.h>
 #include <script/interpreter.h>
-#include <span.h>
 #include <uint256.h>
 #include <util/log.h>
 
 #include <mutex>
 #include <shared_mutex>
+#include <utility>
 #include <vector>
 
 SignatureCache::SignatureCache(const size_t max_size_bytes)
diff --git a/src/script/sigcache.h b/src/script/sigcache.h
index fe9a3562507..092bbf3e8e1 100644
--- a/src/script/sigcache.h
+++ b/src/script/sigcache.h
@@ -10,13 +10,15 @@
 #include <crypto/sha256.h>
 #include <cuckoocache.h>
 #include <script/interpreter.h>
-#include <span.h>
 #include <uint256.h>
-#include <util/byte_units.h>
+// IWYU incorrectly suggests removing this header.
+// See https://github.com/include-what-you-use/include-what-you-use/issues/2014.
+#include <util/byte_units.h> // IWYU pragma: keep
 #include <util/hasher.h>
 
 #include <cstddef>
 #include <shared_mutex>
+#include <span>
 #include <vector>
 
 class CPubKey;
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
index e8a0071ee96..6716d044128 100644
--- a/src/script/sign.cpp
+++ b/src/script/sign.cpp
@@ -5,21 +5,35 @@
 
 #include <script/sign.h>
 
+#include <addresstype.h>
+#include <coins.h>
 #include <consensus/amount.h>
+#include <hash.h>
 #include <key.h>
 #include <musig.h>
 #include <policy/policy.h>
+#include <prevector.h>
 #include <primitives/transaction.h>
-#include <random.h>
 #include <script/keyorigin.h>
 #include <script/miniscript.h>
 #include <script/script.h>
+#include <script/script_error.h>
 #include <script/signingprovider.h>
 #include <script/solver.h>
+#include <script/verify_flags.h>
+#include <serialize.h>
 #include <uint256.h>
+#include <util/check.h>
 #include <util/translation.h>
 #include <util/vector.h>
 
+#include <algorithm>
+#include <cstddef>
+#include <functional>
+#include <iterator>
+#include <span>
+#include <string>
+
 typedef std::vector<unsigned char> valtype;
 
 MutableTransactionSignatureCreator::MutableTransactionSignatureCreator(const CMutableTransaction& tx, unsigned int input_idx, const CAmount& amount, const SignOptions& options)
diff --git a/src/script/sign.h b/src/script/sign.h
index 44bc5060fe2..107abb9e849 100644
--- a/src/script/sign.h
+++ b/src/script/sign.h
@@ -7,19 +7,25 @@
 #define BITCOIN_SCRIPT_SIGN_H
 
 #include <attributes.h>
-#include <coins.h>
-#include <hash.h>
+#include <consensus/amount.h>
 #include <pubkey.h>
 #include <script/interpreter.h>
 #include <script/keyorigin.h>
+#include <script/script.h>
 #include <script/signingprovider.h>
 #include <uint256.h>
 
-class CKey;
-class CKeyID;
-class CScript;
-class CTransaction;
-class SigningProvider;
+#include <cstdint>
+#include <map>
+#include <optional>
+#include <set>
+#include <utility>
+#include <vector>
+
+class COutPoint;
+class CTxIn;
+class CTxOut;
+class Coin;
 
 struct bilingual_str;
 struct CMutableTransaction;
diff --git a/src/script/signingprovider.cpp b/src/script/signingprovider.cpp
index b680d18c2c6..2b5d6e2f696 100644
--- a/src/script/signingprovider.cpp
+++ b/src/script/signingprovider.cpp
@@ -3,12 +3,17 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <script/keyorigin.h>
-#include <script/interpreter.h>
 #include <script/signingprovider.h>
 
+#include <musig.h>
+#include <script/interpreter.h>
+#include <script/keyorigin.h>
+#include <util/check.h>
 #include <util/log.h>
 
+#include <algorithm>
+#include <cstddef>
+
 const SigningProvider& DUMMY_SIGNING_PROVIDER = SigningProvider();
 
 template<typename M, typename K, typename V>
diff --git a/src/script/signingprovider.h b/src/script/signingprovider.h
index 31422bb4b6a..c104e218962 100644
--- a/src/script/signingprovider.h
+++ b/src/script/signingprovider.h
@@ -9,14 +9,26 @@
 #include <addresstype.h>
 #include <attributes.h>
 #include <key.h>
-#include <musig.h>
 #include <pubkey.h>
 #include <script/keyorigin.h>
 #include <script/script.h>
 #include <sync.h>
+#include <uint256.h>
 
+#include <compare>
+#include <cstdint>
 #include <functional>
+#include <map>
+#include <memory>
 #include <optional>
+#include <set>
+#include <span>
+#include <tuple>
+#include <utility>
+#include <variant>
+#include <vector>
+
+class MuSig2SecNonce;
 
 struct ShortestVectorFirstComparator
 {
diff --git a/src/script/solver.cpp b/src/script/solver.cpp
index 783baf07089..e99f1f099c9 100644
--- a/src/script/solver.cpp
+++ b/src/script/solver.cpp
@@ -3,13 +3,13 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <script/solver.h>
+
+#include <prevector.h>
 #include <pubkey.h>
 #include <script/interpreter.h>
 #include <script/script.h>
-#include <script/solver.h>
-#include <span.h>
 
-#include <algorithm>
 #include <cassert>
 #include <string>
 
diff --git a/src/script/solver.h b/src/script/solver.h
index d2b7fb88814..07e7b728741 100644
--- a/src/script/solver.h
+++ b/src/script/solver.h
@@ -10,10 +10,10 @@
 
 #include <attributes.h>
 #include <script/script.h>
-#include <span.h>
 
-#include <string>
 #include <optional>
+#include <span>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/src/signet.cpp b/src/signet.cpp
index c37ea52fa8c..9206f47752a 100644
--- a/src/signet.cpp
+++ b/src/signet.cpp
@@ -11,6 +11,7 @@
 #include <primitives/transaction.h>
 #include <script/interpreter.h>
 #include <script/script.h>
+#include <script/verify_flags.h>
 #include <streams.h>
 #include <uint256.h>
 #include <util/log.h>
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index ffb7acd2df9..37ca862a8d6 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -2,10 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <test/data/script_tests.json.h>
-#include <test/data/bip341_wallet_vectors.json.h>
-
 #include <common/system.h>
+#include <compressor.h>
 #include <core_io.h>
 #include <key.h>
 #include <rpc/util.h>
@@ -16,25 +14,26 @@
 #include <script/sign.h>
 #include <script/signingprovider.h>
 #include <script/solver.h>
+#include <secp256k1.h>
 #include <streams.h>
+#include <test/data/bip341_wallet_vectors.json.h>
+#include <test/data/script_tests.json.h>
+#include <test/util/common.h>
 #include <test/util/json.h>
 #include <test/util/random.h>
-#include <test/util/common.h>
 #include <test/util/setup_common.h>
 #include <test/util/transaction_utils.h>
+#include <univalue.h>
 #include <util/fs.h>
 #include <util/strencodings.h>
 #include <util/string.h>
 
+#include <boost/test/unit_test.hpp>
+
 #include <cstdint>
 #include <string>
 #include <vector>
 
-#include <boost/test/unit_test.hpp>
-
-#include <secp256k1.h>
-#include <univalue.h>
-
 // Uncomment if you want to output updated JSON tests.
 // #define UPDATE_JSON_TESTS
 
diff --git a/src/wallet/feebumper.cpp b/src/wallet/feebumper.cpp
index 85e5f778b1f..1a402c851fa 100644
--- a/src/wallet/feebumper.cpp
+++ b/src/wallet/feebumper.cpp
@@ -2,6 +2,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <wallet/feebumper.h>
+
+#include <coins.h>
 #include <common/system.h>
 #include <consensus/validation.h>
 #include <interfaces/chain.h>
@@ -11,7 +14,6 @@
 #include <util/rbf.h>
 #include <util/translation.h>
 #include <wallet/coincontrol.h>
-#include <wallet/feebumper.h>
 #include <wallet/fees.h>
 #include <wallet/receive.h>
 #include <wallet/spend.h>
diff --git a/src/wallet/rpc/wallet.cpp b/src/wallet/rpc/wallet.cpp
index 8aa15c7ec5c..67b2f9e33ba 100644
--- a/src/wallet/rpc/wallet.cpp
+++ b/src/wallet/rpc/wallet.cpp
@@ -5,6 +5,9 @@
 
 #include <bitcoin-build-config.h> // IWYU pragma: keep
 
+#include <wallet/rpc/wallet.h>
+
+#include <coins.h>
 #include <core_io.h>
 #include <key_io.h>
 #include <rpc/server.h>
@@ -14,7 +17,6 @@
 #include <wallet/context.h>
 #include <wallet/receive.h>
 #include <wallet/rpc/util.h>
-#include <wallet/rpc/wallet.h>
 #include <wallet/wallet.h>
 #include <wallet/walletutil.h>
 
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index 06ceed40d9b..dad8aef39dc 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -2,6 +2,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <wallet/scriptpubkeyman.h>
+
+#include <coins.h>
 #include <hash.h>
 #include <key_io.h>
 #include <node/types.h>
@@ -17,7 +20,6 @@
 #include <util/string.h>
 #include <util/time.h>
 #include <util/translation.h>
-#include <wallet/scriptpubkeyman.h>
 
 #include <optional>
 
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
index 1acaa93bf8f..35a419396b1 100644
--- a/src/wallet/scriptpubkeyman.h
+++ b/src/wallet/scriptpubkeyman.h
@@ -16,6 +16,7 @@
 #include <script/descriptor.h>
 #include <script/script.h>
 #include <script/signingprovider.h>
+#include <util/hasher.h>
 #include <util/log.h>
 #include <util/result.h>
 #include <util/time.h>
@@ -27,6 +28,7 @@
 #include <functional>
 #include <optional>
 #include <unordered_map>
+#include <unordered_set>
 
 enum class OutputType;
 
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 454435cfcb4..8397fff9cc4 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -14,6 +14,7 @@
 
 #include <cstdint>
 #include <string>
+#include <unordered_set>
 #include <vector>
 
 class CScript;