Index: kernel/arch/ia32/include/arch/boot/boot.h
===================================================================
--- kernel/arch/ia32/include/arch/boot/boot.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/ia32/include/arch/boot/boot.h	(revision b127e4afcb39cae71e775fb2c65b181edcc0429f)
@@ -40,5 +40,5 @@
 #define BOOT_STACK_SIZE  0x0400
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #ifdef CONFIG_SMP
@@ -49,5 +49,5 @@
 #endif /* CONFIG_SMP */
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/ia32/include/arch/boot/memmap.h
===================================================================
--- kernel/arch/ia32/include/arch/boot/memmap.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/ia32/include/arch/boot/memmap.h	(revision b127e4afcb39cae71e775fb2c65b181edcc0429f)
@@ -61,5 +61,5 @@
 #define MEMMAP_E820_MAX_RECORDS  32
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <stdint.h>
Index: kernel/arch/ia32/include/arch/cpu.h
===================================================================
--- kernel/arch/ia32/include/arch/cpu.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/ia32/include/arch/cpu.h	(revision b127e4afcb39cae71e775fb2c65b181edcc0429f)
@@ -64,5 +64,5 @@
 #define IA32_MSR_SYSENTER_EIP	0x176
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/pm.h>
Index: kernel/arch/ia32/include/arch/cpuid.h
===================================================================
--- kernel/arch/ia32/include/arch/cpuid.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/ia32/include/arch/cpuid.h	(revision b127e4afcb39cae71e775fb2c65b181edcc0429f)
@@ -41,5 +41,5 @@
 #define INTEL_SEP             11
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/cpu.h>
@@ -116,5 +116,5 @@
 }
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 #endif
 
Index: kernel/arch/ia32/include/arch/mm/frame.h
===================================================================
--- kernel/arch/ia32/include/arch/mm/frame.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/ia32/include/arch/mm/frame.h	(revision b127e4afcb39cae71e775fb2c65b181edcc0429f)
@@ -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/ia32/include/arch/mm/page.h
===================================================================
--- kernel/arch/ia32/include/arch/mm/page.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/ia32/include/arch/mm/page.h	(revision b127e4afcb39cae71e775fb2c65b181edcc0429f)
@@ -50,15 +50,15 @@
 #define PDE_4M		(1 << 7)
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #define KA2PA(x)  (((uintptr_t) (x)) - UINT32_C(0x80000000))
 #define PA2KA(x)  (((uintptr_t) (x)) + UINT32_C(0x80000000))
 
-#else /* __ASM__ */
+#else /* __ASSEMBLER__ */
 
 #define KA2PA(x)  ((x) - 0x80000000)
 #define PA2KA(x)  ((x) + 0x80000000)
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 /*
@@ -142,5 +142,5 @@
 #define PTE_EXECUTABLE_ARCH(p)  1
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <mm/mm.h>
@@ -220,5 +220,5 @@
 extern void page_fault(unsigned int, istate_t *);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/ia32/include/arch/pm.h
===================================================================
--- kernel/arch/ia32/include/arch/pm.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/ia32/include/arch/pm.h	(revision b127e4afcb39cae71e775fb2c65b181edcc0429f)
@@ -81,5 +81,5 @@
 #define IO_PORTS  (64 * 1024)
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <typedefs.h>
@@ -170,5 +170,5 @@
 extern void tss_initialize(tss_t *t);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/ia32/include/arch/smp/apic.h
===================================================================
--- kernel/arch/ia32/include/arch/smp/apic.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/ia32/include/arch/smp/apic.h	(revision b127e4afcb39cae71e775fb2c65b181edcc0429f)
@@ -39,5 +39,5 @@
 #define IO_APIC_BASE	0xfec00000
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <cpu.h>
@@ -369,5 +369,5 @@
 extern void io_apic_enable_irqs(uint16_t);
 
-#endif	/* __ASM__ */
+#endif	/* __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/ia32/include/arch/vreg.h
===================================================================
--- kernel/arch/ia32/include/arch/vreg.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/ia32/include/arch/vreg.h	(revision b127e4afcb39cae71e775fb2c65b181edcc0429f)
@@ -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