More include header cleanups

20 files changed, 10 insertions, 33 deletions

diff --git a/src/tests/test_bigint.cpp b/src/tests/test_bigint.cpp
index 132723727..7692aecea 100644
--- a/src/tests/test_bigint.cpp
+++ b/src/tests/test_bigint.cpp
@@ -9,9 +9,8 @@
 #if defined(BOTAN_HAS_NUMBERTHEORY)
    #include <botan/bigint.h>
    #include <botan/numthry.h>
-   #include <botan/reducer.h>
+   #include <botan/pow_mod.h>
    #include <botan/parsing.h>
-   #include <cmath>
 #endif
 
 namespace Botan_Tests {
diff --git a/src/tests/test_c25519.cpp b/src/tests/test_c25519.cpp
index cb6c8a2d5..deccc88b3 100644
--- a/src/tests/test_c25519.cpp
+++ b/src/tests/test_c25519.cpp
@@ -10,6 +10,7 @@
    #include "test_pubkey.h"
    #include <botan/curve25519.h>
    #include <botan/pkcs8.h>
+   #include <botan/data_src.h>
 #endif
 
 namespace Botan_Tests {
diff --git a/src/tests/test_dlies.cpp b/src/tests/test_dlies.cpp
index 515f7a319..42ee0b55f 100644
--- a/src/tests/test_dlies.cpp
+++ b/src/tests/test_dlies.cpp
@@ -11,7 +11,6 @@
    #include "test_pubkey.h"
    #include <botan/dlies.h>
    #include <botan/dh.h>
-   #include <botan/pubkey.h>
 #endif
 
 namespace Botan_Tests {
diff --git a/src/tests/test_ecc_pointmul.cpp b/src/tests/test_ecc_pointmul.cpp
index 9517be400..a1117a3d3 100644
--- a/src/tests/test_ecc_pointmul.cpp
+++ b/src/tests/test_ecc_pointmul.cpp
@@ -7,8 +7,6 @@
 #include "tests.h"
 
 #if defined(BOTAN_HAS_ECDSA)
-   #include "test_pubkey.h"
-   #include <botan/pubkey.h>
    #include <botan/ecdsa.h>
    #include <botan/oids.h>
 #endif
diff --git a/src/tests/test_ecdh.cpp b/src/tests/test_ecdh.cpp
index 99c8665f2..73622d015 100644
--- a/src/tests/test_ecdh.cpp
+++ b/src/tests/test_ecdh.cpp
@@ -8,7 +8,6 @@
 
 #if defined(BOTAN_HAS_ECDH)
    #include "test_pubkey.h"
-   #include <botan/pubkey.h>
    #include <botan/ecdh.h>
 #endif
 
diff --git a/src/tests/test_ecies.cpp b/src/tests/test_ecies.cpp
index 6b5f92b1e..a35725d62 100644
--- a/src/tests/test_ecies.cpp
+++ b/src/tests/test_ecies.cpp
@@ -8,7 +8,6 @@
 #include "tests.h"
 
 #if defined(BOTAN_HAS_ECIES)
-   #include "test_pubkey.h"
    #include <botan/ecies.h>
    #include <botan/ecdh.h>
 #endif
diff --git a/src/tests/test_ed25519.cpp b/src/tests/test_ed25519.cpp
index 32023589c..7cef95a48 100644
--- a/src/tests/test_ed25519.cpp
+++ b/src/tests/test_ed25519.cpp
@@ -7,9 +7,10 @@
 #include "tests.h"
 
 #if defined(BOTAN_HAS_ED25519)
+   #include "test_pubkey.h"
    #include <botan/ed25519.h>
    #include <botan/pkcs8.h>
-   #include "test_pubkey.h"
+   #include <botan/data_src.h>
 #endif
 
 namespace Botan_Tests {
diff --git a/src/tests/test_keywrap.cpp b/src/tests/test_keywrap.cpp
index 3a036ba8f..05e9cea01 100644
--- a/src/tests/test_keywrap.cpp
+++ b/src/tests/test_keywrap.cpp
@@ -6,8 +6,6 @@
 
 #include "tests.h"
 
-#include <botan/hex.h>
-
 #if defined(BOTAN_HAS_RFC3394_KEYWRAP)
    #include <botan/rfc3394.h>
 #endif
diff --git a/src/tests/test_mceliece.cpp b/src/tests/test_mceliece.cpp
index ad5fc9055..821a80f12 100644
--- a/src/tests/test_mceliece.cpp
+++ b/src/tests/test_mceliece.cpp
@@ -12,7 +12,6 @@
 
    #include <botan/mceliece.h>
    #include <botan/pubkey.h>
-   #include <botan/oids.h>
    #include <botan/loadstor.h>
    #include <botan/hash.h>
    #include <botan/hex.h>
diff --git a/src/tests/test_name_constraint.cpp b/src/tests/test_name_constraint.cpp
index 4fc6f437d..96d7bee00 100644
--- a/src/tests/test_name_constraint.cpp
+++ b/src/tests/test_name_constraint.cpp
@@ -11,13 +11,7 @@
    #include <botan/calendar.h>
 #endif
 
-#include <algorithm>
-#include <fstream>
-#include <iomanip>
-#include <string>
-#include <vector>
-#include <map>
-#include <cstdlib>
+#include <utility>
 
 namespace Botan_Tests {
 
diff --git a/src/tests/test_ocb.cpp b/src/tests/test_ocb.cpp
index a51829ef4..61d77144b 100644
--- a/src/tests/test_ocb.cpp
+++ b/src/tests/test_ocb.cpp
@@ -8,6 +8,7 @@
 
 #if defined(BOTAN_HAS_AEAD_OCB)
    #include <botan/ocb.h>
+   #include <botan/block_cipher.h>
    #include <botan/loadstor.h>
    #include <botan/internal/poly_dbl.h>
 #endif
diff --git a/src/tests/test_pkcs11_high_level.cpp b/src/tests/test_pkcs11_high_level.cpp
index 7422aed84..069aba5cb 100644
--- a/src/tests/test_pkcs11_high_level.cpp
+++ b/src/tests/test_pkcs11_high_level.cpp
@@ -10,11 +10,7 @@
 
 #include <string>
 #include <vector>
-#include <functional>
 #include <memory>
-#include <array>
-#include <type_traits>
-#include <map>
 #include <numeric>
 
 #if defined(BOTAN_HAS_PKCS11)
diff --git a/src/tests/test_pkcs11_low_level.cpp b/src/tests/test_pkcs11_low_level.cpp
index 01933b359..04659e6f6 100644
--- a/src/tests/test_pkcs11_low_level.cpp
+++ b/src/tests/test_pkcs11_low_level.cpp
@@ -13,7 +13,6 @@
 #include <functional>
 #include <memory>
 #include <array>
-#include <type_traits>
 #include <map>
 
 #if defined(BOTAN_HAS_PKCS11)
diff --git a/src/tests/test_pubkey.cpp b/src/tests/test_pubkey.cpp
index a7e58b10f..3859fcf8f 100644
--- a/src/tests/test_pubkey.cpp
+++ b/src/tests/test_pubkey.cpp
@@ -15,8 +15,8 @@
 #include <botan/pk_algs.h>
 #include <botan/x509_key.h>
 #include <botan/pkcs8.h>
-#include <botan/oids.h>
 #include <botan/hex.h>
+#include <botan/data_src.h>
 
 namespace Botan_Tests {
 
diff --git a/src/tests/test_rfc6979.cpp b/src/tests/test_rfc6979.cpp
index a9992b4f2..9dcba0f40 100644
--- a/src/tests/test_rfc6979.cpp
+++ b/src/tests/test_rfc6979.cpp
@@ -8,7 +8,6 @@
 
 #if defined(BOTAN_HAS_RFC6979_GENERATOR)
    #include <botan/rfc6979.h>
-   #include <botan/hex.h>
 #endif
 
 #include <botan/hash.h>
diff --git a/src/tests/test_x509_path.cpp b/src/tests/test_x509_path.cpp
index 544d1b35d..84b3b682b 100644
--- a/src/tests/test_x509_path.cpp
+++ b/src/tests/test_x509_path.cpp
@@ -11,15 +11,13 @@
    #include <botan/calendar.h>
    #include <botan/internal/filesystem.h>
    #include <botan/parsing.h>
+   #include <botan/data_src.h>
 #endif
 
-#include <algorithm>
 #include <fstream>
-#include <iomanip>
 #include <string>
 #include <vector>
 #include <map>
-#include <cstdlib>
 
 namespace Botan_Tests {
 
diff --git a/src/tests/unit_ecdsa.cpp b/src/tests/unit_ecdsa.cpp
index 2654753eb..46d270aab 100644
--- a/src/tests/unit_ecdsa.cpp
+++ b/src/tests/unit_ecdsa.cpp
@@ -19,6 +19,7 @@
    #include <botan/oids.h>
    #include <botan/pkcs8.h>
    #include <botan/hash.h>
+   #include <botan/data_src.h>
 #endif
 
 #if defined(BOTAN_HAS_X509_CERTIFICATES)
diff --git a/src/tests/unit_tls.cpp b/src/tests/unit_tls.cpp
index 5ec44331c..2983aa3eb 100644
--- a/src/tests/unit_tls.cpp
+++ b/src/tests/unit_tls.cpp
@@ -18,13 +18,13 @@
 
    #include <botan/tls_client.h>
    #include <botan/tls_server.h>
+   #include <botan/tls_policy.h>
 
    #include <botan/ec_group.h>
    #include <botan/hex.h>
    #include <botan/pkcs10.h>
    #include <botan/rsa.h>
    #include <botan/ecdsa.h>
-   #include <botan/tls_handshake_msg.h>
    #include <botan/x509_ca.h>
    #include <botan/x509self.h>
 
diff --git a/src/tests/unit_tls_policy.cpp b/src/tests/unit_tls_policy.cpp
index 909a3cd57..aa337a81b 100644
--- a/src/tests/unit_tls_policy.cpp
+++ b/src/tests/unit_tls_policy.cpp
@@ -9,8 +9,6 @@
 #include "tests.h"
 
 #if defined(BOTAN_HAS_TLS)
-   #include <botan/pubkey.h>
-   #include <botan/oids.h>
    #include <botan/tls_policy.h>
    #include <botan/tls_exceptn.h>
 #endif
diff --git a/src/tests/unit_x509.cpp b/src/tests/unit_x509.cpp
index 0979325ce..3f28da4a0 100644
--- a/src/tests/unit_x509.cpp
+++ b/src/tests/unit_x509.cpp
@@ -10,8 +10,6 @@
 #if defined(BOTAN_HAS_X509_CERTIFICATES)
 
    #include <botan/calendar.h>
-   #include <botan/pkcs8.h>
-   #include <botan/hash.h>
    #include <botan/pkcs10.h>
    #include <botan/x509self.h>
    #include <botan/x509path.h>