Index: kernel/arch/arm32/include/mach/integratorcp/integratorcp.h
===================================================================
--- kernel/arch/arm32/include/mach/integratorcp/integratorcp.h	(revision 25c97174ad54c56246fcc300267d73f4c184fa15)
+++ kernel/arch/arm32/include/mach/integratorcp/integratorcp.h	(revision 172aad63f50c7c155cabbf9d2f577f1d906b7262)
@@ -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 25c97174ad54c56246fcc300267d73f4c184fa15)
+++ kernel/arch/arm32/include/mach/testarm/testarm.h	(revision 172aad63f50c7c155cabbf9d2f577f1d906b7262)
@@ -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
Index: kernel/arch/arm32/include/machine_func.h
===================================================================
--- kernel/arch/arm32/include/machine_func.h	(revision 25c97174ad54c56246fcc300267d73f4c184fa15)
+++ kernel/arch/arm32/include/machine_func.h	(revision 172aad63f50c7c155cabbf9d2f577f1d906b7262)
@@ -57,6 +57,9 @@
 };
 
-extern struct arm_machine_ops machine_ops;
+/** Pointer to arm_machine_ops structure being used. */
+extern struct arm_machine_ops *machine_ops;
 
+/** Initialize machine_ops pointer. */
+extern void machine_ops_init(void);
 
 /** Maps HW devices to the kernel address space using #hw_map. */