Header file cleanups

Some help from include-what-you-use

10 files changed, 12 insertions, 11 deletions

diff --git a/src/lib/math/bigint/big_rand.cpp b/src/lib/math/bigint/big_rand.cpp
index 506e9776a..1b715d1b4 100644
--- a/src/lib/math/bigint/big_rand.cpp
+++ b/src/lib/math/bigint/big_rand.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/bigint.h>
-#include <botan/parsing.h>
+#include <botan/rng.h>
 #include <botan/internal/rounding.h>
 
 namespace Botan {
diff --git a/src/lib/math/bigint/bigint.cpp b/src/lib/math/bigint/bigint.cpp
index a91a685e0..5bf91df23 100644
--- a/src/lib/math/bigint/bigint.cpp
+++ b/src/lib/math/bigint/bigint.cpp
@@ -7,8 +7,6 @@
 
 #include <botan/bigint.h>
 #include <botan/internal/mp_core.h>
-#include <botan/loadstor.h>
-#include <botan/parsing.h>
 #include <botan/internal/rounding.h>
 #include <botan/internal/bit_ops.h>
 
diff --git a/src/lib/math/bigint/bigint.h b/src/lib/math/bigint/bigint.h
index 683a1f596..0b116f3cc 100644
--- a/src/lib/math/bigint/bigint.h
+++ b/src/lib/math/bigint/bigint.h
@@ -9,14 +9,16 @@
 #ifndef BOTAN_BIGINT_H_
 #define BOTAN_BIGINT_H_
 
-#include <botan/rng.h>
 #include <botan/secmem.h>
 #include <botan/mp_types.h>
+#include <botan/exceptn.h>
 #include <botan/loadstor.h>
 #include <iosfwd>
 
 namespace Botan {
 
+class RandomNumberGenerator;
+
 /**
 * Arbitrary precision integer
 */
diff --git a/src/lib/math/ec_gfp/curve_gfp.cpp b/src/lib/math/ec_gfp/curve_gfp.cpp
index 96593e601..efeb5210f 100644
--- a/src/lib/math/ec_gfp/curve_gfp.cpp
+++ b/src/lib/math/ec_gfp/curve_gfp.cpp
@@ -8,6 +8,7 @@
 
 #include <botan/curve_gfp.h>
 #include <botan/curve_nistp.h>
+#include <botan/numthry.h>
 #include <botan/internal/mp_core.h>
 #include <botan/internal/mp_asmi.h>
 
diff --git a/src/lib/math/ec_gfp/curve_gfp.h b/src/lib/math/ec_gfp/curve_gfp.h
index 330d0ba0d..805359ba9 100644
--- a/src/lib/math/ec_gfp/curve_gfp.h
+++ b/src/lib/math/ec_gfp/curve_gfp.h
@@ -10,7 +10,7 @@
 #ifndef BOTAN_GFP_CURVE_H_
 #define BOTAN_GFP_CURVE_H_
 
-#include <botan/numthry.h>
+#include <botan/bigint.h>
 #include <memory>
 
 namespace Botan {
diff --git a/src/lib/math/ec_gfp/point_gfp.cpp b/src/lib/math/ec_gfp/point_gfp.cpp
index 5283b7352..c549823aa 100644
--- a/src/lib/math/ec_gfp/point_gfp.cpp
+++ b/src/lib/math/ec_gfp/point_gfp.cpp
@@ -9,8 +9,7 @@
 
 #include <botan/point_gfp.h>
 #include <botan/numthry.h>
-#include <botan/loadstor.h>
-#include <botan/internal/rounding.h>
+#include <botan/rng.h>
 
 namespace Botan {
 
diff --git a/src/lib/math/numbertheory/dsa_gen.cpp b/src/lib/math/numbertheory/dsa_gen.cpp
index e8d620f4c..e345910ca 100644
--- a/src/lib/math/numbertheory/dsa_gen.cpp
+++ b/src/lib/math/numbertheory/dsa_gen.cpp
@@ -7,8 +7,7 @@
 
 #include <botan/numthry.h>
 #include <botan/hash.h>
-#include <botan/parsing.h>
-#include <algorithm>
+#include <botan/rng.h>
 
 namespace Botan {
 
diff --git a/src/lib/math/numbertheory/make_prm.cpp b/src/lib/math/numbertheory/make_prm.cpp
index 9443bb9a1..f06f1978e 100644
--- a/src/lib/math/numbertheory/make_prm.cpp
+++ b/src/lib/math/numbertheory/make_prm.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/numthry.h>
-#include <botan/parsing.h>
+#include <botan/rng.h>
 #include <algorithm>
 
 namespace Botan {
diff --git a/src/lib/math/numbertheory/numthry.cpp b/src/lib/math/numbertheory/numthry.cpp
index 27fb73d08..961f50043 100644
--- a/src/lib/math/numbertheory/numthry.cpp
+++ b/src/lib/math/numbertheory/numthry.cpp
@@ -7,6 +7,7 @@
 
 #include <botan/numthry.h>
 #include <botan/reducer.h>
+#include <botan/rng.h>
 #include <botan/internal/bit_ops.h>
 #include <botan/internal/mp_core.h>
 #include <botan/internal/ct_utils.h>
diff --git a/src/lib/math/numbertheory/numthry.h b/src/lib/math/numbertheory/numthry.h
index 91dcda68d..286304f7e 100644
--- a/src/lib/math/numbertheory/numthry.h
+++ b/src/lib/math/numbertheory/numthry.h
@@ -10,10 +10,11 @@
 
 #include <botan/bigint.h>
 #include <botan/pow_mod.h>
-#include <botan/rng.h>
 
 namespace Botan {
 
+class RandomNumberGenerator;
+
 /**
 * Fused multiply-add
 * @param a an integer