14 files changed, 31 insertions, 2 deletions
diff --git a/src/lib/pubkey/blinding.h b/src/lib/pubkey/blinding.h
index 1bdd235f0..988a41a35 100644
--- a/src/lib/pubkey/blinding.h
+++ b/src/lib/pubkey/blinding.h
@@ -12,6 +12,8 @@
 #include <botan/reducer.h>
 #include <functional>
 
+BOTAN_FUTURE_INTERNAL_HEADER(blinding.h)
+
 namespace Botan {
 
 class RandomNumberGenerator;
diff --git a/src/lib/pubkey/ec_group/curve_gfp.h b/src/lib/pubkey/ec_group/curve_gfp.h
index fe7a0a54d..158f7f8c8 100644
--- a/src/lib/pubkey/ec_group/curve_gfp.h
+++ b/src/lib/pubkey/ec_group/curve_gfp.h
@@ -13,6 +13,9 @@
 #include <botan/bigint.h>
 #include <memory>
 
+// Currently exposed in PointGFp
+//BOTAN_FUTURE_INTERNAL_HEADER(curve_gfp.h)
+
 namespace Botan {
 
 class BOTAN_UNSTABLE_API CurveGFp_Repr
diff --git a/src/lib/pubkey/keypair/keypair.h b/src/lib/pubkey/keypair/keypair.h
index 4f28f325f..6900faa35 100644
--- a/src/lib/pubkey/keypair/keypair.h
+++ b/src/lib/pubkey/keypair/keypair.h
@@ -10,6 +10,8 @@
 
 #include <botan/pk_keys.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(keypair.h)
+
 namespace Botan {
 
 namespace KeyPair {
diff --git a/src/lib/pubkey/mce/gf2m_small_m.h b/src/lib/pubkey/mce/gf2m_small_m.h
index a74094930..9acc50c72 100644
--- a/src/lib/pubkey/mce/gf2m_small_m.h
+++ b/src/lib/pubkey/mce/gf2m_small_m.h
@@ -12,8 +12,11 @@
 #ifndef BOTAN_GF2M_SMALL_M_H_
 #define BOTAN_GF2M_SMALL_M_H_
 
-#include <vector>
 #include <botan/types.h>
+#include <vector>
+
+// fixme - still used in mceliece.h
+//BOTAN_FUTURE_INTERNAL_HEADER(gf2m_small_m.h)
 
 namespace Botan {
 
diff --git a/src/lib/pubkey/mce/polyn_gf2m.h b/src/lib/pubkey/mce/polyn_gf2m.h
index f2d3ac53c..5d7caa8b5 100644
--- a/src/lib/pubkey/mce/polyn_gf2m.h
+++ b/src/lib/pubkey/mce/polyn_gf2m.h
@@ -17,6 +17,8 @@
 #include <utility>
 #include <string>
 
+//BOTAN_FUTURE_INTERNAL_HEADER(gf2m_small_m.h)
+
 namespace Botan {
 
 class RandomNumberGenerator;
diff --git a/src/lib/pubkey/pbes2/pbes2.h b/src/lib/pubkey/pbes2/pbes2.h
index bc56abd97..daa9ac580 100644
--- a/src/lib/pubkey/pbes2/pbes2.h
+++ b/src/lib/pubkey/pbes2/pbes2.h
@@ -11,6 +11,8 @@
 #include <botan/alg_id.h>
 #include <chrono>
 
+BOTAN_FUTURE_INTERNAL_HEADER(pbes2.h)
+
 namespace Botan {
 
 class RandomNumberGenerator;
diff --git a/src/lib/pubkey/rfc6979/rfc6979.h b/src/lib/pubkey/rfc6979/rfc6979.h
index d78effc26..54134a682 100644
--- a/src/lib/pubkey/rfc6979/rfc6979.h
+++ b/src/lib/pubkey/rfc6979/rfc6979.h
@@ -12,6 +12,8 @@
 #include <string>
 #include <memory>
 
+BOTAN_FUTURE_INTERNAL_HEADER(rfc6979.h)
+
 namespace Botan {
 
 class HMAC_DRBG;
diff --git a/src/lib/pubkey/sm2/sm2.cpp b/src/lib/pubkey/sm2/sm2.cpp
index 5ffd547cf..a976c097b 100644
--- a/src/lib/pubkey/sm2/sm2.cpp
+++ b/src/lib/pubkey/sm2/sm2.cpp
@@ -9,6 +9,7 @@
 #include <botan/sm2.h>
 #include <botan/internal/pk_ops_impl.h>
 #include <botan/internal/point_mul.h>
+#include <botan/loadstor.h>
 #include <botan/numthry.h>
 #include <botan/keypair.h>
 #include <botan/hash.h>
diff --git a/src/lib/pubkey/xmss/atomic.h b/src/lib/pubkey/xmss/atomic.h
index d2e65c104..a542d4c00 100644
--- a/src/lib/pubkey/xmss/atomic.h
+++ b/src/lib/pubkey/xmss/atomic.h
@@ -8,9 +8,12 @@
 #ifndef BOTAN_ATOMIC_H_
 #define BOTAN_ATOMIC_H_
 
+#include <botan/types.h>
 #include <atomic>
 #include <memory>
 
+//BOTAN_FUTURE_INTERNAL_HEADER(atomic.h)
+
 namespace Botan {
 
 template <typename T>
diff --git a/src/lib/pubkey/xmss/xmss_common_ops.h b/src/lib/pubkey/xmss/xmss_common_ops.h
index 065a727d9..f3c59f85f 100644
--- a/src/lib/pubkey/xmss/xmss_common_ops.h
+++ b/src/lib/pubkey/xmss/xmss_common_ops.h
@@ -14,6 +14,8 @@
 #include <botan/xmss_address.h>
 #include <botan/xmss_hash.h>
 
+//BOTAN_FUTURE_INTERNAL_HEADER(xmss_common_ops.h)
+
 namespace Botan {
 
 typedef std::vector<secure_vector<uint8_t>> wots_keysig_t;
diff --git a/src/lib/pubkey/xmss/xmss_hash.h b/src/lib/pubkey/xmss/xmss_hash.h
index f45432d59..5d8cbab53 100644
--- a/src/lib/pubkey/xmss/xmss_hash.h
+++ b/src/lib/pubkey/xmss/xmss_hash.h
@@ -10,6 +10,8 @@
 
 #include <botan/hash.h>
 
+//BOTAN_FUTURE_INTERNAL_HEADER(xmss_hash.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/pubkey/xmss/xmss_index_registry.h b/src/lib/pubkey/xmss/xmss_index_registry.h
index 27a68631a..6ec9137d3 100644
--- a/src/lib/pubkey/xmss/xmss_index_registry.h
+++ b/src/lib/pubkey/xmss/xmss_index_registry.h
@@ -12,6 +12,8 @@
 #include <botan/atomic.h>
 #include <botan/mutex.h>
 
+//BOTAN_FUTURE_INTERNAL_HEADER(xmss_index_registry.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/pubkey/xmss/xmss_key_pair.h b/src/lib/pubkey/xmss/xmss_key_pair.h
index 2e7cc06da..3b586cfd4 100644
--- a/src/lib/pubkey/xmss/xmss_key_pair.h
+++ b/src/lib/pubkey/xmss/xmss_key_pair.h
@@ -8,12 +8,13 @@
 #ifndef BOTAN_XMSS_KEY_PAIR_H_
 #define BOTAN_XMSS_KEY_PAIR_H_
 
-#include <botan/botan.h>
 #include <botan/xmss_parameters.h>
 #include <botan/xmss_wots_parameters.h>
 #include <botan/xmss_publickey.h>
 #include <botan/xmss_privatekey.h>
 
+BOTAN_DEPRECATED_HEADER(xmss_key_pair.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/pubkey/xmss/xmss_tools.h b/src/lib/pubkey/xmss/xmss_tools.h
index bbd31fd9f..81d17f5bf 100644
--- a/src/lib/pubkey/xmss/xmss_tools.h
+++ b/src/lib/pubkey/xmss/xmss_tools.h
@@ -13,6 +13,8 @@
 #include <iterator>
 #include <type_traits>
 
+//BOTAN_FUTURE_INTERNAL_HEADER(xmss_tools.h)
+
 namespace Botan {
 
 /**