4 files changed, 9 insertions, 3 deletions
diff --git a/src/lib/passhash/bcrypt/bcrypt.cpp b/src/lib/passhash/bcrypt/bcrypt.cpp
index 73456dead..8424de7e2 100644
--- a/src/lib/passhash/bcrypt/bcrypt.cpp
+++ b/src/lib/passhash/bcrypt/bcrypt.cpp
@@ -6,9 +6,10 @@
 */
 
 #include <botan/bcrypt.h>
-#include <botan/loadstor.h>
+#include <botan/rng.h>
 #include <botan/blowfish.h>
 #include <botan/base64.h>
+#include <botan/parsing.h>
 
 namespace Botan {
 
diff --git a/src/lib/passhash/bcrypt/bcrypt.h b/src/lib/passhash/bcrypt/bcrypt.h
index c88df2745..51db8062d 100644
--- a/src/lib/passhash/bcrypt/bcrypt.h
+++ b/src/lib/passhash/bcrypt/bcrypt.h
@@ -8,10 +8,12 @@
 #ifndef BOTAN_BCRYPT_H_
 #define BOTAN_BCRYPT_H_
 
-#include <botan/rng.h>
+#include <botan/types.h>
 
 namespace Botan {
 
+class RandomNumberGenerator;
+
 /**
 * Create a password hash using Bcrypt
 * @param password the password
diff --git a/src/lib/passhash/passhash9/passhash9.cpp b/src/lib/passhash/passhash9/passhash9.cpp
index 1fa88c8c4..47c7d0342 100644
--- a/src/lib/passhash/passhash9/passhash9.cpp
+++ b/src/lib/passhash/passhash9/passhash9.cpp
@@ -6,6 +6,7 @@
 */
 
 #include <botan/passhash9.h>
+#include <botan/rng.h>
 #include <botan/loadstor.h>
 #include <botan/pbkdf2.h>
 #include <botan/base64.h>
diff --git a/src/lib/passhash/passhash9/passhash9.h b/src/lib/passhash/passhash9/passhash9.h
index 75847bfa5..825c63da6 100644
--- a/src/lib/passhash/passhash9/passhash9.h
+++ b/src/lib/passhash/passhash9/passhash9.h
@@ -8,10 +8,12 @@
 #ifndef BOTAN_PASSHASH9_H_
 #define BOTAN_PASSHASH9_H_
 
-#include <botan/rng.h>
+#include <botan/types.h>
 
 namespace Botan {
 
+class RandomNumberGenerator;
+
 /**
 * Create a password hash using PBKDF2
 * @param password the password