Deprecate many publically available headers

6 files changed, 13 insertions, 1 deletions

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 {
 
 /**