diff --git a/arch/arm/src/efm32/efm32_clockconfig.c b/arch/arm/src/efm32/efm32_clockconfig.c
index bae57c5594..75af2d7589 100644
--- a/arch/arm/src/efm32/efm32_clockconfig.c
+++ b/arch/arm/src/efm32/efm32_clockconfig.c
@@ -504,9 +504,9 @@ static inline uint32_t efm32_hfclk_config(uint32_t hfclksel, uint32_t hfclkdiv)
 #ifdef CONFIG_EFM32_LECLOCK
 uint32_t efm32_coreleclk_config( int frequency )
 {
+#ifdef CMU_CTRL_HFLE
   uint32_t regval;
 
-#ifdef CMU_CTRL_HFLE
   /* Check if the core frequency is higher than CMU_MAX_FREQ_HFLE */
 
    if (frequency > CMU_MAX_FREQ_HFLE)
diff --git a/arch/arm/src/lpc11xx/lpc11_serial.c b/arch/arm/src/lpc11xx/lpc11_serial.c
index 62d5578960..2db88cf11a 100644
--- a/arch/arm/src/lpc11xx/lpc11_serial.c
+++ b/arch/arm/src/lpc11xx/lpc11_serial.c
@@ -64,6 +64,7 @@
 #include "chip.h"
 #include "chip/lpc11_uart.h"
 #include "lpc11_gpio.h"
+#include "lpc11_lowgetc.h"
 #include "lpc11_serial.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc17xx/lpc17_usbhost.c b/arch/arm/src/lpc17xx/lpc17_usbhost.c
index 7bde767827..6338dbf964 100644
--- a/arch/arm/src/lpc17xx/lpc17_usbhost.c
+++ b/arch/arm/src/lpc17xx/lpc17_usbhost.c
@@ -1788,6 +1788,7 @@ static int lpc17_usbinterrupt(int irq, void *context)
 
           td = (struct lpc17_gtd_s *)(HCCA->donehead & HCCA_DONEHEAD_MASK);
           HCCA->donehead = 0;
+          next = NULL;
 
           /* Process each TD in the write done list */
 
diff --git a/arch/arm/src/lpc31xx/lpc31_usbdev.c b/arch/arm/src/lpc31xx/lpc31_usbdev.c
index 761b4e5825..caac897092 100644
--- a/arch/arm/src/lpc31xx/lpc31_usbdev.c
+++ b/arch/arm/src/lpc31xx/lpc31_usbdev.c
@@ -2106,7 +2106,6 @@ static int lpc31_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
 static int lpc31_epcancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
 {
   FAR struct lpc31_ep_s *privep = (FAR struct lpc31_ep_s *)ep;
-  FAR struct lpc31_usbdev_s *priv;
   irqstate_t flags;
 
 #ifdef CONFIG_DEBUG
@@ -2118,7 +2117,6 @@ static int lpc31_epcancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
 #endif
 
   usbtrace(TRACE_EPCANCEL, privep->epphy);
-  priv = privep->dev;
 
   flags = irqsave();
 
diff --git a/arch/arm/src/sam34/sam_lowputc.c b/arch/arm/src/sam34/sam_lowputc.c
index 9c7636c416..9cb9a0eecb 100644
--- a/arch/arm/src/sam34/sam_lowputc.c
+++ b/arch/arm/src/sam34/sam_lowputc.c
@@ -42,7 +42,6 @@
 #include <stdint.h>
 
 #include <arch/irq.h>
-#include <arch/board/board.h>
 
 #include "up_internal.h"
 #include "up_arch.h"
@@ -61,7 +60,10 @@
 #  error Unknown UART
 #endif
 
+/* The board.h file may redefine pin configurations defined in sam_pinmap.h */
+
 #include "chip/sam_pinmap.h"
+#include <arch/board/board.h>
 
 /**************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/sama5/sam_clockconfig.c b/arch/arm/src/sama5/sam_clockconfig.c
index d34a07fa08..5df01d159a 100644
--- a/arch/arm/src/sama5/sam_clockconfig.c
+++ b/arch/arm/src/sama5/sam_clockconfig.c
@@ -135,7 +135,7 @@ static void __ramfunc__ sam_pmcwait(uint32_t bit)
  ****************************************************************************/
 
 #if defined(NEED_PLLSETUP)
-static inline void __ramfunc__ sam_enablemosc(void)
+static void __ramfunc__ sam_enablemosc(void)
 {
   uint32_t regval;
 
@@ -190,7 +190,7 @@ static inline void __ramfunc__ sam_enablemosc(void)
  ****************************************************************************/
 
 #if defined(NEED_PLLSETUP)
-static inline void __ramfunc__ sam_selectmosc(void)
+static void __ramfunc__ sam_selectmosc(void)
 {
   uint32_t regval;
 
@@ -218,7 +218,7 @@ static inline void __ramfunc__ sam_selectmosc(void)
  ****************************************************************************/
 
 #if defined(NEED_PLLSETUP)
-static inline void __ramfunc__ sam_pllasetup(void)
+static void __ramfunc__ sam_pllasetup(void)
 {
   uint32_t regval;
 
@@ -255,7 +255,7 @@ static inline void __ramfunc__ sam_pllasetup(void)
  ****************************************************************************/
 
 #if defined(NEED_PLLSETUP)
-static inline void __ramfunc__ sam_plladivider(void)
+static void __ramfunc__ sam_plladivider(void)
 {
   uint32_t regval;
 
@@ -306,7 +306,7 @@ static inline void __ramfunc__ sam_plladivider(void)
  ****************************************************************************/
 
 #if defined(NEED_PLLSETUP)
-static inline void __ramfunc__ sam_mckprescaler(void)
+static void __ramfunc__ sam_mckprescaler(void)
 {
   uint32_t regval;
 
@@ -333,7 +333,7 @@ static inline void __ramfunc__ sam_mckprescaler(void)
  ****************************************************************************/
 
 #if defined(NEED_PLLSETUP)
-static inline void __ramfunc__ sam_mckdivider(void)
+static void __ramfunc__ sam_mckdivider(void)
 {
   uint32_t regval;
 
@@ -365,7 +365,7 @@ static inline void __ramfunc__ sam_mckdivider(void)
  ****************************************************************************/
 
 #ifdef PMC_MCKR_H32MXDIV
-static inline void __ramfunc__ sam_h32mxdivider(void)
+static void __ramfunc__ sam_h32mxdivider(void)
 {
   uint32_t regval;
 
@@ -397,7 +397,7 @@ static inline void __ramfunc__ sam_h32mxdivider(void)
  ****************************************************************************/
 
 #if defined(NEED_PLLSETUP)
-static inline void __ramfunc__ sam_selectplla(void)
+static void __ramfunc__ sam_selectplla(void)
 {
   uint32_t regval;
 
diff --git a/arch/arm/src/stm32/stm32_can.c b/arch/arm/src/stm32/stm32_can.c
index 2b5d83b894..297394abd2 100644
--- a/arch/arm/src/stm32/stm32_can.c
+++ b/arch/arm/src/stm32/stm32_can.c
@@ -1127,7 +1127,7 @@ errout:
   regval  = can_getreg(priv, STM32_CAN_RF0R_OFFSET);
   regval |= CAN_RFR_RFOM;
   can_putreg(priv, STM32_CAN_RF0R_OFFSET, regval);
-  return OK;
+  return ret;
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/tiva/tiva_lowputc.h b/arch/arm/src/tiva/tiva_lowputc.h
index 348b1865d6..405813ee8f 100644
--- a/arch/arm/src/tiva/tiva_lowputc.h
+++ b/arch/arm/src/tiva/tiva_lowputc.h
@@ -41,6 +41,7 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
+#include <arch/tiva/chip.h>
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/configs b/configs
index 5084a89d2e..3c3046fd1d 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 5084a89d2e5d4a2949581255a976272b7d207db6
+Subproject commit 3c3046fd1d04f43e25cb86a7c6d69d69ce9852ac
diff --git a/include/nuttx/board.h b/include/nuttx/board.h
index 9b45de37ad..f29b68cf10 100644
--- a/include/nuttx/board.h
+++ b/include/nuttx/board.h
@@ -144,9 +144,7 @@ void board_initialize(void);
  *
  ****************************************************************************/
 
-#ifdef CONFIG_LIB_BOARDCTL
 int board_app_initialize(void);
-#endif /* CONFIG_LIB_BOARDCTL */
 
 /****************************************************************************
  * Name: board_power_off
diff --git a/include/nuttx/mm/mm.h b/include/nuttx/mm/mm.h
index b12f4366aa..6a8c27ba46 100644
--- a/include/nuttx/mm/mm.h
+++ b/include/nuttx/mm/mm.h
@@ -336,9 +336,7 @@ void kmm_initialize(FAR void *heap_start, size_t heap_size);
 
 /* Functions contained in umm_addregion.c ***********************************/
 
-#if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__)
 void umm_addregion(FAR void *heapstart, size_t heapsize);
-#endif
 
 /* Functions contained in kmm_addregion.c ***********************************/
 
@@ -355,10 +353,8 @@ void mm_givesemaphore(FAR struct mm_heap_s *heap);
 
 /* Functions contained in umm_sem.c ****************************************/
 
-#if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__)
 int  umm_trysemaphore(void);
 void umm_givesemaphore(void);
-#endif
 
 /* Functions contained in kmm_sem.c ****************************************/
 
diff --git a/sched/sched/sched_free.c b/sched/sched/sched_free.c
index 854d8caab4..d5c8dd8d09 100644
--- a/sched/sched/sched_free.c
+++ b/sched/sched/sched_free.c
@@ -45,6 +45,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
+
 #include "sched/sched.h"
 
 /************************************************************************