75 files changed, 20 insertions, 14 deletions
diff --git a/configure.pl b/configure.pl
index 70c89d45e..a4a543110 100755
--- a/configure.pl
+++ b/configure.pl
@@ -47,7 +47,6 @@ sub main {
     $$config{'base-dir'} = $base_dir;
     $$config{'config-dir'} = File::Spec->catdir($base_dir, 'misc', 'config');
     $$config{'src-dir'} = File::Spec->catdir($base_dir, 'src');
-    $$config{'include-dir'} = File::Spec->catdir($base_dir, 'include');
     $$config{'checks-dir'} = File::Spec->catdir($base_dir, 'checks');
     $$config{'doc-dir'} = File::Spec->catdir($base_dir, 'doc');
 
@@ -122,13 +121,8 @@ sub main {
         'mp_bits'       => find_mp_bits(sort keys %{$$config{'modules'}}),
         'mod_libs'      => [ using_libs($os, sort keys %{$$config{'modules'}}) ],
 
-        'sources'       => {
-            map_to($$config{'src-dir'}, dir_list($$config{'src-dir'}))
-            },
-
-        'includes'      => {
-            map_to($$config{'include-dir'}, dir_list($$config{'include-dir'}))
-            },
+        'sources'       => { },
+        'includes'      => { },
 
         'check_src'     => {
             map_to($$config{'checks-dir'},
@@ -1170,12 +1164,11 @@ sub load_module {
 #                                                #
 ##################################################
 sub file_type {
-    my ($config, $file) = @_;
+    my ($file) = @_;
 
-    return ('sources', $$config{'src-dir'})
+    return 'sources'
         if($file =~ /\.cpp$/ or $file =~ /\.c$/ or $file =~ /\.S$/);
-    return ('includes', $$config{'include-dir'})
-        if($file =~ /\.h$/);
+    return 'includes' if($file =~ /\.h$/);
 
     croak('file_type() - don\'t know what sort of file ', $file, ' is');
 }
@@ -1194,7 +1187,7 @@ sub add_file {
         $$config{$type}{$file} = $mod_dir;
     };
 
-    &$do_add_file(file_type($config, $file));
+    &$do_add_file(file_type($file));
 }
 
 sub ignore_file {
@@ -1214,7 +1207,7 @@ sub ignore_file {
         }
     };
 
-    &$do_ignore_file(file_type($config, $file));
+    &$do_ignore_file(file_type($file));
 }
 
 sub check_for_file {
diff --git a/src/base.cpp b/src/core/base.cpp
index eb38d0c85..eb38d0c85 100644
--- a/src/base.cpp
+++ b/src/core/base.cpp
diff --git a/include/base.h b/src/core/base.h
index b05feaacb..b05feaacb 100644
--- a/include/base.h
+++ b/src/core/base.h
diff --git a/include/botan.h b/src/core/botan.h
index 70261398a..70261398a 100644
--- a/include/botan.h
+++ b/src/core/botan.h
diff --git a/src/data_src.cpp b/src/core/data_src.cpp
index 1ec1ae090..1ec1ae090 100644
--- a/src/data_src.cpp
+++ b/src/core/data_src.cpp
diff --git a/include/data_src.h b/src/core/data_src.h
index f7285e8fb..f7285e8fb 100644
--- a/include/data_src.h
+++ b/src/core/data_src.h
diff --git a/src/datastor.cpp b/src/core/datastor.cpp
index bff6bcf5b..bff6bcf5b 100644
--- a/src/datastor.cpp
+++ b/src/core/datastor.cpp
diff --git a/include/datastor.h b/src/core/datastor.h
index 0f6029189..0f6029189 100644
--- a/include/datastor.h
+++ b/src/core/datastor.h
diff --git a/src/def_alg.cpp b/src/core/def_alg.cpp
index b13439fe2..b13439fe2 100644
--- a/src/def_alg.cpp
+++ b/src/core/def_alg.cpp
diff --git a/src/def_mode.cpp b/src/core/def_mode.cpp
index b062cc34b..b062cc34b 100644
--- a/src/def_mode.cpp
+++ b/src/core/def_mode.cpp
diff --git a/src/dh_op.cpp b/src/core/dh_op.cpp
index 0bcfd4ef8..0bcfd4ef8 100644
--- a/src/dh_op.cpp
+++ b/src/core/dh_op.cpp
diff --git a/src/dsa_op.cpp b/src/core/dsa_op.cpp
index ee94cb256..ee94cb256 100644
--- a/src/dsa_op.cpp
+++ b/src/core/dsa_op.cpp
diff --git a/src/elg_op.cpp b/src/core/elg_op.cpp
index 0d852d145..0d852d145 100644
--- a/src/elg_op.cpp
+++ b/src/core/elg_op.cpp
diff --git a/src/eng_base.cpp b/src/core/eng_base.cpp
index 38234d462..38234d462 100644
--- a/src/eng_base.cpp
+++ b/src/core/eng_base.cpp
diff --git a/include/eng_def.h b/src/core/eng_def.h
index 95f1fc0f7..95f1fc0f7 100644
--- a/include/eng_def.h
+++ b/src/core/eng_def.h
diff --git a/src/engine.cpp b/src/core/engine.cpp
index 8511c07c2..8511c07c2 100644
--- a/src/engine.cpp
+++ b/src/core/engine.cpp
diff --git a/include/engine.h b/src/core/engine.h
index 13007e662..13007e662 100644
--- a/include/engine.h
+++ b/src/core/engine.h
diff --git a/include/enums.h b/src/core/enums.h
index dc404b728..dc404b728 100644
--- a/include/enums.h
+++ b/src/core/enums.h
diff --git a/src/exceptn.cpp b/src/core/exceptn.cpp
index 29357afa5..29357afa5 100644
--- a/src/exceptn.cpp
+++ b/src/core/exceptn.cpp
diff --git a/include/exceptn.h b/src/core/exceptn.h
index 3bfec2fd2..3bfec2fd2 100644
--- a/include/exceptn.h
+++ b/src/core/exceptn.h
diff --git a/src/get_algo.cpp b/src/core/get_algo.cpp
index 2325c144d..2325c144d 100644
--- a/src/get_algo.cpp
+++ b/src/core/get_algo.cpp
diff --git a/src/get_enc.cpp b/src/core/get_enc.cpp
index fb5952a3e..fb5952a3e 100644
--- a/src/get_enc.cpp
+++ b/src/core/get_enc.cpp
diff --git a/src/get_pbe.cpp b/src/core/get_pbe.cpp
index 6bd85b3e1..6bd85b3e1 100644
--- a/src/get_pbe.cpp
+++ b/src/core/get_pbe.cpp
diff --git a/include/init.h b/src/core/init.h
index f4296a868..f4296a868 100644
--- a/include/init.h
+++ b/src/core/init.h
diff --git a/src/init_def.cpp b/src/core/init_def.cpp
index 03f97252e..03f97252e 100644
--- a/src/init_def.cpp
+++ b/src/core/init_def.cpp
diff --git a/src/init_opt.cpp b/src/core/init_opt.cpp
index 5c4fbee65..5c4fbee65 100644
--- a/src/init_opt.cpp
+++ b/src/core/init_opt.cpp
diff --git a/src/kdf.cpp b/src/core/kdf.cpp
index dca56e1a6..dca56e1a6 100644
--- a/src/kdf.cpp
+++ b/src/core/kdf.cpp
diff --git a/src/libstate.cpp b/src/core/libstate.cpp
index df9d2b519..df9d2b519 100644
--- a/src/libstate.cpp
+++ b/src/core/libstate.cpp
diff --git a/include/libstate.h b/src/core/libstate.h
index 4b1221c84..4b1221c84 100644
--- a/include/libstate.h
+++ b/src/core/libstate.h
diff --git a/include/look_add.h b/src/core/look_add.h
index 4185cbc0a..4185cbc0a 100644
--- a/include/look_add.h
+++ b/src/core/look_add.h
diff --git a/src/look_pk.cpp b/src/core/look_pk.cpp
index a4062b57c..a4062b57c 100644
--- a/src/look_pk.cpp
+++ b/src/core/look_pk.cpp
diff --git a/include/look_pk.h b/src/core/look_pk.h
index 63756ad22..63756ad22 100644
--- a/include/look_pk.h
+++ b/src/core/look_pk.h
diff --git a/include/lookup.h b/src/core/lookup.h
index 97c2eff50..97c2eff50 100644
--- a/include/lookup.h
+++ b/src/core/lookup.h
diff --git a/src/mlock.cpp b/src/core/mlock.cpp
index e4456658d..e4456658d 100644
--- a/src/mlock.cpp
+++ b/src/core/mlock.cpp
diff --git a/src/modules.cpp b/src/core/modules.cpp
index 08ab0cdbb..08ab0cdbb 100644
--- a/src/modules.cpp
+++ b/src/core/modules.cpp
diff --git a/include/modules.h b/src/core/modules.h
index 69a6e1ffb..69a6e1ffb 100644
--- a/include/modules.h
+++ b/src/core/modules.h
diff --git a/include/mutex.h b/src/core/mutex.h
index e30b48eb0..e30b48eb0 100644
--- a/include/mutex.h
+++ b/src/core/mutex.h
diff --git a/src/nr_op.cpp b/src/core/nr_op.cpp
index 01e96a822..01e96a822 100644
--- a/src/nr_op.cpp
+++ b/src/core/nr_op.cpp
diff --git a/src/oids.cpp b/src/core/oids.cpp
index 0823625ea..0823625ea 100644
--- a/src/oids.cpp
+++ b/src/core/oids.cpp
diff --git a/include/oids.h b/src/core/oids.h
index b5be0e01f..b5be0e01f 100644
--- a/include/oids.h
+++ b/src/core/oids.h
diff --git a/src/pk_algs.cpp b/src/core/pk_algs.cpp
index 83ceb61c7..83ceb61c7 100644
--- a/src/pk_algs.cpp
+++ b/src/core/pk_algs.cpp
diff --git a/include/pk_algs.h b/src/core/pk_algs.h
index a8fa5f176..a8fa5f176 100644
--- a/include/pk_algs.h
+++ b/src/core/pk_algs.h
diff --git a/src/pk_core.cpp b/src/core/pk_core.cpp
index 82fe4c217..82fe4c217 100644
--- a/src/pk_core.cpp
+++ b/src/core/pk_core.cpp
diff --git a/include/pk_core.h b/src/core/pk_core.h
index 585c12ee4..585c12ee4 100644
--- a/include/pk_core.h
+++ b/src/core/pk_core.h
diff --git a/src/pk_keys.cpp b/src/core/pk_keys.cpp
index d991f3788..d991f3788 100644
--- a/src/pk_keys.cpp
+++ b/src/core/pk_keys.cpp
diff --git a/include/pk_keys.h b/src/core/pk_keys.h
index 16109c634..16109c634 100644
--- a/include/pk_keys.h
+++ b/src/core/pk_keys.h
diff --git a/include/pk_ops.h b/src/core/pk_ops.h
index fad87b573..fad87b573 100644
--- a/include/pk_ops.h
+++ b/src/core/pk_ops.h
diff --git a/src/pk_util.cpp b/src/core/pk_util.cpp
index 1976436ea..1976436ea 100644
--- a/src/pk_util.cpp
+++ b/src/core/pk_util.cpp
diff --git a/include/pk_util.h b/src/core/pk_util.h
index aa7a71234..aa7a71234 100644
--- a/include/pk_util.h
+++ b/src/core/pk_util.h
diff --git a/src/pkcs8.cpp b/src/core/pkcs8.cpp
index 2963c9d86..2963c9d86 100644
--- a/src/pkcs8.cpp
+++ b/src/core/pkcs8.cpp
diff --git a/include/pkcs8.h b/src/core/pkcs8.h
index 383b1604a..383b1604a 100644
--- a/include/pkcs8.h
+++ b/src/core/pkcs8.h
diff --git a/src/policy.cpp b/src/core/policy.cpp
index f1c844017..f1c844017 100644
--- a/src/policy.cpp
+++ b/src/core/policy.cpp
diff --git a/src/pubkey.cpp b/src/core/pubkey.cpp
index 06bb44bca..06bb44bca 100644
--- a/src/pubkey.cpp
+++ b/src/core/pubkey.cpp
diff --git a/include/pubkey.h b/src/core/pubkey.h
index 0c9abf18f..0c9abf18f 100644
--- a/include/pubkey.h
+++ b/src/core/pubkey.h
diff --git a/src/rng.cpp b/src/core/rng.cpp
index 9bed40dc1..9bed40dc1 100644
--- a/src/rng.cpp
+++ b/src/core/rng.cpp
diff --git a/include/rng.h b/src/core/rng.h
index f8b9a7f62..f8b9a7f62 100644
--- a/include/rng.h
+++ b/src/core/rng.h
diff --git a/src/rsa_op.cpp b/src/core/rsa_op.cpp
index 0b151bf3b..0b151bf3b 100644
--- a/src/rsa_op.cpp
+++ b/src/core/rsa_op.cpp
diff --git a/src/s2k.cpp b/src/core/s2k.cpp
index 9c67aef10..9c67aef10 100644
--- a/src/s2k.cpp
+++ b/src/core/s2k.cpp
diff --git a/include/s2k.h b/src/core/s2k.h
index 031592513..031592513 100644
--- a/include/s2k.h
+++ b/src/core/s2k.h
diff --git a/src/symkey.cpp b/src/core/symkey.cpp
index 7cc1bce64..7cc1bce64 100644
--- a/src/symkey.cpp
+++ b/src/core/symkey.cpp
diff --git a/include/symkey.h b/src/core/symkey.h
index f3211eb0f..f3211eb0f 100644
--- a/include/symkey.h
+++ b/src/core/symkey.h
diff --git a/src/x509_key.cpp b/src/core/x509_key.cpp
index 26ce16a72..26ce16a72 100644
--- a/src/x509_key.cpp
+++ b/src/core/x509_key.cpp
diff --git a/include/x509_key.h b/src/core/x509_key.h
index abaeaaced..abaeaaced 100644
--- a/include/x509_key.h
+++ b/src/core/x509_key.h
diff --git a/src/pk/dsa/modinfo.txt b/src/pk/dsa/modinfo.txt
index 503d9f23a..c29593e36 100644
--- a/src/pk/dsa/modinfo.txt
+++ b/src/pk/dsa/modinfo.txt
@@ -12,4 +12,5 @@ dsa.h
 <requires>
 asn1
 dl_algo
+keypair
 </requires>
diff --git a/src/pk/elgamal/modinfo.txt b/src/pk/elgamal/modinfo.txt
index df38d48d6..ffae2a667 100644
--- a/src/pk/elgamal/modinfo.txt
+++ b/src/pk/elgamal/modinfo.txt
@@ -8,3 +8,10 @@ load_on auto
 elgamal.cpp
 elgamal.h
 </add>
+
+<requires>
+asn1
+bigint
+dl_algo
+keypair
+</requires>
diff --git a/src/keypair.cpp b/src/pk/keypair/keypair.cpp
index 940f0c028..940f0c028 100644
--- a/src/keypair.cpp
+++ b/src/pk/keypair/keypair.cpp
diff --git a/include/keypair.h b/src/pk/keypair/keypair.h
index da322c075..da322c075 100644
--- a/include/keypair.h
+++ b/src/pk/keypair/keypair.h
diff --git a/src/pk/nr/modinfo.txt b/src/pk/nr/modinfo.txt
index c54631f16..c30dbb4cc 100644
--- a/src/pk/nr/modinfo.txt
+++ b/src/pk/nr/modinfo.txt
@@ -12,4 +12,5 @@ nr.h
 <requires>
 asn1
 dl_algo
+keypair
 </requires>
diff --git a/src/pk/rsa/modinfo.txt b/src/pk/rsa/modinfo.txt
index 041c01ca9..793ff95e3 100644
--- a/src/pk/rsa/modinfo.txt
+++ b/src/pk/rsa/modinfo.txt
@@ -12,4 +12,5 @@ rsa.h
 <requires>
 asn1
 if_algo
+keypair
 </requires>
diff --git a/src/pk/rw/modinfo.txt b/src/pk/rw/modinfo.txt
index f9989b3b8..58320a927 100644
--- a/src/pk/rw/modinfo.txt
+++ b/src/pk/rw/modinfo.txt
@@ -12,4 +12,5 @@ rw.h
 <requires>
 asn1
 if_algo
+keypair
 </requires>
diff --git a/src/secalloc/ml_unix/modinfo.txt b/src/secalloc/ml_unix/xxxinfo.txt
index 201a30ead..201a30ead 100644
--- a/src/secalloc/ml_unix/modinfo.txt
+++ b/src/secalloc/ml_unix/xxxinfo.txt
diff --git a/src/secalloc/ml_win32/modinfo.txt b/src/secalloc/ml_win32/xxxinfo.txt
index 92936e1de..92936e1de 100644
--- a/src/secalloc/ml_win32/modinfo.txt
+++ b/src/secalloc/ml_win32/xxxinfo.txt
diff --git a/src/utils/modinfo.txt b/src/utils/modinfo.txt
index ed4450ff9..538057fcf 100644
--- a/src/utils/modinfo.txt
+++ b/src/utils/modinfo.txt
@@ -21,4 +21,6 @@ types.h
 util.h
 version.h
 xor_buf.h
+ui.h
+ui.cpp
 </add>
diff --git a/src/ui.cpp b/src/utils/ui.cpp
index fb81ae23c..fb81ae23c 100644
--- a/src/ui.cpp
+++ b/src/utils/ui.cpp
diff --git a/include/ui.h b/src/utils/ui.h
index f66ac3e56..f66ac3e56 100644
--- a/include/ui.h
+++ b/src/utils/ui.h