diff --git a/TESTS/psa/crypto_access_control/COMPONENT_SPE/test_partition.c b/TESTS/psa/crypto_access_control/COMPONENT_SPE/test_partition.c
index aee6728f12..05872535ec 100644
--- a/TESTS/psa/crypto_access_control/COMPONENT_SPE/test_partition.c
+++ b/TESTS/psa/crypto_access_control/COMPONENT_SPE/test_partition.c
@@ -16,7 +16,7 @@
  */
 
 #include <stdlib.h>
-#include "psa_crypto_acl_test_partition.h"
+#include "mbed_spm_partitions.h"
 #include "psa/client.h"
 #include "psa/service.h"
 #include "psa/crypto.h"
diff --git a/TESTS/psa/spm_client/COMPONENT_SPE/client_tests_partition.c b/TESTS/psa/spm_client/COMPONENT_SPE/client_tests_partition.c
index 28c4e8dd3f..afe5767613 100644
--- a/TESTS/psa/spm_client/COMPONENT_SPE/client_tests_partition.c
+++ b/TESTS/psa/spm_client/COMPONENT_SPE/client_tests_partition.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include "psa/client.h"
 #include "psa/service.h"
-#include "psa_client_tests_part1_partition.h"
+#include "mbed_spm_partitions.h"
 
 #define MSG_BUF_SIZE 128
 uint8_t data[MSG_BUF_SIZE] = {0};
diff --git a/TESTS/psa/spm_server/COMPONENT_SPE/server_tests_partition1.c b/TESTS/psa/spm_server/COMPONENT_SPE/server_tests_partition1.c
index 024dc16647..4fca965879 100644
--- a/TESTS/psa/spm_server/COMPONENT_SPE/server_tests_partition1.c
+++ b/TESTS/psa/spm_server/COMPONENT_SPE/server_tests_partition1.c
@@ -18,7 +18,7 @@
 #include "string.h"
 #include "psa/client.h"
 #include "psa/service.h"
-#include "psa_server_tests_part1_partition.h"
+#include "mbed_spm_partitions.h"
 #include "server_tests.h"
 
 extern psa_test_server_side_func test_list[];
diff --git a/TESTS/psa/spm_server/COMPONENT_SPE/server_tests_partition2.c b/TESTS/psa/spm_server/COMPONENT_SPE/server_tests_partition2.c
index 02b0bbfe60..4727bffded 100644
--- a/TESTS/psa/spm_server/COMPONENT_SPE/server_tests_partition2.c
+++ b/TESTS/psa/spm_server/COMPONENT_SPE/server_tests_partition2.c
@@ -19,7 +19,7 @@
 #include <string.h>
 #include "psa/client.h"
 #include "psa/service.h"
-#include "psa_server_tests_part2_partition.h"
+#include "mbed_spm_partitions.h"
 
 #if defined(TARGET_MBED_SPM)
 #include "cmsis_os2.h"
diff --git a/TESTS/psa/spm_server/COMPONENT_SPE/tests.c b/TESTS/psa/spm_server/COMPONENT_SPE/tests.c
index c73f61b45a..39359353ee 100644
--- a/TESTS/psa/spm_server/COMPONENT_SPE/tests.c
+++ b/TESTS/psa/spm_server/COMPONENT_SPE/tests.c
@@ -18,7 +18,7 @@
 #include "string.h"
 #include "psa/client.h"
 #include "psa/service.h"
-#include "psa_server_tests_part1_partition.h"
+#include "mbed_spm_partitions.h"
 #include "server_tests.h"
 #include "psa_manifest/sid.h"
 
diff --git a/TESTS/psa/spm_smoke/COMPONENT_SPE/smoke_tests_partition.c b/TESTS/psa/spm_smoke/COMPONENT_SPE/smoke_tests_partition.c
index af2df8b660..f79459805c 100644
--- a/TESTS/psa/spm_smoke/COMPONENT_SPE/smoke_tests_partition.c
+++ b/TESTS/psa/spm_smoke/COMPONENT_SPE/smoke_tests_partition.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include "psa/client.h"
 #include "psa/service.h"
-#include "psa_smoke_tests_part1_partition.h"
+#include "mbed_spm_partitions.h"
 
 // ------------------------------------ Definitions ----------------------------------
 
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 0291dc2599..239b8d35df 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
@@ -19,7 +19,7 @@
 #include "psa_attest_inject_key.h"
 #include "psa/crypto.h"
 #include "psa/client.h"
-#include "psa_attest_srv_ifs.h"
+#include "psa_manifest/sid.h"
 
 #define MINOR_VER 1
 
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 8985076db8..ff90cc8530 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
@@ -21,7 +21,7 @@
 #include "psa/client.h"
 #include "attestation.h"
 #include <string.h>
-#include "psa_attest_srv_ifs.h"
+#include "psa_manifest/sid.h"
 
 #define MINOR_VER 1
 
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 8608d474d6..3459a7d768 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
@@ -20,7 +20,7 @@
 #include "psa/client.h"
 #include "psa/service.h"
 
-#include "psa_attest_srv_partition.h"
+#include "mbed_spm_partitions.h"
 #include "psa_initial_attestation_api.h"
 #include "psa_attest_inject_key.h"
 #include "psa_inject_attestation_key_impl.h"
diff --git a/components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_partition.c b/components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_partition.c
index 13c6a06a4a..221a44c1e7 100644
--- a/components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_partition.c
+++ b/components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_partition.c
@@ -8,7 +8,7 @@
 #define PSA_CRYPTO_SECURE 1
 #include "crypto_spe.h"
 #include "crypto_platform_spe.h"
-#include "psa_crypto_srv_partition.h"
+#include "mbed_spm_partitions.h"
 #include "mbedtls/entropy.h"
 #include "psa_crypto_access_control.h"
 
diff --git a/components/TARGET_PSA/services/platform/COMPONENT_SPE/platform_partition.c b/components/TARGET_PSA/services/platform/COMPONENT_SPE/platform_partition.c
index 9d3e0ee8a8..db47444a34 100644
--- a/components/TARGET_PSA/services/platform/COMPONENT_SPE/platform_partition.c
+++ b/components/TARGET_PSA/services/platform/COMPONENT_SPE/platform_partition.c
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "psa_platform_partition.h"
+#include "mbed_spm_partitions.h"
 #include "platform_srv_impl.h"
 #include "psa/internal_trusted_storage.h"
 #include "psa/service.h"
diff --git a/components/TARGET_PSA/services/storage/its/COMPONENT_SPE/its_partition.c b/components/TARGET_PSA/services/storage/its/COMPONENT_SPE/its_partition.c
index 3299bdba1d..305783e8cb 100644
--- a/components/TARGET_PSA/services/storage/its/COMPONENT_SPE/its_partition.c
+++ b/components/TARGET_PSA/services/storage/its/COMPONENT_SPE/its_partition.c
@@ -19,7 +19,7 @@
 #include <string.h>
 #include "psa/client.h"
 #include "psa/service.h"
-#include "psa_its_partition.h"
+#include "mbed_spm_partitions.h"
 #include "psa/internal_trusted_storage.h"
 #include "pits_impl.h"
 #include "mbed_error.h"