diff --git a/include/mbedtls/x509_crt.h b/include/mbedtls/x509_crt.h
index e47e70c42..77609efe9 100644
--- a/include/mbedtls/x509_crt.h
+++ b/include/mbedtls/x509_crt.h
@@ -791,16 +791,6 @@ int mbedtls_x509_crt_get_ext_key_usage( mbedtls_x509_crt const *crt,
  */
 int mbedtls_x509_crt_flush_cache( mbedtls_x509_crt const *crt );
 
-/* Internal X.509 CRT cache handling functions.
- * They are not part of the public API and may change
- * at any time. */
-
-int mbedtls_x509_crt_flush_cache_frame( mbedtls_x509_crt const *crt );
-int mbedtls_x509_crt_flush_cache_pk( mbedtls_x509_crt const *crt );
-
-int mbedtls_x509_crt_cache_provide_frame( mbedtls_x509_crt const *crt );
-int mbedtls_x509_crt_cache_provide_pk( mbedtls_x509_crt const *crt );
-
 static inline int mbedtls_x509_crt_frame_acquire( mbedtls_x509_crt const *crt,
                                                   mbedtls_x509_crt_frame **frame_ptr )
 {
diff --git a/include/mbedtls/x509_internal.h b/include/mbedtls/x509_internal.h
index 30f428854..19d63ec00 100644
--- a/include/mbedtls/x509_internal.h
+++ b/include/mbedtls/x509_internal.h
@@ -44,6 +44,16 @@ typedef struct mbedtls_x509_crt_cache
     struct mbedtls_pk_context *pk;
 } mbedtls_x509_crt_cache;
 
+/* Internal X.509 CRT cache handling functions. */
+
+int mbedtls_x509_crt_flush_cache_frame( struct mbedtls_x509_crt const *crt );
+int mbedtls_x509_crt_flush_cache_pk( struct mbedtls_x509_crt const *crt );
+
+int mbedtls_x509_crt_cache_provide_frame( struct mbedtls_x509_crt const *crt );
+int mbedtls_x509_crt_cache_provide_pk( struct mbedtls_x509_crt const *crt );
+
+/* Uncategorized internal X.509 functions */
+
 int mbedtls_x509_get_name( unsigned char *p, size_t len,
                            mbedtls_x509_name *cur );
 int mbedtls_x509_get_alg_null( unsigned char **p, const unsigned char *end,