15 files changed, 48 insertions, 22 deletions
diff --git a/src/core/info.txt b/src/core/info.txt
index 7e8fb3c76..eed162c44 100644
--- a/src/core/info.txt
+++ b/src/core/info.txt
@@ -11,6 +11,9 @@ sha2
 hmac
 filters
 hex
+bigint
+libstate
+kdf_base
 timer_base
 </requires>
 
@@ -26,8 +29,6 @@ defalloc.h
 enums.h
 exceptn.cpp
 exceptn.h
-kdf.cpp
-kdf.h
 mem_pool.cpp
 mem_pool.h
 mutex.h
diff --git a/src/core/libstate/info.txt b/src/core/libstate/info.txt
index 38e3d1352..93c429241 100644
--- a/src/core/libstate/info.txt
+++ b/src/core/libstate/info.txt
@@ -4,11 +4,6 @@ load_on auto
 
 define LIBSTATE_MODULE
 
-<required>
-core
-bigint
-</required>
-
 <add>
 def_alg.cpp
 def_mode.cpp
diff --git a/src/core/oid_lookup/info.txt b/src/core/oid_lookup/info.txt
index 6f0c9fd3c..b5f4ef21f 100644
--- a/src/core/oid_lookup/info.txt
+++ b/src/core/oid_lookup/info.txt
@@ -4,10 +4,10 @@ load_on dep
 
 define OID_LOOKUP
 
-<required>
-libstate
-asn1
-</required>
+<requires>
+#libstate
+#asn1
+</requires>
 
 <add>
 oids.cpp
diff --git a/src/engine/gnump/info.txt b/src/engine/gnump/info.txt
index 59a9055c1..c428c32d6 100644
--- a/src/engine/gnump/info.txt
+++ b/src/engine/gnump/info.txt
@@ -4,14 +4,14 @@ define ENGINE_GNU_MP
 
 load_on request
 
-<required>
+<requires>
 dh
 dsa
 elgamal
 if_algo
 libstate
 nr
-</required>
+</requires>
 
 <add>
 eng_gmp.cpp
diff --git a/src/engine/openssl/info.txt b/src/engine/openssl/info.txt
index ce8a6cfe4..d04c3790d 100644
--- a/src/engine/openssl/info.txt
+++ b/src/engine/openssl/info.txt
@@ -4,14 +4,14 @@ define ENGINE_OPENSSL
 
 load_on request
 
-<required>
+<requires>
 dh
 dsa
 elgamal
 if_algo
 libstate
 nr
-</required>
+</requires>
 
 <add>
 eng_ossl.cpp
diff --git a/src/kdf/kdf1/info.txt b/src/kdf/kdf1/info.txt
index 65011907e..a4d2c36af 100644
--- a/src/kdf/kdf1/info.txt
+++ b/src/kdf/kdf1/info.txt
@@ -4,6 +4,10 @@ define KDF1
 
 load_on auto
 
+<requires>
+kdf_base
+</requires>
+
 <add>
 kdf1.h
 kdf1.cpp
diff --git a/src/kdf/kdf2/info.txt b/src/kdf/kdf2/info.txt
index 7fceffb18..46a88a392 100644
--- a/src/kdf/kdf2/info.txt
+++ b/src/kdf/kdf2/info.txt
@@ -4,6 +4,10 @@ define KDF2
 
 load_on auto
 
+<requires>
+kdf_base
+</requires>
+
 <add>
 kdf2.cpp
 kdf2.h
diff --git a/src/kdf/kdf_base/info.txt b/src/kdf/kdf_base/info.txt
new file mode 100644
index 000000000..fa5cca334
--- /dev/null
+++ b/src/kdf/kdf_base/info.txt
@@ -0,0 +1,10 @@
+realname "KDF Base Class"
+
+define KDF_BASE
+
+load_on auto
+
+<add>
+kdf.cpp
+kdf.h
+</add>
diff --git a/src/core/kdf.cpp b/src/kdf/kdf_base/kdf.cpp
index a96f86e99..a96f86e99 100644
--- a/src/core/kdf.cpp
+++ b/src/kdf/kdf_base/kdf.cpp
diff --git a/src/core/kdf.h b/src/kdf/kdf_base/kdf.h
index 7d0c1866b..7d0c1866b 100644
--- a/src/core/kdf.h
+++ b/src/kdf/kdf_base/kdf.h
diff --git a/src/kdf/mgf1/info.txt b/src/kdf/mgf1/info.txt
index 2f704173d..1e91e8a9b 100644
--- a/src/kdf/mgf1/info.txt
+++ b/src/kdf/mgf1/info.txt
@@ -4,6 +4,10 @@ define MGF1
 
 load_on dep
 
+<requires>
+kdf_base
+</requires>
+
 <add>
 mgf1.h
 mgf1.cpp
diff --git a/src/kdf/ssl_prf/info.txt b/src/kdf/ssl_prf/info.txt
index c41b59b12..48796afaf 100644
--- a/src/kdf/ssl_prf/info.txt
+++ b/src/kdf/ssl_prf/info.txt
@@ -4,6 +4,10 @@ define SSL_V3_PRF
 
 load_on auto
 
+<requires>
+kdf_base
+</requires>
+
 <add>
 prf_ssl3.h
 prf_ssl3.cpp
diff --git a/src/kdf/tls_prf/info.txt b/src/kdf/tls_prf/info.txt
index 9f05f8729..a83b470ba 100644
--- a/src/kdf/tls_prf/info.txt
+++ b/src/kdf/tls_prf/info.txt
@@ -4,6 +4,10 @@ define TLS_V10_PRF
 
 load_on auto
 
+<requires>
+kdf_base
+</requires>
+
 <add>
 prf_tls.h
 prf_tls.cpp
diff --git a/src/kdf/x942_prf/info.txt b/src/kdf/x942_prf/info.txt
index 096745dce..e29c7bd9b 100644
--- a/src/kdf/x942_prf/info.txt
+++ b/src/kdf/x942_prf/info.txt
@@ -6,7 +6,8 @@ load_on auto
 
 <requires>
 core
-oid_lookup
+#kdf_base
+#oid_lookup
 </requires>
 
 <add>
diff --git a/src/pk_pad/eme1/info.txt b/src/pk_pad/eme1/info.txt
index e2b74265f..4e68aba4b 100644
--- a/src/pk_pad/eme1/info.txt
+++ b/src/pk_pad/eme1/info.txt
@@ -4,13 +4,12 @@ define EME1
 
 load_on auto
 
-<add>
-eme1.h
-eme1.cpp
-</add>
-
 <requires>
 mgf1
 utils
-core
 </requires>
+
+<add>
+eme1.h
+eme1.cpp
+</add>