More header cleanups

4 files changed, 6 insertions, 2 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
 */