Index: kernel/arch/riscv64/include/arch/boot/boot.h
===================================================================
--- kernel/arch/riscv64/include/arch/boot/boot.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/riscv64/include/arch/boot/boot.h	(revision 9fc776c77e73f9b1550d50810a94c88df45e3682)
@@ -45,5 +45,5 @@
 #define TEMP_STACK_SIZE  0x1000
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <stddef.h>
Index: kernel/arch/riscv64/include/arch/cpu.h
===================================================================
--- kernel/arch/riscv64/include/arch/cpu.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/riscv64/include/arch/cpu.h	(revision 9fc776c77e73f9b1550d50810a94c88df45e3682)
@@ -45,5 +45,5 @@
 #define SATP_MODE_SV48  UINT64_C(0x9000000000000000)
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 typedef struct {
@@ -52,5 +52,5 @@
 extern void cpu_setup_fpu(void);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/riscv64/include/arch/mm/frame.h
===================================================================
--- kernel/arch/riscv64/include/arch/mm/frame.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/riscv64/include/arch/mm/frame.h	(revision 9fc776c77e73f9b1550d50810a94c88df45e3682)
@@ -41,5 +41,5 @@
 #define FRAME_LOWPRIO  0
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/boot/boot.h>
@@ -54,5 +54,5 @@
 extern void physmem_print(void);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/riscv64/include/arch/mm/page.h
===================================================================
--- kernel/arch/riscv64/include/arch/mm/page.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/riscv64/include/arch/mm/page.h	(revision 9fc776c77e73f9b1550d50810a94c88df45e3682)
@@ -41,5 +41,5 @@
 #define PAGE_SIZE   FRAME_SIZE
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 	#define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
 	#define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffff800000000000))
@@ -159,5 +159,5 @@
 #define PTE_EXECUTABLE_ARCH(pte)  ((pte)->executable != 0)
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <mm/mm.h>
@@ -216,5 +216,5 @@
 extern void write_satp(uintptr_t);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif