diff --git a/arch/arm/src/lpc214x/lpc214x_decodeirq.c b/arch/arm/src/lpc214x/lpc214x_decodeirq.c
index 55b891bd3d688eb1512db29e83ec3d6401befcda..dc76509a9bbc9203c6553e16a08161cfa57b9cba 100644
--- a/arch/arm/src/lpc214x/lpc214x_decodeirq.c
+++ b/arch/arm/src/lpc214x/lpc214x_decodeirq.c
@@ -45,9 +45,11 @@
 #include <assert.h>
 #include <debug.h>
 
+#include "chip.h"
 #include "up_arch.h"
 #include "os_internal.h"
 #include "up_internal.h"
+
 #include "lpc214x_vic.h"
 
 /********************************************************************************
diff --git a/arch/arm/src/lpc214x/lpc214x_irq.c b/arch/arm/src/lpc214x/lpc214x_irq.c
index 3f5d267f2eca2a771ee94ae43da1808a23c2c770..9d8ed817bcb48b64d827fb866757dec952744652 100644
--- a/arch/arm/src/lpc214x/lpc214x_irq.c
+++ b/arch/arm/src/lpc214x/lpc214x_irq.c
@@ -44,9 +44,11 @@
 #include <nuttx/irq.h>
 
 #include "arm.h"
+#include "chip.h"
 #include "up_arch.h"
 #include "os_internal.h"
 #include "up_internal.h"
+
 #include "lpc214x_vic.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc214x/lpc214x_lowputc.S b/arch/arm/src/lpc214x/lpc214x_lowputc.S
index 190a33b378be0cbf7f6971d4304a501bbe1462ae..e36b1d83f849cf3d366cb51c14c31c201d618857 100644
--- a/arch/arm/src/lpc214x/lpc214x_lowputc.S
+++ b/arch/arm/src/lpc214x/lpc214x_lowputc.S
@@ -38,8 +38,11 @@
  **************************************************************************/
 
 #include <nuttx/config.h>
-#include "up_internal.h"
+
+#include "chip.h"
 #include "up_arch.h"
+#include "up_internal.h"
+
 #include "lpc214x_pinsel.h"
 #include "lpc214x_uart.h"
 
diff --git a/arch/arm/src/lpc214x/lpc214x_serial.c b/arch/arm/src/lpc214x/lpc214x_serial.c
index f18af4fe06b5419e703b0163f4543b9ad01bd259..13a69716bc45f109765435dc22d9746993b1fb75 100644
--- a/arch/arm/src/lpc214x/lpc214x_serial.c
+++ b/arch/arm/src/lpc214x/lpc214x_serial.c
@@ -52,6 +52,7 @@
 #include <nuttx/serial.h>
 #include <arch/serial.h>
 
+#include "chip.h"
 #include "up_arch.h"
 #include "os_internal.h"
 #include "up_internal.h"
diff --git a/arch/arm/src/lpc214x/lpc214x_timerisr.c b/arch/arm/src/lpc214x/lpc214x_timerisr.c
index c75b5421e00db798e1d1c5ef3c7607b627fccf95..65e9adb57d4b5b8a0e47688da7b538977eb982af 100644
--- a/arch/arm/src/lpc214x/lpc214x_timerisr.c
+++ b/arch/arm/src/lpc214x/lpc214x_timerisr.c
@@ -44,9 +44,10 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
+#include "chip.h"
+#include "up_arch.h"
 #include "clock_internal.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 #include "lpc214x_timer.h"
 #include "lpc214x_vic.h"
diff --git a/arch/arm/src/lpc214x/lpc214x_usbdev.c b/arch/arm/src/lpc214x/lpc214x_usbdev.c
index 0149465d53f6ee051b3a0a6fb103c03d2d77f94e..639b7b91491877be91f01229f3623b0567f8e74e 100644
--- a/arch/arm/src/lpc214x/lpc214x_usbdev.c
+++ b/arch/arm/src/lpc214x/lpc214x_usbdev.c
@@ -55,8 +55,10 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
+#include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
+
 #include "lpc214x_usbdev.h"
 #include "lpc214x_pll.h"
 #include "lpc214x_power.h"
diff --git a/arch/arm/src/str71x/str71x_decodeirq.c b/arch/arm/src/str71x/str71x_decodeirq.c
index 035ec5318d108de43ce2e4dc4b993adc2c5dfe69..1a816bcf746f656eabc8840405790a8762c7f535 100644
--- a/arch/arm/src/str71x/str71x_decodeirq.c
+++ b/arch/arm/src/str71x/str71x_decodeirq.c
@@ -45,10 +45,10 @@
 #include <assert.h>
 #include <debug.h>
 
+#include "chip.h"
 #include "up_arch.h"
 #include "os_internal.h"
 #include "up_internal.h"
-#include "chip.h"
 
 /********************************************************************************
  * Pre-procesor Definitions
diff --git a/arch/arm/src/str71x/str71x_irq.c b/arch/arm/src/str71x/str71x_irq.c
index 2f9570d0297f9e8e1cce93bdf4fff85be30fe92b..ed39a560be68126cfe30d0d3a6110d25e1d20e90 100644
--- a/arch/arm/src/str71x/str71x_irq.c
+++ b/arch/arm/src/str71x/str71x_irq.c
@@ -45,9 +45,9 @@
 #include <nuttx/arch.h>
 
 #include "arm.h"
+#include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "chip.h"
 
 /****************************************************************************
  * Pre-procesor Definitions
diff --git a/arch/arm/src/str71x/str71x_lowputc.c b/arch/arm/src/str71x/str71x_lowputc.c
index bf81f5b663500448cdd74d8f7d9a1c721c5a8bc9..a34b185c8ff56a232ff85166d81e7c2cedece967 100644
--- a/arch/arm/src/str71x/str71x_lowputc.c
+++ b/arch/arm/src/str71x/str71x_lowputc.c
@@ -40,10 +40,10 @@
 #include <nuttx/config.h>
 #include <stdint.h>
 
-#include "up_internal.h"
+#include "chip.h"
 #include "up_arch.h"
+#include "up_internal.h"
 
-#include "chip.h"
 #include "str71x_internal.h"
 
 /**************************************************************************
diff --git a/arch/arm/src/str71x/str71x_serial.c b/arch/arm/src/str71x/str71x_serial.c
index da4d280ebc5369c717ec1f30628ae98b519442a5..31389404c5a5c87feee0630cba2fe80f957005e7 100644
--- a/arch/arm/src/str71x/str71x_serial.c
+++ b/arch/arm/src/str71x/str71x_serial.c
@@ -56,6 +56,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 #include "os_internal.h"
+
 #include "str71x_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/str71x/str71x_timerisr.c b/arch/arm/src/str71x/str71x_timerisr.c
index 238e0eb77ef653ab98fb607d2820fed73d513d36..8f41b929127efc9af3c903432acb2dd342f7e4e0 100644
--- a/arch/arm/src/str71x/str71x_timerisr.c
+++ b/arch/arm/src/str71x/str71x_timerisr.c
@@ -45,11 +45,11 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
+#include "chip.h"
+#include "up_arch.h"
 #include "clock_internal.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
-#include "chip.h"
 #include "str71x_internal.h"
 
 /****************************************************************************