diff --git a/arch/arm/include/armv7-m/nvicpri.h b/arch/arm/include/armv7-m/nvicpri.h
index 540b095c20..e05e696106 100644
--- a/arch/arm/include/armv7-m/nvicpri.h
+++ b/arch/arm/include/armv7-m/nvicpri.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/include/rmv7-m/nvicpri.h
+ * arch/arm/include/armv7-m/nvicpri.h
  *
  *   Copyright (C) 2009, 2011-2014, 2017-2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/arm/include/elf.h b/arch/arm/include/elf.h
index 9928a85a76..88dd7d97fa 100644
--- a/arch/arm/include/elf.h
+++ b/arch/arm/include/elf.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/include/syscall.h
+ * arch/arm/include/elf.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/arm/include/syscall.h b/arch/arm/include/syscall.h
index c8aa0fe43c..d309bb1232 100644
--- a/arch/arm/include/syscall.h
+++ b/arch/arm/include/syscall.h
@@ -46,8 +46,13 @@
 
 /* Include ARM architecture-specific syscall macros */
 
-#if defined(CONFIG_ARCH_CORTEXA5) || defined(CONFIG_ARCH_CORTEXA8)
+#if defined(CONFIG_ARCH_CORTEXA5) || defined(CONFIG_ARCH_CORTEXA8) || \
+    defined(CONFIG_ARCH_CORTEXA9)
 #  include <arch/armv7-a/syscall.h>
+#elif defined(CONFIG_ARCH_CORTEXR4) || defined(CONFIG_ARCH_CORTEXR4F) || \
+      defined(CONFIG_ARCH_CORTEXR5) || defined(CONFIG_ARCH_CORTEXR5F) || \
+      defined(CONFIG_ARCH_CORTEXR7) || defined(CONFIG_ARCH_CORTEXR7F)
+#  include <arch/armv7-r/syscall.h>
 #elif defined(CONFIG_ARCH_CORTEXM3) || defined(CONFIG_ARCH_CORTEXM4) || \
       defined(CONFIG_ARCH_CORTEXM7)
 #  include <arch/armv7-m/syscall.h>