diff --git a/headers/private/kernel/arch/arm/arch_atomic.h b/headers/private/kernel/arch/arm/arch_atomic.h
index abe3943674..d8045721c3 100644
--- a/headers/private/kernel/arch/arm/arch_atomic.h
+++ b/headers/private/kernel/arch/arm/arch_atomic.h
@@ -9,23 +9,7 @@
 #define _KERNEL_ARCH_ARM_ATOMIC_H
 
 
-#if __ARM_ARCH__ <= 5
-#define isb() __asm__ __volatile__("" : : : "memory")
-#define dsb() __asm__ __volatile__("mcr p15, 0, %0, c7, c10, 4" \
-	: : "r" (0) : "memory")
-#define dmb() __asm__ __volatile__("" : : : "memory")
-#elif __ARM_ARCH__ == 6
-#define isb() __asm__ __volatile__("mcr p15, 0, %0, c7, c5, 4" \
-	: : "r" (0) : "memory")
-#define dsb() __asm__ __volatile__("mcr p15, 0, %0, c7, c10, 4" \
-	: : "r" (0) : "memory")
-#define dmb() __asm__ __volatile__("mcr p15, 0, %0, c7, c10, 5" \
-	: : "r" (0) : "memory")
-#else /* ARMv7+ */
-#define isb() __asm__ __volatile__("isb" : : : "memory")
-#define dsb() __asm__ __volatile__("dsb" : : : "memory")
-#define dmb() __asm__ __volatile__("dmb" : : : "memory")
-#endif
+#include <arch_cpu.h>
 
 
 static inline void
diff --git a/headers/private/kernel/arch/arm/arch_cpu.h b/headers/private/kernel/arch/arm/arch_cpu.h
index aa28d75730..988ac3e819 100644
--- a/headers/private/kernel/arch/arm/arch_cpu.h
+++ b/headers/private/kernel/arch/arm/arch_cpu.h
@@ -11,6 +11,24 @@
 	// TODO: Could be 32-bits sometimes?
 
 
+#if __ARM_ARCH__ <= 5
+#define isb() __asm__ __volatile__("" : : : "memory")
+#define dsb() __asm__ __volatile__("mcr p15, 0, %0, c7, c10, 4" \
+    : : "r" (0) : "memory")
+#define dmb() __asm__ __volatile__("" : : : "memory")
+#elif __ARM_ARCH__ == 6
+#define isb() __asm__ __volatile__("mcr p15, 0, %0, c7, c5, 4" \
+    : : "r" (0) : "memory")
+#define dsb() __asm__ __volatile__("mcr p15, 0, %0, c7, c10, 4" \
+    : : "r" (0) : "memory")
+#define dmb() __asm__ __volatile__("mcr p15, 0, %0, c7, c10, 5" \
+    : : "r" (0) : "memory")
+#else /* ARMv7+ */
+#define isb() __asm__ __volatile__("isb" : : : "memory")
+#define dsb() __asm__ __volatile__("dsb" : : : "memory")
+#define dmb() __asm__ __volatile__("dmb" : : : "memory")
+#endif
+
 #define set_ac()
 #define clear_ac()