diff --git a/src/arch/arm64/include/arch/transition.h b/src/arch/arm64/include/arch/transition.h
index 4793b840c2..5cd73c15d8 100644
--- a/src/arch/arm64/include/arch/transition.h
+++ b/src/arch/arm64/include/arch/transition.h
@@ -56,7 +56,7 @@
 #define EXC_VID_LOW32_SERR		15
 #define NUM_EXC_VIDS			16
 
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 
 #include <stdint.h>
 #include <arch/lib_helpers.h>
@@ -197,6 +197,6 @@ void exc_dispatch(struct exc_state *exc_state, uint64_t id);
  */
 void exc_entry(struct exc_state *exc_state, uint64_t id);
 
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
 
 #endif /* __ARCH_ARM64_TRANSITION_H__ */
diff --git a/src/arch/arm64/include/armv8/arch/barrier.h b/src/arch/arm64/include/armv8/arch/barrier.h
index b653d24bee..397ac2aa67 100644
--- a/src/arch/arm64/include/armv8/arch/barrier.h
+++ b/src/arch/arm64/include/armv8/arch/barrier.h
@@ -15,7 +15,7 @@
 #ifndef __ASM_ARM_BARRIER_H
 #define __ASM_ARM_BARRIER_H
 
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 
 #define sevl()		asm volatile("sevl" : : : "memory")
 #define sev()		asm volatile("sev" : : : "memory")
@@ -103,6 +103,6 @@ do {									\
 	!ret;								\
 })
 
-#endif	/* __ASSEMBLY__ */
+#endif	/* __ASSEMBLER__ */
 
 #endif	/* __ASM_ARM_BARRIER_H */
diff --git a/src/arch/arm64/include/armv8/arch/lib_helpers.h b/src/arch/arm64/include/armv8/arch/lib_helpers.h
index f4b6ba6e6a..d2d30e12aa 100644
--- a/src/arch/arm64/include/armv8/arch/lib_helpers.h
+++ b/src/arch/arm64/include/armv8/arch/lib_helpers.h
@@ -136,7 +136,7 @@
 #define CPACR_TRAP_FP_EL0	(1 << CPACR_FPEN_SHIFT)
 #define CPACR_TRAP_FP_DISABLE	(3 << CPACR_FPEN_SHIFT)
 
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
 
 /* Macro to switch to label based on current el */
 .macro switch_el xreg label1 label2 label3
@@ -585,6 +585,6 @@ void tlbiallis_current(void);
 void tlbiallis(uint32_t el);
 void tlbivaa_el1(uint64_t va);
 
-#endif // __ASSEMBLY__
+#endif /* __ASSEMBLER__ */
 
 #endif /* __ARCH_LIB_HELPERS_H__ */
diff --git a/src/arch/arm64/transition_asm.S b/src/arch/arm64/transition_asm.S
index 8e61246db1..924a4bc388 100644
--- a/src/arch/arm64/transition_asm.S
+++ b/src/arch/arm64/transition_asm.S
@@ -53,7 +53,6 @@
  * to be executed.
  */
 
-#define __ASSEMBLY__
 #include <arch/asm.h>
 #include <arch/lib_helpers.h>
 #include <arch/transition.h>