More header cleanups

12 files changed, 13 insertions, 4 deletions

diff --git a/src/lib/misc/aont/package.cpp b/src/lib/misc/aont/package.cpp
index c9dd3dada..7cadc62f4 100644
--- a/src/lib/misc/aont/package.cpp
+++ b/src/lib/misc/aont/package.cpp
@@ -10,6 +10,7 @@
 #include <botan/filters.h>
 #include <botan/ctr.h>
 #include <botan/loadstor.h>
+#include <botan/rng.h>
 
 namespace Botan {
 
diff --git a/src/lib/misc/aont/package.h b/src/lib/misc/aont/package.h
index c2f8c159d..38e04e470 100644
--- a/src/lib/misc/aont/package.h
+++ b/src/lib/misc/aont/package.h
@@ -9,10 +9,11 @@
 #define BOTAN_AONT_PACKAGE_TRANSFORM_H_
 
 #include <botan/block_cipher.h>
-#include <botan/rng.h>
 
 namespace Botan {
 
+class RandomNumberGenerator;
+
 /**
 * Rivest's Package Tranform
 * @param rng the random number generator to use
diff --git a/src/lib/misc/cryptobox/cryptobox.cpp b/src/lib/misc/cryptobox/cryptobox.cpp
index bb897949f..195263368 100644
--- a/src/lib/misc/cryptobox/cryptobox.cpp
+++ b/src/lib/misc/cryptobox/cryptobox.cpp
@@ -8,6 +8,7 @@
 #include <botan/cryptobox.h>
 #include <botan/cipher_mode.h>
 #include <botan/mac.h>
+#include <botan/rng.h>
 #include <botan/pbkdf.h>
 #include <botan/data_src.h>
 #include <botan/pem.h>
diff --git a/src/lib/misc/cryptobox/cryptobox.h b/src/lib/misc/cryptobox/cryptobox.h
index bfa6d06af..a579a9f7a 100644
--- a/src/lib/misc/cryptobox/cryptobox.h
+++ b/src/lib/misc/cryptobox/cryptobox.h
@@ -9,11 +9,12 @@
 #define BOTAN_CRYPTOBOX_H_
 
 #include <string>
-#include <botan/rng.h>
 #include <botan/symkey.h>
 
 namespace Botan {
 
+class RandomNumberGenerator;
+
 /**
 * This namespace holds various high-level crypto functions
 */
diff --git a/src/lib/prov/pkcs11/p11_ecc_key.h b/src/lib/prov/pkcs11/p11_ecc_key.h
index 2ab92790d..2372ae07c 100644
--- a/src/lib/prov/pkcs11/p11_ecc_key.h
+++ b/src/lib/prov/pkcs11/p11_ecc_key.h
@@ -15,7 +15,6 @@
 #include <botan/pk_keys.h>
 #include <botan/ecc_key.h>
 #include <botan/ec_group.h>
-#include <botan/rng.h>
 #include <botan/alg_id.h>
 #include <vector>
 
diff --git a/src/lib/pubkey/curve25519/curve25519.cpp b/src/lib/pubkey/curve25519/curve25519.cpp
index 2d07f67ab..3414bfbda 100644
--- a/src/lib/pubkey/curve25519/curve25519.cpp
+++ b/src/lib/pubkey/curve25519/curve25519.cpp
@@ -9,6 +9,7 @@
 #include <botan/internal/pk_ops_impl.h>
 #include <botan/ber_dec.h>
 #include <botan/der_enc.h>
+#include <botan/rng.h>
 
 namespace Botan {
 
diff --git a/src/lib/pubkey/eckcdsa/eckcdsa.cpp b/src/lib/pubkey/eckcdsa/eckcdsa.cpp
index 2a320cc5a..93cbf0449 100644
--- a/src/lib/pubkey/eckcdsa/eckcdsa.cpp
+++ b/src/lib/pubkey/eckcdsa/eckcdsa.cpp
@@ -11,6 +11,7 @@
 #include <botan/reducer.h>
 #include <botan/emsa.h>
 #include <botan/hash.h>
+#include <botan/rng.h>
 
 namespace Botan {
 
diff --git a/src/lib/pubkey/ed25519/ed25519.cpp b/src/lib/pubkey/ed25519/ed25519.cpp
index 5c9bd2b3d..d959df709 100644
--- a/src/lib/pubkey/ed25519/ed25519.cpp
+++ b/src/lib/pubkey/ed25519/ed25519.cpp
@@ -11,6 +11,7 @@
 #include <botan/ed25519.h>
 #include <botan/internal/ed25519_internal.h>
 #include <botan/sha2_64.h>
+#include <botan/rng.h>
 
 namespace Botan {
 
diff --git a/src/lib/pubkey/ed25519/ed25519_key.cpp b/src/lib/pubkey/ed25519/ed25519_key.cpp
index 269834a33..2b0f4eaec 100644
--- a/src/lib/pubkey/ed25519/ed25519_key.cpp
+++ b/src/lib/pubkey/ed25519/ed25519_key.cpp
@@ -13,6 +13,7 @@
 #include <botan/hash.h>
 #include <botan/ber_dec.h>
 #include <botan/der_enc.h>
+#include <botan/rng.h>
 
 namespace Botan {
 
diff --git a/src/lib/pubkey/mce/mceliece_key.cpp b/src/lib/pubkey/mce/mceliece_key.cpp
index 5d8378e52..67ff8f635 100644
--- a/src/lib/pubkey/mce/mceliece_key.cpp
+++ b/src/lib/pubkey/mce/mceliece_key.cpp
@@ -17,6 +17,7 @@
 #include <botan/internal/pk_ops_impl.h>
 #include <botan/der_enc.h>
 #include <botan/ber_dec.h>
+#include <botan/rng.h>
 
 namespace Botan {
 
diff --git a/src/lib/pubkey/pk_ops.cpp b/src/lib/pubkey/pk_ops.cpp
index 5c864d966..fb85645cb 100644
--- a/src/lib/pubkey/pk_ops.cpp
+++ b/src/lib/pubkey/pk_ops.cpp
@@ -7,6 +7,7 @@
 
 #include <botan/internal/pk_ops_impl.h>
 #include <botan/internal/bit_ops.h>
+#include <botan/rng.h>
 
 namespace Botan {
 
diff --git a/src/lib/pubkey/pk_ops.h b/src/lib/pubkey/pk_ops.h
index 4345c18c6..0aaf0b0df 100644
--- a/src/lib/pubkey/pk_ops.h
+++ b/src/lib/pubkey/pk_ops.h
@@ -20,10 +20,10 @@
 
 #include <botan/pk_keys.h>
 #include <botan/secmem.h>
-#include <botan/rng.h>
 
 namespace Botan {
 
+class RandomNumberGenerator;
 class EME;
 class KDF;
 class EMSA;