diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index a462a07e70..a308711754 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -10,7 +10,7 @@
 #ifndef MBEDTLS_SSL_MISC_H
 #define MBEDTLS_SSL_MISC_H
 
-#include "common.h"
+#include "tf_psa_crypto_common.h"
 #include "mbedtls/build_info.h"
 
 #include "mbedtls/error.h"
diff --git a/library/x509_internal.h b/library/x509_internal.h
index 9360471b96..8160270be1 100644
--- a/library/x509_internal.h
+++ b/library/x509_internal.h
@@ -10,7 +10,7 @@
 #ifndef MBEDTLS_X509_INTERNAL_H
 #define MBEDTLS_X509_INTERNAL_H
 
-#include "common.h"
+#include "tf_psa_crypto_common.h"
 #include "mbedtls/build_info.h"
 #include "mbedtls/private_access.h"
 
diff --git a/scripts/data_files/error.fmt b/scripts/data_files/error.fmt
index 14522ecd20..69bec9fe40 100644
--- a/scripts/data_files/error.fmt
+++ b/scripts/data_files/error.fmt
@@ -5,7 +5,7 @@
  *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
  */
 
-#include "common.h"
+#include "tf_psa_crypto_common.h"
 
 #include "mbedtls/error.h"
 
diff --git a/tests/psa-client-server/psasim/src/aut_psa_aead_encrypt_decrypt.c b/tests/psa-client-server/psasim/src/aut_psa_aead_encrypt_decrypt.c
index 71173d2b52..87ef39a9ed 100644
--- a/tests/psa-client-server/psasim/src/aut_psa_aead_encrypt_decrypt.c
+++ b/tests/psa-client-server/psasim/src/aut_psa_aead_encrypt_decrypt.c
@@ -12,13 +12,13 @@
  *  -I$(MBEDTLS_ROOT_PATH)/tf-psa-crypto/drivers/builtin/include
  * None of those cover tf-psa-crypto/core, so we rely on the
  * “-I$(MBEDTLS_ROOT_PATH)/include” entry plus a parent-relative
- * include "../tf-psa-crypto/core/common.h" in order to pull in common.h here,
+ * include "../tf-psa-crypto/core/tf_psa_crypto_common.h" in order to pull in tf_psa_crypto_common.h here,
  * which in turn gets MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING (to silence the
  * new GCC-15 unterminated-string-initialization warning).
  * See GitHub issue #10223 for the proper long-term fix.
  * https://github.com/Mbed-TLS/mbedtls/issues/10223
  */
-#include "../tf-psa-crypto/core/common.h"
+#include "../tf-psa-crypto/core/tf_psa_crypto_common.h"
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/psa-client-server/psasim/src/aut_psa_cipher_encrypt_decrypt.c b/tests/psa-client-server/psasim/src/aut_psa_cipher_encrypt_decrypt.c
index 25c0b8a61e..82bdca54dc 100644
--- a/tests/psa-client-server/psasim/src/aut_psa_cipher_encrypt_decrypt.c
+++ b/tests/psa-client-server/psasim/src/aut_psa_cipher_encrypt_decrypt.c
@@ -4,7 +4,7 @@
  */
 
 #include "psa/crypto.h"
-#include "../tf-psa-crypto/core/common.h"
+#include "../tf-psa-crypto/core/tf_psa_crypto_common.h"
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/src/certs.c b/tests/src/certs.c
index f7a73bf74e..c45f0628c0 100644
--- a/tests/src/certs.c
+++ b/tests/src/certs.c
@@ -5,7 +5,7 @@
  *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
  */
 
-#include "common.h"
+#include "tf_psa_crypto_common.h"
 
 #include <test/certs.h>