Index: kernel/arch/ia64/include/arch/interrupt.h
===================================================================
--- kernel/arch/ia64/include/arch/interrupt.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/ia64/include/arch/interrupt.h	(revision a35a3d819d4e2e4e35964eea617087b5c6431b02)
@@ -36,5 +36,5 @@
 #define KERN_ia64_INTERRUPT_H_
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 #include <arch/istate.h>
 #include <stdint.h>
@@ -83,5 +83,5 @@
 #define EOI  0  /**< The actual value doesn't matter. */
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 extern void *ivt;
 
Index: kernel/arch/ia64/include/arch/mm/asid.h
===================================================================
--- kernel/arch/ia64/include/arch/mm/asid.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/ia64/include/arch/mm/asid.h	(revision a35a3d819d4e2e4e35964eea617087b5c6431b02)
@@ -36,5 +36,5 @@
 #define KERN_ia64_ASID_H_
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <stdint.h>
@@ -43,5 +43,5 @@
 typedef uint32_t rid_t;
 
-#endif  /* __ASM__ */
+#endif  /* __ASSEMBLER__ */
 
 /**
Index: kernel/arch/ia64/include/arch/mm/frame.h
===================================================================
--- kernel/arch/ia64/include/arch/mm/frame.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/ia64/include/arch/mm/frame.h	(revision a35a3d819d4e2e4e35964eea617087b5c6431b02)
@@ -41,5 +41,5 @@
 #define FRAME_LOWPRIO  0
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <typedefs.h>
@@ -51,5 +51,5 @@
 #define physmem_print()
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/ia64/include/arch/mm/page.h
===================================================================
--- kernel/arch/ia64/include/arch/mm/page.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/ia64/include/arch/mm/page.h	(revision a35a3d819d4e2e4e35964eea617087b5c6431b02)
@@ -39,5 +39,5 @@
 #include <arch/mm/frame.h>
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 #include <assert.h>
 #endif
@@ -55,5 +55,5 @@
 #define VA2VRN(va)  ((va) >> VRN_SHIFT)
 
-#ifdef __ASM__
+#ifdef __ASSEMBLER__
 	#define VRN_KERNEL  7
 #else
@@ -84,5 +84,5 @@
 #define AR_WRITE    0x02
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/mm/as.h>
@@ -297,5 +297,5 @@
 extern void vhpt_set_record(vhpt_entry_t *v, uintptr_t page, asid_t asid, uintptr_t frame, int flags);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/ia64/include/arch/register.h
===================================================================
--- kernel/arch/ia64/include/arch/register.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/ia64/include/arch/register.h	(revision a35a3d819d4e2e4e35964eea617087b5c6431b02)
@@ -143,5 +143,5 @@
 /* CR82-CR127 are reserved */
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 /** Processor Status Register. */
@@ -269,5 +269,5 @@
 } cpuid3_t;
 
-#endif /* !__ASM__ */
+#endif /* !__ASSEMBLER__ */
 
 #endif