11 files changed, 24 insertions, 0 deletions
diff --git a/src/lib/kdf/hkdf/hkdf.cpp b/src/lib/kdf/hkdf/hkdf.cpp
index 4b2ee1b3d..679a2ed42 100644
--- a/src/lib/kdf/hkdf/hkdf.cpp
+++ b/src/lib/kdf/hkdf/hkdf.cpp
@@ -7,6 +7,7 @@
 */
 
 #include <botan/hkdf.h>
+#include <botan/loadstor.h>
 
 namespace Botan {
 
diff --git a/src/lib/kdf/hkdf/hkdf.h b/src/lib/kdf/hkdf/hkdf.h
index cd2b13dd8..4b1ed2922 100644
--- a/src/lib/kdf/hkdf/hkdf.h
+++ b/src/lib/kdf/hkdf/hkdf.h
@@ -12,6 +12,12 @@
 #include <botan/mac.h>
 #include <botan/kdf.h>
 
+/*
+* The definitions of HKDF, HKDF_Extract, HKDF_Expand will be made internal
+* in the future. However the function hkdf_expand_label will still be defined.
+*/
+//BOTAN_FUTURE_INTERNAL_HEADER(hkdf.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/kdf/kdf1/kdf1.h b/src/lib/kdf/kdf1/kdf1.h
index 803aae300..388b55251 100644
--- a/src/lib/kdf/kdf1/kdf1.h
+++ b/src/lib/kdf/kdf1/kdf1.h
@@ -11,6 +11,8 @@
 #include <botan/kdf.h>
 #include <botan/hash.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(kdf1.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/kdf/kdf1_iso18033/kdf1_iso18033.h b/src/lib/kdf/kdf1_iso18033/kdf1_iso18033.h
index 7a95a093b..5f913057e 100644
--- a/src/lib/kdf/kdf1_iso18033/kdf1_iso18033.h
+++ b/src/lib/kdf/kdf1_iso18033/kdf1_iso18033.h
@@ -11,6 +11,8 @@
 #include <botan/kdf.h>
 #include <botan/hash.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(kdf1_iso18033.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/kdf/kdf2/kdf2.h b/src/lib/kdf/kdf2/kdf2.h
index 2fd40e736..43abbf087 100644
--- a/src/lib/kdf/kdf2/kdf2.h
+++ b/src/lib/kdf/kdf2/kdf2.h
@@ -11,6 +11,8 @@
 #include <botan/kdf.h>
 #include <botan/hash.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(kdf2.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/kdf/prf_tls/prf_tls.h b/src/lib/kdf/prf_tls/prf_tls.h
index 3ed8db247..a8a30ee2c 100644
--- a/src/lib/kdf/prf_tls/prf_tls.h
+++ b/src/lib/kdf/prf_tls/prf_tls.h
@@ -11,6 +11,8 @@
 #include <botan/kdf.h>
 #include <botan/mac.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(prf_tls.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/kdf/prf_x942/prf_x942.h b/src/lib/kdf/prf_x942/prf_x942.h
index 4b93d5966..1987b9bc3 100644
--- a/src/lib/kdf/prf_x942/prf_x942.h
+++ b/src/lib/kdf/prf_x942/prf_x942.h
@@ -11,6 +11,8 @@
 #include <botan/kdf.h>
 #include <botan/asn1_oid.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(prf_x942.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/kdf/sp800_108/sp800_108.cpp b/src/lib/kdf/sp800_108/sp800_108.cpp
index 990e10386..fbeae23cd 100644
--- a/src/lib/kdf/sp800_108/sp800_108.cpp
+++ b/src/lib/kdf/sp800_108/sp800_108.cpp
@@ -6,6 +6,7 @@
 */
 
 #include <botan/sp800_108.h>
+#include <botan/loadstor.h>
 #include <botan/exceptn.h>
 #include <iterator>
 
diff --git a/src/lib/kdf/sp800_108/sp800_108.h b/src/lib/kdf/sp800_108/sp800_108.h
index 25802f69e..46f734e8e 100644
--- a/src/lib/kdf/sp800_108/sp800_108.h
+++ b/src/lib/kdf/sp800_108/sp800_108.h
@@ -11,6 +11,8 @@
 #include <botan/kdf.h>
 #include <botan/mac.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(sp800_108.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/kdf/sp800_56a/sp800_56a.h b/src/lib/kdf/sp800_56a/sp800_56a.h
index 17fd3a84b..e83f117e2 100644
--- a/src/lib/kdf/sp800_56a/sp800_56a.h
+++ b/src/lib/kdf/sp800_56a/sp800_56a.h
@@ -13,6 +13,8 @@
 #include <botan/hash.h>
 #include <botan/mac.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(sp800_56a.h)
+
 namespace Botan {
 
 /**
diff --git a/src/lib/kdf/sp800_56c/sp800_56c.h b/src/lib/kdf/sp800_56c/sp800_56c.h
index a6db91658..bdbdfcd9e 100644
--- a/src/lib/kdf/sp800_56c/sp800_56c.h
+++ b/src/lib/kdf/sp800_56c/sp800_56c.h
@@ -11,6 +11,8 @@
 #include <botan/kdf.h>
 #include <botan/mac.h>
 
+BOTAN_FUTURE_INTERNAL_HEADER(sp800_56c.h)
+
 namespace Botan {
 
 /**