diff --git a/arch/arm/src/armv7-m/up_svcall.c b/arch/arm/src/armv7-m/up_svcall.c
index 80d07b4e505..ada12e61a05 100644
--- a/arch/arm/src/armv7-m/up_svcall.c
+++ b/arch/arm/src/armv7-m/up_svcall.c
@@ -46,6 +46,7 @@
 
 #include <arch/irq.h>
 #include <nuttx/sched.h>
+#include <nuttx/userspace.h>
 
 #ifdef CONFIG_LIB_SYSCALL
 #  include <syscall.h>
diff --git a/arch/arm/src/common/up_pthread_start.c b/arch/arm/src/common/up_pthread_start.c
index 31ccb80c1fe..59fd7073b5d 100644
--- a/arch/arm/src/common/up_pthread_start.c
+++ b/arch/arm/src/common/up_pthread_start.c
@@ -44,9 +44,8 @@
 #include "svcall.h"
 #include "up_internal.h"
 
-#if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__) || \
-      defined(defined(CONFIG_BUILD_KERNEL)) && \
-     !defined(CONFIG_DISABLE_PTHREAD)
+#if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)) || \
+      defined(CONFIG_BUILD_KERNEL)) && !defined(CONFIG_DISABLE_PTHREAD)
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/common/up_signal_dispatch.c b/arch/arm/src/common/up_signal_dispatch.c
index 75725237f6b..f0cf91a490c 100644
--- a/arch/arm/src/common/up_signal_dispatch.c
+++ b/arch/arm/src/common/up_signal_dispatch.c
@@ -43,9 +43,8 @@
 #include "svcall.h"
 #include "up_internal.h"
 
-#if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__) || \
-      defined(defined(CONFIG_BUILD_KERNEL)) && \
-     !defined(CONFIG_DISABLE_SIGNALS)
+#if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)) || \
+      defined(CONFIG_BUILD_KERNEL)) && !defined(CONFIG_DISABLE_SIGNALS)
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/stm32/stm32_serial.c b/arch/arm/src/stm32/stm32_serial.c
index 647b66bc949..42973bce158 100644
--- a/arch/arm/src/stm32/stm32_serial.c
+++ b/arch/arm/src/stm32/stm32_serial.c
@@ -177,7 +177,7 @@
 /* The DMA buffer size when using RX DMA to emulate a FIFO.
  *
  * When streaming data, the generic serial layer will be called
- * everytime the FIFO receives half this number of bytes.
+ * every time the FIFO receives half this number of bytes.
  */
 
 #  define RXDMA_BUFFER_SIZE   32
@@ -2426,8 +2426,6 @@ static void up_dma_rxcallback(DMA_HANDLE handle, uint8_t status, void *arg)
 }
 #endif
 
-#endif /* HAVE UART */
-
 /****************************************************************************
  * Name: up_pm_notify
  *
@@ -2532,11 +2530,14 @@ static int up_pm_prepare(struct pm_callback_s *cb, enum pm_state_e pmstate)
   return OK;
 }
 #endif
+#endif /* USE_SERIALDRIVER */
 
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
 
+#ifdef USE_SERIALDRIVER
+
 /****************************************************************************
  * Name: up_earlyserialinit
  *
@@ -2734,8 +2735,6 @@ void stm32_serial_dma_poll(void)
  *
  ****************************************************************************/
 
-#ifdef USE_SERIALDRIVER
-
 int up_putc(int ch)
 {
 #if CONSOLE_UART > 0