14 files changed, 7 insertions, 137 deletions
diff --git a/src/lib/pubkey/xmss/atomic.h b/src/lib/pubkey/xmss/atomic.h
index a542d4c00..fc6d8ba94 100644
--- a/src/lib/pubkey/xmss/atomic.h
+++ b/src/lib/pubkey/xmss/atomic.h
@@ -12,8 +12,6 @@
 #include <atomic>
 #include <memory>
 
-//BOTAN_FUTURE_INTERNAL_HEADER(atomic.h)
-
 namespace Botan {
 
 template <typename T>
diff --git a/src/lib/pubkey/xmss/info.txt b/src/lib/pubkey/xmss/info.txt
index ae290f5fc..bc4a1e745 100644
--- a/src/lib/pubkey/xmss/info.txt
+++ b/src/lib/pubkey/xmss/info.txt
@@ -7,18 +7,13 @@ xmss.h
 xmss_hash.h
 xmss_wots.h
 xmss_parameters.h
-xmss_key_pair.h
-xmss_privatekey.h
-xmss_publickey.h
-xmss_wots_parameters.h
-xmss_wots_privatekey.h
-xmss_wots_publickey.h
 </header:public>
 
 <header:internal>
 atomic.h
 xmss_address.h
 xmss_common_ops.h
+xmss_common_ops.h
 xmss_index_registry.h
 xmss_signature.h
 xmss_signature_operation.h
diff --git a/src/lib/pubkey/xmss/xmss_common_ops.cpp b/src/lib/pubkey/xmss/xmss_common_ops.cpp
index 9a3fe085a..bdc03e40f 100644
--- a/src/lib/pubkey/xmss/xmss_common_ops.cpp
+++ b/src/lib/pubkey/xmss/xmss_common_ops.cpp
@@ -7,6 +7,7 @@
  **/
 
 #include <botan/internal/xmss_common_ops.h>
+#include <botan/xmss_hash.h>
 
 namespace Botan {
 
diff --git a/src/lib/pubkey/xmss/xmss_common_ops.h b/src/lib/pubkey/xmss/xmss_common_ops.h
index 77fdc9dc1..d04e65242 100644
--- a/src/lib/pubkey/xmss/xmss_common_ops.h
+++ b/src/lib/pubkey/xmss/xmss_common_ops.h
@@ -12,12 +12,11 @@
 #include <botan/secmem.h>
 #include <botan/xmss_parameters.h>
 #include <botan/internal/xmss_address.h>
-#include <botan/xmss_hash.h>
-
-BOTAN_FUTURE_INTERNAL_HEADER(xmss_common_ops.h)
 
 namespace Botan {
 
+class XMSS_Hash;
+
 typedef std::vector<secure_vector<uint8_t>> wots_keysig_t;
 
 /**
diff --git a/src/lib/pubkey/xmss/xmss_index_registry.h b/src/lib/pubkey/xmss/xmss_index_registry.h
index 91166db4b..7b5af100d 100644
--- a/src/lib/pubkey/xmss/xmss_index_registry.h
+++ b/src/lib/pubkey/xmss/xmss_index_registry.h
@@ -14,8 +14,6 @@
 #include <botan/internal/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
deleted file mode 100644
index 19e23c777..000000000
--- a/src/lib/pubkey/xmss/xmss_key_pair.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * XMSS Key Pair
- * (C) 2016 Matthias Gierlings
- *
- * Botan is released under the Simplified BSD License (see license.txt)
- **/
-
-#ifndef BOTAN_XMSS_KEY_PAIR_H_
-#define BOTAN_XMSS_KEY_PAIR_H_
-
-#include <botan/xmss.h>
-
-BOTAN_DEPRECATED_HEADER(xmss_key_pair.h)
-
-namespace Botan {
-
-/**
- * A pair of XMSS public and private key.
- **/
-class BOTAN_PUBLIC_API(2,0) XMSS_Key_Pair
-   {
-   public:
-      XMSS_Key_Pair(XMSS_Parameters::xmss_algorithm_t xmss_oid,
-                    RandomNumberGenerator& rng)
-         : m_priv_key(xmss_oid, rng), m_pub_key(m_priv_key) {}
-
-      XMSS_Key_Pair(const XMSS_PublicKey& pub_key,
-                    const XMSS_PrivateKey& priv_key)
-         : m_priv_key(priv_key), m_pub_key(pub_key)
-         {}
-
-      XMSS_Key_Pair(XMSS_PublicKey&& pub_key,
-                    XMSS_PrivateKey&& priv_key)
-         : m_priv_key(std::move(priv_key)), m_pub_key(std::move(pub_key)) {}
-
-      const XMSS_PublicKey& public_key() const { return m_pub_key; }
-      XMSS_PublicKey& public_key() { return m_pub_key; }
-
-      const XMSS_PrivateKey& private_key() const { return m_priv_key; }
-      XMSS_PrivateKey& private_key() { return m_priv_key; }
-
-   private:
-      XMSS_PrivateKey m_priv_key;
-      XMSS_PublicKey m_pub_key;
-   };
-
-}
-
-#endif
diff --git a/src/lib/pubkey/xmss/xmss_privatekey.h b/src/lib/pubkey/xmss/xmss_privatekey.h
deleted file mode 100644
index dc040e443..000000000
--- a/src/lib/pubkey/xmss/xmss_privatekey.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * (C) 2016,2017,2018 Matthias Gierlings
- *
- * Botan is released under the Simplified BSD License (see license.txt)
- **/
-
-#ifndef BOTAN_XMSS_PRIVATEKEY_H_
-#define BOTAN_XMSS_PRIVATEKEY_H_
-
-#include <botan/xmss.h>
-BOTAN_DEPRECATED_HEADER(xmss_privatekey.h)
-
-#endif
diff --git a/src/lib/pubkey/xmss/xmss_publickey.h b/src/lib/pubkey/xmss/xmss_publickey.h
deleted file mode 100644
index eba27fc95..000000000
--- a/src/lib/pubkey/xmss/xmss_publickey.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * (C) 2016,2017,2018 Matthias Gierlings
- *
- * Botan is released under the Simplified BSD License (see license.txt)
- **/
-
-#ifndef BOTAN_XMSS_PUBLICKEY_H_
-#define BOTAN_XMSS_PUBLICKEY_H_
-
-#include <botan/xmss.h>
-BOTAN_DEPRECATED_HEADER(xmss_publickey.h)
-
-#endif
-
diff --git a/src/lib/pubkey/xmss/xmss_signature_operation.h b/src/lib/pubkey/xmss/xmss_signature_operation.h
index e6fb2c711..5236b5bbe 100644
--- a/src/lib/pubkey/xmss/xmss_signature_operation.h
+++ b/src/lib/pubkey/xmss/xmss_signature_operation.h
@@ -8,7 +8,7 @@
 #ifndef BOTAN_XMSS_SIGNATURE_OPERATION_H_
 #define BOTAN_XMSS_SIGNATURE_OPERATION_H_
 
-#include <botan/pk_ops.h>
+#include <botan/internal/pk_ops.h>
 #include <botan/xmss.h>
 #include <botan/internal/xmss_address.h>
 #include <botan/internal/xmss_signature.h>
diff --git a/src/lib/pubkey/xmss/xmss_tools.h b/src/lib/pubkey/xmss/xmss_tools.h
index 81d17f5bf..bbd31fd9f 100644
--- a/src/lib/pubkey/xmss/xmss_tools.h
+++ b/src/lib/pubkey/xmss/xmss_tools.h
@@ -13,8 +13,6 @@
 #include <iterator>
 #include <type_traits>
 
-//BOTAN_FUTURE_INTERNAL_HEADER(xmss_tools.h)
-
 namespace Botan {
 
 /**
diff --git a/src/lib/pubkey/xmss/xmss_verification_operation.h b/src/lib/pubkey/xmss/xmss_verification_operation.h
index f96b3803b..7ef6d83b2 100644
--- a/src/lib/pubkey/xmss/xmss_verification_operation.h
+++ b/src/lib/pubkey/xmss/xmss_verification_operation.h
@@ -8,9 +8,9 @@
 #ifndef BOTAN_XMSS_VERIFICATION_OPERATION_H_
 #define BOTAN_XMSS_VERIFICATION_OPERATION_H_
 
-#include <botan/pk_ops.h>
-#include <botan/xmss.h>
+#include <botan/internal/pk_ops.h>
 #include <botan/internal/xmss_signature.h>
+#include <botan/xmss.h>
 
 namespace Botan {
 
diff --git a/src/lib/pubkey/xmss/xmss_wots_parameters.h b/src/lib/pubkey/xmss/xmss_wots_parameters.h
deleted file mode 100644
index e8c3e2b4a..000000000
--- a/src/lib/pubkey/xmss/xmss_wots_parameters.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * XMSS WOTS Parameters
- * (C) 2016,2018 Matthias Gierlings
- *
- * Botan is released under the Simplified BSD License (see license.txt)
- **/
-
-#ifndef BOTAN_XMSS_WOTS_PARAMETERS_H_
-#define BOTAN_XMSS_WOTS_PARAMETERS_H_
-
-#include <botan/xmss_wots.h>
-BOTAN_DEPRECATED_HEADER(xmss_wots_parameters.h)
-
-#endif
diff --git a/src/lib/pubkey/xmss/xmss_wots_privatekey.h b/src/lib/pubkey/xmss/xmss_wots_privatekey.h
deleted file mode 100644
index 2d631598b..000000000
--- a/src/lib/pubkey/xmss/xmss_wots_privatekey.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * XMSS WOTS Private Key
- * (C) 2016,2017 Matthias Gierlings
- *
- * Botan is released under the Simplified BSD License (see license.txt)
- **/
-
-#ifndef BOTAN_XMSS_WOTS_PRIVATEKEY_H_
-#define BOTAN_XMSS_WOTS_PRIVATEKEY_H_
-
-#include <botan/xmss.h>
-BOTAN_DEPRECATED_HEADER(xmss_wots_privatekey.h)
-
-#endif
-
diff --git a/src/lib/pubkey/xmss/xmss_wots_publickey.h b/src/lib/pubkey/xmss/xmss_wots_publickey.h
deleted file mode 100644
index 796bf4c30..000000000
--- a/src/lib/pubkey/xmss/xmss_wots_publickey.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * XMSS WOTS Public Key
- * (C) 2016,2017,2018 Matthias Gierlings
- *
- * Botan is released under the Simplified BSD License (see license.txt)
- **/
-
-#ifndef BOTAN_XMSS_WOTS_PUBLICKEY_H_
-#define BOTAN_XMSS_WOTS_PUBLICKEY_H_
-
-#include <botan/xmss.h>
-BOTAN_DEPRECATED_HEADER(xmss_wots_publickey.h)
-
-#endif