9 files changed, 6 insertions, 10 deletions
diff --git a/src/pubkey/dl_algo/info.txt b/src/pubkey/dl_algo/info.txt
index 21829fa42..f6e609062 100644
--- a/src/pubkey/dl_algo/info.txt
+++ b/src/pubkey/dl_algo/info.txt
@@ -4,6 +4,5 @@ define DL_PUBLIC_KEY_FAMILY
 asn1
 dl_group
 numbertheory
-pk_codecs
 rng
 </requires>
diff --git a/src/pubkey/ecc_key/info.txt b/src/pubkey/ecc_key/info.txt
index 4650fb612..e08a4231d 100644
--- a/src/pubkey/ecc_key/info.txt
+++ b/src/pubkey/ecc_key/info.txt
@@ -6,5 +6,4 @@ asn1
 bigint
 ec_dompar
 numbertheory
-pk_codecs
 </requires>
diff --git a/src/pubkey/if_algo/info.txt b/src/pubkey/if_algo/info.txt
index 833117819..c0914cd15 100644
--- a/src/pubkey/if_algo/info.txt
+++ b/src/pubkey/if_algo/info.txt
@@ -19,5 +19,4 @@ asn1
 bigint
 libstate
 numbertheory
-pk_codecs
 </requires>
diff --git a/src/pubkey/info.txt b/src/pubkey/info.txt
index b28bd1868..4d7105e9d 100644
--- a/src/pubkey/info.txt
+++ b/src/pubkey/info.txt
@@ -3,15 +3,19 @@ define PUBLIC_KEY_CRYPTO
 <source>
 pk_algs.cpp
 pk_keys.cpp
+pkcs8.cpp
 pubkey.cpp
 pubkey_enums.cpp
 workfactor.cpp
+x509_key.cpp
 </source>
 
 <header:public>
 pk_keys.h
+pkcs8.h
 pubkey.h
 pubkey_enums.h
+x509_key.h
 </header:public>
 
 <header:internal>
@@ -26,6 +30,8 @@ bigint
 filters
 kdf
 oid_lookup
+pbe
+pem
 pk_pad
 rng
 sym_algo
diff --git a/src/pubkey/pk_codecs/info.txt b/src/pubkey/pk_codecs/info.txt
deleted file mode 100644
index 64fb10b8a..000000000
--- a/src/pubkey/pk_codecs/info.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-<requires>
-asn1
-filters
-oid_lookup
-pbe
-pem
-</requires>
diff --git a/src/pubkey/pk_codecs/pkcs8.cpp b/src/pubkey/pkcs8.cpp
index 099d52ffa..099d52ffa 100644
--- a/src/pubkey/pk_codecs/pkcs8.cpp
+++ b/src/pubkey/pkcs8.cpp
diff --git a/src/pubkey/pk_codecs/pkcs8.h b/src/pubkey/pkcs8.h
index 9488c2c0b..9488c2c0b 100644
--- a/src/pubkey/pk_codecs/pkcs8.h
+++ b/src/pubkey/pkcs8.h
diff --git a/src/pubkey/pk_codecs/x509_key.cpp b/src/pubkey/x509_key.cpp
index fdcfccf87..fdcfccf87 100644
--- a/src/pubkey/pk_codecs/x509_key.cpp
+++ b/src/pubkey/x509_key.cpp
diff --git a/src/pubkey/pk_codecs/x509_key.h b/src/pubkey/x509_key.h
index a8f5267d7..a8f5267d7 100644
--- a/src/pubkey/pk_codecs/x509_key.h
+++ b/src/pubkey/x509_key.h