Further header cleanups

3 files changed, 12 insertions, 3 deletions

diff --git a/src/lib/pubkey/pkcs8.cpp b/src/lib/pubkey/pkcs8.cpp
index d719ca8f8..6eb3505ca 100644
--- a/src/lib/pubkey/pkcs8.cpp
+++ b/src/lib/pubkey/pkcs8.cpp
@@ -399,6 +399,7 @@ Private_Key* load_key(const std::string& fsname,
                       RandomNumberGenerator& rng,
                       const std::string& pass)
    {
+   BOTAN_UNUSED(rng);
    DataSource_Stream in(fsname);
    return PKCS8::load_key(in, [pass]() { return pass; }).release();
    }
diff --git a/src/lib/pubkey/pkcs8.h b/src/lib/pubkey/pkcs8.h
index 65ca97a47..1902394d7 100644
--- a/src/lib/pubkey/pkcs8.h
+++ b/src/lib/pubkey/pkcs8.h
@@ -8,12 +8,18 @@
 #ifndef BOTAN_PKCS8_H_
 #define BOTAN_PKCS8_H_
 
-#include <botan/x509_key.h>
+#include <botan/exceptn.h>
+#include <botan/secmem.h>
 #include <functional>
 #include <chrono>
+#include <memory>
 
 namespace Botan {
 
+class DataSource;
+class RandomNumberGenerator;
+class Private_Key;
+
 /**
 * PKCS #8 General Exception
 */
diff --git a/src/lib/pubkey/x509_key.h b/src/lib/pubkey/x509_key.h
index b562208aa..e2ebed51c 100644
--- a/src/lib/pubkey/x509_key.h
+++ b/src/lib/pubkey/x509_key.h
@@ -8,12 +8,14 @@
 #ifndef BOTAN_X509_PUBLIC_KEY_H_
 #define BOTAN_X509_PUBLIC_KEY_H_
 
-#include <botan/pk_keys.h>
-#include <botan/alg_id.h>
+#include <botan/types.h>
 #include <string>
+#include <vector>
 
 namespace Botan {
 
+class Public_Key;
+class RandomNumberGenerator;
 class DataSource;
 
 /**