diff --git a/src/pubkey.cpp b/src/pubkey.cpp
index fc1624af25..64a9def502 100644
--- a/src/pubkey.cpp
+++ b/src/pubkey.cpp
@@ -5,9 +5,16 @@
 
 #include <pubkey.h>
 
+#include <hash.h>
 #include <secp256k1.h>
+#include <secp256k1_extrakeys.h>
 #include <secp256k1_recovery.h>
 #include <secp256k1_schnorrsig.h>
+#include <span.h>
+#include <uint256.h>
+
+#include <algorithm>
+#include <cassert>
 
 namespace
 {
diff --git a/src/pubkey.h b/src/pubkey.h
index 12514fc3c9..7a1f97f173 100644
--- a/src/pubkey.h
+++ b/src/pubkey.h
@@ -12,7 +12,7 @@
 #include <span.h>
 #include <uint256.h>
 
-#include <stdexcept>
+#include <cstring>
 #include <vector>
 
 const unsigned int BIP32_EXTKEY_SIZE = 74;