Index: kernel/arch/arm32/include/mach/integratorcp/integratorcp.h
===================================================================
--- kernel/arch/arm32/include/mach/integratorcp/integratorcp.h	(revision 6ac14a70ed101ee9fa8379a5f9ef15a38f08aec5)
+++ kernel/arch/arm32/include/mach/integratorcp/integratorcp.h	(revision 19490cea4251de33ed19741087be0c03ff4d2a4f)
@@ -36,6 +36,6 @@
  */
 
-#ifndef KERN_arm32_ICP_H_
-#define KERN_arm32_ICP_H_
+#ifndef KERN_arm32_MACHINE_H_
+#define KERN_arm32_MACHINE_H_
 
 #include <arch/machine_func.h>
Index: kernel/arch/arm32/include/mach/testarm/testarm.h
===================================================================
--- kernel/arch/arm32/include/mach/testarm/testarm.h	(revision 6ac14a70ed101ee9fa8379a5f9ef15a38f08aec5)
+++ kernel/arch/arm32/include/mach/testarm/testarm.h	(revision 19490cea4251de33ed19741087be0c03ff4d2a4f)
@@ -37,6 +37,6 @@
  */
 
-#ifndef KERN_arm32_GXEMUL_H_
-#define KERN_arm32_GXEMUL_H_
+#ifndef KERN_arm32_MACHINE_H_
+#define KERN_arm32_MACHINE_H_
 
 #include <arch/machine_func.h>