diff --git a/headers/private/system/arch/arm/arch_config.h b/headers/private/system/arch/arm/arch_config.h
index 5e203811bb..bdc3218fc3 100644
--- a/headers/private/system/arch/arm/arch_config.h
+++ b/headers/private/system/arch/arm/arch_config.h
@@ -5,18 +5,19 @@
 #ifndef _KERNEL_ARCH_ARM_CONFIG_H
 #define _KERNEL_ARCH_ARM_CONFIG_H
 
+#include "arch_arm_version.h"
 
 #define FUNCTION_CALL_PARAMETER_ALIGNMENT_TYPE	unsigned int
 
 #define STACK_GROWS_DOWNWARDS
 
 // If we're building on ARMv5 or older, all our atomics need to be syscalls... :(
-#if _M_ARM <= 5
+#if __ARM_ARCH__ <= 5
 #define ATOMIC_FUNCS_ARE_SYSCALLS
 #endif
 
 // If we're building on ARMv6 or older, 64-bit atomics need to be syscalls...
-#if _M_ARM < 7
+#if __ARM_ARCH__ <= 6
 #define ATOMIC64_FUNCS_ARE_SYSCALLS
 #endif