Index: kernel/arch/arm32/src/exception.c
===================================================================
--- kernel/arch/arm32/src/exception.c	(revision 25c97174ad54c56246fcc300267d73f4c184fa15)
+++ kernel/arch/arm32/src/exception.c	(revision 5ac77cc96d78ca645a458a91b3c210a0a31dc894)
@@ -37,4 +37,5 @@
 #include <arch/memstr.h>
 #include <arch/regutils.h>
+#include <arch/machine_func.h>
 #include <interrupt.h>
 #include <arch/mm/page_fault.h>
@@ -43,12 +44,4 @@
 #include <syscall/syscall.h>
 #include <stacktrace.h>
-
-#ifdef MACHINE_testarm
-	#include <arch/mach/testarm/testarm.h>
-#endif
-
-#ifdef MACHINE_integratorcp
-	#include <arch/mach/integratorcp/integratorcp.h>
-#endif
 
 /** Offset used in calculation of exception handler's relative address.
Index: kernel/arch/arm32/src/interrupt.c
===================================================================
--- kernel/arch/arm32/src/interrupt.c	(revision 25c97174ad54c56246fcc300267d73f4c184fa15)
+++ kernel/arch/arm32/src/interrupt.c	(revision 5ac77cc96d78ca645a458a91b3c210a0a31dc894)
@@ -36,15 +36,8 @@
 #include <arch/asm.h>
 #include <arch/regutils.h>
+#include <arch/machine_func.h>
 #include <ddi/irq.h>
 #include <ddi/device.h>
 #include <interrupt.h>
-
-#ifdef MACHINE_testarm
-	#include <arch/mach/testarm/testarm.h>
-#endif
-
-#ifdef MACHINE_integratorcp
-	#include <arch/mach/integratorcp/integratorcp.h>
-#endif
 
 /** Initial size of a table holding interrupt handlers. */
Index: kernel/arch/arm32/src/mm/frame.c
===================================================================
--- kernel/arch/arm32/src/mm/frame.c	(revision 25c97174ad54c56246fcc300267d73f4c184fa15)
+++ kernel/arch/arm32/src/mm/frame.c	(revision 5ac77cc96d78ca645a458a91b3c210a0a31dc894)
@@ -36,13 +36,6 @@
 #include <mm/frame.h>
 #include <arch/mm/frame.h>
+#include <arch/machine_func.h>
 #include <config.h>
-
-#ifdef MACHINE_testarm
-	#include <arch/mach/testarm/testarm.h>
-#endif
-
-#ifdef MACHINE_integratorcp
-	#include <arch/mach/integratorcp/integratorcp.h>
-#endif
 
 /** Address of the last frame in the memory. */