14 files changed, 23 insertions, 5 deletions
diff --git a/src/lib/pk_pad/eme.cpp b/src/lib/pk_pad/eme.cpp
index 85efe1615..aa62f4196 100644
--- a/src/lib/pk_pad/eme.cpp
+++ b/src/lib/pk_pad/eme.cpp
@@ -7,6 +7,7 @@
 
 #include <botan/eme.h>
 #include <botan/scan_name.h>
+#include <botan/exceptn.h>
 
 #if defined(BOTAN_HAS_EME_OAEP)
 #include <botan/oaep.h>
diff --git a/src/lib/pk_pad/eme.h b/src/lib/pk_pad/eme.h
index 8842358fe..26523bc88 100644
--- a/src/lib/pk_pad/eme.h
+++ b/src/lib/pk_pad/eme.h
@@ -9,10 +9,11 @@
 #define BOTAN_PUBKEY_EME_ENCRYPTION_PAD_H_
 
 #include <botan/secmem.h>
-#include <botan/rng.h>
 
 namespace Botan {
 
+class RandomNumberGenerator;
+
 /**
 * Encoding Method for Encryption
 */
diff --git a/src/lib/pk_pad/eme_oaep/oaep.cpp b/src/lib/pk_pad/eme_oaep/oaep.cpp
index 71f5c14e0..5e567d0c2 100644
--- a/src/lib/pk_pad/eme_oaep/oaep.cpp
+++ b/src/lib/pk_pad/eme_oaep/oaep.cpp
@@ -7,6 +7,8 @@
 
 #include <botan/oaep.h>
 #include <botan/mgf1.h>
+#include <botan/exceptn.h>
+#include <botan/rng.h>
 #include <botan/internal/ct_utils.h>
 
 namespace Botan {
diff --git a/src/lib/pk_pad/eme_pkcs1/eme_pkcs.cpp b/src/lib/pk_pad/eme_pkcs1/eme_pkcs.cpp
index 5d4f950f5..58aadbc38 100644
--- a/src/lib/pk_pad/eme_pkcs1/eme_pkcs.cpp
+++ b/src/lib/pk_pad/eme_pkcs1/eme_pkcs.cpp
@@ -6,6 +6,8 @@
 */
 
 #include <botan/eme_pkcs.h>
+#include <botan/exceptn.h>
+#include <botan/rng.h>
 #include <botan/internal/ct_utils.h>
 
 namespace Botan {
diff --git a/src/lib/pk_pad/emsa.cpp b/src/lib/pk_pad/emsa.cpp
index d78c562c9..2c3370f4d 100644
--- a/src/lib/pk_pad/emsa.cpp
+++ b/src/lib/pk_pad/emsa.cpp
@@ -6,6 +6,7 @@
 
 #include <botan/emsa.h>
 #include <botan/scan_name.h>
+#include <botan/exceptn.h>
 
 #if defined(BOTAN_HAS_EMSA1)
    #include <botan/emsa1.h>
diff --git a/src/lib/pk_pad/emsa.h b/src/lib/pk_pad/emsa.h
index 270aa9298..d45185f30 100644
--- a/src/lib/pk_pad/emsa.h
+++ b/src/lib/pk_pad/emsa.h
@@ -9,10 +9,11 @@
 #define BOTAN_PUBKEY_EMSA_H_
 
 #include <botan/secmem.h>
-#include <botan/rng.h>
 
 namespace Botan {
 
+class RandomNumberGenerator;
+
 /**
 * EMSA, from IEEE 1363s Encoding Method for Signatures, Appendix
 *
diff --git a/src/lib/pk_pad/emsa1/emsa1.cpp b/src/lib/pk_pad/emsa1/emsa1.cpp
index e3580ff93..db9f2432f 100644
--- a/src/lib/pk_pad/emsa1/emsa1.cpp
+++ b/src/lib/pk_pad/emsa1/emsa1.cpp
@@ -6,6 +6,7 @@
 */
 
 #include <botan/emsa1.h>
+#include <botan/exceptn.h>
 
 namespace Botan {
 
diff --git a/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.cpp b/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.cpp
index d5a6aa8fb..4175fe4b3 100644
--- a/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.cpp
+++ b/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.cpp
@@ -7,6 +7,7 @@
 
 #include <botan/emsa_pkcs1.h>
 #include <botan/hash_id.h>
+#include <botan/exceptn.h>
 
 namespace Botan {
 
diff --git a/src/lib/pk_pad/emsa_pssr/pssr.cpp b/src/lib/pk_pad/emsa_pssr/pssr.cpp
index f0fd69a78..941da7d99 100644
--- a/src/lib/pk_pad/emsa_pssr/pssr.cpp
+++ b/src/lib/pk_pad/emsa_pssr/pssr.cpp
@@ -6,6 +6,8 @@
 */
 
 #include <botan/pssr.h>
+#include <botan/exceptn.h>
+#include <botan/rng.h>
 #include <botan/mgf1.h>
 #include <botan/internal/bit_ops.h>
 
diff --git a/src/lib/pk_pad/emsa_raw/emsa_raw.cpp b/src/lib/pk_pad/emsa_raw/emsa_raw.cpp
index cf2426298..0302033f0 100644
--- a/src/lib/pk_pad/emsa_raw/emsa_raw.cpp
+++ b/src/lib/pk_pad/emsa_raw/emsa_raw.cpp
@@ -6,6 +6,7 @@
 */
 
 #include <botan/emsa_raw.h>
+#include <botan/exceptn.h>
 
 namespace Botan {
 
diff --git a/src/lib/pk_pad/emsa_x931/emsa_x931.cpp b/src/lib/pk_pad/emsa_x931/emsa_x931.cpp
index 8d90bd245..91227328e 100644
--- a/src/lib/pk_pad/emsa_x931/emsa_x931.cpp
+++ b/src/lib/pk_pad/emsa_x931/emsa_x931.cpp
@@ -6,6 +6,7 @@
 */
 
 #include <botan/emsa_x931.h>
+#include <botan/exceptn.h>
 #include <botan/hash_id.h>
 
 namespace Botan {
diff --git a/src/lib/pk_pad/iso9796/iso9796.cpp b/src/lib/pk_pad/iso9796/iso9796.cpp
index 8608e7239..b8375af68 100644
--- a/src/lib/pk_pad/iso9796/iso9796.cpp
+++ b/src/lib/pk_pad/iso9796/iso9796.cpp
@@ -6,9 +6,11 @@
  */
 
 #include <botan/iso9796.h>
+#include <botan/rng.h>
+#include <botan/exceptn.h>
 #include <botan/mgf1.h>
-#include <botan/internal/bit_ops.h>
 #include <botan/hash_id.h>
+#include <botan/internal/bit_ops.h>
 #include <botan/internal/ct_utils.h>
 
 namespace Botan {
diff --git a/src/lib/pk_pad/mgf1/mgf1.cpp b/src/lib/pk_pad/mgf1/mgf1.cpp
index 8903ac6f0..dbfac5110 100644
--- a/src/lib/pk_pad/mgf1/mgf1.cpp
+++ b/src/lib/pk_pad/mgf1/mgf1.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/mgf1.h>
-#include <botan/exceptn.h>
+#include <botan/hash.h>
 #include <algorithm>
 
 namespace Botan {
diff --git a/src/lib/pk_pad/mgf1/mgf1.h b/src/lib/pk_pad/mgf1/mgf1.h
index 65227afef..9eb652a82 100644
--- a/src/lib/pk_pad/mgf1/mgf1.h
+++ b/src/lib/pk_pad/mgf1/mgf1.h
@@ -8,10 +8,12 @@
 #ifndef BOTAN_MGF1_H_
 #define BOTAN_MGF1_H_
 
-#include <botan/hash.h>
+#include <botan/types.h>
 
 namespace Botan {
 
+class HashFunction;
+
 /**
 * MGF1 from PKCS #1 v2.0
 * @param hash hash function to use