diff --git a/arch/arm/include/irq.h b/arch/arm/include/irq.h
index 137592728c..ccd28abb7a 100644
--- a/arch/arm/include/irq.h
+++ b/arch/arm/include/irq.h
@@ -34,14 +34,22 @@
 #  include <stdbool.h>
 #endif
 
-/* Include NuttX-specific IRQ definitions */
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
 
-#include <nuttx/irq.h>
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 /* Include chip-specific IRQ definitions (including IRQ numbers) */
 
 #include <arch/chip/irq.h>
 
+/* Include NuttX-specific IRQ definitions */
+
+#include <nuttx/irq.h>
+
 /* Include ARM architecture-specific IRQ definitions (including register
  * save structure and up_irq_save()/up_irq_restore() functions)
  */