Index: kernel/arch/arm32/include/mach/integratorcp/integratorcp.h
===================================================================
--- kernel/arch/arm32/include/mach/integratorcp/integratorcp.h	(revision 214ec25cbbfd86e547613a9d32809cef432e810d)
+++ kernel/arch/arm32/include/mach/integratorcp/integratorcp.h	(revision 6b80696ae6a6ecbf5152b450a40baedf83e9ce6c)
@@ -36,6 +36,6 @@
  */
 
-#ifndef KERN_arm32_MACHINE_H_
-#define KERN_arm32_MACHINE_H_
+#ifndef KERN_arm32_icp_H_
+#define KERN_arm32_icp_H_
 
 #include <arch/machine_func.h>
@@ -106,4 +106,6 @@
 extern void icp_frame_init(void);
 
+extern struct arm_machine_ops icp_machine_ops;
+
 #endif
 
Index: kernel/arch/arm32/include/mach/testarm/testarm.h
===================================================================
--- kernel/arch/arm32/include/mach/testarm/testarm.h	(revision 214ec25cbbfd86e547613a9d32809cef432e810d)
+++ kernel/arch/arm32/include/mach/testarm/testarm.h	(revision 6b80696ae6a6ecbf5152b450a40baedf83e9ce6c)
@@ -37,6 +37,6 @@
  */
 
-#ifndef KERN_arm32_MACHINE_H_
-#define KERN_arm32_MACHINE_H_
+#ifndef KERN_arm32_testarm_H_
+#define KERN_arm32_testarm_H_
 
 #include <arch/machine_func.h>
@@ -76,4 +76,5 @@
 extern void gxemul_frame_init(void);
 
+extern struct arm_machine_ops gxemul_machine_ops;
 
 #endif