16 files changed, 107 insertions, 80 deletions
diff --git a/src/pubkey/dh/info.txt b/src/pubkey/dh/info.txt
index 9e4ceb65b..33af9a8e5 100644
--- a/src/pubkey/dh/info.txt
+++ b/src/pubkey/dh/info.txt
@@ -13,8 +13,8 @@ dh_op.h
 </add>
 
 <requires>
-asn1
-bigint
 dl_algo
+dl_group
+libstate
 numbertheory
 </requires>
diff --git a/src/pubkey/dl_algo/info.txt b/src/pubkey/dl_algo/info.txt
index d3368765a..15a77516b 100644
--- a/src/pubkey/dl_algo/info.txt
+++ b/src/pubkey/dl_algo/info.txt
@@ -11,6 +11,8 @@ dl_algo.h
 
 <requires>
 asn1
-bigint
 dl_group
+numbertheory
+pk_codecs
+rng
 </requires>
diff --git a/src/pubkey/dl_group/info.txt b/src/pubkey/dl_group/info.txt
index 62446091f..6b9884a4d 100644
--- a/src/pubkey/dl_group/info.txt
+++ b/src/pubkey/dl_group/info.txt
@@ -12,4 +12,8 @@ dl_group.h
 <requires>
 asn1
 bigint
+filters
+libstate
+numbertheory
+pem
 </requires>
diff --git a/src/pubkey/dlies/info.txt b/src/pubkey/dlies/info.txt
index 9e32aeb2a..5138aafc5 100644
--- a/src/pubkey/dlies/info.txt
+++ b/src/pubkey/dlies/info.txt
@@ -10,6 +10,7 @@ dlies.h
 </add>
 
 <requires>
-dh
-kdf2
+kdf
+libstate
+mac
 </requires>
diff --git a/src/pubkey/dsa/info.txt b/src/pubkey/dsa/info.txt
index 2d6287fbd..c70e02d90 100644
--- a/src/pubkey/dsa/info.txt
+++ b/src/pubkey/dsa/info.txt
@@ -4,14 +4,6 @@ define DSA
 
 load_on auto
 
-<requires>
-asn1
-bigint
-dl_algo
-keypair
-numbertheory
-</requires>
-
 <add>
 dsa.cpp
 dsa.h
@@ -20,3 +12,11 @@ dsa_core.h
 dsa_op.cpp
 dsa_op.h
 </add>
+
+<requires>
+dl_algo
+dl_group
+keypair
+libstate
+numbertheory
+</requires>
diff --git a/src/pubkey/ec_dompar/info.txt b/src/pubkey/ec_dompar/info.txt
index 59032ce90..212783725 100644
--- a/src/pubkey/ec_dompar/info.txt
+++ b/src/pubkey/ec_dompar/info.txt
@@ -12,6 +12,7 @@ ec_dompar.h
 <requires>
 asn1
 bigint
-numbertheory
+filters
 gfpmath
+hex
 </requires>
diff --git a/src/pubkey/ecc_key/info.txt b/src/pubkey/ecc_key/info.txt
index a57de3d0c..c1972052d 100644
--- a/src/pubkey/ecc_key/info.txt
+++ b/src/pubkey/ecc_key/info.txt
@@ -4,15 +4,16 @@ define ECC_PUBLIC_KEY_CRYPTO
 
 load_on auto
 
+<add>
+ecc_key.cpp
+ecc_key.h
+</add>
+
 <requires>
 asn1
 bigint
 ec_dompar
-numbertheory
 gfpmath
+numbertheory
+pk_codecs
 </requires>
-
-<add>
-ecc_key.cpp
-ecc_key.h
-</add>
diff --git a/src/pubkey/ecdsa/info.txt b/src/pubkey/ecdsa/info.txt
index c67122348..4ca020ad5 100644
--- a/src/pubkey/ecdsa/info.txt
+++ b/src/pubkey/ecdsa/info.txt
@@ -4,15 +4,6 @@ define ECDSA
 
 load_on auto
 
-<requires>
-asn1
-bigint
-ec_dompar
-ecc_key
-numbertheory
-gfpmath
-</requires>
-
 <add>
 ecdsa.cpp
 ecdsa.h
@@ -21,3 +12,13 @@ ecdsa_core.h
 ecdsa_op.cpp
 ecdsa_op.h
 </add>
+
+<requires>
+asn1
+ec_dompar
+ecc_key
+gfpmath
+libstate
+numbertheory
+rng
+</requires>
diff --git a/src/pubkey/eckaeg/info.txt b/src/pubkey/eckaeg/info.txt
index cdac09220..d18a805ee 100644
--- a/src/pubkey/eckaeg/info.txt
+++ b/src/pubkey/eckaeg/info.txt
@@ -4,15 +4,6 @@ define ECKAEG
 
 load_on auto
 
-<requires>
-asn1
-bigint
-ec_dompar
-ecc_key
-numbertheory
-gfpmath
-</requires>
-
 <add>
 eckaeg.cpp
 eckaeg.h
@@ -21,3 +12,12 @@ eckaeg_core.h
 eckaeg_op.cpp
 eckaeg_op.h
 </add>
+
+<requires>
+asn1
+ec_dompar
+ecc_key
+gfpmath
+libstate
+numbertheory
+</requires>
diff --git a/src/pubkey/elgamal/info.txt b/src/pubkey/elgamal/info.txt
index 53a039585..d7ae614ea 100644
--- a/src/pubkey/elgamal/info.txt
+++ b/src/pubkey/elgamal/info.txt
@@ -4,15 +4,6 @@ define ELGAMAL
 
 load_on auto
 
-<requires>
-asn1
-bigint
-bigint
-dl_algo
-keypair
-numbertheory
-</requires>
-
 <add>
 elgamal.cpp
 elgamal.h
@@ -21,3 +12,11 @@ elg_core.h
 elg_op.cpp
 elg_op.h
 </add>
+
+<requires>
+dl_algo
+dl_group
+keypair
+libstate
+numbertheory
+</requires>
diff --git a/src/pubkey/if_algo/info.txt b/src/pubkey/if_algo/info.txt
index 7686ed398..d2142f42f 100644
--- a/src/pubkey/if_algo/info.txt
+++ b/src/pubkey/if_algo/info.txt
@@ -4,12 +4,6 @@ define IF_PUBLIC_KEY_FAMILY
 
 load_on dep
 
-<requires>
-asn1
-bigint
-filters
-</requires>
-
 <add>
 if_algo.cpp
 if_algo.h
@@ -18,3 +12,11 @@ if_core.h
 if_op.cpp
 if_op.h
 </add>
+
+<requires>
+asn1
+bigint
+libstate
+numbertheory
+pk_codecs
+</requires>
diff --git a/src/pubkey/info.txt b/src/pubkey/info.txt
index 74698503a..de58fd271 100644
--- a/src/pubkey/info.txt
+++ b/src/pubkey/info.txt
@@ -4,17 +4,6 @@ define PUBLIC_KEY_CRYPTO
 
 load_on auto
 
-<requires>
-asn1
-bigint
-numbertheory
-oid_lookup
-pbe
-pk_codecs
-pk_pad
-rng
-</requires>
-
 <add>
 pk_algs.cpp
 pk_algs.h
@@ -29,3 +18,14 @@ pubkey_enums.h
 x509_key.cpp
 x509_key.h
 </add>
+
+<requires>
+asn1
+bigint
+filters
+kdf
+oid_lookup
+pk_pad
+rng
+sym_algo
+</requires>
diff --git a/src/pubkey/nr/info.txt b/src/pubkey/nr/info.txt
index a02be064d..c89820aeb 100644
--- a/src/pubkey/nr/info.txt
+++ b/src/pubkey/nr/info.txt
@@ -14,9 +14,9 @@ nr_op.h
 </add>
 
 <requires>
-asn1
-bigint
 dl_algo
+dl_group
 keypair
+libstate
 numbertheory
 </requires>
diff --git a/src/pubkey/pk_codecs/info.txt b/src/pubkey/pk_codecs/info.txt
new file mode 100644
index 000000000..96511a663
--- /dev/null
+++ b/src/pubkey/pk_codecs/info.txt
@@ -0,0 +1,18 @@
+realname "PK codecs (PKCS8, X.509)"
+
+load_on auto
+
+<add>
+pkcs8.h
+pkcs8.cpp
+x509_key.h
+x509_key.cpp
+</add>
+
+<requires>
+asn1
+filters
+oid_lookup
+pbe
+pem
+</requires>
diff --git a/src/pubkey/rsa/info.txt b/src/pubkey/rsa/info.txt
index a75c69ae5..7729fd83d 100644
--- a/src/pubkey/rsa/info.txt
+++ b/src/pubkey/rsa/info.txt
@@ -4,15 +4,14 @@ define RSA
 
 load_on auto
 
+<add>
+rsa.cpp
+rsa.h
+</add>
+
 <requires>
-asn1
-bigint
 if_algo
 keypair
+libstate
 numbertheory
 </requires>
-
-<add>
-rsa.cpp
-rsa.h
-</add>
diff --git a/src/pubkey/rw/info.txt b/src/pubkey/rw/info.txt
index 83265399f..ada6c37d6 100644
--- a/src/pubkey/rw/info.txt
+++ b/src/pubkey/rw/info.txt
@@ -4,15 +4,14 @@ define RW
 
 load_on auto
 
+<add>
+rw.cpp
+rw.h
+</add>
+
 <requires>
-asn1
-bigint
 if_algo
 keypair
+libstate
 numbertheory
 </requires>
-
-<add>
-rw.cpp
-rw.h
-</add>