From f3c9078b4cddec5581e52de5c216ae53984ec130 Mon Sep 17 00:00:00 2001
From: Andrew Chow <github@achow101.com>
Date: Wed, 9 Aug 2023 05:17:30 -0400
Subject: Clean up things that include script/standard.h

Remove standard.h from files that don't use anything in it, and include
it in files that do.
---
 src/bench/verify_script.cpp               | 2 +-
 src/compressor.cpp                        | 1 -
 src/init.cpp                              | 1 -
 src/kernel/mempool_options.h              | 1 -
 src/key_io.cpp                            | 1 +
 src/key_io.h                              | 1 -
 src/node/mempool_args.cpp                 | 1 -
 src/outputtype.cpp                        | 1 -
 src/qt/guiutil.cpp                        | 2 +-
 src/qt/test/wallettests.cpp               | 1 +
 src/qt/walletmodel.h                      | 1 -
 src/rpc/mempool.cpp                       | 1 -
 src/rpc/output_script.cpp                 | 1 -
 src/rpc/util.cpp                          | 1 +
 src/rpc/util.h                            | 2 +-
 src/script/miniscript.cpp                 | 1 -
 src/script/sign.h                         | 1 -
 src/script/signingprovider.cpp            | 1 -
 src/script/signingprovider.h              | 1 -
 src/signet.cpp                            | 1 -
 src/test/blockfilter_index_tests.cpp      | 1 -
 src/test/blockmanager_tests.cpp           | 1 +
 src/test/coins_tests.cpp                  | 1 -
 src/test/compress_tests.cpp               | 1 -
 src/test/denialofservice_tests.cpp        | 1 -
 src/test/descriptor_tests.cpp             | 1 -
 src/test/fuzz/integer.cpp                 | 1 -
 src/test/fuzz/util.h                      | 1 -
 src/test/interfaces_tests.cpp             | 2 +-
 src/test/miner_tests.cpp                  | 1 -
 src/test/miniscript_tests.cpp             | 1 -
 src/test/orphanage_tests.cpp              | 1 -
 src/test/script_tests.cpp                 | 1 +
 src/test/txindex_tests.cpp                | 1 -
 src/test/txpackage_tests.cpp              | 1 -
 src/test/txvalidation_tests.cpp           | 1 -
 src/test/txvalidationcache_tests.cpp      | 1 -
 src/test/util/mining.cpp                  | 1 -
 src/test/validation_block_tests.cpp       | 1 -
 src/util/message.cpp                      | 1 -
 src/wallet/coincontrol.h                  | 1 -
 src/wallet/interfaces.cpp                 | 1 -
 src/wallet/rpc/addresses.cpp              | 1 +
 src/wallet/scriptpubkeyman.cpp            | 1 +
 src/wallet/scriptpubkeyman.h              | 1 -
 src/wallet/spend.cpp                      | 1 +
 src/wallet/test/ismine_tests.cpp          | 2 +-
 src/wallet/test/scriptpubkeyman_tests.cpp | 2 +-
 src/wallet/test/spend_tests.cpp           | 1 +
 src/wallet/test/wallet_tests.cpp          | 1 +
 src/wallet/wallet.cpp                     | 1 +
 src/wallet/walletdb.h                     | 1 -
 52 files changed, 17 insertions(+), 41 deletions(-)

(limited to 'src')

diff --git a/src/bench/verify_script.cpp b/src/bench/verify_script.cpp
index 757094167a..11f96b1005 100644
--- a/src/bench/verify_script.cpp
+++ b/src/bench/verify_script.cpp
@@ -8,7 +8,7 @@
 #include <script/bitcoinconsensus.h>
 #endif
 #include <script/script.h>
-#include <script/standard.h>
+#include <script/interpreter.h>
 #include <streams.h>
 #include <test/util/transaction_utils.h>
 
diff --git a/src/compressor.cpp b/src/compressor.cpp
index 2dbd586bfa..668e25581c 100644
--- a/src/compressor.cpp
+++ b/src/compressor.cpp
@@ -7,7 +7,6 @@
 
 #include <pubkey.h>
 #include <script/script.h>
-#include <script/standard.h>
 
 /*
  * These check for scripts for which a special case with a shorter encoding is defined.
diff --git a/src/init.cpp b/src/init.cpp
index 33389e695c..ae5f35f8d3 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -65,7 +65,6 @@
 #include <rpc/util.h>
 #include <scheduler.h>
 #include <script/sigcache.h>
-#include <script/standard.h>
 #include <shutdown.h>
 #include <sync.h>
 #include <timedata.h>
diff --git a/src/kernel/mempool_options.h b/src/kernel/mempool_options.h
index beb5fca5e9..58bb3debbf 100644
--- a/src/kernel/mempool_options.h
+++ b/src/kernel/mempool_options.h
@@ -8,7 +8,6 @@
 
 #include <policy/feerate.h>
 #include <policy/policy.h>
-#include <script/standard.h>
 
 #include <chrono>
 #include <cstdint>
diff --git a/src/key_io.cpp b/src/key_io.cpp
index 454a96df5e..30fd964232 100644
--- a/src/key_io.cpp
+++ b/src/key_io.cpp
@@ -6,6 +6,7 @@
 
 #include <base58.h>
 #include <bech32.h>
+#include <script/standard.h>
 #include <util/strencodings.h>
 
 #include <algorithm>
diff --git a/src/key_io.h b/src/key_io.h
index 6d2aface4c..e387273e54 100644
--- a/src/key_io.h
+++ b/src/key_io.h
@@ -10,7 +10,6 @@
 #include <chainparams.h>
 #include <key.h>
 #include <pubkey.h>
-#include <script/standard.h>
 
 #include <string>
 
diff --git a/src/node/mempool_args.cpp b/src/node/mempool_args.cpp
index 5381902263..7d8244980d 100644
--- a/src/node/mempool_args.cpp
+++ b/src/node/mempool_args.cpp
@@ -13,7 +13,6 @@
 #include <logging.h>
 #include <policy/feerate.h>
 #include <policy/policy.h>
-#include <script/standard.h>
 #include <tinyformat.h>
 #include <util/error.h>
 #include <util/moneystr.h>
diff --git a/src/outputtype.cpp b/src/outputtype.cpp
index 9a3870d8dc..566e5ec55a 100644
--- a/src/outputtype.cpp
+++ b/src/outputtype.cpp
@@ -9,7 +9,6 @@
 #include <script/script.h>
 #include <script/sign.h>
 #include <script/signingprovider.h>
-#include <script/standard.h>
 #include <util/vector.h>
 
 #include <assert.h>
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 8d8328aad8..eb9c65caf2 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -10,6 +10,7 @@
 #include <qt/qvalidatedlineedit.h>
 #include <qt/sendcoinsrecipient.h>
 
+#include <addresstype.h>
 #include <base58.h>
 #include <chainparams.h>
 #include <common/args.h>
@@ -20,7 +21,6 @@
 #include <primitives/transaction.h>
 #include <protocol.h>
 #include <script/script.h>
-#include <script/standard.h>
 #include <util/chaintype.h>
 #include <util/exception.h>
 #include <util/fs.h>
diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp
index 5f789e400e..b3b0e85c94 100644
--- a/src/qt/test/wallettests.cpp
+++ b/src/qt/test/wallettests.cpp
@@ -24,6 +24,7 @@
 #include <qt/transactiontablemodel.h>
 #include <qt/transactionview.h>
 #include <qt/walletmodel.h>
+#include <script/standard.h>
 #include <test/util/setup_common.h>
 #include <validation.h>
 #include <wallet/test/util.h>
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index 4f75d41404..68218b0c1b 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -10,7 +10,6 @@
 #endif
 
 #include <key.h>
-#include <script/standard.h>
 
 #include <qt/walletmodeltransaction.h>
 
diff --git a/src/rpc/mempool.cpp b/src/rpc/mempool.cpp
index 11d2874961..e8a3979469 100644
--- a/src/rpc/mempool.cpp
+++ b/src/rpc/mempool.cpp
@@ -17,7 +17,6 @@
 #include <rpc/server.h>
 #include <rpc/server_util.h>
 #include <rpc/util.h>
-#include <script/standard.h>
 #include <txmempool.h>
 #include <univalue.h>
 #include <util/fs.h>
diff --git a/src/rpc/output_script.cpp b/src/rpc/output_script.cpp
index 990ec3ab0c..4dd424fa14 100644
--- a/src/rpc/output_script.cpp
+++ b/src/rpc/output_script.cpp
@@ -13,7 +13,6 @@
 #include <script/descriptor.h>
 #include <script/script.h>
 #include <script/signingprovider.h>
-#include <script/standard.h>
 #include <tinyformat.h>
 #include <univalue.h>
 #include <util/check.h>
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
index faae840d40..4c1aa9ee03 100644
--- a/src/rpc/util.cpp
+++ b/src/rpc/util.cpp
@@ -12,6 +12,7 @@
 #include <rpc/util.h>
 #include <script/descriptor.h>
 #include <script/signingprovider.h>
+#include <script/standard.h>
 #include <tinyformat.h>
 #include <util/check.h>
 #include <util/result.h>
diff --git a/src/rpc/util.h b/src/rpc/util.h
index 02d26f1ab7..ac0b2c088e 100644
--- a/src/rpc/util.h
+++ b/src/rpc/util.h
@@ -5,6 +5,7 @@
 #ifndef BITCOIN_RPC_UTIL_H
 #define BITCOIN_RPC_UTIL_H
 
+#include <addresstype.h>
 #include <node/transaction.h>
 #include <outputtype.h>
 #include <protocol.h>
@@ -13,7 +14,6 @@
 #include <rpc/request.h>
 #include <script/script.h>
 #include <script/sign.h>
-#include <script/standard.h>
 #include <univalue.h>
 #include <util/check.h>
 
diff --git a/src/script/miniscript.cpp b/src/script/miniscript.cpp
index 3937638cf8..19556a9775 100644
--- a/src/script/miniscript.cpp
+++ b/src/script/miniscript.cpp
@@ -5,7 +5,6 @@
 #include <string>
 #include <vector>
 #include <script/script.h>
-#include <script/standard.h>
 #include <script/miniscript.h>
 
 #include <assert.h>
diff --git a/src/script/sign.h b/src/script/sign.h
index b8806876a2..4d7dade44e 100644
--- a/src/script/sign.h
+++ b/src/script/sign.h
@@ -12,7 +12,6 @@
 #include <pubkey.h>
 #include <script/interpreter.h>
 #include <script/keyorigin.h>
-#include <script/standard.h>
 #include <script/signingprovider.h>
 #include <uint256.h>
 
diff --git a/src/script/signingprovider.cpp b/src/script/signingprovider.cpp
index 248305c82e..f3a69e5d21 100644
--- a/src/script/signingprovider.cpp
+++ b/src/script/signingprovider.cpp
@@ -6,7 +6,6 @@
 #include <script/keyorigin.h>
 #include <script/interpreter.h>
 #include <script/signingprovider.h>
-#include <script/standard.h>
 
 #include <logging.h>
 
diff --git a/src/script/signingprovider.h b/src/script/signingprovider.h
index 40927f57bc..712e2e73d1 100644
--- a/src/script/signingprovider.h
+++ b/src/script/signingprovider.h
@@ -12,7 +12,6 @@
 #include <pubkey.h>
 #include <script/keyorigin.h>
 #include <script/script.h>
-#include <script/standard.h>
 #include <sync.h>
 
 struct ShortestVectorFirstComparator
diff --git a/src/signet.cpp b/src/signet.cpp
index b73d82bb2e..21b289b637 100644
--- a/src/signet.cpp
+++ b/src/signet.cpp
@@ -18,7 +18,6 @@
 #include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <script/interpreter.h>
-#include <script/standard.h>
 #include <span.h>
 #include <streams.h>
 #include <uint256.h>
diff --git a/src/test/blockfilter_index_tests.cpp b/src/test/blockfilter_index_tests.cpp
index cd90448e28..97ea5cfbf3 100644
--- a/src/test/blockfilter_index_tests.cpp
+++ b/src/test/blockfilter_index_tests.cpp
@@ -11,7 +11,6 @@
 #include <interfaces/chain.h>
 #include <node/miner.h>
 #include <pow.h>
-#include <script/standard.h>
 #include <test/util/blockfilter.h>
 #include <test/util/index.h>
 #include <test/util/setup_common.h>
diff --git a/src/test/blockmanager_tests.cpp b/src/test/blockmanager_tests.cpp
index f52c692649..224a00ce46 100644
--- a/src/test/blockmanager_tests.cpp
+++ b/src/test/blockmanager_tests.cpp
@@ -6,6 +6,7 @@
 #include <node/blockstorage.h>
 #include <node/context.h>
 #include <node/kernel_notifications.h>
+#include <script/standard.h>
 #include <util/chaintype.h>
 #include <validation.h>
 
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index f8a2917978..12dc4d1ccc 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -5,7 +5,6 @@
 #include <addresstype.h>
 #include <clientversion.h>
 #include <coins.h>
-#include <script/standard.h>
 #include <streams.h>
 #include <test/util/poolresourcetester.h>
 #include <test/util/random.h>
diff --git a/src/test/compress_tests.cpp b/src/test/compress_tests.cpp
index bf9aba1868..b56629ae40 100644
--- a/src/test/compress_tests.cpp
+++ b/src/test/compress_tests.cpp
@@ -4,7 +4,6 @@
 
 #include <compressor.h>
 #include <script/script.h>
-#include <script/standard.h>
 #include <test/util/setup_common.h>
 
 #include <stdint.h>
diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp
index b740a51574..90e5bb34ed 100644
--- a/src/test/denialofservice_tests.cpp
+++ b/src/test/denialofservice_tests.cpp
@@ -12,7 +12,6 @@
 #include <pubkey.h>
 #include <script/sign.h>
 #include <script/signingprovider.h>
-#include <script/standard.h>
 #include <serialize.h>
 #include <test/util/net.h>
 #include <test/util/random.h>
diff --git a/src/test/descriptor_tests.cpp b/src/test/descriptor_tests.cpp
index 5cec0b07c9..829afab8da 100644
--- a/src/test/descriptor_tests.cpp
+++ b/src/test/descriptor_tests.cpp
@@ -5,7 +5,6 @@
 #include <pubkey.h>
 #include <script/descriptor.h>
 #include <script/sign.h>
-#include <script/standard.h>
 #include <test/util/setup_common.h>
 #include <util/strencodings.h>
 
diff --git a/src/test/fuzz/integer.cpp b/src/test/fuzz/integer.cpp
index 54f968c53c..849618d748 100644
--- a/src/test/fuzz/integer.cpp
+++ b/src/test/fuzz/integer.cpp
@@ -20,7 +20,6 @@
 #include <protocol.h>
 #include <pubkey.h>
 #include <script/script.h>
-#include <script/standard.h>
 #include <serialize.h>
 #include <streams.h>
 #include <test/fuzz/FuzzedDataProvider.h>
diff --git a/src/test/fuzz/util.h b/src/test/fuzz/util.h
index 2d612a8272..736311ed55 100644
--- a/src/test/fuzz/util.h
+++ b/src/test/fuzz/util.h
@@ -14,7 +14,6 @@
 #include <merkleblock.h>
 #include <primitives/transaction.h>
 #include <script/script.h>
-#include <script/standard.h>
 #include <serialize.h>
 #include <streams.h>
 #include <test/fuzz/FuzzedDataProvider.h>
diff --git a/src/test/interfaces_tests.cpp b/src/test/interfaces_tests.cpp
index 68377e197f..07f6175deb 100644
--- a/src/test/interfaces_tests.cpp
+++ b/src/test/interfaces_tests.cpp
@@ -5,8 +5,8 @@
 #include <chainparams.h>
 #include <consensus/validation.h>
 #include <interfaces/chain.h>
-#include <script/standard.h>
 #include <test/util/setup_common.h>
+#include <script/standard.h>
 #include <validation.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index ea13989eb3..b4c7cac223 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -10,7 +10,6 @@
 #include <consensus/tx_verify.h>
 #include <node/miner.h>
 #include <policy/policy.h>
-#include <script/standard.h>
 #include <test/util/random.h>
 #include <test/util/txmempool.h>
 #include <timedata.h>
diff --git a/src/test/miniscript_tests.cpp b/src/test/miniscript_tests.cpp
index 2a67da5cab..0cb58450e8 100644
--- a/src/test/miniscript_tests.cpp
+++ b/src/test/miniscript_tests.cpp
@@ -19,7 +19,6 @@
 #include <crypto/sha256.h>
 #include <script/interpreter.h>
 #include <script/miniscript.h>
-#include <script/standard.h>
 #include <script/script_error.h>
 
 namespace {
diff --git a/src/test/orphanage_tests.cpp b/src/test/orphanage_tests.cpp
index a2c4774338..af53737fec 100644
--- a/src/test/orphanage_tests.cpp
+++ b/src/test/orphanage_tests.cpp
@@ -6,7 +6,6 @@
 #include <pubkey.h>
 #include <script/sign.h>
 #include <script/signingprovider.h>
-#include <script/standard.h>
 #include <test/util/random.h>
 #include <test/util/setup_common.h>
 #include <txorphanage.h>
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 411924496c..1cf179c8e5 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -14,6 +14,7 @@
 #include <script/sigcache.h>
 #include <script/sign.h>
 #include <script/signingprovider.h>
+#include <script/standard.h>
 #include <streams.h>
 #include <test/util/json.h>
 #include <test/util/random.h>
diff --git a/src/test/txindex_tests.cpp b/src/test/txindex_tests.cpp
index 1471290d4b..9fa59bab57 100644
--- a/src/test/txindex_tests.cpp
+++ b/src/test/txindex_tests.cpp
@@ -6,7 +6,6 @@
 #include <chainparams.h>
 #include <index/txindex.h>
 #include <interfaces/chain.h>
-#include <script/standard.h>
 #include <test/util/index.h>
 #include <test/util/setup_common.h>
 #include <validation.h>
diff --git a/src/test/txpackage_tests.cpp b/src/test/txpackage_tests.cpp
index c08d2748a6..df5f8b4cce 100644
--- a/src/test/txpackage_tests.cpp
+++ b/src/test/txpackage_tests.cpp
@@ -8,7 +8,6 @@
 #include <policy/policy.h>
 #include <primitives/transaction.h>
 #include <script/script.h>
-#include <script/standard.h>
 #include <test/util/random.h>
 #include <test/util/setup_common.h>
 #include <validation.h>
diff --git a/src/test/txvalidation_tests.cpp b/src/test/txvalidation_tests.cpp
index f06bef3589..ecf0889711 100644
--- a/src/test/txvalidation_tests.cpp
+++ b/src/test/txvalidation_tests.cpp
@@ -8,7 +8,6 @@
 #include <policy/policy.h>
 #include <primitives/transaction.h>
 #include <script/script.h>
-#include <script/standard.h>
 #include <test/util/setup_common.h>
 #include <validation.h>
 
diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp
index 8f8628169f..c1f6226982 100644
--- a/src/test/txvalidationcache_tests.cpp
+++ b/src/test/txvalidationcache_tests.cpp
@@ -6,7 +6,6 @@
 #include <key.h>
 #include <script/sign.h>
 #include <script/signingprovider.h>
-#include <script/standard.h>
 #include <test/util/setup_common.h>
 #include <txmempool.h>
 #include <util/chaintype.h>
diff --git a/src/test/util/mining.cpp b/src/test/util/mining.cpp
index 51f4b89512..08d1b4c902 100644
--- a/src/test/util/mining.cpp
+++ b/src/test/util/mining.cpp
@@ -11,7 +11,6 @@
 #include <node/context.h>
 #include <pow.h>
 #include <primitives/transaction.h>
-#include <script/standard.h>
 #include <test/util/script.h>
 #include <util/check.h>
 #include <validation.h>
diff --git a/src/test/validation_block_tests.cpp b/src/test/validation_block_tests.cpp
index e08f2c98c2..d1463634cc 100644
--- a/src/test/validation_block_tests.cpp
+++ b/src/test/validation_block_tests.cpp
@@ -10,7 +10,6 @@
 #include <node/miner.h>
 #include <pow.h>
 #include <random.h>
-#include <script/standard.h>
 #include <test/util/random.h>
 #include <test/util/script.h>
 #include <test/util/setup_common.h>
diff --git a/src/util/message.cpp b/src/util/message.cpp
index f8ea8247d5..ec845aeffb 100644
--- a/src/util/message.cpp
+++ b/src/util/message.cpp
@@ -7,7 +7,6 @@
 #include <key.h>
 #include <key_io.h>
 #include <pubkey.h>
-#include <script/standard.h>
 #include <uint256.h>
 #include <util/message.h>
 #include <util/strencodings.h>
diff --git a/src/wallet/coincontrol.h b/src/wallet/coincontrol.h
index 7ff8fee5bc..71593e236f 100644
--- a/src/wallet/coincontrol.h
+++ b/src/wallet/coincontrol.h
@@ -11,7 +11,6 @@
 #include <primitives/transaction.h>
 #include <script/keyorigin.h>
 #include <script/signingprovider.h>
-#include <script/standard.h>
 
 #include <algorithm>
 #include <map>
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
index cd438cfe2f..5f2aee6923 100644
--- a/src/wallet/interfaces.cpp
+++ b/src/wallet/interfaces.cpp
@@ -11,7 +11,6 @@
 #include <policy/fees.h>
 #include <primitives/transaction.h>
 #include <rpc/server.h>
-#include <script/standard.h>
 #include <support/allocators/secure.h>
 #include <sync.h>
 #include <uint256.h>
diff --git a/src/wallet/rpc/addresses.cpp b/src/wallet/rpc/addresses.cpp
index dbd5c60511..d2d391daf4 100644
--- a/src/wallet/rpc/addresses.cpp
+++ b/src/wallet/rpc/addresses.cpp
@@ -6,6 +6,7 @@
 #include <key_io.h>
 #include <rpc/util.h>
 #include <script/script.h>
+#include <script/standard.h>
 #include <util/bip32.h>
 #include <util/translation.h>
 #include <wallet/receive.h>
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index 284bd531be..6ece0433a2 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -9,6 +9,7 @@
 #include <script/descriptor.h>
 #include <script/script.h>
 #include <script/sign.h>
+#include <script/standard.h>
 #include <util/bip32.h>
 #include <util/strencodings.h>
 #include <util/string.h>
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
index c775d26c4f..f03673e9d3 100644
--- a/src/wallet/scriptpubkeyman.h
+++ b/src/wallet/scriptpubkeyman.h
@@ -11,7 +11,6 @@
 #include <script/descriptor.h>
 #include <script/script.h>
 #include <script/signingprovider.h>
-#include <script/standard.h>
 #include <util/error.h>
 #include <util/message.h>
 #include <util/result.h>
diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp
index 9358bbeebe..4985731641 100644
--- a/src/wallet/spend.cpp
+++ b/src/wallet/spend.cpp
@@ -13,6 +13,7 @@
 #include <primitives/transaction.h>
 #include <script/script.h>
 #include <script/signingprovider.h>
+#include <script/standard.h>
 #include <util/check.h>
 #include <util/fees.h>
 #include <util/moneystr.h>
diff --git a/src/wallet/test/ismine_tests.cpp b/src/wallet/test/ismine_tests.cpp
index 8fdfaf946e..d06bcba6cf 100644
--- a/src/wallet/test/ismine_tests.cpp
+++ b/src/wallet/test/ismine_tests.cpp
@@ -6,8 +6,8 @@
 #include <key_io.h>
 #include <node/context.h>
 #include <script/script.h>
-#include <script/signingprovider.h>
 #include <script/standard.h>
+#include <script/signingprovider.h>
 #include <test/util/setup_common.h>
 #include <wallet/types.h>
 #include <wallet/wallet.h>
diff --git a/src/wallet/test/scriptpubkeyman_tests.cpp b/src/wallet/test/scriptpubkeyman_tests.cpp
index d4997c418a..d3d5aa578c 100644
--- a/src/wallet/test/scriptpubkeyman_tests.cpp
+++ b/src/wallet/test/scriptpubkeyman_tests.cpp
@@ -3,8 +3,8 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <key.h>
-#include <script/standard.h>
 #include <test/util/setup_common.h>
+#include <script/standard.h>
 #include <wallet/scriptpubkeyman.h>
 #include <wallet/wallet.h>
 #include <wallet/test/util.h>
diff --git a/src/wallet/test/spend_tests.cpp b/src/wallet/test/spend_tests.cpp
index 6e87d1cb49..3dbb0a8c34 100644
--- a/src/wallet/test/spend_tests.cpp
+++ b/src/wallet/test/spend_tests.cpp
@@ -4,6 +4,7 @@
 
 #include <consensus/amount.h>
 #include <policy/fees.h>
+#include <script/standard.h>
 #include <validation.h>
 #include <wallet/coincontrol.h>
 #include <wallet/spend.h>
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index 1c128a85df..26285b936d 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -15,6 +15,7 @@
 #include <node/blockstorage.h>
 #include <policy/policy.h>
 #include <rpc/server.h>
+#include <script/standard.h>
 #include <test/util/logging.h>
 #include <test/util/random.h>
 #include <test/util/setup_common.h>
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 6b2755ea53..91fbd0c9be 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -26,6 +26,7 @@
 #include <script/descriptor.h>
 #include <script/script.h>
 #include <script/signingprovider.h>
+#include <script/standard.h>
 #include <support/cleanse.h>
 #include <txmempool.h>
 #include <util/bip32.h>
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 8f7c2f030c..dad0b18a78 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -7,7 +7,6 @@
 #define BITCOIN_WALLET_WALLETDB_H
 
 #include <script/sign.h>
-#include <script/standard.h>
 #include <wallet/db.h>
 #include <wallet/walletutil.h>
 #include <key.h>
-- 
cgit v1.2.3