diff --git a/boards/cubepilot/cubeyellow/nuttx-config/nsh/defconfig b/boards/cubepilot/cubeyellow/nuttx-config/nsh/defconfig
index 82432e42c9..213c733aca 100644
--- a/boards/cubepilot/cubeyellow/nuttx-config/nsh/defconfig
+++ b/boards/cubepilot/cubeyellow/nuttx-config/nsh/defconfig
@@ -84,11 +84,9 @@ CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIBC_LONG_LONG=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=64
-CONFIG_MAX_WDOGPARMS=2
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MMCSD=y
-CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y
 CONFIG_MM_REGIONS=3
@@ -119,7 +117,6 @@ CONFIG_NSH_STRERROR=y
 CONFIG_NSH_VARS=y
 CONFIG_PIPES=y
 CONFIG_PREALLOC_TIMERS=50
-CONFIG_PREALLOC_WDOGS=50
 CONFIG_PRIORITY_INHERITANCE=y
 CONFIG_PTHREAD_MUTEX_ROBUST=y
 CONFIG_PTHREAD_STACK_MIN=512
@@ -202,7 +199,6 @@ CONFIG_STM32F7_WWDG=y
 CONFIG_SYSTEM_CDCACM=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=24
-CONFIG_TIME_EXTENDED=y
 CONFIG_UART4_BAUD=57600
 CONFIG_UART4_RXBUFSIZE=600
 CONFIG_UART4_RXDMA=y
diff --git a/boards/cubepilot/cubeyellow/src/led.c b/boards/cubepilot/cubeyellow/src/led.c
index 5564a16fc0..f3c25469c4 100644
--- a/boards/cubepilot/cubeyellow/src/led.c
+++ b/boards/cubepilot/cubeyellow/src/led.c
@@ -49,7 +49,7 @@
 #include <arch/board/board.h>
 
 /*
- * Ideally we'd be able to get these from up_internal.h,
+ * Ideally we'd be able to get these from arm_internal.h,
  * but since we want to be able to disable the NuttX use
  * of leds for system indication at will and there is no
  * separate switch, we need to build independent of the
diff --git a/boards/holybro/durandal-v1/src/can.c b/boards/holybro/durandal-v1/src/can.c
index f275c30865..3834074f37 100644
--- a/boards/holybro/durandal-v1/src/can.c
+++ b/boards/holybro/durandal-v1/src/can.c
@@ -46,7 +46,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
 
 #include "chip.h"
 #include "stm32_can.h"
diff --git a/boards/modalai/fc-v1/nuttx-config/scripts/script.ld b/boards/modalai/fc-v1/nuttx-config/scripts/script.ld
index dcaf04fd2c..bc2193fac2 100644
--- a/boards/modalai/fc-v1/nuttx-config/scripts/script.ld
+++ b/boards/modalai/fc-v1/nuttx-config/scripts/script.ld
@@ -115,11 +115,6 @@ SECTIONS
 		*(.gnu.linkonce.r.*)
 		_etext = ABSOLUTE(.);
 
-		/*
-		 * This is a hack to make the newlib libm __errno() call
-		 * use the NuttX get_errno_ptr() function.
-		 */
-		__errno = get_errno_ptr;
 	} > FLASH_AXIM
 
 	/*
diff --git a/boards/mro/ctrl-zero-f7/src/init.c b/boards/mro/ctrl-zero-f7/src/init.c
index 0ec6d666e8..0ca18a915f 100644
--- a/boards/mro/ctrl-zero-f7/src/init.c
+++ b/boards/mro/ctrl-zero-f7/src/init.c
@@ -63,7 +63,7 @@
 #include <chip.h>
 #include <stm32_uart.h>
 #include <arch/board/board.h>
-#include "up_internal.h"
+#include "arm_internal.h"
 
 #include <px4_arch/io_timer.h>
 #include <drivers/drv_hrt.h>
@@ -80,7 +80,7 @@
 /* Configuration ************************************************************/
 
 /*
- * Ideally we'd be able to get these from up_internal.h,
+ * Ideally we'd be able to get these from arm_internal.h,
  * but since we want to be able to disable the NuttX use
  * of leds for system indication at will and there is no
  * separate switch, we need to build independent of the
diff --git a/boards/px4/fmu-v5/src/usb.c b/boards/px4/fmu-v5/src/usb.c
index ad6d39ec12..ef279653d9 100644
--- a/boards/px4/fmu-v5/src/usb.c
+++ b/boards/px4/fmu-v5/src/usb.c
@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <up_arch.h>
+#include <arm_arch.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 #include <stm32_otg.h>