diff --git a/configs/stm32f746g-disco/src/stm32_appinitialize.c b/configs/stm32f746g-disco/src/stm32_appinitialize.c
index e1feb21c4aa..3ca1df58f39 100644
--- a/configs/stm32f746g-disco/src/stm32_appinitialize.c
+++ b/configs/stm32f746g-disco/src/stm32_appinitialize.c
@@ -39,7 +39,11 @@
 
 #include <nuttx/config.h>
 
-#include "stm32_ccm.h"
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <syslog.h>
+#include <errno.h>
+
 #include "stm32f746g-disco.h"
 
 /****************************************************************************
@@ -86,11 +90,14 @@ int board_app_initialize(uintptr_t arg)
 
   /* Mount the procfs file system */
 
-  ret = mount(NULL, SAMV71_PROCFS_MOUNTPOINT, "procfs", 0, NULL);
+  ret = mount(NULL, STM32_PROCFS_MOUNTPOINT, "procfs", 0, NULL);
   if (ret < 0)
     {
-      SYSLOG("ERROR: Failed to mount procfs at %s: %d\n",
-             SAMV71_PROCFS_MOUNTPOINT, ret);
+      syslog(LOG_ERR,
+             "ERROR: Failed to mount the PROC filesystem: %d (%d)\n",
+             ret, errno);
+      return ret;
+
     }
 #endif
 
diff --git a/configs/stm32f746g-disco/src/stm32_boot.c b/configs/stm32f746g-disco/src/stm32_boot.c
index c5954af1771..576847ab196 100644
--- a/configs/stm32f746g-disco/src/stm32_boot.c
+++ b/configs/stm32f746g-disco/src/stm32_boot.c
@@ -47,14 +47,6 @@
 #include "up_arch.h"
 #include "stm32f746g-disco.h"
 
-/************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************/
-
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -115,7 +107,7 @@ void stm32_boardinitialize(void)
 #ifdef CONFIG_BOARD_INITIALIZE
 void board_initialize(void)
 {
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
+#if !defined(CONFIG_NSH_ARCHINIT) && !defined(CONFIG_LIB_BOARDCTL)
   /* Perform NSH initialization here instead of from the NSH.  This
    * alternative NSH initialization is necessary when NSH is ran in user-space
    * but the initialization function must run in kernel space.
diff --git a/libc/misc/lib_utsname.c b/libc/misc/lib_utsname.c
index ff69aa1af48..fc8470bfc7f 100644
--- a/libc/misc/lib_utsname.c
+++ b/libc/misc/lib_utsname.c
@@ -43,6 +43,7 @@
 #include <string.h>
 
 #include <nuttx/version.h>
+#include <unistd.h>
 
 /* In the protected and kernel build modes where kernel and application code
  * are separated, some of these common system property must reside only in