Include fixups (headers moves to private directory)
Signed-off-by: Anton Matkin <anton.matkin@arm.com>
diff --git a/include/mbedtls/debug.h b/include/mbedtls/debug.h
index b6d4e27..c293e87 100644
--- a/include/mbedtls/debug.h
+++ b/include/mbedtls/debug.h
@@ -15,7 +15,7 @@
#include "mbedtls/ssl.h"
#if defined(MBEDTLS_ECP_C)
-#include "mbedtls/ecp.h"
+#include "mbedtls/private/ecp.h"
#endif
#if defined(MBEDTLS_DEBUG_C)
diff --git a/include/mbedtls/error.h b/include/mbedtls/error.h
index 7abb00f..ee3d093 100644
--- a/include/mbedtls/error.h
+++ b/include/mbedtls/error.h
@@ -11,7 +11,7 @@
#define MBEDTLS_ERROR_H
#include "mbedtls/build_info.h"
-#include "mbedtls/error_common.h"
+#include "mbedtls/private/error_common.h"
#include <stddef.h>
diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index 628d5c7..36132c3 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -14,8 +14,8 @@
#include "mbedtls/build_info.h"
-#include "mbedtls/bignum.h"
-#include "mbedtls/ecp.h"
+#include "mbedtls/private/bignum.h"
+#include "mbedtls/private/ecp.h"
#include "mbedtls/ssl_ciphersuites.h"
@@ -27,7 +27,7 @@
#include "mbedtls/md.h"
#if defined(MBEDTLS_KEY_EXCHANGE_SOME_ECDH_OR_ECDHE_ANY_ENABLED)
-#include "mbedtls/ecdh.h"
+#include "mbedtls/private/ecdh.h"
#endif
#if defined(MBEDTLS_HAVE_TIME)
diff --git a/include/mbedtls/ssl_ciphersuites.h b/include/mbedtls/ssl_ciphersuites.h
index b031231..c97f6ab 100644
--- a/include/mbedtls/ssl_ciphersuites.h
+++ b/include/mbedtls/ssl_ciphersuites.h
@@ -14,7 +14,7 @@
#include "mbedtls/build_info.h"
#include "mbedtls/pk.h"
-#include "mbedtls/cipher.h"
+#include "mbedtls/private/cipher.h"
#include "mbedtls/md.h"
#ifdef __cplusplus
diff --git a/include/mbedtls/x509.h b/include/mbedtls/x509.h
index b1a80e3..f0742a8 100644
--- a/include/mbedtls/x509.h
+++ b/include/mbedtls/x509.h
@@ -17,7 +17,7 @@
#include "mbedtls/pk.h"
#if defined(MBEDTLS_RSA_C)
-#include "mbedtls/rsa.h"
+#include "mbedtls/private/rsa.h"
#endif
/**
diff --git a/include/mbedtls/x509_crt.h b/include/mbedtls/x509_crt.h
index bbe5fc4..a7bf029 100644
--- a/include/mbedtls/x509_crt.h
+++ b/include/mbedtls/x509_crt.h
@@ -15,7 +15,7 @@
#include "mbedtls/x509.h"
#include "mbedtls/x509_crl.h"
-#include "mbedtls/bignum.h"
+#include "mbedtls/private/bignum.h"
/**
* \addtogroup x509_module
diff --git a/library/pkcs7.c b/library/pkcs7.c
index 3481cbd..57b4e96 100644
--- a/library/pkcs7.c
+++ b/library/pkcs7.c
@@ -9,7 +9,7 @@
#include "mbedtls/asn1.h"
#include "mbedtls/x509_crt.h"
#include "mbedtls/x509_crl.h"
-#include "mbedtls/oid.h"
+#include "mbedtls/private/oid.h"
#include "x509_oid.h"
#include "mbedtls/error.h"
diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index 981ac0e..ed3c4a7 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -19,26 +19,26 @@
#include "mbedtls/debug.h"
#include "debug_internal.h"
-#include "mbedtls/cipher.h"
+#include "mbedtls/private/cipher.h"
#include "psa/crypto.h"
#include "psa_util_internal.h"
extern const mbedtls_error_pair_t psa_to_ssl_errors[7];
#if defined(PSA_WANT_ALG_MD5)
-#include "mbedtls/md5.h"
+#include "mbedtls/private/md5.h"
#endif
#if defined(PSA_WANT_ALG_SHA_1)
-#include "mbedtls/sha1.h"
+#include "mbedtls/private/sha1.h"
#endif
#if defined(PSA_WANT_ALG_SHA_256)
-#include "mbedtls/sha256.h"
+#include "mbedtls/private/sha256.h"
#endif
#if defined(PSA_WANT_ALG_SHA_512)
-#include "mbedtls/sha512.h"
+#include "mbedtls/private/sha512.h"
#endif
#include "mbedtls/pk.h"
diff --git a/library/ssl_msg.c b/library/ssl_msg.c
index 731cbc8..fd7e16c 100644
--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@@ -30,7 +30,7 @@
#include "psa/crypto.h"
#if defined(MBEDTLS_X509_CRT_PARSE_C)
-#include "mbedtls/oid.h"
+#include "mbedtls/private/oid.h"
#endif
/* Define a local translating function to save code size by not using too many
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 9144f92..c575a42 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -34,7 +34,7 @@
#include "psa/crypto.h"
#if defined(MBEDTLS_X509_CRT_PARSE_C)
-#include "mbedtls/oid.h"
+#include "mbedtls/private/oid.h"
#endif
/* Define local translating functions to save code size by not using too many
diff --git a/library/ssl_tls12_server.c b/library/ssl_tls12_server.c
index b2b5e33..181c6de 100644
--- a/library/ssl_tls12_server.c
+++ b/library/ssl_tls12_server.c
@@ -34,7 +34,7 @@
#endif
#if defined(MBEDTLS_ECP_C)
-#include "mbedtls/ecp.h"
+#include "mbedtls/private/ecp.h"
#endif
#if defined(MBEDTLS_HAVE_TIME)
diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c
index e88c00a..756d529 100644
--- a/library/ssl_tls13_generic.c
+++ b/library/ssl_tls13_generic.c
@@ -13,7 +13,7 @@
#include "mbedtls/error.h"
#include "debug_internal.h"
-#include "mbedtls/oid.h"
+#include "mbedtls/private/oid.h"
#include "mbedtls/platform.h"
#include "mbedtls/constant_time.h"
#include "psa/crypto.h"
diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c
index dc50bee..2a47445 100644
--- a/library/ssl_tls13_server.c
+++ b/library/ssl_tls13_server.c
@@ -13,7 +13,7 @@
#include "mbedtls/error.h"
#include "mbedtls/platform.h"
#include "mbedtls/constant_time.h"
-#include "mbedtls/oid.h"
+#include "mbedtls/private/oid.h"
#include "mbedtls/psa_util.h"
#include "ssl_tls13_keys.h"
diff --git a/library/x509.c b/library/x509.c
index 1adff8f..9d7b4b7 100644
--- a/library/x509.c
+++ b/library/x509.c
@@ -21,7 +21,7 @@
#include "mbedtls/asn1.h"
#include "mbedtls/error.h"
-#include "mbedtls/oid.h"
+#include "mbedtls/private/oid.h"
#include "x509_oid.h"
#include <limits.h>
diff --git a/library/x509_create.c b/library/x509_create.c
index 370eb9b..341d741 100644
--- a/library/x509_create.c
+++ b/library/x509_create.c
@@ -11,7 +11,7 @@
#include "mbedtls/asn1write.h"
#include "mbedtls/error.h"
-#include "mbedtls/oid.h"
+#include "mbedtls/private/oid.h"
#include "x509_oid.h"
#include <limits.h>
diff --git a/library/x509_crl.c b/library/x509_crl.c
index 0b98ba4..e8aca5b 100644
--- a/library/x509_crl.c
+++ b/library/x509_crl.c
@@ -21,7 +21,7 @@
#include "mbedtls/x509_crl.h"
#include "mbedtls/error.h"
-#include "mbedtls/oid.h"
+#include "mbedtls/private/oid.h"
#include "mbedtls/platform_util.h"
#include <string.h>
diff --git a/library/x509_crt.c b/library/x509_crt.c
index e6b9252..df1dbf6 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -23,7 +23,7 @@
#include "mbedtls/x509_crt.h"
#include "mbedtls/error.h"
-#include "mbedtls/oid.h"
+#include "mbedtls/private/oid.h"
#include "x509_oid.h"
#include "mbedtls/platform_util.h"
diff --git a/library/x509_csr.c b/library/x509_csr.c
index 32a3bb2..e78b5d7 100644
--- a/library/x509_csr.c
+++ b/library/x509_csr.c
@@ -21,7 +21,7 @@
#include "mbedtls/x509_csr.h"
#include "mbedtls/error.h"
-#include "mbedtls/oid.h"
+#include "mbedtls/private/oid.h"
#include "x509_oid.h"
#include "mbedtls/platform_util.h"
diff --git a/library/x509_internal.h b/library/x509_internal.h
index b44b957..5505b97 100644
--- a/library/x509_internal.h
+++ b/library/x509_internal.h
@@ -19,7 +19,7 @@
#include "pk_internal.h"
#if defined(MBEDTLS_RSA_C)
-#include "mbedtls/rsa.h"
+#include "mbedtls/private/rsa.h"
#endif
int mbedtls_x509_get_name(unsigned char **p, const unsigned char *end,
diff --git a/library/x509_oid.c b/library/x509_oid.c
index cc0063b..8963529 100644
--- a/library/x509_oid.c
+++ b/library/x509_oid.c
@@ -14,7 +14,7 @@
* disabled. */
#if defined(MBEDTLS_X509_USE_C) || defined(MBEDTLS_X509_CREATE_C)
-#include "mbedtls/oid.h"
+#include "mbedtls/private/oid.h"
#include "x509_oid.h"
#include <stdio.h>
diff --git a/library/x509write.c b/library/x509write.c
index 0906a5a..1d4d556 100644
--- a/library/x509write.c
+++ b/library/x509write.c
@@ -11,7 +11,7 @@
#include "mbedtls/x509_crt.h"
#include "mbedtls/asn1write.h"
#include "mbedtls/error.h"
-#include "mbedtls/oid.h"
+#include "mbedtls/private/oid.h"
#include "mbedtls/platform.h"
#include "mbedtls/platform_util.h"
diff --git a/library/x509write_crt.c b/library/x509write_crt.c
index 663b308..ccf5a92 100644
--- a/library/x509write_crt.c
+++ b/library/x509write_crt.c
@@ -18,7 +18,7 @@
#include "mbedtls/x509_crt.h"
#include "mbedtls/asn1write.h"
#include "mbedtls/error.h"
-#include "mbedtls/oid.h"
+#include "mbedtls/private/oid.h"
#include "x509_oid.h"
#include "mbedtls/platform.h"
#include "mbedtls/platform_util.h"
diff --git a/library/x509write_csr.c b/library/x509write_csr.c
index 8e37278..88e5e5a 100644
--- a/library/x509write_csr.c
+++ b/library/x509write_csr.c
@@ -17,7 +17,7 @@
#include "mbedtls/x509_csr.h"
#include "mbedtls/asn1write.h"
#include "mbedtls/error.h"
-#include "mbedtls/oid.h"
+#include "mbedtls/private/oid.h"
#include "x509_oid.h"
#include "mbedtls/platform_util.h"
diff --git a/programs/fuzz/fuzz_client.c b/programs/fuzz/fuzz_client.c
index 0878480..70eb656 100644
--- a/programs/fuzz/fuzz_client.c
+++ b/programs/fuzz/fuzz_client.c
@@ -1,8 +1,8 @@
#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS
#include "mbedtls/ssl.h"
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/entropy.h"
+#include "mbedtls/private/ctr_drbg.h"
#include "test/certs.h"
#include "fuzz_common.h"
#include <string.h>
diff --git a/programs/fuzz/fuzz_dtlsclient.c b/programs/fuzz/fuzz_dtlsclient.c
index ca7626d..c83f314 100644
--- a/programs/fuzz/fuzz_dtlsclient.c
+++ b/programs/fuzz/fuzz_dtlsclient.c
@@ -6,8 +6,8 @@
#include "fuzz_common.h"
#include "mbedtls/ssl.h"
#if defined(MBEDTLS_SSL_PROTO_DTLS)
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/entropy.h"
+#include "mbedtls/private/ctr_drbg.h"
#include "mbedtls/timing.h"
#include "test/certs.h"
diff --git a/programs/fuzz/fuzz_dtlsserver.c b/programs/fuzz/fuzz_dtlsserver.c
index 4f159fb..dd2a8b6 100644
--- a/programs/fuzz/fuzz_dtlsserver.c
+++ b/programs/fuzz/fuzz_dtlsserver.c
@@ -7,8 +7,8 @@
#include "mbedtls/ssl.h"
#include "test/certs.h"
#if defined(MBEDTLS_SSL_PROTO_DTLS)
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/entropy.h"
+#include "mbedtls/private/ctr_drbg.h"
#include "mbedtls/timing.h"
#include "mbedtls/ssl_cookie.h"
diff --git a/programs/fuzz/fuzz_server.c b/programs/fuzz/fuzz_server.c
index 3a5e502..3b1054e 100644
--- a/programs/fuzz/fuzz_server.c
+++ b/programs/fuzz/fuzz_server.c
@@ -1,8 +1,8 @@
#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS
#include "mbedtls/ssl.h"
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/entropy.h"
+#include "mbedtls/private/ctr_drbg.h"
#include "mbedtls/ssl_ticket.h"
#include "test/certs.h"
#include "fuzz_common.h"
diff --git a/programs/ssl/dtls_client.c b/programs/ssl/dtls_client.c
index 26eb20d..bb1d5af 100644
--- a/programs/ssl/dtls_client.c
+++ b/programs/ssl/dtls_client.c
@@ -31,8 +31,8 @@
#include "mbedtls/net_sockets.h"
#include "mbedtls/debug.h"
#include "mbedtls/ssl.h"
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/entropy.h"
+#include "mbedtls/private/ctr_drbg.h"
#include "mbedtls/error.h"
#include "mbedtls/timing.h"
#include "test/certs.h"
diff --git a/programs/ssl/dtls_server.c b/programs/ssl/dtls_server.c
index 0e155fd..479b543 100644
--- a/programs/ssl/dtls_server.c
+++ b/programs/ssl/dtls_server.c
@@ -45,8 +45,8 @@
#include <stdlib.h>
#include <stdio.h>
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/entropy.h"
+#include "mbedtls/private/ctr_drbg.h"
#include "mbedtls/x509.h"
#include "mbedtls/ssl.h"
#include "mbedtls/ssl_cookie.h"
diff --git a/programs/ssl/mini_client.c b/programs/ssl/mini_client.c
index e3adb3c..96d41b3 100644
--- a/programs/ssl/mini_client.c
+++ b/programs/ssl/mini_client.c
@@ -43,8 +43,8 @@
#include "mbedtls/net_sockets.h"
#include "mbedtls/ssl.h"
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/entropy.h"
+#include "mbedtls/private/ctr_drbg.h"
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/programs/ssl/ssl_client1.c b/programs/ssl/ssl_client1.c
index dba8aab..c56ff07 100644
--- a/programs/ssl/ssl_client1.c
+++ b/programs/ssl/ssl_client1.c
@@ -27,8 +27,8 @@
#include "mbedtls/net_sockets.h"
#include "mbedtls/debug.h"
#include "mbedtls/ssl.h"
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/entropy.h"
+#include "mbedtls/private/ctr_drbg.h"
#include "mbedtls/error.h"
#include "test/certs.h"
diff --git a/programs/ssl/ssl_fork_server.c b/programs/ssl/ssl_fork_server.c
index f8752bb..ff1c877 100644
--- a/programs/ssl/ssl_fork_server.c
+++ b/programs/ssl/ssl_fork_server.c
@@ -31,8 +31,8 @@
}
#else
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/entropy.h"
+#include "mbedtls/private/ctr_drbg.h"
#include "test/certs.h"
#include "mbedtls/x509.h"
#include "mbedtls/ssl.h"
diff --git a/programs/ssl/ssl_mail_client.c b/programs/ssl/ssl_mail_client.c
index 521bc54..0c2822c 100644
--- a/programs/ssl/ssl_mail_client.c
+++ b/programs/ssl/ssl_mail_client.c
@@ -38,8 +38,8 @@
#include "mbedtls/error.h"
#include "mbedtls/net_sockets.h"
#include "mbedtls/ssl.h"
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/entropy.h"
+#include "mbedtls/private/ctr_drbg.h"
#include "test/certs.h"
#include "mbedtls/x509.h"
diff --git a/programs/ssl/ssl_pthread_server.c b/programs/ssl/ssl_pthread_server.c
index 5701a7b..867926d 100644
--- a/programs/ssl/ssl_pthread_server.c
+++ b/programs/ssl/ssl_pthread_server.c
@@ -38,8 +38,8 @@
#include <windows.h>
#endif
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/entropy.h"
+#include "mbedtls/private/ctr_drbg.h"
#include "mbedtls/x509.h"
#include "mbedtls/ssl.h"
#include "mbedtls/net_sockets.h"
diff --git a/programs/ssl/ssl_server.c b/programs/ssl/ssl_server.c
index 2f26ca4..fd9da18 100644
--- a/programs/ssl/ssl_server.c
+++ b/programs/ssl/ssl_server.c
@@ -31,8 +31,8 @@
#include <windows.h>
#endif
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/entropy.h"
+#include "mbedtls/private/ctr_drbg.h"
#include "mbedtls/x509.h"
#include "mbedtls/ssl.h"
#include "mbedtls/net_sockets.h"
diff --git a/programs/ssl/ssl_test_lib.h b/programs/ssl/ssl_test_lib.h
index 20dbe61..1dda8d6 100644
--- a/programs/ssl/ssl_test_lib.h
+++ b/programs/ssl/ssl_test_lib.h
@@ -43,9 +43,9 @@
#include "mbedtls/net_sockets.h"
#include "mbedtls/ssl.h"
#include "mbedtls/ssl_ciphersuites.h"
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
-#include "mbedtls/hmac_drbg.h"
+#include "mbedtls/private/entropy.h"
+#include "mbedtls/private/ctr_drbg.h"
+#include "mbedtls/private/hmac_drbg.h"
#include "mbedtls/x509.h"
#include "mbedtls/error.h"
#include "mbedtls/debug.h"
diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index 372a84d..2c2b48e 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -9,31 +9,31 @@
#include "mbedtls/build_info.h"
-#include "mbedtls/entropy.h"
-#include "mbedtls/hmac_drbg.h"
-#include "mbedtls/ctr_drbg.h"
-#include "mbedtls/gcm.h"
-#include "mbedtls/ccm.h"
-#include "mbedtls/cmac.h"
-#include "mbedtls/md5.h"
-#include "mbedtls/ripemd160.h"
-#include "mbedtls/sha1.h"
-#include "mbedtls/sha256.h"
-#include "mbedtls/sha512.h"
-#include "mbedtls/sha3.h"
-#include "mbedtls/aes.h"
-#include "mbedtls/camellia.h"
-#include "mbedtls/aria.h"
-#include "mbedtls/chacha20.h"
-#include "mbedtls/poly1305.h"
-#include "mbedtls/chachapoly.h"
+#include "mbedtls/private/entropy.h"
+#include "mbedtls/private/hmac_drbg.h"
+#include "mbedtls/private/ctr_drbg.h"
+#include "mbedtls/private/gcm.h"
+#include "mbedtls/private/ccm.h"
+#include "mbedtls/private/cmac.h"
+#include "mbedtls/private/md5.h"
+#include "mbedtls/private/ripemd160.h"
+#include "mbedtls/private/sha1.h"
+#include "mbedtls/private/sha256.h"
+#include "mbedtls/private/sha512.h"
+#include "mbedtls/private/sha3.h"
+#include "mbedtls/private/aes.h"
+#include "mbedtls/private/camellia.h"
+#include "mbedtls/private/aria.h"
+#include "mbedtls/private/chacha20.h"
+#include "mbedtls/private/poly1305.h"
+#include "mbedtls/private/chachapoly.h"
#include "mbedtls/base64.h"
-#include "mbedtls/bignum.h"
-#include "mbedtls/rsa.h"
+#include "mbedtls/private/bignum.h"
+#include "mbedtls/private/rsa.h"
#include "mbedtls/x509.h"
-#include "mbedtls/pkcs5.h"
-#include "mbedtls/ecp.h"
-#include "mbedtls/ecjpake.h"
+#include "mbedtls/private/pkcs5.h"
+#include "mbedtls/private/ecp.h"
+#include "mbedtls/private/ecjpake.h"
#include "mbedtls/timing.h"
#include "mbedtls/nist_kw.h"
#include "mbedtls/debug.h"
diff --git a/programs/x509/cert_app.c b/programs/x509/cert_app.c
index c747505..2f31a8e 100644
--- a/programs/x509/cert_app.c
+++ b/programs/x509/cert_app.c
@@ -27,8 +27,8 @@
}
#else
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/entropy.h"
+#include "mbedtls/private/ctr_drbg.h"
#include "mbedtls/net_sockets.h"
#include "mbedtls/ssl.h"
#include "mbedtls/x509.h"
diff --git a/programs/x509/cert_req.c b/programs/x509/cert_req.c
index 02fd567..c20f08d 100644
--- a/programs/x509/cert_req.c
+++ b/programs/x509/cert_req.c
@@ -29,8 +29,8 @@
#else
#include "mbedtls/x509_csr.h"
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/entropy.h"
+#include "mbedtls/private/ctr_drbg.h"
#include "mbedtls/error.h"
#include <stdio.h>
diff --git a/programs/x509/cert_write.c b/programs/x509/cert_write.c
index fb55c3f..be32230 100644
--- a/programs/x509/cert_write.c
+++ b/programs/x509/cert_write.c
@@ -30,9 +30,9 @@
#include "mbedtls/x509_crt.h"
#include "mbedtls/x509_csr.h"
-#include "mbedtls/oid.h"
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/private/oid.h"
+#include "mbedtls/private/entropy.h"
+#include "mbedtls/private/ctr_drbg.h"
#include "mbedtls/error.h"
#include "test/helpers.h"
diff --git a/tests/psa-client-server/psasim/src/aut_psa_random.c b/tests/psa-client-server/psasim/src/aut_psa_random.c
index 5880c4d..203f4d4 100644
--- a/tests/psa-client-server/psasim/src/aut_psa_random.c
+++ b/tests/psa-client-server/psasim/src/aut_psa_random.c
@@ -10,7 +10,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "mbedtls/entropy.h"
+#include "mbedtls/private/entropy.h"
#define BUFFER_SIZE 100
diff --git a/tests/suites/test_suite_pkcs7.function b/tests/suites/test_suite_pkcs7.function
index 0c4a00b..335bec5 100644
--- a/tests/suites/test_suite_pkcs7.function
+++ b/tests/suites/test_suite_pkcs7.function
@@ -1,14 +1,14 @@
/* BEGIN_HEADER */
-#include "mbedtls/bignum.h"
+#include "mbedtls/private/bignum.h"
#include "mbedtls/pkcs7.h"
#include "mbedtls/x509.h"
#include "mbedtls/x509_crt.h"
#include "mbedtls/x509_crl.h"
#include "x509_internal.h"
-#include "mbedtls/oid.h"
+#include "mbedtls/private/oid.h"
#include "sys/types.h"
#include "sys/stat.h"
-#include "mbedtls/rsa.h"
+#include "mbedtls/private/rsa.h"
#include "mbedtls/error.h"
/* END_HEADER */
diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index 079dca4..4ce66e9 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -1,12 +1,12 @@
/* BEGIN_HEADER */
-#include "mbedtls/bignum.h"
+#include "mbedtls/private/bignum.h"
#include "mbedtls/x509.h"
#include "mbedtls/x509_crt.h"
#include "mbedtls/x509_crl.h"
#include "mbedtls/x509_csr.h"
#include "x509_internal.h"
#include "mbedtls/pem.h"
-#include "mbedtls/oid.h"
+#include "mbedtls/private/oid.h"
#include "x509_oid.h"
#include "mbedtls/base64.h"
#include "mbedtls/error.h"
diff --git a/tests/suites/test_suite_x509write.function b/tests/suites/test_suite_x509write.function
index 000c09a..0c0e799 100644
--- a/tests/suites/test_suite_x509write.function
+++ b/tests/suites/test_suite_x509write.function
@@ -1,12 +1,12 @@
/* BEGIN_HEADER */
-#include "mbedtls/bignum.h"
+#include "mbedtls/private/bignum.h"
#include "mbedtls/x509_crt.h"
#include "mbedtls/x509_csr.h"
#include "x509_internal.h"
#include "mbedtls/pem.h"
-#include "mbedtls/oid.h"
+#include "mbedtls/private/oid.h"
#include "x509_oid.h"
-#include "mbedtls/rsa.h"
+#include "mbedtls/private/rsa.h"
#include "mbedtls/asn1.h"
#include "mbedtls/asn1write.h"
#include "mbedtls/pk.h"
diff --git a/tf-psa-crypto b/tf-psa-crypto
index 3fd4e75..20524a8 160000
--- a/tf-psa-crypto
+++ b/tf-psa-crypto
@@ -1 +1 @@
-Subproject commit 3fd4e754b283d7b766d8f3798fe07d42b3bcf961
+Subproject commit 20524a89722972a7dbf06a32ab7bb225053713f6