19 files changed, 3 insertions, 17 deletions
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>