17 files changed, 11 insertions, 35 deletions
diff --git a/src/cert/x509/info.txt b/src/cert/x509/info.txt
index 98b7afb98..25db8c1e6 100644
--- a/src/cert/x509/info.txt
+++ b/src/cert/x509/info.txt
@@ -8,7 +8,6 @@ load_on auto
 asn1
 bigint
 pubkey
-pk_lookup
 oid_lookup
 </requires>
 
diff --git a/src/cms/info.txt b/src/cms/info.txt
index 7399eb85e..402865b07 100644
--- a/src/cms/info.txt
+++ b/src/cms/info.txt
@@ -8,7 +8,6 @@ load_on auto
 asn1
 filters
 oid_lookup
-pk_lookup
 pubkey
 x509
 </requires>
diff --git a/src/engine/engine.h b/src/engine/engine.h
index 6cb63fa36..f73ecb0a0 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -12,7 +12,7 @@
 #include <botan/stream_cipher.h>
 #include <botan/hash.h>
 #include <botan/mac.h>
-#include <botan/bigint.h>
+#include <botan/pow_mod.h>
 
 #include <utility>
 #include <map>
@@ -51,7 +51,6 @@ namespace Botan {
 
 class Algorithm_Factory;
 class Keyed_Filter;
-class Modular_Exponentiator;
 
 /*************************************************
 * Engine Base Class                              *
diff --git a/src/libstate/info.txt b/src/libstate/info.txt
index 1ac76f1a4..f3111a31e 100644
--- a/src/libstate/info.txt
+++ b/src/libstate/info.txt
@@ -16,13 +16,15 @@ system_alloc
 <add>
 botan.h
 get_enc.cpp
-init.h
 init.cpp
+init.h
 libstate.cpp
 libstate.h
+look_pk.cpp
+look_pk.h
 lookup.cpp
 lookup.h
-policy.cpp
-pk_engine.h
 pk_engine.cpp
+pk_engine.h
+policy.cpp
 </add>
diff --git a/src/pubkey/pk_lookup/look_pk.cpp b/src/libstate/look_pk.cpp
index d72c1ce0f..d72c1ce0f 100644
--- a/src/pubkey/pk_lookup/look_pk.cpp
+++ b/src/libstate/look_pk.cpp
diff --git a/src/pubkey/pk_lookup/look_pk.h b/src/libstate/look_pk.h
index 926416a41..926416a41 100644
--- a/src/pubkey/pk_lookup/look_pk.h
+++ b/src/libstate/look_pk.h
diff --git a/src/pubkey/dh/info.txt b/src/pubkey/dh/info.txt
index 461184829..5d3396216 100644
--- a/src/pubkey/dh/info.txt
+++ b/src/pubkey/dh/info.txt
@@ -18,5 +18,4 @@ bigint
 dl_algo
 numbertheory
 pubkey
-pk_lookup
 </requires>
diff --git a/src/pubkey/dlies/info.txt b/src/pubkey/dlies/info.txt
index a44b40f11..1a09dcbc5 100644
--- a/src/pubkey/dlies/info.txt
+++ b/src/pubkey/dlies/info.txt
@@ -13,5 +13,4 @@ dlies.h
 dh
 kdf2
 pubkey
-pk_lookup
 </requires>
diff --git a/src/pubkey/elgamal/info.txt b/src/pubkey/elgamal/info.txt
index 9ca94e3e9..c457e1529 100644
--- a/src/pubkey/elgamal/info.txt
+++ b/src/pubkey/elgamal/info.txt
@@ -11,7 +11,6 @@ bigint
 dl_algo
 keypair
 numbertheory
-pk_lookup
 pubkey
 </requires>
 
diff --git a/src/pubkey/keypair/info.txt b/src/pubkey/keypair/info.txt
index 74a0c037d..c6fa4af5d 100644
--- a/src/pubkey/keypair/info.txt
+++ b/src/pubkey/keypair/info.txt
@@ -11,5 +11,4 @@ keypair.h
 
 <requires>
 pubkey
-pk_lookup
 </requires>
diff --git a/src/pubkey/nr/info.txt b/src/pubkey/nr/info.txt
index 98d1100a0..6434d4385 100644
--- a/src/pubkey/nr/info.txt
+++ b/src/pubkey/nr/info.txt
@@ -19,6 +19,5 @@ bigint
 dl_algo
 keypair
 numbertheory
-pk_lookup
 pubkey
 </requires>
diff --git a/src/pubkey/pk_lookup/info.txt b/src/pubkey/pk_lookup/info.txt
deleted file mode 100644
index 39dd4dfc2..000000000
--- a/src/pubkey/pk_lookup/info.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-realname "Public Key Lookup"
-
-define PUBLIC_KEY_LOOKUP
-
-load_on dep
-
-<requires>
-asn1
-bigint
-numbertheory
-</requires>
-
-<add>
-look_pk.cpp
-look_pk.h
-pk_algs.cpp
-pk_algs.h
-</add>
diff --git a/src/pubkey/pubkey/info.txt b/src/pubkey/pubkey/info.txt
index 71d56e17e..72fe5b3eb 100644
--- a/src/pubkey/pubkey/info.txt
+++ b/src/pubkey/pubkey/info.txt
@@ -2,7 +2,7 @@ realname "Public Key Base"
 
 define PUBLIC_KEY_CRYPTO
 
-load_on dep
+load_on auto
 
 <requires>
 asn1
@@ -15,14 +15,16 @@ rng
 </requires>
 
 <add>
-pubkey_enums.h
-pubkey_enums.cpp
+pk_algs.cpp
+pk_algs.h
 pk_keys.cpp
 pk_keys.h
 pkcs8.cpp
 pkcs8.h
 pubkey.cpp
 pubkey.h
+pubkey_enums.cpp
+pubkey_enums.h
 x509_key.cpp
 x509_key.h
 </add>
diff --git a/src/pubkey/pk_lookup/pk_algs.cpp b/src/pubkey/pubkey/pk_algs.cpp
index 3d33d8f35..3d33d8f35 100644
--- a/src/pubkey/pk_lookup/pk_algs.cpp
+++ b/src/pubkey/pubkey/pk_algs.cpp
diff --git a/src/pubkey/pk_lookup/pk_algs.h b/src/pubkey/pubkey/pk_algs.h
index 2bb9a546e..2bb9a546e 100644
--- a/src/pubkey/pk_lookup/pk_algs.h
+++ b/src/pubkey/pubkey/pk_algs.h
diff --git a/src/pubkey/rsa/info.txt b/src/pubkey/rsa/info.txt
index 378457e2a..ac2b6dde7 100644
--- a/src/pubkey/rsa/info.txt
+++ b/src/pubkey/rsa/info.txt
@@ -10,7 +10,6 @@ bigint
 if_algo
 keypair
 numbertheory
-pk_lookup
 pubkey
 </requires>
 
diff --git a/src/pubkey/rw/info.txt b/src/pubkey/rw/info.txt
index 7a29bd568..40c849d1c 100644
--- a/src/pubkey/rw/info.txt
+++ b/src/pubkey/rw/info.txt
@@ -10,7 +10,6 @@ bigint
 if_algo
 keypair
 numbertheory
-pk_lookup
 pubkey
 </requires>