diff --git a/src/key_io.cpp b/src/key_io.cpp
index 30fd964232a..b7fe4d2423a 100644
--- a/src/key_io.cpp
+++ b/src/key_io.cpp
@@ -6,6 +6,7 @@
 
 #include <base58.h>
 #include <bech32.h>
+#include <script/interpreter.h>
 #include <script/standard.h>
 #include <util/strencodings.h>
 
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 6cbcf9a016b..40ae381f0fb 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -4,15 +4,13 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <script/standard.h>
-
-#include <crypto/sha256.h>
-#include <hash.h>
 #include <pubkey.h>
 #include <script/interpreter.h>
 #include <script/script.h>
-#include <util/strencodings.h>
+#include <span.h>
 
 #include <string>
+#include <algorithm>
 
 typedef std::vector<unsigned char> valtype;
 
diff --git a/src/script/standard.h b/src/script/standard.h
index 53987ed2443..2b743776b41 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -7,16 +7,15 @@
 #define BITCOIN_SCRIPT_STANDARD_H
 
 #include <attributes.h>
-#include <pubkey.h>
-#include <script/interpreter.h>
-#include <uint256.h>
-#include <util/hash_type.h>
+#include <script/script.h>
 
-#include <map>
 #include <string>
-#include <variant>
+#include <optional>
+#include <utility>
+#include <vector>
 
-class CScript;
+class CPubKey;
+template <typename C> class Span;
 
 enum class TxoutType {
     NONSTANDARD,
diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp
index e20b591c807..825413e0235 100644
--- a/src/test/sigopcount_tests.cpp
+++ b/src/test/sigopcount_tests.cpp
@@ -8,6 +8,7 @@
 #include <consensus/tx_verify.h>
 #include <key.h>
 #include <pubkey.h>
+#include <script/interpreter.h>
 #include <script/script.h>
 #include <script/standard.h>
 #include <test/util/setup_common.h>