Index: kernel/arch/amd64/include/arch/boot/boot.h
===================================================================
--- kernel/arch/amd64/include/arch/boot/boot.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/amd64/include/arch/boot/boot.h	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -40,5 +40,5 @@
 #define BOOT_STACK_SIZE  0x000400
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #ifdef CONFIG_SMP
@@ -49,5 +49,5 @@
 #endif /* CONFIG_SMP */
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/amd64/include/arch/cpu.h
===================================================================
--- kernel/arch/amd64/include/arch/cpu.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/amd64/include/arch/cpu.h	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -79,5 +79,5 @@
 #define AMD_MSR_GS_KERNEL	0xc0000102
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/pm.h>
@@ -103,5 +103,5 @@
 void cpu_setup_fpu(void);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/amd64/include/arch/cpuid.h
===================================================================
--- kernel/arch/amd64/include/arch/cpuid.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/amd64/include/arch/cpuid.h	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -46,5 +46,5 @@
 #define INTEL_FXSAVE          24
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <stdint.h>
@@ -61,5 +61,5 @@
 extern void cpuid(uint32_t cmd, cpu_info_t *info);
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 #endif
 
Index: kernel/arch/amd64/include/arch/mm/frame.h
===================================================================
--- kernel/arch/amd64/include/arch/mm/frame.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/amd64/include/arch/mm/frame.h	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -41,5 +41,5 @@
 #define FRAME_LOWPRIO  0x1000
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 extern void frame_low_arch_init(void);
@@ -47,5 +47,5 @@
 extern void physmem_print(void);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/amd64/include/arch/mm/page.h
===================================================================
--- kernel/arch/amd64/include/arch/mm/page.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/amd64/include/arch/mm/page.h	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -44,15 +44,15 @@
 #ifdef MEMORY_MODEL_kernel
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffffffff80000000))
 #define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffffffff80000000))
 
-#else /* __ASM__ */
+#else /* __ASSEMBLER__ */
 
 #define KA2PA(x)  ((x) - 0xffffffff80000000)
 #define PA2KA(x)  ((x) + 0xffffffff80000000)
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif /* MEMORY_MODEL_kernel */
@@ -60,15 +60,15 @@
 #ifdef MEMORY_MODEL_large
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
 #define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffff800000000000))
 
-#else /* __ASM__ */
+#else /* __ASSEMBLER__ */
 
 #define KA2PA(x)  ((x) - 0xffff800000000000)
 #define PA2KA(x)  ((x) + 0xffff800000000000)
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif /* MEMORY_MODEL_large */
@@ -162,5 +162,5 @@
 	((p)->no_execute == 0)
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <mm/mm.h>
@@ -255,5 +255,5 @@
 extern void page_fault(unsigned int, istate_t *);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/amd64/include/arch/pm.h
===================================================================
--- kernel/arch/amd64/include/arch/pm.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/amd64/include/arch/pm.h	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -36,5 +36,5 @@
 #define KERN_amd64_PM_H_
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 	#include <typedefs.h>
 	#include <arch/context.h>
@@ -88,5 +88,5 @@
 #define IO_PORTS  (64 * 1024)
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 typedef struct {
@@ -180,5 +180,5 @@
 extern void tss_initialize(tss_t *t);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/amd64/include/arch/vreg.h
===================================================================
--- kernel/arch/amd64/include/arch/vreg.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/amd64/include/arch/vreg.h	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -38,5 +38,5 @@
 #define VREG_TP	0
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <stdint.h>
@@ -46,5 +46,5 @@
 extern void vreg_init(void);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif