From 3b5dc9e5aa7a92fdf38a86f60d4e409dbfb970bf Mon Sep 17 00:00:00 2001
From: "W. J. van der Laan" <laanwj@protonmail.com>
Date: Mon, 10 May 2021 14:35:28 +0200
Subject: [PATCH] Merge bitcoin/bitcoin#21745: refactor: Add missing includes
 in pubkey.cpp/pubkey.h

71c824ed6cf70b39ca09e8b3962f452f69523af0 cleaned up and added missing "include" statements for pubkey.cpp and pubkey.h (William Bright)

Pull request description:

  #### Problem:
  Many symbols in the files were undefined and causing issues when I was working on building independent sections of the codebase. The hidden imports from the "secp256k1" library was a particular pain point.

  The other standard and missing includes are following best practices and will help with refactoring, build process and others.

  #### Changes:
  Clean up and declared imports/include for `pubkey.cpp` and `pubkey.h`

ACKs for top commit:
  jnewbery:
    utACK 71c824ed6c
  laanwj:
    Code review ACK 71c824ed6cf70b39ca09e8b3962f452f69523af0

Tree-SHA512: bce605cfde24d8e3be82a596cabab7a8577fec0aef7c5e6f7a56603357046d8e8dea11ac8e3dbe79600550291be7784e35c7a55ebf40b46525b8949e4bedae96
---
 src/pubkey.cpp | 6 ++++++
 src/pubkey.h   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pubkey.cpp b/src/pubkey.cpp
index 120c5c78ad..3a9c9ced37 100644
--- a/src/pubkey.cpp
+++ b/src/pubkey.cpp
@@ -5,10 +5,16 @@
 
 #include <pubkey.h>
 
+#include <hash.h>
 #include <secp256k1.h>
+#include <secp256k1_extrakeys.h>
 #include <secp256k1_ellswift.h>
 #include <secp256k1_recovery.h>
+#include <span.h>
+#include <uint256.h>
 
+#include <algorithm>
+#include <cassert>
 namespace {
 
 struct Secp256k1SelfTester
diff --git a/src/pubkey.h b/src/pubkey.h
index 5899bc6674..062b4946c4 100644
--- a/src/pubkey.h
+++ b/src/pubkey.h
@@ -12,7 +12,7 @@
 #include <uint256.h>
 
 #include <array>
-#include <stdexcept>
+#include <cstring>
 #include <vector>
 
 const unsigned int BIP32_EXTKEY_SIZE = 74;