15 files changed, 33 insertions, 14 deletions
diff --git a/src/pubkey/dh/dh.cpp b/src/pubkey/dh/dh.cpp
index 149bc5882..baaa31126 100644
--- a/src/pubkey/dh/dh.cpp
+++ b/src/pubkey/dh/dh.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/dh.h>
 #include <botan/numthry.h>
-#include <botan/workfactor.h>
+#include <botan/internal/workfactor.h>
 
 namespace Botan {
 
diff --git a/src/pubkey/dh/dh_core.cpp b/src/pubkey/dh/dh_core.cpp
index 07d134c44..cbe2dc9f1 100644
--- a/src/pubkey/dh/dh_core.cpp
+++ b/src/pubkey/dh/dh_core.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/dh_core.h>
 #include <botan/numthry.h>
-#include <botan/pk_engine.h>
+#include <botan/internal/pk_engine.h>
 #include <botan/parsing.h>
 #include <algorithm>
 
diff --git a/src/pubkey/dl_group/dl_group.cpp b/src/pubkey/dl_group/dl_group.cpp
index 13ea03016..a2e239783 100644
--- a/src/pubkey/dl_group/dl_group.cpp
+++ b/src/pubkey/dl_group/dl_group.cpp
@@ -12,8 +12,8 @@
 #include <botan/der_enc.h>
 #include <botan/ber_dec.h>
 #include <botan/pipe.h>
-#include <botan/workfactor.h>
 #include <botan/pem.h>
+#include <botan/internal/workfactor.h>
 
 namespace Botan {
 
diff --git a/src/pubkey/dsa/dsa_core.cpp b/src/pubkey/dsa/dsa_core.cpp
index e5a23a5c3..d952e10eb 100644
--- a/src/pubkey/dsa/dsa_core.cpp
+++ b/src/pubkey/dsa/dsa_core.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/dsa_core.h>
 #include <botan/numthry.h>
-#include <botan/pk_engine.h>
+#include <botan/internal/pk_engine.h>
 #include <botan/parsing.h>
 #include <algorithm>
 
diff --git a/src/pubkey/ecdsa/ecdsa_core.cpp b/src/pubkey/ecdsa/ecdsa_core.cpp
index 0be186fb4..78b527786 100644
--- a/src/pubkey/ecdsa/ecdsa_core.cpp
+++ b/src/pubkey/ecdsa/ecdsa_core.cpp
@@ -7,7 +7,7 @@
 */
 
 #include <botan/ecdsa_core.h>
-#include <botan/pk_engine.h>
+#include <botan/internal/pk_engine.h>
 
 namespace Botan {
 
diff --git a/src/pubkey/eckaeg/eckaeg_core.cpp b/src/pubkey/eckaeg/eckaeg_core.cpp
index dc89a878d..eaf467933 100644
--- a/src/pubkey/eckaeg/eckaeg_core.cpp
+++ b/src/pubkey/eckaeg/eckaeg_core.cpp
@@ -8,7 +8,7 @@
 
 #include <botan/eckaeg_core.h>
 #include <botan/numthry.h>
-#include <botan/pk_engine.h>
+#include <botan/internal/pk_engine.h>
 #include <botan/parsing.h>
 #include <algorithm>
 
diff --git a/src/pubkey/elgamal/elg_core.cpp b/src/pubkey/elgamal/elg_core.cpp
index f2416d8a0..0005c4ffc 100644
--- a/src/pubkey/elgamal/elg_core.cpp
+++ b/src/pubkey/elgamal/elg_core.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/elg_core.h>
 #include <botan/numthry.h>
-#include <botan/pk_engine.h>
+#include <botan/internal/pk_engine.h>
 #include <botan/parsing.h>
 #include <algorithm>
 
diff --git a/src/pubkey/elgamal/elgamal.cpp b/src/pubkey/elgamal/elgamal.cpp
index 8c07c5735..e3215f757 100644
--- a/src/pubkey/elgamal/elgamal.cpp
+++ b/src/pubkey/elgamal/elgamal.cpp
@@ -9,7 +9,7 @@
 #include <botan/numthry.h>
 #include <botan/keypair.h>
 #include <botan/look_pk.h>
-#include <botan/workfactor.h>
+#include <botan/internal/workfactor.h>
 
 namespace Botan {
 
diff --git a/src/pubkey/if_algo/if_core.cpp b/src/pubkey/if_algo/if_core.cpp
index 9c4a12ee5..41ebfe8dd 100644
--- a/src/pubkey/if_algo/if_core.cpp
+++ b/src/pubkey/if_algo/if_core.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/if_core.h>
 #include <botan/numthry.h>
-#include <botan/pk_engine.h>
+#include <botan/internal/pk_engine.h>
 #include <botan/parsing.h>
 #include <algorithm>
 
diff --git a/src/pubkey/info.txt b/src/pubkey/info.txt
index 69e743351..b28bd1868 100644
--- a/src/pubkey/info.txt
+++ b/src/pubkey/info.txt
@@ -1,5 +1,24 @@
 define PUBLIC_KEY_CRYPTO
 
+<source>
+pk_algs.cpp
+pk_keys.cpp
+pubkey.cpp
+pubkey_enums.cpp
+workfactor.cpp
+</source>
+
+<header:public>
+pk_keys.h
+pubkey.h
+pubkey_enums.h
+</header:public>
+
+<header:internal>
+pk_algs.h
+workfactor.h
+</header:internal>
+
 <requires>
 alloc
 asn1
diff --git a/src/pubkey/nr/nr_core.cpp b/src/pubkey/nr/nr_core.cpp
index afa1115db..a87c32d60 100644
--- a/src/pubkey/nr/nr_core.cpp
+++ b/src/pubkey/nr/nr_core.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/nr_core.h>
 #include <botan/numthry.h>
-#include <botan/pk_engine.h>
+#include <botan/internal/pk_engine.h>
 #include <botan/parsing.h>
 #include <algorithm>
 
diff --git a/src/pubkey/pk_algs.cpp b/src/pubkey/pk_algs.cpp
index 99d7294f0..c040e006b 100644
--- a/src/pubkey/pk_algs.cpp
+++ b/src/pubkey/pk_algs.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/pk_algs.h>
+#include <botan/internal/pk_algs.h>
 
 #if defined(BOTAN_HAS_RSA)
   #include <botan/rsa.h>
diff --git a/src/pubkey/pk_codecs/pkcs8.cpp b/src/pubkey/pk_codecs/pkcs8.cpp
index 3d73b7ab1..f287e1e63 100644
--- a/src/pubkey/pk_codecs/pkcs8.cpp
+++ b/src/pubkey/pk_codecs/pkcs8.cpp
@@ -10,9 +10,9 @@
 #include <botan/der_enc.h>
 #include <botan/ber_dec.h>
 #include <botan/asn1_obj.h>
-#include <botan/pk_algs.h>
 #include <botan/oids.h>
 #include <botan/pem.h>
+#include <botan/internal/pk_algs.h>
 #include <memory>
 
 namespace Botan {
diff --git a/src/pubkey/pk_codecs/x509_key.cpp b/src/pubkey/pk_codecs/x509_key.cpp
index 3fec15f7f..fcfb2b165 100644
--- a/src/pubkey/pk_codecs/x509_key.cpp
+++ b/src/pubkey/pk_codecs/x509_key.cpp
@@ -10,9 +10,9 @@
 #include <botan/asn1_obj.h>
 #include <botan/der_enc.h>
 #include <botan/ber_dec.h>
-#include <botan/pk_algs.h>
 #include <botan/oids.h>
 #include <botan/pem.h>
+#include <botan/internal/pk_algs.h>
 #include <memory>
 
 namespace Botan {
diff --git a/src/pubkey/workfactor.cpp b/src/pubkey/workfactor.cpp
index e40b7919c..f15c64783 100644
--- a/src/pubkey/workfactor.cpp
+++ b/src/pubkey/workfactor.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/workfactor.h>
+#include <botan/internal/workfactor.h>
 #include <algorithm>
 #include <cmath>