diff --git a/arch/arm/src/cortexm3/up_doirq.c b/arch/arm/src/cortexm3/up_doirq.c
index f465109a10..d5f3a61857 100644
--- a/arch/arm/src/cortexm3/up_doirq.c
+++ b/arch/arm/src/cortexm3/up_doirq.c
@@ -40,9 +40,11 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+#include <assert.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <assert.h>
+#include <arch/board/board.h>
 
 #include "up_arch.h"
 #include "os_internal.h"
diff --git a/arch/arm/src/lm3s/lm3s_ethernet.c b/arch/arm/src/lm3s/lm3s_ethernet.c
index 940fa6aec4..02d41e3da2 100644
--- a/arch/arm/src/lm3s/lm3s_ethernet.c
+++ b/arch/arm/src/lm3s/lm3s_ethernet.c
@@ -50,13 +50,14 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-
+#include <arch/board/board.h>
 #include <net/uip/uip.h>
 #include <net/uip/uip-arp.h>
 #include <net/uip/uip-arch.h>
 
-#include "up_arch.h"
 #include "chip.h"
+#include "up_arch.h"
+
 #include "lm3s_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lm3s/lm3s_lowputc.c b/arch/arm/src/lm3s/lm3s_lowputc.c
index aa7f5466a4..70d37b0c02 100644
--- a/arch/arm/src/lm3s/lm3s_lowputc.c
+++ b/arch/arm/src/lm3s/lm3s_lowputc.c
@@ -40,10 +40,12 @@
 #include <nuttx/config.h>
 #include <stdint.h>
 
-#include "up_internal.h"
-#include "up_arch.h"
+#include <arch/board/board.h>
 
 #include "chip.h"
+#include "up_arch.h"
+#include "up_internal.h"
+
 #include "lm3s_internal.h"
 
 /**************************************************************************
diff --git a/arch/arm/src/lm3s/lm3s_start.c b/arch/arm/src/lm3s/lm3s_start.c
index 272ebec173..292467d568 100644
--- a/arch/arm/src/lm3s/lm3s_start.c
+++ b/arch/arm/src/lm3s/lm3s_start.c
@@ -45,6 +45,7 @@
 #include <debug.h>
 
 #include <nuttx/init.h>
+#include <arch/board/board.h>
 
 #include "up_arch.h"
 #include "up_internal.h"
diff --git a/arch/arm/src/stm32/stm32_dma.c b/arch/arm/src/stm32/stm32_dma.c
index 3050820d11..77d6261273 100755
--- a/arch/arm/src/stm32/stm32_dma.c
+++ b/arch/arm/src/stm32/stm32_dma.c
@@ -274,7 +274,7 @@ static int stm32_dmainterrupt(int irq, void *context)
 {
   struct stm32_dma_s *dmach;
   uint32_t isr;
-  int chndx;
+  int chndx = 0;
 
   /* Get the channel structure from the interrupt number */
 
@@ -502,7 +502,6 @@ void stm32_dmasetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t nt
 void stm32_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg, bool half)
 {
   struct stm32_dma_s *dmach = (struct stm32_dma_s *)handle;
-  int irq;
   uint32_t ccr;
 
   DEBUGASSERT(handle != NULL);
diff --git a/arch/arm/src/stm32/stm32_lowputc.c b/arch/arm/src/stm32/stm32_lowputc.c
index 93e6b747f5..bc5022cf13 100644
--- a/arch/arm/src/stm32/stm32_lowputc.c
+++ b/arch/arm/src/stm32/stm32_lowputc.c
@@ -40,6 +40,7 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+
 #include <arch/board/board.h>
 
 #include "up_internal.h"
diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c
index 8500ae6612..f70418bb8a 100644
--- a/arch/arm/src/stm32/stm32_sdio.c
+++ b/arch/arm/src/stm32/stm32_sdio.c
@@ -53,10 +53,13 @@
 #include <nuttx/sdio.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mmcsd.h>
+
 #include <arch/irq.h>
+#include <arch/board/board.h>
 
 #include "chip.h"
 #include "up_arch.h"
+
 #include "stm32_internal.h"
 #include "stm32_dma.h"
 #include "stm32_sdio.h"
diff --git a/arch/arm/src/stm32/stm32_serial.c b/arch/arm/src/stm32/stm32_serial.c
index 2ff783b0a1..111ca62ad5 100644
--- a/arch/arm/src/stm32/stm32_serial.c
+++ b/arch/arm/src/stm32/stm32_serial.c
@@ -51,7 +51,9 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/serial.h>
+
 #include <arch/serial.h>
+#include <arch/board/board.h>
 
 #include "chip.h"
 #include "stm32_uart.h"
diff --git a/arch/arm/src/stm32/stm32_spi.c b/arch/arm/src/stm32/stm32_spi.c
index bdea7da379..de0ff2ac50 100755
--- a/arch/arm/src/stm32/stm32_spi.c
+++ b/arch/arm/src/stm32/stm32_spi.c
@@ -68,10 +68,11 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <arch/board/board.h>
 #include <nuttx/arch.h>
 #include <nuttx/spi.h>
 
+#include <arch/board/board.h>
+
 #include "up_internal.h"
 #include "up_arch.h"
 
diff --git a/arch/arm/src/stm32/stm32_start.c b/arch/arm/src/stm32/stm32_start.c
index 7ed3c0851f..1ac753f5ac 100644
--- a/arch/arm/src/stm32/stm32_start.c
+++ b/arch/arm/src/stm32/stm32_start.c
@@ -45,9 +45,11 @@
 #include <debug.h>
 
 #include <nuttx/init.h>
+#include <arch/board/board.h>
 
 #include "up_arch.h"
 #include "up_internal.h"
+
 #include "stm32_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32/stm32_usbdev.c b/arch/arm/src/stm32/stm32_usbdev.c
index 7fbcd3ef7a..07e3ae417f 100644
--- a/arch/arm/src/stm32/stm32_usbdev.c
+++ b/arch/arm/src/stm32/stm32_usbdev.c
@@ -3454,7 +3454,6 @@ void up_usbuninitialize(void)
    */
 
   struct stm32_usbdev_s *priv = &g_usbdev;
-  uint16_t regval;
   irqstate_t flags;
 
   usbtrace(TRACE_DEVUNINIT, 0);