9 files changed, 27 insertions, 7 deletions
diff --git a/src/lib/pbkdf/argon2/argon2.cpp b/src/lib/pbkdf/argon2/argon2.cpp
index 0d767e04e..e7d02a9ea 100644
--- a/src/lib/pbkdf/argon2/argon2.cpp
+++ b/src/lib/pbkdf/argon2/argon2.cpp
@@ -5,10 +5,10 @@
 */
 
 #include <botan/argon2.h>
-#include <botan/loadstor.h>
+#include <botan/internal/loadstor.h>
 #include <botan/hash.h>
 #include <botan/mem_ops.h>
-#include <botan/rotate.h>
+#include <botan/internal/rotate.h>
 #include <botan/exceptn.h>
 
 namespace Botan {
diff --git a/src/lib/pbkdf/argon2/argon2fmt.cpp b/src/lib/pbkdf/argon2/argon2fmt.cpp
index 480be5fa3..974710b29 100644
--- a/src/lib/pbkdf/argon2/argon2fmt.cpp
+++ b/src/lib/pbkdf/argon2/argon2fmt.cpp
@@ -7,7 +7,7 @@
 #include <botan/argon2.h>
 #include <botan/rng.h>
 #include <botan/base64.h>
-#include <botan/parsing.h>
+#include <botan/internal/parsing.h>
 #include <sstream>
 
 namespace Botan {
diff --git a/src/lib/pbkdf/argon2/info.txt b/src/lib/pbkdf/argon2/info.txt
index 91e85d0c4..c0a33f580 100644
--- a/src/lib/pbkdf/argon2/info.txt
+++ b/src/lib/pbkdf/argon2/info.txt
@@ -7,3 +7,7 @@ blake2
 base64
 </requires>
 
+
+<header:public>
+argon2.h
+</header:public>
diff --git a/src/lib/pbkdf/bcrypt_pbkdf/bcrypt_pbkdf.cpp b/src/lib/pbkdf/bcrypt_pbkdf/bcrypt_pbkdf.cpp
index 2f2c77025..f3e2b47b9 100644
--- a/src/lib/pbkdf/bcrypt_pbkdf/bcrypt_pbkdf.cpp
+++ b/src/lib/pbkdf/bcrypt_pbkdf/bcrypt_pbkdf.cpp
@@ -5,8 +5,8 @@
 */
 
 #include <botan/bcrypt_pbkdf.h>
-#include <botan/loadstor.h>
-#include <botan/blowfish.h>
+#include <botan/internal/loadstor.h>
+#include <botan/internal/blowfish.h>
 #include <botan/hash.h>
 #include <botan/internal/timer.h>
 
diff --git a/src/lib/pbkdf/bcrypt_pbkdf/info.txt b/src/lib/pbkdf/bcrypt_pbkdf/info.txt
index 0e2b10178..0bdb9fabf 100644
--- a/src/lib/pbkdf/bcrypt_pbkdf/info.txt
+++ b/src/lib/pbkdf/bcrypt_pbkdf/info.txt
@@ -6,3 +6,7 @@ PBKDF_BCRYPT -> 20190531
 blowfish
 sha2_64
 </requires>
+
+<header:public>
+bcrypt_pbkdf.h
+</header:public>
diff --git a/src/lib/pbkdf/pbkdf2/info.txt b/src/lib/pbkdf/pbkdf2/info.txt
index b6c6fb4e6..525796a3f 100644
--- a/src/lib/pbkdf/pbkdf2/info.txt
+++ b/src/lib/pbkdf/pbkdf2/info.txt
@@ -5,3 +5,7 @@ PBKDF2 -> 20180902
 <requires>
 hmac
 </requires>
+
+<header:public>
+pbkdf2.h
+</header:public>
diff --git a/src/lib/pbkdf/pgp_s2k/info.txt b/src/lib/pbkdf/pgp_s2k/info.txt
index 5aabc0919..4868dd070 100644
--- a/src/lib/pbkdf/pgp_s2k/info.txt
+++ b/src/lib/pbkdf/pgp_s2k/info.txt
@@ -5,3 +5,7 @@ PGP_S2K -> 20170527
 <requires>
 hash
 </requires>
+
+<header:public>
+pgp_s2k.h
+</header:public>
diff --git a/src/lib/pbkdf/scrypt/info.txt b/src/lib/pbkdf/scrypt/info.txt
index 3ba48fd72..0d9082f6a 100644
--- a/src/lib/pbkdf/scrypt/info.txt
+++ b/src/lib/pbkdf/scrypt/info.txt
@@ -8,3 +8,7 @@ pbkdf2
 hmac
 sha2_32
 </requires>
+
+<header:public>
+scrypt.h
+</header:public>
diff --git a/src/lib/pbkdf/scrypt/scrypt.cpp b/src/lib/pbkdf/scrypt/scrypt.cpp
index 8275ac956..2820cddf3 100644
--- a/src/lib/pbkdf/scrypt/scrypt.cpp
+++ b/src/lib/pbkdf/scrypt/scrypt.cpp
@@ -7,8 +7,8 @@
 
 #include <botan/scrypt.h>
 #include <botan/pbkdf2.h>
-#include <botan/salsa20.h>
-#include <botan/loadstor.h>
+#include <botan/internal/salsa20.h>
+#include <botan/internal/loadstor.h>
 #include <botan/exceptn.h>
 #include <botan/internal/bit_ops.h>
 #include <botan/internal/timer.h>