diff --git a/arch/xtensa/include/iss-hifi3z/core-isa.h b/arch/xtensa/include/iss-hifi3z/core-isa.h
index 7fe873f293a..10b8b47a2e6 100644
--- a/arch/xtensa/include/iss-hifi3z/core-isa.h
+++ b/arch/xtensa/include/iss-hifi3z/core-isa.h
@@ -25,8 +25,8 @@
  *
  ****************************************************************************/
 
-#ifndef XTENSA_CORE_CONFIGURATION_H_
-#define XTENSA_CORE_CONFIGURATION_H_
+#ifndef __ARCH_XTENSA_INCLUDE_ISS_HIFI3Z_CORE_ISA_H
+#define __ARCH_XTENSA_INCLUDE_ISS_HIFI3Z_CORE_ISA_H
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -819,4 +819,4 @@
 #define XCHAL_HAVE_WWDT                 0
 #endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */
 
-#endif /* XTENSA_CORE_CONFIGURATION_H_ */
+#endif /* __ARCH_XTENSA_INCLUDE_ISS_HIFI3Z_CORE_ISA_H */
diff --git a/arch/xtensa/include/iss-hifi3z/tie-asm.h b/arch/xtensa/include/iss-hifi3z/tie-asm.h
index 0021cf19908..237165e7b29 100644
--- a/arch/xtensa/include/iss-hifi3z/tie-asm.h
+++ b/arch/xtensa/include/iss-hifi3z/tie-asm.h
@@ -30,8 +30,8 @@
  *
  ****************************************************************************/
 
-#ifndef _XTENSA_CORE_TIE_ASM_H
-#define _XTENSA_CORE_TIE_ASM_H
+#ifndef __ARCH_XTENSA_INCLUDE_ISS_HIFI3Z_TIE_ASM_H
+#define __ARCH_XTENSA_INCLUDE_ISS_HIFI3Z_TIE_ASM_H
 
 /*  Selection parameter values for save-area save/restore macros:  */
 
@@ -274,4 +274,4 @@
     .macro xchal_cp7_store   p a b c d continue=0 ofs=-1 select=-1 ; .endm
     .macro xchal_cp7_load    p a b c d continue=0 ofs=-1 select=-1 ; .endm
 
-#endif /* _XTENSA_CORE_TIE_ASM_H */
+#endif /* __ARCH_XTENSA_INCLUDE_ISS_HIFI3Z_TIE_ASM_H */
diff --git a/arch/xtensa/include/iss-hifi3z/tie.h b/arch/xtensa/include/iss-hifi3z/tie.h
index ee4335c0a17..fbc5063290d 100644
--- a/arch/xtensa/include/iss-hifi3z/tie.h
+++ b/arch/xtensa/include/iss-hifi3z/tie.h
@@ -32,8 +32,8 @@
  *
  ****************************************************************************/
 
-#ifndef XTENSA_CORE_TIE_H
-#define XTENSA_CORE_TIE_H
+#ifndef __ARCH_XTENSA_INCLUDE_ISS_HIFI3Z_TIE_H
+#define __ARCH_XTENSA_INCLUDE_ISS_HIFI3Z_TIE_H
 
 /* parasoft-begin-suppress ALL "This file not MISRA checked." */
 
@@ -179,4 +179,4 @@
 
 /* parasoft-end-suppress ALL "This file not MISRA checked." */
 
-#endif /* XTENSA_CORE_TIE_H */
+#endif /* __ARCH_XTENSA_INCLUDE_ISS_HIFI3Z_TIE_H */
diff --git a/arch/xtensa/include/iss-hifi4/core-isa.h b/arch/xtensa/include/iss-hifi4/core-isa.h
index 53d0831905c..8d12675fdba 100644
--- a/arch/xtensa/include/iss-hifi4/core-isa.h
+++ b/arch/xtensa/include/iss-hifi4/core-isa.h
@@ -25,8 +25,8 @@
  *
  ****************************************************************************/
 
-#ifndef XTENSA_CORE_CONFIGURATION_H_
-#define XTENSA_CORE_CONFIGURATION_H_
+#ifndef __ARCH_XTENSA_INCLUDE_ISS_HIFI4_CORE_ISA_H
+#define __ARCH_XTENSA_INCLUDE_ISS_HIFI4_CORE_ISA_H
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -762,4 +762,4 @@
 
 #endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */
 
-#endif /* XTENSA_CORE_CONFIGURATION_H_ */
+#endif /* __ARCH_XTENSA_INCLUDE_ISS_HIFI4_CORE_ISA_H */
diff --git a/arch/xtensa/include/iss-hifi4/tie-asm.h b/arch/xtensa/include/iss-hifi4/tie-asm.h
index 7113aa384e5..6bae0dc9edb 100644
--- a/arch/xtensa/include/iss-hifi4/tie-asm.h
+++ b/arch/xtensa/include/iss-hifi4/tie-asm.h
@@ -30,8 +30,8 @@
  *
  ****************************************************************************/
 
-#ifndef _XTENSA_CORE_TIE_ASM_H
-#define _XTENSA_CORE_TIE_ASM_H
+#ifndef __ARCH_XTENSA_INCLUDE_ISS_HIFI4_TIE_ASM_H
+#define __ARCH_XTENSA_INCLUDE_ISS_HIFI4_TIE_ASM_H
 
 /*  Selection parameter values for save-area save/restore macros:  */
 
@@ -346,4 +346,4 @@
   .macro xchal_cp7_store   p a b c d continue=0 ofs=-1 select=-1 ; .endm
   .macro xchal_cp7_load    p a b c d continue=0 ofs=-1 select=-1 ; .endm
 
-#endif /* _XTENSA_CORE_TIE_ASM_H */
+#endif /* __ARCH_XTENSA_INCLUDE_ISS_HIFI4_TIE_ASM_H */
diff --git a/arch/xtensa/include/iss-hifi4/tie.h b/arch/xtensa/include/iss-hifi4/tie.h
index d1549d0d9b5..9a8be6a89b4 100644
--- a/arch/xtensa/include/iss-hifi4/tie.h
+++ b/arch/xtensa/include/iss-hifi4/tie.h
@@ -32,8 +32,8 @@
  *
  ****************************************************************************/
 
-#ifndef XTENSA_CORE_TIE_H
-#define XTENSA_CORE_TIE_H
+#ifndef __ARCH_XTENSA_INCLUDE_ISS_HIFI4_TIE_H
+#define __ARCH_XTENSA_INCLUDE_ISS_HIFI4_TIE_H
 
 /* parasoft-begin-suppress ALL "This file not MISRA checked." */
 
@@ -193,4 +193,4 @@
 
 /* parasoft-end-suppress ALL "This file not MISRA checked." */
 
-#endif /* XTENSA_CORE_TIE_H */
+#endif /* __ARCH_XTENSA_INCLUDE_ISS_HIFI4_TIE_H */