diff --git a/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IMPL/attest_crypto.c b/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IMPL/attest_crypto.c
index 4c82369895..e1cb6d3619 100755
--- a/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IMPL/attest_crypto.c
+++ b/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IMPL/attest_crypto.c
@@ -18,7 +18,7 @@
 
 #include "t_cose_crypto.h"
 #include "tfm_plat_defs.h"
-#include "crypto.h"
+#include "psa/crypto.h"
 #include "tfm_plat_crypto_keys.h"
 #include <string.h>
 
diff --git a/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IMPL/attest_crypto_keys.c b/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IMPL/attest_crypto_keys.c
index 369a79b7b6..6523dcccd0 100755
--- a/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IMPL/attest_crypto_keys.c
+++ b/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IMPL/attest_crypto_keys.c
@@ -17,7 +17,7 @@
 */
 
 #include "tfm_plat_crypto_keys.h"
-#include "crypto.h"
+#include "psa/crypto.h"
 
 #include <stdlib.h>
 #include <math.h>
diff --git a/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IMPL/psa_inject_attestation_key_impl.h b/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IMPL/psa_inject_attestation_key_impl.h
index 1d4050c43e..de6e1bbceb 100755
--- a/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IMPL/psa_inject_attestation_key_impl.h
+++ b/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IMPL/psa_inject_attestation_key_impl.h
@@ -19,7 +19,7 @@
 #ifndef __PSA_INITIAL_ATTESTATION_IMPL_H__
 #define __PSA_INITIAL_ATTESTATION_IMPL_H__
 
-#include "crypto.h"
+#include "psa/crypto.h"
 #include <stdint.h>
 #include <string.h>
 
diff --git a/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IPC/psa_attest_inject_key.c b/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IPC/psa_attest_inject_key.c
index 3e64d64342..405c5b16cd 100755
--- a/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IPC/psa_attest_inject_key.c
+++ b/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IPC/psa_attest_inject_key.c
@@ -17,7 +17,7 @@
 */
 
 #include "psa_attest_inject_key.h"
-#include "crypto.h"
+#include "psa/crypto.h"
 #include "psa/client.h"
 #include "psa_attest_srv_ifs.h"
 
diff --git a/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IPC/psa_initial_attestation_api.c b/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IPC/psa_initial_attestation_api.c
index f5982a3941..609b684272 100755
--- a/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IPC/psa_initial_attestation_api.c
+++ b/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IPC/psa_initial_attestation_api.c
@@ -17,7 +17,7 @@
 */
 
 #include "psa_initial_attestation_api.h"
-#include "crypto.h"
+#include "psa/crypto.h"
 #include "psa/client.h"
 #include "attestation.h"
 #include <string.h>
diff --git a/components/TARGET_PSA/services/attestation/COMPONENT_SPE/psa_attestation_partition.c b/components/TARGET_PSA/services/attestation/COMPONENT_SPE/psa_attestation_partition.c
index c79e3cfe3f..afef1fe638 100755
--- a/components/TARGET_PSA/services/attestation/COMPONENT_SPE/psa_attestation_partition.c
+++ b/components/TARGET_PSA/services/attestation/COMPONENT_SPE/psa_attestation_partition.c
@@ -28,7 +28,7 @@
 #include "attestation.h"
 #include <string.h>
 #include "mbedtls/entropy.h"
-#include "crypto.h"
+#include "psa/crypto.h"
 
 #if defined(PLATFORM_C)
 #include "mbedtls/platform.h"
diff --git a/components/TARGET_PSA/services/attestation/psa_attest_inject_key.h b/components/TARGET_PSA/services/attestation/psa_attest_inject_key.h
index 38e53bd0a2..e6d1607af9 100644
--- a/components/TARGET_PSA/services/attestation/psa_attest_inject_key.h
+++ b/components/TARGET_PSA/services/attestation/psa_attest_inject_key.h
@@ -19,7 +19,7 @@
 #ifndef __PSA_INJECT_KEY_H__
 #define __PSA_INJECT_KEY_H__
 
-#include "crypto.h"
+#include "psa/crypto.h"
 #include <stdint.h>
 #include <string.h>