diff --git a/library/x509_internal.h b/library/x509_internal.h
index 5505b9778c..9bad6a2ad8 100644
--- a/library/x509_internal.h
+++ b/library/x509_internal.h
@@ -16,11 +16,9 @@
 
 #include "mbedtls/x509.h"
 #include "mbedtls/asn1.h"
-#include "pk_internal.h"
 
-#if defined(MBEDTLS_RSA_C)
-#include "mbedtls/private/rsa.h"
-#endif
+// XXX: internal crypto header - used for mbedtls_pk_load_file()
+#include "pk_internal.h"
 
 int mbedtls_x509_get_name(unsigned char **p, const unsigned char *end,
                           mbedtls_x509_name *cur);
diff --git a/library/x509_oid.h b/library/x509_oid.h
index 0752953aac..5721d8586c 100644
--- a/library/x509_oid.h
+++ b/library/x509_oid.h
@@ -13,9 +13,6 @@
 
 #include "mbedtls/asn1.h"
 #include "mbedtls/pk.h"
-#if defined(MBEDTLS_PK_HAVE_PRIVATE_HEADER)
-#include <mbedtls/private/pk_private.h>
-#endif /* MBEDTLS_PK_HAVE_PRIVATE_HEADER */
 #include "mbedtls/x509.h"
 
 #include <stddef.h>