diff --git a/boards/bitcraze/crazyflie/src/init.c b/boards/bitcraze/crazyflie/src/init.c
index 14f786d4ba..0537d7d846 100644
--- a/boards/bitcraze/crazyflie/src/init.c
+++ b/boards/bitcraze/crazyflie/src/init.c
@@ -128,7 +128,6 @@ stm32_boardinitialize(void)
 
 __EXPORT int board_app_initialize(uintptr_t arg)
 {
-
 	px4_platform_init();
 
 	/* set up the serial DMA polling */
diff --git a/boards/intel/aerofc-v1/src/init.c b/boards/intel/aerofc-v1/src/init.c
index ee45c6e5bc..0d6bea5549 100644
--- a/boards/intel/aerofc-v1/src/init.c
+++ b/boards/intel/aerofc-v1/src/init.c
@@ -154,7 +154,6 @@ __EXPORT int board_app_initialize(uintptr_t arg)
 	/* the interruption subsystem is not initialized when stm32_boardinitialize() is called */
 	stm32_gpiosetevent(GPIO_FORCE_BOOTLOADER, true, false, false, _bootloader_force_pin_callback, NULL);
 
-
 	px4_platform_init();
 
 	/* set up the serial DMA polling */
diff --git a/boards/nxp/fmuk66-v3/src/init.c b/boards/nxp/fmuk66-v3/src/init.c
index e5a4470629..9a0a5080ef 100644
--- a/boards/nxp/fmuk66-v3/src/init.c
+++ b/boards/nxp/fmuk66-v3/src/init.c
@@ -258,7 +258,6 @@ __EXPORT int board_app_initialize(uintptr_t arg)
 
 	VDD_ETH_EN(true);
 
-
 	px4_platform_init();
 
 	/* configure the DMA allocator */
diff --git a/boards/omnibus/f4sd/src/init.c b/boards/omnibus/f4sd/src/init.c
index 03f7e438b8..6e68a8e42e 100644
--- a/boards/omnibus/f4sd/src/init.c
+++ b/boards/omnibus/f4sd/src/init.c
@@ -237,8 +237,6 @@ static struct spi_dev_s *spi3;
 
 __EXPORT int board_app_initialize(uintptr_t arg)
 {
-
-
 	px4_platform_init();
 
 	/* configure the DMA allocator */
diff --git a/boards/px4/cannode-v1/src/init.c b/boards/px4/cannode-v1/src/init.c
index f342bd10a6..9da9ee9956 100644
--- a/boards/px4/cannode-v1/src/init.c
+++ b/boards/px4/cannode-v1/src/init.c
@@ -159,7 +159,6 @@ __EXPORT int board_app_initialize(uintptr_t arg)
 {
 	int result = OK;
 
-
 	px4_platform_init();
 
 	/* set up the serial DMA polling */
diff --git a/boards/px4/esc-v1/src/init.c b/boards/px4/esc-v1/src/init.c
index da4be3572f..f80e7da078 100644
--- a/boards/px4/esc-v1/src/init.c
+++ b/boards/px4/esc-v1/src/init.c
@@ -154,7 +154,6 @@ __EXPORT int board_app_initialize(uintptr_t arg)
 
 	int result = OK;
 
-
 	px4_platform_init();
 
 	/* set up the serial DMA polling */
diff --git a/boards/px4/fmu-v4pro/src/init.c b/boards/px4/fmu-v4pro/src/init.c
index 8077cab32d..a67e3a6b7f 100644
--- a/boards/px4/fmu-v4pro/src/init.c
+++ b/boards/px4/fmu-v4pro/src/init.c
@@ -273,8 +273,6 @@ static struct sdio_dev_s *sdio;
 
 __EXPORT int board_app_initialize(uintptr_t arg)
 {
-
-
 	/* Bring up the Sensor power */
 
 	stm32_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, 1);
diff --git a/boards/px4/fmu-v5/src/init.c b/boards/px4/fmu-v5/src/init.c
index 849cb07da0..3fb852691c 100644
--- a/boards/px4/fmu-v5/src/init.c
+++ b/boards/px4/fmu-v5/src/init.c
@@ -217,7 +217,7 @@ __EXPORT void board_on_reset(int status)
 #ifdef CONFIG_BOARDCTL_FINALINIT
 int board_app_finalinitialize(uintptr_t arg)
 {
-    return 0;
+	return 0;
 }
 #endif
 
diff --git a/boards/stm/nucleo-F767ZI/src/init.c b/boards/stm/nucleo-F767ZI/src/init.c
index 347bbf786d..0650d7bd8d 100644
--- a/boards/stm/nucleo-F767ZI/src/init.c
+++ b/boards/stm/nucleo-F767ZI/src/init.c
@@ -213,8 +213,6 @@ stm32_boardinitialize(void)
 
 __EXPORT int board_app_initialize(uintptr_t arg)
 {
-
-
 	px4_platform_init();
 
 	/* configure the DMA allocator */
diff --git a/boards/thiemar/s2740vc-v1/src/init.c b/boards/thiemar/s2740vc-v1/src/init.c
index aa22cf5074..61a2cb4016 100644
--- a/boards/thiemar/s2740vc-v1/src/init.c
+++ b/boards/thiemar/s2740vc-v1/src/init.c
@@ -146,7 +146,6 @@ __EXPORT int board_app_initialize(uintptr_t arg)
 {
 	int result = OK;
 
-
 	px4_platform_init();
 
 	/* set up the serial DMA polling */
diff --git a/platforms/nuttx/src/px4_layer/px4_init.cpp b/platforms/nuttx/src/px4_layer/px4_init.cpp
index 8be6af0a68..82b9632aff 100644
--- a/platforms/nuttx/src/px4_layer/px4_init.cpp
+++ b/platforms/nuttx/src/px4_layer/px4_init.cpp
@@ -48,8 +48,8 @@ int px4_platform_init(void)
 	/* run C++ ctors before we go any further */
 	up_cxxinitialize();
 
-#	if defined(CONFIG_EXAMPLES_NSH_CXXINITIALIZE)
-#  		error CONFIG_EXAMPLES_NSH_CXXINITIALIZE Must not be defined! Use CONFIG_HAVE_CXX and CONFIG_HAVE_CXXINITIALIZE.
+#	if defined(CONFIG_SYSTEM_NSH_CXXINITIALIZE)
+#  		error CONFIG_SYSTEM_NSH_CXXINITIALIZE Must not be defined! Use CONFIG_HAVE_CXX and CONFIG_HAVE_CXXINITIALIZE.
 #	endif
 
 #else
diff --git a/src/modules/px4iofirmware/px4io.c b/src/modules/px4iofirmware/px4io.c
index 0c757d843e..54e9ba12e3 100644
--- a/src/modules/px4iofirmware/px4io.c
+++ b/src/modules/px4iofirmware/px4io.c
@@ -266,8 +266,8 @@ user_start(int argc, char *argv[])
 
 	up_cxxinitialize();
 
-#	if defined(CONFIG_EXAMPLES_NSH_CXXINITIALIZE)
-#  		error CONFIG_EXAMPLES_NSH_CXXINITIALIZE Must not be defined! Use CONFIG_HAVE_CXX and CONFIG_HAVE_CXXINITIALIZE.
+#	if defined(CONFIG_SYSTEM_NSH_CXXINITIALIZE)
+#  		error CONFIG_SYSTEM_NSH_CXXINITIALIZE Must not be defined! Use CONFIG_HAVE_CXX and CONFIG_HAVE_CXXINITIALIZE.
 #	endif
 
 #else