Header file cleanups

Some help from include-what-you-use

4 files changed, 8 insertions, 4 deletions

diff --git a/src/lib/misc/srp6/srp6.cpp b/src/lib/misc/srp6/srp6.cpp
index 12107715f..44e137237 100644
--- a/src/lib/misc/srp6/srp6.cpp
+++ b/src/lib/misc/srp6/srp6.cpp
@@ -6,6 +6,8 @@
 */
 
 #include <botan/srp6.h>
+#include <botan/rng.h>
+#include <botan/hash.h>
 #include <botan/dl_group.h>
 #include <botan/numthry.h>
 
diff --git a/src/lib/misc/srp6/srp6.h b/src/lib/misc/srp6/srp6.h
index a35098839..464b67252 100644
--- a/src/lib/misc/srp6/srp6.h
+++ b/src/lib/misc/srp6/srp6.h
@@ -9,13 +9,13 @@
 #define BOTAN_RFC5054_SRP6_H_
 
 #include <botan/bigint.h>
-#include <botan/hash.h>
-#include <botan/rng.h>
 #include <botan/symkey.h>
 #include <string>
 
 namespace Botan {
 
+class RandomNumberGenerator;
+
 /**
 * SRP6a Client side
 * @param username the username we are attempting login for
diff --git a/src/lib/misc/tss/tss.cpp b/src/lib/misc/tss/tss.cpp
index 2039e5fea..33a21314e 100644
--- a/src/lib/misc/tss/tss.cpp
+++ b/src/lib/misc/tss/tss.cpp
@@ -6,6 +6,8 @@
 */
 
 #include <botan/tss.h>
+#include <botan/rng.h>
+#include <botan/hash.h>
 #include <botan/loadstor.h>
 #include <botan/hex.h>
 #include <botan/sha2_32.h>
diff --git a/src/lib/misc/tss/tss.h b/src/lib/misc/tss/tss.h
index f1f503201..d1fd15f24 100644
--- a/src/lib/misc/tss/tss.h
+++ b/src/lib/misc/tss/tss.h
@@ -9,12 +9,12 @@
 #define BOTAN_RTSS_H_
 
 #include <botan/secmem.h>
-#include <botan/hash.h>
-#include <botan/rng.h>
 #include <vector>
 
 namespace Botan {
 
+class RandomNumberGenerator;
+
 /**
 * A split secret, using the format from draft-mcgrew-tss-03
 */