diff --git a/secure_fw/spm/model_ipc/spm_ipc.c b/secure_fw/spm/model_ipc/spm_ipc.c
index ea1a368..21f1bc6 100644
--- a/secure_fw/spm/model_ipc/spm_ipc.c
+++ b/secure_fw/spm/model_ipc/spm_ipc.c
@@ -20,9 +20,9 @@
 #include "tfm_api.h"
 #include "tfm_secure_api.h"
 #include "tfm_memory_utils.h"
-#include "tfm/spm_api.h"
+#include "spm_api.h"
 #include "tfm_peripherals_def.h"
-#include "tfm/spm_db.h"
+#include "spm_db.h"
 #include "tfm_core_utils.h"
 #include "spm_psa_client_call.h"
 #include "tfm_rpc.h"
diff --git a/secure_fw/spm/model_ipc/spm_psa_client_call.c b/secure_fw/spm/model_ipc/spm_psa_client_call.c
index 58aae56..bf5171e 100644
--- a/secure_fw/spm/model_ipc/spm_psa_client_call.c
+++ b/secure_fw/spm/model_ipc/spm_psa_client_call.c
@@ -6,7 +6,7 @@
  */
 
 #include "psa/service.h"
-#include "tfm/spm_api.h"
+#include "spm_api.h"
 #include "tfm_core_utils.h"
 #include "tfm_internal_defines.h"
 #include "tfm_memory_utils.h"
diff --git a/secure_fw/spm/model_ipc/tfm_core_svcalls_ipc.c b/secure_fw/spm/model_ipc/tfm_core_svcalls_ipc.c
index 2c07bf4..2db4233 100644
--- a/secure_fw/spm/model_ipc/tfm_core_svcalls_ipc.c
+++ b/secure_fw/spm/model_ipc/tfm_core_svcalls_ipc.c
@@ -7,8 +7,8 @@
 
 #include <string.h>
 #include "region.h"
-#include "tfm/spm_api.h"
-#include "tfm/spm_db.h"
+#include "spm_api.h"
+#include "spm_db.h"
 #include "tfm_api.h"
 #include "tfm_arch.h"
 #include "tfm_core_trustzone.h"
diff --git a/secure_fw/spm/model_ipc/tfm_multi_core_mem_check.c b/secure_fw/spm/model_ipc/tfm_multi_core_mem_check.c
index ff97cf5..55e8e57 100644
--- a/secure_fw/spm/model_ipc/tfm_multi_core_mem_check.c
+++ b/secure_fw/spm/model_ipc/tfm_multi_core_mem_check.c
@@ -9,7 +9,7 @@
 #include "tfm_spm_hal.h"
 #include "region_defs.h"
 #include "secure_utilities.h"
-#include "tfm/spm_api.h"
+#include "spm_api.h"
 #include "tfm_internal.h"
 #include "tfm_multi_core.h"
 #include "tfm_secure_api.h"
diff --git a/secure_fw/spm/model_ipc/tfm_rpc.c b/secure_fw/spm/model_ipc/tfm_rpc.c
index 073e4f4..f2778aa 100644
--- a/secure_fw/spm/model_ipc/tfm_rpc.c
+++ b/secure_fw/spm/model_ipc/tfm_rpc.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "tfm/spm_api.h"
+#include "spm_api.h"
 #include "spm_psa_client_call.h"
 #include "tfm_rpc.h"
 #include "tfm_utils.h"
diff --git a/secure_fw/spm/model_ipc/tfm_spm_db_ipc.inc b/secure_fw/spm/model_ipc/tfm_spm_db_ipc.inc
index 8618458..0102970 100644
--- a/secure_fw/spm/model_ipc/tfm_spm_db_ipc.inc
+++ b/secure_fw/spm/model_ipc/tfm_spm_db_ipc.inc
@@ -10,7 +10,7 @@
 #ifndef __TFM_SPM_DB_IPC_INC__
 #define __TFM_SPM_DB_IPC_INC__
 
-#include "tfm/spm_api.h"
+#include "spm_api.h"
 #include "psa_manifest/sid.h"
 
 /**************************************************************************/
diff --git a/secure_fw/spm/model_ipc/tfm_spm_db_ipc.inc.template b/secure_fw/spm/model_ipc/tfm_spm_db_ipc.inc.template
index 4fcd0fb..86390df 100644
--- a/secure_fw/spm/model_ipc/tfm_spm_db_ipc.inc.template
+++ b/secure_fw/spm/model_ipc/tfm_spm_db_ipc.inc.template
@@ -10,7 +10,7 @@
 #ifndef __TFM_SPM_DB_IPC_INC__
 #define __TFM_SPM_DB_IPC_INC__
 
-#include "tfm/spm_api.h"
+#include "spm_api.h"
 #include "psa_manifest/sid.h"
 
 {# Produce a build error if heap_size is presented in the manifest, because of the dynamic memory allocation is not supported now. #}
diff --git a/secure_fw/spm/model_ipc/tfm_thread.c b/secure_fw/spm/model_ipc/tfm_thread.c
index 1d66e25..74af5a9 100644
--- a/secure_fw/spm/model_ipc/tfm_thread.c
+++ b/secure_fw/spm/model_ipc/tfm_thread.c
@@ -10,7 +10,7 @@
 #include "tfm_utils.h"
 #include "tfm_memory_utils.h"
 #include "tfm/tfm_core_svc.h"
-#include "tfm/spm_api.h"
+#include "spm_api.h"
 #include "tfm_core_utils.h"
 
 /* Force ZERO in case ZI(bss) clear is missing */