diff --git a/src/lib/asn1/info.txt b/src/lib/asn1/info.txt
index dc80cdbd462..ec2591cec49 100644
--- a/src/lib/asn1/info.txt
+++ b/src/lib/asn1/info.txt
@@ -17,9 +17,9 @@ asn1_obj.h
 der_enc.h
 oids.h
 ber_dec.h
+pss_params.h
 </header:public>
 
 <header:internal>
 oid_map.h
-pss_params.h
 </header:internal>
diff --git a/src/lib/asn1/pss_params.cpp b/src/lib/asn1/pss_params.cpp
index a6e0ab3e4b2..014906691a9 100644
--- a/src/lib/asn1/pss_params.cpp
+++ b/src/lib/asn1/pss_params.cpp
@@ -5,7 +5,7 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#include <botan/internal/pss_params.h>
+#include <botan/pss_params.h>
 
 #include <botan/ber_dec.h>
 #include <botan/der_enc.h>
diff --git a/src/lib/asn1/pss_params.h b/src/lib/asn1/pss_params.h
index fec4e9fc0a6..5b93b7fe701 100644
--- a/src/lib/asn1/pss_params.h
+++ b/src/lib/asn1/pss_params.h
@@ -13,7 +13,7 @@
 
 namespace Botan {
 
-class PSS_Params final : public ASN1_Object {
+class BOTAN_PUBLIC_API(2, 0) PSS_Params final : public ASN1_Object {
    public:
       static PSS_Params from_emsa_name(std::string_view emsa_name);
 
diff --git a/src/lib/prov/pkcs11/info.txt b/src/lib/prov/pkcs11/info.txt
index 050f484e451..6141f729aac 100644
--- a/src/lib/prov/pkcs11/info.txt
+++ b/src/lib/prov/pkcs11/info.txt
@@ -14,10 +14,6 @@ pubkey
 pk_pad
 </requires>
 
-<header:internal>
-p11_mechanism.h
-</header:internal>
-
 <header:external>
 pkcs11.h
 pkcs11f.h
@@ -34,4 +30,5 @@ p11_randomgenerator.h
 p11_rsa.h
 p11_types.h
 p11_x509.h
+p11_mechanism.h
 </header:public>
diff --git a/src/lib/prov/pkcs11/p11_ecdh.cpp b/src/lib/prov/pkcs11/p11_ecdh.cpp
index f7881d6400d..be39659be94 100644
--- a/src/lib/prov/pkcs11/p11_ecdh.cpp
+++ b/src/lib/prov/pkcs11/p11_ecdh.cpp
@@ -12,8 +12,8 @@
 
    #include <botan/der_enc.h>
    #include <botan/rng.h>
-   #include <botan/internal/p11_mechanism.h>
-   #include <botan/internal/pk_ops.h>
+   #include <botan/p11_mechanism.h>
+   #include <botan/pk_ops.h>
 
 namespace Botan::PKCS11 {
 
diff --git a/src/lib/prov/pkcs11/p11_ecdsa.cpp b/src/lib/prov/pkcs11/p11_ecdsa.cpp
index 3fc4589c087..ef790e532e4 100644
--- a/src/lib/prov/pkcs11/p11_ecdsa.cpp
+++ b/src/lib/prov/pkcs11/p11_ecdsa.cpp
@@ -12,8 +12,8 @@
 
    #include <botan/rng.h>
    #include <botan/internal/keypair.h>
-   #include <botan/internal/p11_mechanism.h>
-   #include <botan/internal/pk_ops.h>
+   #include <botan/p11_mechanism.h>
+   #include <botan/pk_ops.h>
 
 namespace Botan::PKCS11 {
 
diff --git a/src/lib/prov/pkcs11/p11_mechanism.cpp b/src/lib/prov/pkcs11/p11_mechanism.cpp
index 7636c303e8b..68fac0490b2 100644
--- a/src/lib/prov/pkcs11/p11_mechanism.cpp
+++ b/src/lib/prov/pkcs11/p11_mechanism.cpp
@@ -6,7 +6,7 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#include <botan/internal/p11_mechanism.h>
+#include <botan/p11_mechanism.h>
 
 #include <botan/internal/fmt.h>
 #include <botan/internal/parsing.h>
diff --git a/src/lib/prov/pkcs11/p11_mechanism.h b/src/lib/prov/pkcs11/p11_mechanism.h
index 96ea0dc1541..814dba8abbe 100644
--- a/src/lib/prov/pkcs11/p11_mechanism.h
+++ b/src/lib/prov/pkcs11/p11_mechanism.h
@@ -23,7 +23,7 @@ namespace Botan::PKCS11 {
 * for RSA (encryption/decryption, signature/verification)
 * and EC (ECDSA signature/verification, ECDH key derivation).
 */
-class MechanismWrapper final {
+class BOTAN_PUBLIC_API(2, 0) MechanismWrapper final {
    public:
       /// @param mechanism_type the CK_MECHANISM_TYPE for the `mechanism` field of the CK_MECHANISM struct
       explicit MechanismWrapper(MechanismType mechanism_type);
diff --git a/src/lib/prov/pkcs11/p11_rsa.cpp b/src/lib/prov/pkcs11/p11_rsa.cpp
index 9773e8e1b1b..a8e051457d9 100644
--- a/src/lib/prov/pkcs11/p11_rsa.cpp
+++ b/src/lib/prov/pkcs11/p11_rsa.cpp
@@ -15,8 +15,8 @@
    #include <botan/pubkey.h>
    #include <botan/rng.h>
    #include <botan/internal/blinding.h>
-   #include <botan/internal/p11_mechanism.h>
-   #include <botan/internal/pk_ops.h>
+   #include <botan/p11_mechanism.h>
+   #include <botan/pk_ops.h>
    #include <botan/internal/pk_ops_impl.h>
 
 namespace Botan::PKCS11 {
diff --git a/src/lib/prov/tpm/tpm.cpp b/src/lib/prov/tpm/tpm.cpp
index b8d9d537eab..fed00ae8f7e 100644
--- a/src/lib/prov/tpm/tpm.cpp
+++ b/src/lib/prov/tpm/tpm.cpp
@@ -12,7 +12,7 @@
 #include <botan/rsa.h>
 #include <botan/internal/fmt.h>
 #include <botan/internal/hash_id.h>
-#include <botan/internal/pk_ops.h>
+#include <botan/pk_ops.h>
 #include <botan/internal/workfactor.h>
 #include <limits>
 
diff --git a/src/lib/pubkey/info.txt b/src/lib/pubkey/info.txt
index f91d90faf11..3365ea0875e 100644
--- a/src/lib/pubkey/info.txt
+++ b/src/lib/pubkey/info.txt
@@ -14,11 +14,11 @@ pk_ops_fwd.h
 pkcs8.h
 pubkey.h
 x509_key.h
+pk_ops.h
 </header:public>
 
 <header:internal>
 blinding.h
-pk_ops.h
 pk_ops_impl.h
 workfactor.h
 </header:internal>
diff --git a/src/lib/pubkey/mce/mce_internal.h b/src/lib/pubkey/mce/mce_internal.h
index e34de9e438a..4e14ff75dcd 100644
--- a/src/lib/pubkey/mce/mce_internal.h
+++ b/src/lib/pubkey/mce/mce_internal.h
@@ -13,7 +13,7 @@
 #define BOTAN_MCELIECE_INTERNAL_H_
 
 #include <botan/mceliece.h>
-#include <botan/internal/pk_ops.h>
+#include <botan/pk_ops.h>
 #include <botan/internal/polyn_gf2m.h>
 
 namespace Botan {
diff --git a/src/lib/pubkey/pk_keys.cpp b/src/lib/pubkey/pk_keys.cpp
index 300fe05b2e3..851fd93158a 100644
--- a/src/lib/pubkey/pk_keys.cpp
+++ b/src/lib/pubkey/pk_keys.cpp
@@ -11,7 +11,7 @@
 #include <botan/hash.h>
 #include <botan/hex.h>
 #include <botan/internal/fmt.h>
-#include <botan/internal/pk_ops.h>
+#include <botan/pk_ops.h>
 
 namespace Botan {
 
diff --git a/src/lib/pubkey/pk_ops.h b/src/lib/pubkey/pk_ops.h
index 846ceb94bc7..33db83b8ca9 100644
--- a/src/lib/pubkey/pk_ops.h
+++ b/src/lib/pubkey/pk_ops.h
@@ -86,7 +86,7 @@ class Verification {
 /**
 * Public key signature creation interface
 */
-class Signature {
+class BOTAN_PUBLIC_API(2, 0) Signature {
    public:
       /**
       * Add more data to the message currently being signed
diff --git a/src/lib/pubkey/pk_ops_impl.h b/src/lib/pubkey/pk_ops_impl.h
index d95f960158b..d960977717e 100644
--- a/src/lib/pubkey/pk_ops_impl.h
+++ b/src/lib/pubkey/pk_ops_impl.h
@@ -11,7 +11,7 @@
 #include <botan/hash.h>
 #include <botan/kdf.h>
 #include <botan/internal/eme.h>
-#include <botan/internal/pk_ops.h>
+#include <botan/pk_ops.h>
 
 namespace Botan::PK_Ops {
 
diff --git a/src/lib/pubkey/pubkey.cpp b/src/lib/pubkey/pubkey.cpp
index 35c970b0e53..0db3c5b90ed 100644
--- a/src/lib/pubkey/pubkey.cpp
+++ b/src/lib/pubkey/pubkey.cpp
@@ -10,12 +10,12 @@
 #include <botan/bigint.h>
 #include <botan/der_enc.h>
 #include <botan/mem_ops.h>
+#include <botan/pk_ops.h>
+#include <botan/pss_params.h>
 #include <botan/rng.h>
 #include <botan/internal/ct_utils.h>
 #include <botan/internal/fmt.h>
 #include <botan/internal/parsing.h>
-#include <botan/internal/pk_ops.h>
-#include <botan/internal/pss_params.h>
 
 namespace Botan {
 
diff --git a/src/lib/pubkey/rsa/rsa.cpp b/src/lib/pubkey/rsa/rsa.cpp
index 2657af6f07c..b7a5dac792e 100644
--- a/src/lib/pubkey/rsa/rsa.cpp
+++ b/src/lib/pubkey/rsa/rsa.cpp
@@ -9,6 +9,7 @@
 
 #include <botan/ber_dec.h>
 #include <botan/der_enc.h>
+#include <botan/pss_params.h>
 #include <botan/reducer.h>
 #include <botan/internal/blinding.h>
 #include <botan/internal/divide.h>
@@ -19,7 +20,6 @@
 #include <botan/internal/monty_exp.h>
 #include <botan/internal/parsing.h>
 #include <botan/internal/pk_ops_impl.h>
-#include <botan/internal/pss_params.h>
 #include <botan/internal/workfactor.h>
 
 #if defined(BOTAN_HAS_THREAD_UTILS)
diff --git a/src/lib/pubkey/sm2/sm2_enc.cpp b/src/lib/pubkey/sm2/sm2_enc.cpp
index 7985b2b7d0c..77d57a1cec2 100644
--- a/src/lib/pubkey/sm2/sm2_enc.cpp
+++ b/src/lib/pubkey/sm2/sm2_enc.cpp
@@ -13,7 +13,7 @@
 #include <botan/kdf.h>
 #include <botan/internal/ct_utils.h>
 #include <botan/internal/fmt.h>
-#include <botan/internal/pk_ops.h>
+#include <botan/pk_ops.h>
 #include <botan/internal/point_mul.h>
 
 namespace Botan {
diff --git a/src/lib/pubkey/xmss/xmss_signature_operation.h b/src/lib/pubkey/xmss/xmss_signature_operation.h
index f500a0a1580..154a2c912e1 100644
--- a/src/lib/pubkey/xmss/xmss_signature_operation.h
+++ b/src/lib/pubkey/xmss/xmss_signature_operation.h
@@ -9,7 +9,7 @@
 #define BOTAN_XMSS_SIGNATURE_OPERATION_H_
 
 #include <botan/xmss.h>
-#include <botan/internal/pk_ops.h>
+#include <botan/pk_ops.h>
 #include <botan/internal/xmss_address.h>
 #include <botan/internal/xmss_signature.h>
 #include <botan/internal/xmss_wots.h>
diff --git a/src/lib/pubkey/xmss/xmss_verification_operation.h b/src/lib/pubkey/xmss/xmss_verification_operation.h
index 4ff02510c97..214f91c6829 100644
--- a/src/lib/pubkey/xmss/xmss_verification_operation.h
+++ b/src/lib/pubkey/xmss/xmss_verification_operation.h
@@ -9,7 +9,7 @@
 #define BOTAN_XMSS_VERIFICATION_OPERATION_H_
 
 #include <botan/xmss.h>
-#include <botan/internal/pk_ops.h>
+#include <botan/pk_ops.h>
 #include <botan/internal/xmss_signature.h>
 
 namespace Botan {
diff --git a/src/lib/tls/tls_signature_scheme.cpp b/src/lib/tls/tls_signature_scheme.cpp
index d14c6943548..372a1b120a0 100644
--- a/src/lib/tls/tls_signature_scheme.cpp
+++ b/src/lib/tls/tls_signature_scheme.cpp
@@ -11,9 +11,9 @@
 #include <botan/ec_group.h>
 #include <botan/hash.h>
 #include <botan/hex.h>
+#include <botan/pss_params.h>
 #include <botan/tls_exceptn.h>
 #include <botan/tls_version.h>
-#include <botan/internal/pss_params.h>
 #include <botan/internal/stl_util.h>
 
 namespace Botan::TLS {