28 files changed, 6 insertions, 18 deletions
diff --git a/src/cert/x509/info.txt b/src/cert/x509/info.txt
index 25db8c1e6..922aeae4d 100644
--- a/src/cert/x509/info.txt
+++ b/src/cert/x509/info.txt
@@ -7,7 +7,7 @@ load_on auto
 <requires>
 asn1
 bigint
-pubkey
+pk_codecs
 oid_lookup
 </requires>
 
diff --git a/src/cms/info.txt b/src/cms/info.txt
index 402865b07..a85841e21 100644
--- a/src/cms/info.txt
+++ b/src/cms/info.txt
@@ -8,7 +8,7 @@ load_on auto
 asn1
 filters
 oid_lookup
-pubkey
+pk_codecs
 x509
 </requires>
 
diff --git a/src/pubkey/dh/info.txt b/src/pubkey/dh/info.txt
index 5d3396216..9e4ceb65b 100644
--- a/src/pubkey/dh/info.txt
+++ b/src/pubkey/dh/info.txt
@@ -17,5 +17,4 @@ asn1
 bigint
 dl_algo
 numbertheory
-pubkey
 </requires>
diff --git a/src/pubkey/dlies/info.txt b/src/pubkey/dlies/info.txt
index 1a09dcbc5..9e32aeb2a 100644
--- a/src/pubkey/dlies/info.txt
+++ b/src/pubkey/dlies/info.txt
@@ -12,5 +12,4 @@ dlies.h
 <requires>
 dh
 kdf2
-pubkey
 </requires>
diff --git a/src/pubkey/dsa/info.txt b/src/pubkey/dsa/info.txt
index f1b505800..2d6287fbd 100644
--- a/src/pubkey/dsa/info.txt
+++ b/src/pubkey/dsa/info.txt
@@ -10,7 +10,6 @@ bigint
 dl_algo
 keypair
 numbertheory
-pubkey
 </requires>
 
 <add>
diff --git a/src/pubkey/ecc_key/info.txt b/src/pubkey/ecc_key/info.txt
index c5213aef4..a57de3d0c 100644
--- a/src/pubkey/ecc_key/info.txt
+++ b/src/pubkey/ecc_key/info.txt
@@ -10,7 +10,6 @@ bigint
 ec_dompar
 numbertheory
 gfpmath
-pubkey
 </requires>
 
 <add>
diff --git a/src/pubkey/ecdsa/info.txt b/src/pubkey/ecdsa/info.txt
index 48e88bda9..c67122348 100644
--- a/src/pubkey/ecdsa/info.txt
+++ b/src/pubkey/ecdsa/info.txt
@@ -11,7 +11,6 @@ ec_dompar
 ecc_key
 numbertheory
 gfpmath
-pubkey
 </requires>
 
 <add>
diff --git a/src/pubkey/eckaeg/info.txt b/src/pubkey/eckaeg/info.txt
index bac47f861..cdac09220 100644
--- a/src/pubkey/eckaeg/info.txt
+++ b/src/pubkey/eckaeg/info.txt
@@ -11,7 +11,6 @@ ec_dompar
 ecc_key
 numbertheory
 gfpmath
-pubkey
 </requires>
 
 <add>
diff --git a/src/pubkey/elgamal/info.txt b/src/pubkey/elgamal/info.txt
index c457e1529..53a039585 100644
--- a/src/pubkey/elgamal/info.txt
+++ b/src/pubkey/elgamal/info.txt
@@ -11,7 +11,6 @@ bigint
 dl_algo
 keypair
 numbertheory
-pubkey
 </requires>
 
 <add>
diff --git a/src/pubkey/pubkey/info.txt b/src/pubkey/info.txt
index 83b2c80cc..74698503a 100644
--- a/src/pubkey/pubkey/info.txt
+++ b/src/pubkey/info.txt
@@ -8,8 +8,9 @@ load_on auto
 asn1
 bigint
 numbertheory
-pbe
 oid_lookup
+pbe
+pk_codecs
 pk_pad
 rng
 </requires>
@@ -21,8 +22,6 @@ pk_filts.cpp
 pk_filts.h
 pk_keys.cpp
 pk_keys.h
-pkcs8.cpp
-pkcs8.h
 pubkey.cpp
 pubkey.h
 pubkey_enums.cpp
diff --git a/src/pubkey/keypair/info.txt b/src/pubkey/keypair/info.txt
index c6fa4af5d..9e758643f 100644
--- a/src/pubkey/keypair/info.txt
+++ b/src/pubkey/keypair/info.txt
@@ -10,5 +10,5 @@ keypair.h
 </add>
 
 <requires>
-pubkey
+libstate
 </requires>
diff --git a/src/pubkey/nr/info.txt b/src/pubkey/nr/info.txt
index 6434d4385..a02be064d 100644
--- a/src/pubkey/nr/info.txt
+++ b/src/pubkey/nr/info.txt
@@ -19,5 +19,4 @@ bigint
 dl_algo
 keypair
 numbertheory
-pubkey
 </requires>
diff --git a/src/pubkey/pubkey/pk_algs.cpp b/src/pubkey/pk_algs.cpp
index 99d7294f0..99d7294f0 100644
--- a/src/pubkey/pubkey/pk_algs.cpp
+++ b/src/pubkey/pk_algs.cpp
diff --git a/src/pubkey/pubkey/pk_algs.h b/src/pubkey/pk_algs.h
index d32c9365b..c41bf1a63 100644
--- a/src/pubkey/pubkey/pk_algs.h
+++ b/src/pubkey/pk_algs.h
@@ -8,8 +8,7 @@
 #ifndef BOTAN_PK_KEY_FACTORY_H__
 #define BOTAN_PK_KEY_FACTORY_H__
 
-#include <botan/x509_key.h>
-#include <botan/pkcs8.h>
+#include <botan/pk_keys.h>
 
 namespace Botan {
 
diff --git a/src/pubkey/pubkey/pkcs8.cpp b/src/pubkey/pk_codecs/pkcs8.cpp
index 8a464ecfe..8a464ecfe 100644
--- a/src/pubkey/pubkey/pkcs8.cpp
+++ b/src/pubkey/pk_codecs/pkcs8.cpp
diff --git a/src/pubkey/pubkey/pkcs8.h b/src/pubkey/pk_codecs/pkcs8.h
index 87f8ba326..87f8ba326 100644
--- a/src/pubkey/pubkey/pkcs8.h
+++ b/src/pubkey/pk_codecs/pkcs8.h
diff --git a/src/pubkey/pubkey/x509_key.cpp b/src/pubkey/pk_codecs/x509_key.cpp
index 455e627f3..455e627f3 100644
--- a/src/pubkey/pubkey/x509_key.cpp
+++ b/src/pubkey/pk_codecs/x509_key.cpp
diff --git a/src/pubkey/pubkey/x509_key.h b/src/pubkey/pk_codecs/x509_key.h
index 9404b7ecc..9404b7ecc 100644
--- a/src/pubkey/pubkey/x509_key.h
+++ b/src/pubkey/pk_codecs/x509_key.h
diff --git a/src/pubkey/pubkey/pk_filts.cpp b/src/pubkey/pk_filts.cpp
index 18da9c10b..18da9c10b 100644
--- a/src/pubkey/pubkey/pk_filts.cpp
+++ b/src/pubkey/pk_filts.cpp
diff --git a/src/pubkey/pubkey/pk_filts.h b/src/pubkey/pk_filts.h
index 8bf3fc238..8bf3fc238 100644
--- a/src/pubkey/pubkey/pk_filts.h
+++ b/src/pubkey/pk_filts.h
diff --git a/src/pubkey/pubkey/pk_keys.cpp b/src/pubkey/pk_keys.cpp
index b93158558..b93158558 100644
--- a/src/pubkey/pubkey/pk_keys.cpp
+++ b/src/pubkey/pk_keys.cpp
diff --git a/src/pubkey/pubkey/pk_keys.h b/src/pubkey/pk_keys.h
index 5b612577d..5b612577d 100644
--- a/src/pubkey/pubkey/pk_keys.h
+++ b/src/pubkey/pk_keys.h
diff --git a/src/pubkey/pubkey/pubkey.cpp b/src/pubkey/pubkey.cpp
index 4ddaa6fb6..4ddaa6fb6 100644
--- a/src/pubkey/pubkey/pubkey.cpp
+++ b/src/pubkey/pubkey.cpp
diff --git a/src/pubkey/pubkey/pubkey.h b/src/pubkey/pubkey.h
index 815550edd..815550edd 100644
--- a/src/pubkey/pubkey/pubkey.h
+++ b/src/pubkey/pubkey.h
diff --git a/src/pubkey/pubkey/pubkey_enums.cpp b/src/pubkey/pubkey_enums.cpp
index 327107dd1..327107dd1 100644
--- a/src/pubkey/pubkey/pubkey_enums.cpp
+++ b/src/pubkey/pubkey_enums.cpp
diff --git a/src/pubkey/pubkey/pubkey_enums.h b/src/pubkey/pubkey_enums.h
index 53e319f38..53e319f38 100644
--- a/src/pubkey/pubkey/pubkey_enums.h
+++ b/src/pubkey/pubkey_enums.h
diff --git a/src/pubkey/rsa/info.txt b/src/pubkey/rsa/info.txt
index ac2b6dde7..a75c69ae5 100644
--- a/src/pubkey/rsa/info.txt
+++ b/src/pubkey/rsa/info.txt
@@ -10,7 +10,6 @@ bigint
 if_algo
 keypair
 numbertheory
-pubkey
 </requires>
 
 <add>
diff --git a/src/pubkey/rw/info.txt b/src/pubkey/rw/info.txt
index 40c849d1c..83265399f 100644
--- a/src/pubkey/rw/info.txt
+++ b/src/pubkey/rw/info.txt
@@ -10,7 +10,6 @@ bigint
 if_algo
 keypair
 numbertheory
-pubkey
 </requires>
 
 <add>