29 files changed, 15 insertions, 27 deletions
diff --git a/src/core/modinfo.txt b/src/core/modinfo.txt
index 339d610d8..265f39847 100644
--- a/src/core/modinfo.txt
+++ b/src/core/modinfo.txt
@@ -4,15 +4,19 @@ load_on auto
 
 define CORE_MODULE
 
+<requires>
+aes
+sha1
+allocators
+filters
+</requires>
+
 <add>
 base.cpp
 data_src.cpp
 datastor.cpp
 def_alg.cpp
 def_mode.cpp
-dh_op.cpp
-dsa_op.cpp
-elg_op.cpp
 eng_base.cpp
 engine.cpp
 exceptn.cpp
@@ -21,25 +25,15 @@ get_enc.cpp
 get_pbe.cpp
 init_def.cpp
 init_opt.cpp
-kdf.cpp
 libstate.cpp
 look_pk.cpp
 mlock.cpp
 modules.cpp
-nr_op.cpp
 oids.cpp
-pk_algs.cpp
-pk_core.cpp
-pk_keys.cpp
-pk_util.cpp
-pkcs8.cpp
 policy.cpp
-pubkey.cpp
 rng.cpp
-rsa_op.cpp
 s2k.cpp
 symkey.cpp
-x509_key.cpp
 base.h
 botan.h
 data_src.h
@@ -56,22 +50,8 @@ lookup.h
 modules.h
 mutex.h
 oids.h
-pk_algs.h
-pk_core.h
-pk_keys.h
-pk_ops.h
-pk_util.h
-pkcs8.h
-pubkey.h
 rng.h
 s2k.h
 symkey.h
-x509_key.h
 </add>
 
-<requires>
-aes
-sha1
-allocators
-filters
-</requires>
diff --git a/src/pk/dh/modinfo.txt b/src/pk/dh/modinfo.txt
index eed21833d..ca32b307e 100644
--- a/src/pk/dh/modinfo.txt
+++ b/src/pk/dh/modinfo.txt
@@ -12,4 +12,5 @@ dh.h
 <requires>
 asn1
 dl_algo
+pubkey
 </requires>
diff --git a/src/pk/dlies/modinfo.txt b/src/pk/dlies/modinfo.txt
index 163914714..a1e24935a 100644
--- a/src/pk/dlies/modinfo.txt
+++ b/src/pk/dlies/modinfo.txt
@@ -11,4 +11,6 @@ dlies.h
 
 <requires>
 asn1
+kdf2
+pubkey
 </requires>
diff --git a/src/pk/dsa/modinfo.txt b/src/pk/dsa/modinfo.txt
index c29593e36..a64e0c94c 100644
--- a/src/pk/dsa/modinfo.txt
+++ b/src/pk/dsa/modinfo.txt
@@ -13,4 +13,5 @@ dsa.h
 asn1
 dl_algo
 keypair
+pubkey
 </requires>
diff --git a/src/pk/elgamal/modinfo.txt b/src/pk/elgamal/modinfo.txt
index ffae2a667..e7f80031f 100644
--- a/src/pk/elgamal/modinfo.txt
+++ b/src/pk/elgamal/modinfo.txt
@@ -14,4 +14,5 @@ asn1
 bigint
 dl_algo
 keypair
+pubkey
 </requires>
diff --git a/src/pk/nr/modinfo.txt b/src/pk/nr/modinfo.txt
index c30dbb4cc..da31f129b 100644
--- a/src/pk/nr/modinfo.txt
+++ b/src/pk/nr/modinfo.txt
@@ -13,4 +13,5 @@ nr.h
 asn1
 dl_algo
 keypair
+pubkey
 </requires>
diff --git a/src/core/dh_op.cpp b/src/pk/pubkey/dh_op.cpp
index 0bcfd4ef8..0bcfd4ef8 100644
--- a/src/core/dh_op.cpp
+++ b/src/pk/pubkey/dh_op.cpp
diff --git a/src/core/dsa_op.cpp b/src/pk/pubkey/dsa_op.cpp
index ee94cb256..ee94cb256 100644
--- a/src/core/dsa_op.cpp
+++ b/src/pk/pubkey/dsa_op.cpp
diff --git a/src/core/elg_op.cpp b/src/pk/pubkey/elg_op.cpp
index 0d852d145..0d852d145 100644
--- a/src/core/elg_op.cpp
+++ b/src/pk/pubkey/elg_op.cpp
diff --git a/src/core/kdf.cpp b/src/pk/pubkey/kdf.cpp
index dca56e1a6..dca56e1a6 100644
--- a/src/core/kdf.cpp
+++ b/src/pk/pubkey/kdf.cpp
diff --git a/src/core/nr_op.cpp b/src/pk/pubkey/nr_op.cpp
index 01e96a822..01e96a822 100644
--- a/src/core/nr_op.cpp
+++ b/src/pk/pubkey/nr_op.cpp
diff --git a/src/core/pk_algs.cpp b/src/pk/pubkey/pk_algs.cpp
index 83ceb61c7..83ceb61c7 100644
--- a/src/core/pk_algs.cpp
+++ b/src/pk/pubkey/pk_algs.cpp
diff --git a/src/core/pk_algs.h b/src/pk/pubkey/pk_algs.h
index a8fa5f176..a8fa5f176 100644
--- a/src/core/pk_algs.h
+++ b/src/pk/pubkey/pk_algs.h
diff --git a/src/core/pk_core.cpp b/src/pk/pubkey/pk_core.cpp
index 82fe4c217..82fe4c217 100644
--- a/src/core/pk_core.cpp
+++ b/src/pk/pubkey/pk_core.cpp
diff --git a/src/core/pk_core.h b/src/pk/pubkey/pk_core.h
index 585c12ee4..585c12ee4 100644
--- a/src/core/pk_core.h
+++ b/src/pk/pubkey/pk_core.h
diff --git a/src/core/pk_keys.cpp b/src/pk/pubkey/pk_keys.cpp
index d991f3788..d991f3788 100644
--- a/src/core/pk_keys.cpp
+++ b/src/pk/pubkey/pk_keys.cpp
diff --git a/src/core/pk_keys.h b/src/pk/pubkey/pk_keys.h
index 16109c634..16109c634 100644
--- a/src/core/pk_keys.h
+++ b/src/pk/pubkey/pk_keys.h
diff --git a/src/core/pk_ops.h b/src/pk/pubkey/pk_ops.h
index fad87b573..fad87b573 100644
--- a/src/core/pk_ops.h
+++ b/src/pk/pubkey/pk_ops.h
diff --git a/src/core/pk_util.cpp b/src/pk/pubkey/pk_util.cpp
index 1976436ea..1976436ea 100644
--- a/src/core/pk_util.cpp
+++ b/src/pk/pubkey/pk_util.cpp
diff --git a/src/core/pk_util.h b/src/pk/pubkey/pk_util.h
index aa7a71234..aa7a71234 100644
--- a/src/core/pk_util.h
+++ b/src/pk/pubkey/pk_util.h
diff --git a/src/core/pkcs8.cpp b/src/pk/pubkey/pkcs8.cpp
index 2963c9d86..2963c9d86 100644
--- a/src/core/pkcs8.cpp
+++ b/src/pk/pubkey/pkcs8.cpp
diff --git a/src/core/pkcs8.h b/src/pk/pubkey/pkcs8.h
index 383b1604a..383b1604a 100644
--- a/src/core/pkcs8.h
+++ b/src/pk/pubkey/pkcs8.h
diff --git a/src/core/pubkey.cpp b/src/pk/pubkey/pubkey.cpp
index 06bb44bca..06bb44bca 100644
--- a/src/core/pubkey.cpp
+++ b/src/pk/pubkey/pubkey.cpp
diff --git a/src/core/pubkey.h b/src/pk/pubkey/pubkey.h
index 0c9abf18f..0c9abf18f 100644
--- a/src/core/pubkey.h
+++ b/src/pk/pubkey/pubkey.h
diff --git a/src/core/rsa_op.cpp b/src/pk/pubkey/rsa_op.cpp
index 0b151bf3b..0b151bf3b 100644
--- a/src/core/rsa_op.cpp
+++ b/src/pk/pubkey/rsa_op.cpp
diff --git a/src/core/x509_key.cpp b/src/pk/pubkey/x509_key.cpp
index 26ce16a72..26ce16a72 100644
--- a/src/core/x509_key.cpp
+++ b/src/pk/pubkey/x509_key.cpp
diff --git a/src/core/x509_key.h b/src/pk/pubkey/x509_key.h
index abaeaaced..abaeaaced 100644
--- a/src/core/x509_key.h
+++ b/src/pk/pubkey/x509_key.h
diff --git a/src/pk/rsa/modinfo.txt b/src/pk/rsa/modinfo.txt
index 793ff95e3..615d0dd24 100644
--- a/src/pk/rsa/modinfo.txt
+++ b/src/pk/rsa/modinfo.txt
@@ -13,4 +13,5 @@ rsa.h
 asn1
 if_algo
 keypair
+pubkey
 </requires>
diff --git a/src/pk/rw/modinfo.txt b/src/pk/rw/modinfo.txt
index 58320a927..bdff0202f 100644
--- a/src/pk/rw/modinfo.txt
+++ b/src/pk/rw/modinfo.txt
@@ -13,4 +13,5 @@ rw.h
 asn1
 if_algo
 keypair
+pubkey
 </requires>