Merge GH #2061 Add header deprecation warnings

22 files changed, 44 insertions, 0 deletions

diff --git a/src/lib/block/aes/aes.h b/src/lib/block/aes/aes.h
index 6083467b6..84d997d05 100644
--- a/src/lib/block/aes/aes.h
+++ b/src/lib/block/aes/aes.h
@@ -10,6 +10,8 @@
 
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(aes.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/aria/aria.h b/src/lib/block/aria/aria.h
index 374277686..507226b7d 100644
--- a/src/lib/block/aria/aria.h
+++ b/src/lib/block/aria/aria.h
@@ -18,6 +18,8 @@
 
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(aria.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/blowfish/blowfish.h b/src/lib/block/blowfish/blowfish.h
index 97a1b841c..3ba39cbdb 100644
--- a/src/lib/block/blowfish/blowfish.h
+++ b/src/lib/block/blowfish/blowfish.h
@@ -10,6 +10,8 @@
 
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(blowfish.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/camellia/camellia.h b/src/lib/block/camellia/camellia.h
index 3d639bf77..4995eb0c9 100644
--- a/src/lib/block/camellia/camellia.h
+++ b/src/lib/block/camellia/camellia.h
@@ -10,6 +10,8 @@
 
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(camellia.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/cascade/cascade.h b/src/lib/block/cascade/cascade.h
index 8a641fc2f..26f513381 100644
--- a/src/lib/block/cascade/cascade.h
+++ b/src/lib/block/cascade/cascade.h
@@ -10,6 +10,8 @@
 
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(cascade.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/cast128/cast128.h b/src/lib/block/cast128/cast128.h
index 3a1740777..a5f2a6401 100644
--- a/src/lib/block/cast128/cast128.h
+++ b/src/lib/block/cast128/cast128.h
@@ -10,6 +10,8 @@
 
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(cast128.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/cast256/cast256.h b/src/lib/block/cast256/cast256.h
index 798649ef7..3c3016937 100644
--- a/src/lib/block/cast256/cast256.h
+++ b/src/lib/block/cast256/cast256.h
@@ -10,6 +10,8 @@
 
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(cast256.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/des/des.h b/src/lib/block/des/des.h
index 7ba563545..d8bbcfdd1 100644
--- a/src/lib/block/des/des.h
+++ b/src/lib/block/des/des.h
@@ -10,6 +10,8 @@
 
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(des.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/des/desx.h b/src/lib/block/des/desx.h
index fa9a99663..0189a9982 100644
--- a/src/lib/block/des/desx.h
+++ b/src/lib/block/des/desx.h
@@ -10,6 +10,8 @@
 
 #include <botan/des.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(desx.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/gost_28147/gost_28147.h b/src/lib/block/gost_28147/gost_28147.h
index 34e45779b..f71bb28bd 100644
--- a/src/lib/block/gost_28147/gost_28147.h
+++ b/src/lib/block/gost_28147/gost_28147.h
@@ -10,6 +10,8 @@
 
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(gost_28147.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/idea/idea.h b/src/lib/block/idea/idea.h
index 4c45a3aaa..e5e51606b 100644
--- a/src/lib/block/idea/idea.h
+++ b/src/lib/block/idea/idea.h
@@ -10,6 +10,8 @@
 
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(idea.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/kasumi/kasumi.h b/src/lib/block/kasumi/kasumi.h
index 4a3712cd2..9ea09a103 100644
--- a/src/lib/block/kasumi/kasumi.h
+++ b/src/lib/block/kasumi/kasumi.h
@@ -10,6 +10,8 @@
 
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(kasumi.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/lion/lion.h b/src/lib/block/lion/lion.h
index 846c3cd30..fa8e9f414 100644
--- a/src/lib/block/lion/lion.h
+++ b/src/lib/block/lion/lion.h
@@ -12,6 +12,8 @@
 #include <botan/stream_cipher.h>
 #include <botan/hash.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(lion.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/misty1/misty1.h b/src/lib/block/misty1/misty1.h
index c63e3713e..b6c4abbd5 100644
--- a/src/lib/block/misty1/misty1.h
+++ b/src/lib/block/misty1/misty1.h
@@ -10,6 +10,8 @@
 
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(misty1.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/noekeon/noekeon.h b/src/lib/block/noekeon/noekeon.h
index a93266309..9e7e4a5ff 100644
--- a/src/lib/block/noekeon/noekeon.h
+++ b/src/lib/block/noekeon/noekeon.h
@@ -10,6 +10,8 @@
 
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(noekeon.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/seed/seed.h b/src/lib/block/seed/seed.h
index e30293645..a61624313 100644
--- a/src/lib/block/seed/seed.h
+++ b/src/lib/block/seed/seed.h
@@ -10,6 +10,8 @@
 
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(seed.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/serpent/serpent.h b/src/lib/block/serpent/serpent.h
index 641ee0b9c..64eb8a8b0 100644
--- a/src/lib/block/serpent/serpent.h
+++ b/src/lib/block/serpent/serpent.h
@@ -10,6 +10,8 @@
 
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(serpent.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/shacal2/shacal2.h b/src/lib/block/shacal2/shacal2.h
index c4a8f2073..9a1ccff03 100644
--- a/src/lib/block/shacal2/shacal2.h
+++ b/src/lib/block/shacal2/shacal2.h
@@ -10,6 +10,8 @@
 
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(shacal2.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/sm4/sm4.h b/src/lib/block/sm4/sm4.h
index 7d1d8ba98..637ffd4be 100644
--- a/src/lib/block/sm4/sm4.h
+++ b/src/lib/block/sm4/sm4.h
@@ -10,6 +10,8 @@
 
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(sm4.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/threefish_512/threefish_512.h b/src/lib/block/threefish_512/threefish_512.h
index 2e936b25f..f3adf71a9 100644
--- a/src/lib/block/threefish_512/threefish_512.h
+++ b/src/lib/block/threefish_512/threefish_512.h
@@ -10,6 +10,8 @@
 
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(threefish_512.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/twofish/twofish.h b/src/lib/block/twofish/twofish.h
index 8201ede76..027e2c701 100644
--- a/src/lib/block/twofish/twofish.h
+++ b/src/lib/block/twofish/twofish.h
@@ -10,6 +10,8 @@
 
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(twofish.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/block/xtea/xtea.h b/src/lib/block/xtea/xtea.h
index 5ec94fd05..bae0bc7e6 100644
--- a/src/lib/block/xtea/xtea.h
+++ b/src/lib/block/xtea/xtea.h
@@ -10,6 +10,8 @@
 
 #include <botan/block_cipher.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(xtea.h)
+
 namespace Botan {
 
 /**