Index: kernel/arch/arm32/src/arm32.c
===================================================================
--- kernel/arch/arm32/src/arm32.c	(revision 538780736253a52c38332ffe3f75d60f64190f4e)
+++ kernel/arch/arm32/src/arm32.c	(revision 8ef4032969b2ae65d0eda0becc48b72441ef778f)
@@ -45,17 +45,9 @@
 #include <interrupt.h>
 #include <arch/regutils.h>
+#include <arch/machine_func.h>
 #include <userspace.h>
 #include <macros.h>
 #include <str.h>
 #include <arch/ras.h>
-
-#ifdef MACHINE_testarm
-	#include <arch/mach/testarm/testarm.h>
-#endif
-
-#ifdef MACHINE_integratorcp
-	#include <arch/mach/integratorcp/integratorcp.h>
-#endif
-
 
 /** Performs arm32-specific initialization before main_bsp() is called. */