15 files changed, 15 insertions, 28 deletions
diff --git a/src/lib/x509/certstor_sql/certstor_sql.cpp b/src/lib/x509/certstor_sql/certstor_sql.cpp
index 13239252b..cd0aebdb1 100644
--- a/src/lib/x509/certstor_sql/certstor_sql.cpp
+++ b/src/lib/x509/certstor_sql/certstor_sql.cpp
@@ -10,8 +10,6 @@
 #include <botan/der_enc.h>
 #include <botan/pkcs8.h>
 #include <botan/data_src.h>
-#include <botan/hash.h>
-#include <botan/hex.h>
 
 namespace Botan {
 
diff --git a/src/lib/x509/crl_ent.cpp b/src/lib/x509/crl_ent.cpp
index f717e7b07..fabd88326 100644
--- a/src/lib/x509/crl_ent.cpp
+++ b/src/lib/x509/crl_ent.cpp
@@ -11,7 +11,6 @@
 #include <botan/der_enc.h>
 #include <botan/ber_dec.h>
 #include <botan/bigint.h>
-#include <botan/oids.h>
 
 namespace Botan {
 
diff --git a/src/lib/x509/datastor.h b/src/lib/x509/datastor.h
index 5cb9fad9d..c730c7140 100644
--- a/src/lib/x509/datastor.h
+++ b/src/lib/x509/datastor.h
@@ -10,7 +10,6 @@
 
 #include <botan/secmem.h>
 #include <functional>
-#include <utility>
 #include <string>
 #include <vector>
 #include <map>
diff --git a/src/lib/x509/key_constraint.cpp b/src/lib/x509/key_constraint.cpp
index a39747f9a..d8a2bf844 100644
--- a/src/lib/x509/key_constraint.cpp
+++ b/src/lib/x509/key_constraint.cpp
@@ -8,6 +8,7 @@
 
 #include <botan/key_constraint.h>
 #include <botan/x509_key.h>
+#include <vector>
 
 namespace Botan {
 
diff --git a/src/lib/x509/name_constraint.cpp b/src/lib/x509/name_constraint.cpp
index fc91a5477..ea922a3b9 100644
--- a/src/lib/x509/name_constraint.cpp
+++ b/src/lib/x509/name_constraint.cpp
@@ -7,7 +7,6 @@
 
 #include <botan/name_constraint.h>
 #include <botan/ber_dec.h>
-#include <botan/der_enc.h>
 #include <botan/charset.h>
 #include <botan/loadstor.h>
 #include <botan/x509_dn.h>
@@ -17,6 +16,8 @@
 
 namespace Botan {
 
+class DER_Encoder;
+
 GeneralName::GeneralName(const std::string& str) : GeneralName()
    {
    size_t p = str.find(':');
@@ -32,7 +33,7 @@ GeneralName::GeneralName(const std::string& str) : GeneralName()
       }
    }
 
-void GeneralName::encode_into(class DER_Encoder&) const
+void GeneralName::encode_into(DER_Encoder&) const
    {
    throw Not_Implemented("GeneralName encoding");
    }
@@ -248,7 +249,7 @@ GeneralSubtree::GeneralSubtree(const std::string& str) : GeneralSubtree()
       }
    }
 
-void GeneralSubtree::encode_into(class DER_Encoder&) const
+void GeneralSubtree::encode_into(DER_Encoder&) const
    {
    throw Not_Implemented("General Subtree encoding");
    }
diff --git a/src/lib/x509/name_constraint.h b/src/lib/x509/name_constraint.h
index 28c3a2f4f..108028413 100644
--- a/src/lib/x509/name_constraint.h
+++ b/src/lib/x509/name_constraint.h
@@ -14,6 +14,8 @@
 
 namespace Botan {
 
+class BER_Encoder;
+class DER_Encoder;
 class X509_Certificate;
 
 /**
@@ -46,9 +48,9 @@ class BOTAN_PUBLIC_API(2,0) GeneralName : public ASN1_Object
       */
       GeneralName(const std::string& str);
 
-      void encode_into(class DER_Encoder&) const override;
+      void encode_into(DER_Encoder&) const override;
 
-      void decode_from(class BER_Decoder&) override;
+      void decode_from(BER_Decoder&) override;
 
       /**
       * @return Type of the name. Can be DN, DNS, IP, RFC822 or URI.
@@ -110,9 +112,9 @@ class BOTAN_PUBLIC_API(2,0) GeneralSubtree : public ASN1_Object
       */
       GeneralSubtree(const std::string& str);
 
-      void encode_into(class DER_Encoder&) const override;
+      void encode_into(DER_Encoder&) const override;
 
-      void decode_from(class BER_Decoder&) override;
+      void decode_from(BER_Decoder&) override;
 
       /**
       * @return name
diff --git a/src/lib/x509/ocsp.cpp b/src/lib/x509/ocsp.cpp
index c437fa45e..cf0c1064b 100644
--- a/src/lib/x509/ocsp.cpp
+++ b/src/lib/x509/ocsp.cpp
@@ -13,7 +13,6 @@
 #include <botan/oids.h>
 #include <botan/base64.h>
 #include <botan/pubkey.h>
-#include <botan/x509path.h>
 #include <botan/parsing.h>
 
 #if defined(BOTAN_HAS_HTTP_UTIL)
diff --git a/src/lib/x509/pkcs10.cpp b/src/lib/x509/pkcs10.cpp
index a9cec86ee..ab52769f7 100644
--- a/src/lib/x509/pkcs10.cpp
+++ b/src/lib/x509/pkcs10.cpp
@@ -8,9 +8,7 @@
 #include <botan/pkcs10.h>
 #include <botan/x509_ext.h>
 #include <botan/x509cert.h>
-#include <botan/der_enc.h>
 #include <botan/ber_dec.h>
-#include <botan/parsing.h>
 #include <botan/oids.h>
 #include <botan/pem.h>
 
diff --git a/src/lib/x509/x509_ca.cpp b/src/lib/x509/x509_ca.cpp
index e1a8c3af7..ca4d258fd 100644
--- a/src/lib/x509/x509_ca.cpp
+++ b/src/lib/x509/x509_ca.cpp
@@ -8,16 +8,13 @@
 #include <botan/x509_ca.h>
 #include <botan/pubkey.h>
 #include <botan/der_enc.h>
-#include <botan/ber_dec.h>
 #include <botan/bigint.h>
 #include <botan/parsing.h>
 #include <botan/oids.h>
 #include <botan/hash.h>
 #include <botan/key_constraint.h>
 #include <algorithm>
-#include <typeinfo>
 #include <iterator>
-#include <set>
 
 namespace Botan {
 
diff --git a/src/lib/x509/x509_crl.cpp b/src/lib/x509/x509_crl.cpp
index 65d426f20..41a93d6d0 100644
--- a/src/lib/x509/x509_crl.cpp
+++ b/src/lib/x509/x509_crl.cpp
@@ -9,9 +9,6 @@
 #include <botan/x509_ext.h>
 #include <botan/x509cert.h>
 #include <botan/ber_dec.h>
-#include <botan/parsing.h>
-#include <botan/bigint.h>
-#include <botan/oids.h>
 
 namespace Botan {
 
diff --git a/src/lib/x509/x509_obj.cpp b/src/lib/x509/x509_obj.cpp
index 43e92d322..b4ad086af 100644
--- a/src/lib/x509/x509_obj.cpp
+++ b/src/lib/x509/x509_obj.cpp
@@ -6,7 +6,6 @@
 */
 
 #include <botan/x509_obj.h>
-#include <botan/x509_key.h>
 #include <botan/pubkey.h>
 #include <botan/oids.h>
 #include <botan/der_enc.h>
diff --git a/src/lib/x509/x509_obj.h b/src/lib/x509/x509_obj.h
index fdce9cb1f..be686a8c0 100644
--- a/src/lib/x509/x509_obj.h
+++ b/src/lib/x509/x509_obj.h
@@ -9,12 +9,14 @@
 #define BOTAN_X509_OBJECT_H_
 
 #include <botan/asn1_obj.h>
-#include <botan/x509_key.h>
-#include <botan/rng.h>
+#include <botan/alg_id.h>
 #include <vector>
 
 namespace Botan {
 
+class Public_Key;
+class RandomNumberGenerator;
+
 /**
 * This class represents abstract X.509 signed objects as
 * in the X.500 SIGNED macro
diff --git a/src/lib/x509/x509cert.cpp b/src/lib/x509/x509cert.cpp
index 785f414c3..8050a5d68 100644
--- a/src/lib/x509/x509cert.cpp
+++ b/src/lib/x509/x509cert.cpp
@@ -15,7 +15,6 @@
 #include <botan/hash.h>
 #include <botan/hex.h>
 #include <algorithm>
-#include <iterator>
 #include <sstream>
 
 namespace Botan {
diff --git a/src/lib/x509/x509cert.h b/src/lib/x509/x509cert.h
index f2100c8b9..14db2c133 100644
--- a/src/lib/x509/x509cert.h
+++ b/src/lib/x509/x509cert.h
@@ -16,7 +16,6 @@
 #include <botan/datastor.h>
 #include <botan/key_constraint.h>
 #include <botan/name_constraint.h>
-#include <map>
 #include <memory>
 
 namespace Botan {
diff --git a/src/lib/x509/x509path.cpp b/src/lib/x509/x509path.cpp
index beb04ea07..bc44a5cae 100644
--- a/src/lib/x509/x509path.cpp
+++ b/src/lib/x509/x509path.cpp
@@ -7,9 +7,6 @@
 
 #include <botan/x509path.h>
 #include <botan/ocsp.h>
-#include <botan/parsing.h>
-#include <botan/pubkey.h>
-#include <botan/oids.h>
 #include <algorithm>
 #include <chrono>
 #include <vector>