Deprecate many publically available headers

13 files changed, 25 insertions, 0 deletions

diff --git a/src/lib/modes/aead/ccm/ccm.h b/src/lib/modes/aead/ccm/ccm.h
index 37d3c0c04..9b4bcecbf 100644
--- a/src/lib/modes/aead/ccm/ccm.h
+++ b/src/lib/modes/aead/ccm/ccm.h
@@ -12,6 +12,8 @@
 #include <botan/aead.h>
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(ccm.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.cpp b/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.cpp
index ca0c55184..2e1d913ef 100644
--- a/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.cpp
+++ b/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.cpp
@@ -7,6 +7,7 @@
 */
 
 #include <botan/chacha20poly1305.h>
+#include <botan/loadstor.h>
 
 namespace Botan {
 
diff --git a/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.h b/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.h
index c7ed615d6..dbba58cc9 100644
--- a/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.h
+++ b/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.h
@@ -13,6 +13,8 @@
 #include <botan/stream_cipher.h>
 #include <botan/mac.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(chacha20poly1305.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/modes/aead/eax/eax.h b/src/lib/modes/aead/eax/eax.h
index 84a4f3f92..b9b02c192 100644
--- a/src/lib/modes/aead/eax/eax.h
+++ b/src/lib/modes/aead/eax/eax.h
@@ -14,6 +14,8 @@
 #include <botan/stream_cipher.h>
 #include <botan/mac.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(eax.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/modes/aead/gcm/gcm.h b/src/lib/modes/aead/gcm/gcm.h
index 8f27c3679..fe3c40572 100644
--- a/src/lib/modes/aead/gcm/gcm.h
+++ b/src/lib/modes/aead/gcm/gcm.h
@@ -12,6 +12,8 @@
 #include <botan/aead.h>
 #include <botan/sym_algo.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(gcm.h)
+
 namespace Botan {
 
 class BlockCipher;
diff --git a/src/lib/modes/aead/gcm/ghash.h b/src/lib/modes/aead/gcm/ghash.h
index fb7565134..db4500133 100644
--- a/src/lib/modes/aead/gcm/ghash.h
+++ b/src/lib/modes/aead/gcm/ghash.h
@@ -10,6 +10,8 @@
 
 #include <botan/sym_algo.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(ghash.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/modes/aead/ocb/ocb.h b/src/lib/modes/aead/ocb/ocb.h
index 173af3704..d38122593 100644
--- a/src/lib/modes/aead/ocb/ocb.h
+++ b/src/lib/modes/aead/ocb/ocb.h
@@ -11,6 +11,8 @@
 
 #include <botan/aead.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(ocb.h)
+
 namespace Botan {
 
 class BlockCipher;
diff --git a/src/lib/modes/aead/siv/siv.h b/src/lib/modes/aead/siv/siv.h
index 4d9a30222..44e0a6bf9 100644
--- a/src/lib/modes/aead/siv/siv.h
+++ b/src/lib/modes/aead/siv/siv.h
@@ -12,6 +12,8 @@
 #include <botan/aead.h>
 #include <botan/stream_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(siv.h)
+
 namespace Botan {
 
 class BlockCipher;
diff --git a/src/lib/modes/cbc/cbc.h b/src/lib/modes/cbc/cbc.h
index aaa425712..7a488dbd5 100644
--- a/src/lib/modes/cbc/cbc.h
+++ b/src/lib/modes/cbc/cbc.h
@@ -13,6 +13,8 @@
 #include <botan/block_cipher.h>
 #include <botan/mode_pad.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(cbc.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/modes/cfb/cfb.h b/src/lib/modes/cfb/cfb.h
index eddc2a121..1f9e55487 100644
--- a/src/lib/modes/cfb/cfb.h
+++ b/src/lib/modes/cfb/cfb.h
@@ -12,6 +12,8 @@
 #include <botan/cipher_mode.h>
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(cfb.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/modes/mode_pad/mode_pad.h b/src/lib/modes/mode_pad/mode_pad.h
index 25e4221af..b0e4a3cfa 100644
--- a/src/lib/modes/mode_pad/mode_pad.h
+++ b/src/lib/modes/mode_pad/mode_pad.h
@@ -12,6 +12,8 @@
 #include <botan/secmem.h>
 #include <string>
 
+BOTAN_FUTURE_INTERNAL_HEADER(mode_pad.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/modes/stream_mode.h b/src/lib/modes/stream_mode.h
index 3bce01731..da3fc38cf 100644
--- a/src/lib/modes/stream_mode.h
+++ b/src/lib/modes/stream_mode.h
@@ -14,6 +14,8 @@
    #include <botan/stream_cipher.h>
 #endif
 
+BOTAN_FUTURE_INTERNAL_HEADER(stream_mode.h)
+
 namespace Botan {
 
 #if defined(BOTAN_HAS_STREAM_CIPHER)
diff --git a/src/lib/modes/xts/xts.h b/src/lib/modes/xts/xts.h
index 1fd86b2f4..e64a6de9f 100644
--- a/src/lib/modes/xts/xts.h
+++ b/src/lib/modes/xts/xts.h
@@ -12,6 +12,8 @@
 #include <botan/cipher_mode.h>
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(xts.h)
+
 namespace Botan {
 
 /**