15 files changed, 8 insertions, 9 deletions
diff --git a/src/cmd/ca.cpp b/src/cmd/ca.cpp
index 427352c20..3b67d40fb 100644
--- a/src/cmd/ca.cpp
+++ b/src/cmd/ca.cpp
@@ -9,6 +9,7 @@
 #if defined(BOTAN_HAS_X509_CERTIFICATES)
 
 #include <botan/x509_ca.h>
+#include <botan/pkcs8.h>
 
 namespace {
 
diff --git a/src/cmd/credentials.h b/src/cmd/credentials.h
index 9056f31eb..f7109e1a3 100644
--- a/src/cmd/credentials.h
+++ b/src/cmd/credentials.h
@@ -7,6 +7,7 @@
 #ifndef EXAMPLE_CREDENTIALS_MANAGER_H__
 #define EXAMPLE_CREDENTIALS_MANAGER_H__
 
+#include <botan/pkcs8.h>
 #include <botan/credentials_manager.h>
 #include <botan/x509self.h>
 #include <botan/rsa.h>
diff --git a/src/cmd/dsa_sign.cpp b/src/cmd/dsa_sign.cpp
index 8a7365329..25ad6f9de 100644
--- a/src/cmd/dsa_sign.cpp
+++ b/src/cmd/dsa_sign.cpp
@@ -10,6 +10,7 @@
 
 #include <botan/dsa.h>
 #include <botan/pubkey.h>
+#include <botan/pkcs8.h>
 #include <botan/base64.h>
 #include <fstream>
 
diff --git a/src/cmd/pkcs10.cpp b/src/cmd/pkcs10.cpp
index 847f898d5..18fdea9bf 100644
--- a/src/cmd/pkcs10.cpp
+++ b/src/cmd/pkcs10.cpp
@@ -8,6 +8,7 @@
 
 #if defined(BOTAN_HAS_X509_CERTIFICATES) && defined(BOTAN_HAS_RSA)
 
+#include <botan/pkcs8.h>
 #include <botan/x509self.h>
 #include <botan/rsa.h>
 #include <fstream>
diff --git a/src/cmd/self_sig.cpp b/src/cmd/self_sig.cpp
index d6b783497..6916420ca 100644
--- a/src/cmd/self_sig.cpp
+++ b/src/cmd/self_sig.cpp
@@ -8,6 +8,7 @@
 
 #if defined(BOTAN_HAS_X509_CERTIFICATES) && defined(BOTAN_HAS_RSA)
 
+#include <botan/pkcs8.h>
 #include <botan/x509self.h>
 #include <botan/rsa.h>
 #include <fstream>
diff --git a/src/lib/cert/cvc/cvc_self.h b/src/lib/cert/cvc/cvc_self.h
index b29164a7f..005703636 100644
--- a/src/lib/cert/cvc/cvc_self.h
+++ b/src/lib/cert/cvc/cvc_self.h
@@ -9,7 +9,6 @@
 #ifndef BOTAN_CVC_EAC_SELF_H__
 #define BOTAN_CVC_EAC_SELF_H__
 
-#include <botan/pkcs8.h>
 #include <botan/cvc_cert.h>
 #include <botan/ecdsa.h>
 #include <botan/asn1_obj.h>
diff --git a/src/lib/cert/x509/pkcs10.h b/src/lib/cert/x509/pkcs10.h
index 5751e674d..6aa66fbfd 100644
--- a/src/lib/cert/x509/pkcs10.h
+++ b/src/lib/cert/x509/pkcs10.h
@@ -10,7 +10,6 @@
 
 #include <botan/x509_obj.h>
 #include <botan/x509_dn.h>
-#include <botan/pkcs8.h>
 #include <botan/datastor.h>
 #include <botan/key_constraint.h>
 #include <botan/asn1_attribute.h>
diff --git a/src/lib/cert/x509/x509_ca.h b/src/lib/cert/x509/x509_ca.h
index 6dc65493e..2e05258e3 100644
--- a/src/lib/cert/x509/x509_ca.h
+++ b/src/lib/cert/x509/x509_ca.h
@@ -11,7 +11,6 @@
 #include <botan/x509cert.h>
 #include <botan/x509_crl.h>
 #include <botan/x509_ext.h>
-#include <botan/pkcs8.h>
 #include <botan/pkcs10.h>
 #include <botan/pubkey.h>
 
diff --git a/src/lib/cert/x509/x509self.h b/src/lib/cert/x509/x509self.h
index d15aabc59..a4bbad214 100644
--- a/src/lib/cert/x509/x509self.h
+++ b/src/lib/cert/x509/x509self.h
@@ -9,7 +9,6 @@
 #define BOTAN_X509_SELF_H__
 
 #include <botan/x509cert.h>
-#include <botan/pkcs8.h>
 #include <botan/pkcs10.h>
 #include <botan/asn1_time.h>
 
diff --git a/src/lib/pubkey/dl_algo/dl_algo.h b/src/lib/pubkey/dl_algo/dl_algo.h
index 73cf23eec..18886e5dc 100644
--- a/src/lib/pubkey/dl_algo/dl_algo.h
+++ b/src/lib/pubkey/dl_algo/dl_algo.h
@@ -10,7 +10,6 @@
 
 #include <botan/dl_group.h>
 #include <botan/x509_key.h>
-#include <botan/pkcs8.h>
 
 namespace Botan {
 
diff --git a/src/lib/pubkey/ecc_key/ecc_key.h b/src/lib/pubkey/ecc_key/ecc_key.h
index dcf5b84ff..6764df0f0 100644
--- a/src/lib/pubkey/ecc_key/ecc_key.h
+++ b/src/lib/pubkey/ecc_key/ecc_key.h
@@ -13,7 +13,6 @@
 #include <botan/ec_group.h>
 #include <botan/pk_keys.h>
 #include <botan/x509_key.h>
-#include <botan/pkcs8.h>
 
 namespace Botan {
 
diff --git a/src/lib/pubkey/if_algo/if_algo.h b/src/lib/pubkey/if_algo/if_algo.h
index 73050ad41..dec731af3 100644
--- a/src/lib/pubkey/if_algo/if_algo.h
+++ b/src/lib/pubkey/if_algo/if_algo.h
@@ -10,7 +10,6 @@
 
 #include <botan/bigint.h>
 #include <botan/x509_key.h>
-#include <botan/pkcs8.h>
 
 namespace Botan {
 
diff --git a/src/lib/tls/tls_messages.h b/src/lib/tls/tls_messages.h
index befbdb932..7a556a61c 100644
--- a/src/lib/tls/tls_messages.h
+++ b/src/lib/tls/tls_messages.h
@@ -15,7 +15,6 @@
 #include <botan/tls_policy.h>
 #include <botan/tls_ciphersuite.h>
 #include <botan/bigint.h>
-#include <botan/pkcs8.h>
 #include <botan/x509cert.h>
 #include <vector>
 #include <string>
diff --git a/src/tests/unit_ecdsa.cpp b/src/tests/unit_ecdsa.cpp
index 8b666910c..22625d230 100644
--- a/src/tests/unit_ecdsa.cpp
+++ b/src/tests/unit_ecdsa.cpp
@@ -15,6 +15,7 @@
 #if defined(BOTAN_HAS_RSA)
 
 #include <botan/hex.h>
+#include <botan/pkcs8.h>
 #include <botan/pubkey.h>
 #include <botan/ecdsa.h>
 #include <botan/rsa.h>
diff --git a/src/tests/unit_x509.cpp b/src/tests/unit_x509.cpp
index 677ccedd3..f77be1992 100644
--- a/src/tests/unit_x509.cpp
+++ b/src/tests/unit_x509.cpp
@@ -12,10 +12,11 @@
 
 #include <botan/calendar.h>
 #include <botan/filters.h>
+#include <botan/pkcs8.h>
+#include <botan/pkcs10.h>
 #include <botan/x509self.h>
 #include <botan/x509path.h>
 #include <botan/x509_ca.h>
-#include <botan/pkcs10.h>
 
 #if defined(BOTAN_HAS_RSA)
   #include <botan/rsa.h>