diff --git a/arch/arm/src/am335x/am335x_edid.c b/arch/arm/src/am335x/am335x_edid.c
index d2ca92e2501..89878205dfd 100644
--- a/arch/arm/src/am335x/am335x_edid.c
+++ b/arch/arm/src/am335x/am335x_edid.c
@@ -45,8 +45,8 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
-#include <nuttx/debug.h>
 
+#include <nuttx/debug.h>
 #include <nuttx/video/edid.h>
 
 #include "am335x_lcdc.h"
diff --git a/arch/arm/src/at32/at32_gpio.c b/arch/arm/src/at32/at32_gpio.c
index 25153662488..d8dab99cde5 100644
--- a/arch/arm/src/at32/at32_gpio.c
+++ b/arch/arm/src/at32/at32_gpio.c
@@ -30,6 +30,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/irq.h>
 #include <nuttx/spinlock.h>
diff --git a/arch/arm/src/at32/at32_pwm.c b/arch/arm/src/at32/at32_pwm.c
index b35629b8853..919e4fa525e 100644
--- a/arch/arm/src/at32/at32_pwm.c
+++ b/arch/arm/src/at32/at32_pwm.c
@@ -67,7 +67,7 @@
 #define TIMTYPE_GENERAL16    1  /* General 16-bit timers (up, down, up/down)*/
 #define TIMTYPE_COUNTUP16    2  /* General 16-bit count-up timers */
 #define TIMTYPE_COUNTUP16_N  3  /* General 16-bit count-up timers with
-                                 * complementary outptus
+                                 * complementary outputs
                                  */
 #define TIMTYPE_GENERAL32    4  /* General 32-bit timers (up, down, up/down)*/
 #define TIMTYPE_ADVANCED     5  /* Advanced timers */
diff --git a/arch/arm/src/at32/at32_spi.c b/arch/arm/src/at32/at32_spi.c
index 4329132b8dd..bc36f114339 100644
--- a/arch/arm/src/at32/at32_spi.c
+++ b/arch/arm/src/at32/at32_spi.c
@@ -32,6 +32,7 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
diff --git a/arch/arm/src/at32/at32_start.c b/arch/arm/src/at32/at32_start.c
index 9a808742d3e..bba8776f3e2 100644
--- a/arch/arm/src/at32/at32_start.c
+++ b/arch/arm/src/at32/at32_start.c
@@ -27,6 +27,7 @@
 #include <nuttx/config.h>
 #include <stdint.h>
 #include <assert.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/init.h>
 #include "arm_internal.h"
diff --git a/arch/arm/src/at32/at32_timerisr.c b/arch/arm/src/at32/at32_timerisr.c
index 0a2204b0842..0233a8b60ac 100644
--- a/arch/arm/src/at32/at32_timerisr.c
+++ b/arch/arm/src/at32/at32_timerisr.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <nuttx/timers/arch_timer.h>
diff --git a/arch/arm/src/at32/at32f43xxx_rtcc.c b/arch/arm/src/at32/at32f43xxx_rtcc.c
index 2ea1a545109..deef36d8852 100644
--- a/arch/arm/src/at32/at32f43xxx_rtcc.c
+++ b/arch/arm/src/at32/at32f43xxx_rtcc.c
@@ -32,6 +32,7 @@
 #include <time.h>
 #include <assert.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c
index 27cc78854d2..02171c2bbf0 100644
--- a/arch/arm/src/c5471/c5471_ethernet.c
+++ b/arch/arm/src/c5471/c5471_ethernet.c
@@ -260,7 +260,7 @@
 #define MD_PHY_LSB_REG        0x03
 #define MD_PHY_CTRL_STAT_REG  0x17
 
-/*  Lucent LU3X31T-T64 transeiver ID */
+/*  Lucent LU3X31T-T64 transceiver ID */
 
 #define LU3X31_T64_PHYID      0x00437421
 
@@ -446,8 +446,8 @@ static inline void c5471_dumpbuffer(const char *msg, const uint8_t *buffer,
  *
  * Description:
  *   A helper routine used when serially communicating with the c547X's
- *   external ethernet transeiver device. GPIO pins are connected to the
- *   transeiver's MDCLK and MDIO pins and are used to accomplish the serial
+ *   external ethernet transceiver device. GPIO pins are connected to the
+ *   transceiver's MDCLK and MDIO pins and are used to accomplish the serial
  *   comm.
  *
  *   protocol:
@@ -513,8 +513,8 @@ static void c5471_mdtxbit (int bit_state)
  *
  * Description:
  *    A helper routine used when serially communicating with the c547X's
- *    external ethernet transeiver device. GPIO pins are connected to the
- *    transeiver's MDCLK and MDIO pins and are used to accomplish the serial
+ *    external ethernet transceiver device. GPIO pins are connected to the
+ *    transceiver's MDCLK and MDIO pins and are used to accomplish the serial
  *    comm.
  *
  *    protocol:
@@ -574,8 +574,8 @@ static int c5471_mdrxbit (void)
  *
  * Description:
  *    A helper routine used when serially communicating with the c547X's
- *    external ethernet transeiver device. GPIO pins are connected to the
- *    transeiver's MDCLK and MDIO pins and are used to accomplish the serial
+ *    external ethernet transceiver device. GPIO pins are connected to the
+ *    transceiver's MDCLK and MDIO pins and are used to accomplish the serial
  *    comm.
  *
  ****************************************************************************/
@@ -636,8 +636,8 @@ static void c5471_mdwrite (int adr, int reg, int data)
  *
  * Description:
  *    A helper routine used when serially communicating with the c547X's
- *    external ethernet transeiver device. GPIO pins are connected to the
- *    transeiver's MDCLK and MDIO pins and are used to accomplish the serial
+ *    external ethernet transceiver device. GPIO pins are connected to the
+ *    transceiver's MDCLK and MDIO pins and are used to accomplish the serial
  *    comm.
  *
  ****************************************************************************/
@@ -700,21 +700,21 @@ static int c5471_mdread (int adr, int reg)
  * Name: c5471_phyinit
  *
  * Description:
- *   The c547X EVM board uses a Lucent LU3X31T-T64 transeiver device to
+ *   The c547X EVM board uses a Lucent LU3X31T-T64 transceiver device to
  *   handle the physical layer (PHY). It's a h/w block that on the one end
  *   offers a Media Independent Interface (MII) which is connected to the
  *   Ethernet Interface Module (EIM) internal to the C547x and on the other
  *   end offers either the 10baseT or 100baseT electrical interface
- *   connecting to an RJ45 onboard network connector. The PHY transeiver has
+ *   connecting to an RJ45 onboard network connector. The PHY transceiver has
  *   several internal registers allowing host configuration and status
  *   access. These internal registers are accessible by clocking serial data
  *   in/out of the MDIO pin of the LU3X31T-T64 chip. For c547X, the MDC and
  *   the MDIO pins are connected to the C547x GPIO15 and GPIO14 pins
  *   respectively. Host software twiddles the GPIO pins appropriately to get
  *   data serially into and out of the chip. This is typically a one time
- *   operation at boot and normal operation of the transeiver involves
- *   EIM/Transeiver interaction at the other pins of the transeiver chip and
- *   doesn't require host intervention at the MDC and MDIO pins.
+ *   operation at boot and normal operation of the transceiver involves
+ *   EIM/Transceiver interaction at the other pins of the transceiver chip
+ *   and doesn't require host intervention at the MDC and MDIO pins.
  *
  ****************************************************************************/
 
@@ -724,7 +724,7 @@ static int c5471_phyinit (void)
   int phyid;
   int status;
 
-  /* Next, Setup GPIO pins to talk serially to the Lucent transeiver chip */
+  /* Next, Setup GPIO pins to talk serially to the Lucent transceiver chip */
 
   /* enable gpio bits 15,14 */
 
@@ -786,7 +786,7 @@ static int c5471_phyinit (void)
   int phyid;
   int status;
 
-  /* Next, Setup GPIO pins to talk serially to the Lucent transeiver chip */
+  /* Next, Setup GPIO pins to talk serially to the Lucent transceiver chip */
 
   putreg32((getreg32(GPIO_EN)  |  0x0000c000), GPIO_EN);  /* enable gpio bits 15,14 */
   putreg32((getreg32(GPIO_CIO) & ~0x00008000), GPIO_CIO); /* config gpio(15); out -> MDCLK */
diff --git a/arch/arm/src/c5471/c5471_timerisr.c b/arch/arm/src/c5471/c5471_timerisr.c
index 62644204b33..3fddd00ad32 100644
--- a/arch/arm/src/c5471/c5471_timerisr.c
+++ b/arch/arm/src/c5471/c5471_timerisr.c
@@ -27,6 +27,7 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 
diff --git a/arch/arm/src/dm320/dm320_timerisr.c b/arch/arm/src/dm320/dm320_timerisr.c
index 370c100903d..91f3136a7a1 100644
--- a/arch/arm/src/dm320/dm320_timerisr.c
+++ b/arch/arm/src/dm320/dm320_timerisr.c
@@ -27,6 +27,7 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 
diff --git a/arch/arm/src/efm32/efm32_timerisr.c b/arch/arm/src/efm32/efm32_timerisr.c
index 977bae73797..0e1d7dd97bc 100644
--- a/arch/arm/src/efm32/efm32_timerisr.c
+++ b/arch/arm/src/efm32/efm32_timerisr.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/gd32f4/gd32f4xx_timerisr.c b/arch/arm/src/gd32f4/gd32f4xx_timerisr.c
index c6ccd2fc77d..bab1bea3291 100644
--- a/arch/arm/src/gd32f4/gd32f4xx_timerisr.c
+++ b/arch/arm/src/gd32f4/gd32f4xx_timerisr.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <nuttx/timers/arch_timer.h>
diff --git a/arch/arm/src/imx9/imx9_timerisr.c b/arch/arm/src/imx9/imx9_timerisr.c
index 17841d1dbbc..1dd8c189c51 100644
--- a/arch/arm/src/imx9/imx9_timerisr.c
+++ b/arch/arm/src/imx9/imx9_timerisr.c
@@ -144,25 +144,25 @@ static void up_pm_notify(struct pm_callback_s *cb, int domain,
 {
   switch (pmstate)
     {
-      case(PM_NORMAL):
+      case (PM_NORMAL):
         {
           /* Logic for PM_NORMAL goes here */
         }
         break;
 
-      case(PM_IDLE):
+      case (PM_IDLE):
         {
           /* Logic for PM_IDLE goes here */
         }
         break;
 
-      case(PM_STANDBY):
+      case (PM_STANDBY):
         {
           /* Logic for PM_STANDBY goes here */
         }
         break;
 
-      case(PM_SLEEP):
+      case (PM_SLEEP):
         {
           /* Logic for PM_SLEEP goes here */
         }
diff --git a/arch/arm/src/imxrt/imxrt_timerisr.c b/arch/arm/src/imxrt/imxrt_timerisr.c
index 8936a565279..10c057a7908 100644
--- a/arch/arm/src/imxrt/imxrt_timerisr.c
+++ b/arch/arm/src/imxrt/imxrt_timerisr.c
@@ -145,25 +145,25 @@ static void up_pm_notify(struct pm_callback_s *cb, int domain,
 {
   switch (pmstate)
     {
-      case(PM_NORMAL):
+      case (PM_NORMAL):
         {
           /* Logic for PM_NORMAL goes here */
         }
         break;
 
-      case(PM_IDLE):
+      case (PM_IDLE):
         {
           /* Logic for PM_IDLE goes here */
         }
         break;
 
-      case(PM_STANDBY):
+      case (PM_STANDBY):
         {
           /* Logic for PM_STANDBY goes here */
         }
         break;
 
-      case(PM_SLEEP):
+      case (PM_SLEEP):
         {
           /* Logic for PM_SLEEP goes here */
         }
diff --git a/arch/arm/src/kl/kl_timerisr.c b/arch/arm/src/kl/kl_timerisr.c
index a62b749b3aa..b216dfbf94c 100644
--- a/arch/arm/src/kl/kl_timerisr.c
+++ b/arch/arm/src/kl/kl_timerisr.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/lc823450/lc823450_sdc.c b/arch/arm/src/lc823450/lc823450_sdc.c
index 1d7bd355af8..4b2f83d42a3 100644
--- a/arch/arm/src/lc823450/lc823450_sdc.c
+++ b/arch/arm/src/lc823450/lc823450_sdc.c
@@ -2,7 +2,8 @@
  * arch/arm/src/lc823450/lc823450_sdc.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
- * SPDX-FileCopyrightText: 2014,2015,2016,2017 Sony Video & Sound Products Inc.
+ * SPDX-FileCopyrightText: 2014,2015,2016,2017 Sony Video & Sound
+ * Products Inc.
  * SPDX-FileCopyrightText: 2014-2015 ON Semiconductor. All rights reserved.
  * SPDX-FileContributor: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>
  * SPDX-FileContributor: Masatoshi Tateishi <Masatoshi.Tateishi@jp.sony.com>
@@ -45,6 +46,7 @@
 #include <sys/types.h>
 #include <assert.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/clock.h>
 #include <nuttx/arch.h>
diff --git a/arch/arm/src/lc823450/lc823450_timer.c b/arch/arm/src/lc823450/lc823450_timer.c
index 05c0abdcfcf..192b8c23443 100644
--- a/arch/arm/src/lc823450/lc823450_timer.c
+++ b/arch/arm/src/lc823450/lc823450_timer.c
@@ -30,6 +30,7 @@
 #include <stddef.h>
 #include <time.h>
 #include <assert.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/nuttx.h>
 #include <nuttx/arch.h>
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c
index 96960b2307f..e1df730992b 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c
@@ -2,7 +2,7 @@
  * arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
- * SPDX-FileCopyrightText: 2010, 2014, 2016 Gregory Nutt. All rights reserved.
+ * SPDX-FileCopyrightText: 2010,2014,2016 Gregory Nutt. All rights reserved.
  * SPDX-FileCopyrightText: 2011 Li Zhuoyi. All rights reserved.
  * SPDX-FileContributor: Li Zhuoyi <lzyy.cn@gmail.com>
  *
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpiodbg.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpiodbg.c
index da166c9966d..f6b32479d1d 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpiodbg.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpiodbg.c
@@ -34,6 +34,7 @@
 #include <sys/types.h>
 #include <stdint.h>
 #include <stdbool.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/irq.h>
 
diff --git a/arch/arm/src/lpc214x/lpc214x_irq.c b/arch/arm/src/lpc214x/lpc214x_irq.c
index 727380c28a5..f944fc77d2b 100644
--- a/arch/arm/src/lpc214x/lpc214x_irq.c
+++ b/arch/arm/src/lpc214x/lpc214x_irq.c
@@ -27,6 +27,7 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 
diff --git a/arch/arm/src/lpc214x/lpc214x_serial.c b/arch/arm/src/lpc214x/lpc214x_serial.c
index 787d72e9ca1..23dcdf41a6a 100644
--- a/arch/arm/src/lpc214x/lpc214x_serial.c
+++ b/arch/arm/src/lpc214x/lpc214x_serial.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
diff --git a/arch/arm/src/lpc214x/lpc214x_timerisr.c b/arch/arm/src/lpc214x/lpc214x_timerisr.c
index 0b561d1931d..15dfc048eb1 100644
--- a/arch/arm/src/lpc214x/lpc214x_timerisr.c
+++ b/arch/arm/src/lpc214x/lpc214x_timerisr.c
@@ -27,6 +27,7 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/lpc2378/lpc23xx_irq.c b/arch/arm/src/lpc2378/lpc23xx_irq.c
index 6e7962bb868..9b05374a4b4 100644
--- a/arch/arm/src/lpc2378/lpc23xx_irq.c
+++ b/arch/arm/src/lpc2378/lpc23xx_irq.c
@@ -44,6 +44,7 @@
 
 #include <stdint.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 
diff --git a/arch/arm/src/lpc2378/lpc23xx_serial.c b/arch/arm/src/lpc2378/lpc23xx_serial.c
index 86ced415af8..5cb96be108e 100644
--- a/arch/arm/src/lpc2378/lpc23xx_serial.c
+++ b/arch/arm/src/lpc2378/lpc23xx_serial.c
@@ -50,6 +50,7 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
diff --git a/arch/arm/src/lpc2378/lpc23xx_timerisr.c b/arch/arm/src/lpc2378/lpc23xx_timerisr.c
index 1efd8c72def..46f04cfd9e6 100644
--- a/arch/arm/src/lpc2378/lpc23xx_timerisr.c
+++ b/arch/arm/src/lpc2378/lpc23xx_timerisr.c
@@ -42,6 +42,7 @@
 
 #include <nuttx/config.h>
 #include <sys/types.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/nuc1xx/nuc_timerisr.c b/arch/arm/src/nuc1xx/nuc_timerisr.c
index 66ae7927911..013c4c43365 100644
--- a/arch/arm/src/nuc1xx/nuc_timerisr.c
+++ b/arch/arm/src/nuc1xx/nuc_timerisr.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/phy62xx/phyplus_gpio.c b/arch/arm/src/phy62xx/phyplus_gpio.c
index d38e0bb7d37..0ce392f67f7 100644
--- a/arch/arm/src/phy62xx/phyplus_gpio.c
+++ b/arch/arm/src/phy62xx/phyplus_gpio.c
@@ -27,6 +27,7 @@
 #include <nuttx/config.h>
 #include <stdbool.h>
 #include <assert.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/clock.h>
 #include <nuttx/wdog.h>
diff --git a/arch/arm/src/phy62xx/phyplus_timer_lowerhalf.c b/arch/arm/src/phy62xx/phyplus_timer_lowerhalf.c
index e536c3d11cb..e7007f6f87b 100644
--- a/arch/arm/src/phy62xx/phyplus_timer_lowerhalf.c
+++ b/arch/arm/src/phy62xx/phyplus_timer_lowerhalf.c
@@ -48,6 +48,7 @@
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/spinlock.h>
 #include <nuttx/timers/timer.h>
diff --git a/arch/arm/src/phy62xx/phyplus_timerisr.c b/arch/arm/src/phy62xx/phyplus_timerisr.c
index e041ed04017..31d5d104742 100644
--- a/arch/arm/src/phy62xx/phyplus_timerisr.c
+++ b/arch/arm/src/phy62xx/phyplus_timerisr.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/ra4/ra_timerisr.c b/arch/arm/src/ra4/ra_timerisr.c
index 44e8e500c70..8bf99ce2d37 100644
--- a/arch/arm/src/ra4/ra_timerisr.c
+++ b/arch/arm/src/ra4/ra_timerisr.c
@@ -26,6 +26,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/rtl8720c/ameba_uart.c b/arch/arm/src/rtl8720c/ameba_uart.c
index aa989d95f76..1574b810639 100644
--- a/arch/arm/src/rtl8720c/ameba_uart.c
+++ b/arch/arm/src/rtl8720c/ameba_uart.c
@@ -32,6 +32,7 @@
 #include <semaphore.h>
 #include <string.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/spinlock.h>
 #include <nuttx/arch.h>
diff --git a/arch/arm/src/sam34/sam_timerisr.c b/arch/arm/src/sam34/sam_timerisr.c
index 31e6f80cf96..49c06d23dd6 100644
--- a/arch/arm/src/sam34/sam_timerisr.c
+++ b/arch/arm/src/sam34/sam_timerisr.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/samd2l2/sam_timerisr.c b/arch/arm/src/samd2l2/sam_timerisr.c
index 599388d84bf..2a68882527a 100644
--- a/arch/arm/src/samd2l2/sam_timerisr.c
+++ b/arch/arm/src/samd2l2/sam_timerisr.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/samv7/sam_timerisr.c b/arch/arm/src/samv7/sam_timerisr.c
index c4c06464f5e..43a82fd97e4 100644
--- a/arch/arm/src/samv7/sam_timerisr.c
+++ b/arch/arm/src/samv7/sam_timerisr.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/stm32/stm32_pwm.c b/arch/arm/src/stm32/stm32_pwm.c
index d33c3e2dbc0..b94348176f5 100644
--- a/arch/arm/src/stm32/stm32_pwm.c
+++ b/arch/arm/src/stm32/stm32_pwm.c
@@ -68,7 +68,7 @@
 #define TIMTYPE_GENERAL16    1  /* General 16-bit timers (up, down, up/down)*/
 #define TIMTYPE_COUNTUP16    2  /* General 16-bit count-up timers */
 #define TIMTYPE_COUNTUP16_N  3  /* General 16-bit count-up timers with
-                                 * complementary outptus
+                                 * complementary outputs
                                  */
 #define TIMTYPE_GENERAL32    4  /* General 32-bit timers (up, down, up/down)*/
 #define TIMTYPE_ADVANCED     5  /* Advanced timers */
diff --git a/arch/arm/src/stm32/stm32_timerisr.c b/arch/arm/src/stm32/stm32_timerisr.c
index 31790dbb89d..c4fa9c76fb6 100644
--- a/arch/arm/src/stm32/stm32_timerisr.c
+++ b/arch/arm/src/stm32/stm32_timerisr.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <nuttx/timers/arch_timer.h>
diff --git a/arch/arm/src/stm32f0l0g0/stm32_timerisr.c b/arch/arm/src/stm32f0l0g0/stm32_timerisr.c
index 34723aedcfb..5a0737c4144 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_timerisr.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_timerisr.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/stm32f7/stm32_pwm.c b/arch/arm/src/stm32f7/stm32_pwm.c
index 2268a6eccf4..d10551d86ae 100644
--- a/arch/arm/src/stm32f7/stm32_pwm.c
+++ b/arch/arm/src/stm32f7/stm32_pwm.c
@@ -56,7 +56,7 @@
 #define TIMTYPE_GENERAL16    1  /* General 16-bit timers (up, down, up/down)*/
 #define TIMTYPE_COUNTUP16    2  /* General 16-bit count-up timers */
 #define TIMTYPE_COUNTUP16_N  3  /* General 16-bit count-up timers with
-                                 * complementary outptus
+                                 * complementary outputs
                                  */
 #define TIMTYPE_GENERAL32    4  /* General 32-bit timers (up, down, up/down)*/
 #define TIMTYPE_ADVANCED     5  /* Advanced timers */
diff --git a/arch/arm/src/stm32f7/stm32_timerisr.c b/arch/arm/src/stm32f7/stm32_timerisr.c
index 864d7e587ee..637b31bd0f6 100644
--- a/arch/arm/src/stm32f7/stm32_timerisr.c
+++ b/arch/arm/src/stm32f7/stm32_timerisr.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/stm32h5/stm32_pwm.c b/arch/arm/src/stm32h5/stm32_pwm.c
index 096e65614ce..e86d9043814 100644
--- a/arch/arm/src/stm32h5/stm32_pwm.c
+++ b/arch/arm/src/stm32h5/stm32_pwm.c
@@ -61,7 +61,7 @@
 #define TIMTYPE_GENERAL16    1  /* General 16-bit timers (up, down, up/down)*/
 #define TIMTYPE_COUNTUP16    2  /* General 16-bit count-up timers */
 #define TIMTYPE_COUNTUP16_N  3  /* General 16-bit count-up timers with
-                                 * complementary outptus
+                                 * complementary outputs
                                  */
 #define TIMTYPE_GENERAL32    4  /* General 32-bit timers (up, down, up/down)*/
 #define TIMTYPE_ADVANCED     5  /* Advanced timers */
diff --git a/arch/arm/src/stm32h5/stm32_timerisr.c b/arch/arm/src/stm32h5/stm32_timerisr.c
index b2a72ff28cb..448f063b87f 100644
--- a/arch/arm/src/stm32h5/stm32_timerisr.c
+++ b/arch/arm/src/stm32h5/stm32_timerisr.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/stm32h7/stm32_pwm.c b/arch/arm/src/stm32h7/stm32_pwm.c
index 998ba091c8f..40354522c03 100644
--- a/arch/arm/src/stm32h7/stm32_pwm.c
+++ b/arch/arm/src/stm32h7/stm32_pwm.c
@@ -63,7 +63,7 @@
 #define TIMTYPE_GENERAL16    1  /* General 16-bit timers (up, down, up/down)*/
 #define TIMTYPE_COUNTUP16    2  /* General 16-bit count-up timers */
 #define TIMTYPE_COUNTUP16_N  3  /* General 16-bit count-up timers with
-                                 * complementary outptus
+                                 * complementary outputs
                                  */
 #define TIMTYPE_GENERAL32    4  /* General 32-bit timers (up, down, up/down)*/
 #define TIMTYPE_ADVANCED     5  /* Advanced timers */
diff --git a/arch/arm/src/stm32h7/stm32_timerisr.c b/arch/arm/src/stm32h7/stm32_timerisr.c
index c4c4cf509e7..b2f37b5f580 100644
--- a/arch/arm/src/stm32h7/stm32_timerisr.c
+++ b/arch/arm/src/stm32h7/stm32_timerisr.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/stm32l4/stm32l4_pwm.c b/arch/arm/src/stm32l4/stm32l4_pwm.c
index 5debb254ecb..3c2825602e4 100644
--- a/arch/arm/src/stm32l4/stm32l4_pwm.c
+++ b/arch/arm/src/stm32l4/stm32l4_pwm.c
@@ -65,7 +65,7 @@
 #define TIMTYPE_GENERAL16    1  /* General 16-bit timers: TIM3,4 */
 #define TIMTYPE_COUNTUP16    2  /* General 16-bit count-up timers: TIM15-17 */
 #define TIMTYPE_COUNTUP16_N  3  /* General 16-bit count-up timers with
-                                 * complementary outptus
+                                 * complementary outputs
                                  */
 #define TIMTYPE_GENERAL32    4  /* General 32-bit timers: TIM2,5 */
 #define TIMTYPE_ADVANCED     5  /* Advanced timers:  TIM1,8 */
diff --git a/arch/arm/src/stm32l4/stm32l4_timerisr.c b/arch/arm/src/stm32l4/stm32l4_timerisr.c
index ea8a39f3cd1..1a37a689243 100644
--- a/arch/arm/src/stm32l4/stm32l4_timerisr.c
+++ b/arch/arm/src/stm32l4/stm32l4_timerisr.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/stm32l5/stm32l5_timerisr.c b/arch/arm/src/stm32l5/stm32l5_timerisr.c
index c5d1ade558d..4ee9481fb82 100644
--- a/arch/arm/src/stm32l5/stm32l5_timerisr.c
+++ b/arch/arm/src/stm32l5/stm32l5_timerisr.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/stm32u5/stm32_timerisr.c b/arch/arm/src/stm32u5/stm32_timerisr.c
index 39c19a7d931..5cd2f7175dd 100644
--- a/arch/arm/src/stm32u5/stm32_timerisr.c
+++ b/arch/arm/src/stm32u5/stm32_timerisr.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/stm32wl5/stm32wl5_timerisr.c b/arch/arm/src/stm32wl5/stm32wl5_timerisr.c
index 57049cd72f1..c4238fbf268 100644
--- a/arch/arm/src/stm32wl5/stm32wl5_timerisr.c
+++ b/arch/arm/src/stm32wl5/stm32wl5_timerisr.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/str71x/str71x_serial.c b/arch/arm/src/str71x/str71x_serial.c
index 73a6e9e026e..f0ef24c6985 100644
--- a/arch/arm/src/str71x/str71x_serial.c
+++ b/arch/arm/src/str71x/str71x_serial.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
diff --git a/arch/arm/src/tiva/common/tiva_adclib.c b/arch/arm/src/tiva/common/tiva_adclib.c
index f93082b1468..90a5001c569 100644
--- a/arch/arm/src/tiva/common/tiva_adclib.c
+++ b/arch/arm/src/tiva/common/tiva_adclib.c
@@ -316,7 +316,7 @@ void tiva_adc_step_cfg(struct tiva_adc_step_cfg_s *stepcfg)
   uint8_t  sse   = stepcfg->sse;
   uint8_t  step  = stepcfg->step;
 #ifdef CONFIG_EXPERIMENTAL
-  uint8_t  shold = stepcfg->shold;
+  uint8_t  hold = stepcfg->hold;
 #endif
   uint8_t  flags = stepcfg->flags;
   uint8_t  ain   = stepcfg->ain;
@@ -324,8 +324,8 @@ void tiva_adc_step_cfg(struct tiva_adc_step_cfg_s *stepcfg)
 
   ainfo("configure ADC%d SSE%d STEP%d...\n", adc, sse, step);
 #ifdef CONFIG_DEBUG_ANALOG
-  ainfo("  shold=0x%02x flags=0x%02x ain=%d...\n",
-        stepcfg->shold, stepcfg->flags, stepcfg->ain);
+  ainfo("  hold=0x%02x flags=0x%02x ain=%d...\n",
+        stepcfg->hold, stepcfg->flags, stepcfg->ain);
 #endif
 
   /* Configure the AIN GPIO for analog input if not flagged to be mux'ed to
@@ -343,7 +343,7 @@ void tiva_adc_step_cfg(struct tiva_adc_step_cfg_s *stepcfg)
   tiva_adc_sse_differential(adc, sse, step, 0); /* TODO: update when differential
                                                  * support is added. */
 #ifdef CONFIG_EXPERIMENTAL
-  tiva_adc_sse_sample_hold_time(adc, sse, step, shold);
+  tiva_adc_sse_sample_hold_time(adc, sse, step, hold);
 #endif
   tiva_adc_sse_step_cfg(adc, sse, step, flags);
 }
@@ -959,17 +959,17 @@ void tiva_adc_sse_differential(uint8_t adc, uint8_t sse, uint8_t chn,
  *   adc - peripheral state
  *   sse - sample sequencer
  *   chn - sample sequencer channel
- *   shold - sample and hold time
+ *   hold - sample and hold time
  *
  ****************************************************************************/
 
 #ifdef CONFIG_EXPERIMENTAL
 void tiva_adc_sse_sample_hold_time(uint8_t adc, uint8_t sse,
-                                 uint8_t chn, uint32_t shold)
+                                   uint8_t chn, uint32_t hold)
 {
   uintptr_t sstshreg = (TIVA_ADC_BASE(adc) + TIVA_ADC_SSTSH(sse));
   modifyreg32(sstshreg, ADC_SSTSH_MASK(sse),
-              (shold << ADC_SSTSH_SHIFT(sse)));
+              (hold << ADC_SSTSH_SHIFT(sse)));
 }
 #endif
 
diff --git a/arch/arm/src/tiva/common/tiva_hciuart.c b/arch/arm/src/tiva/common/tiva_hciuart.c
index 39caec8b7a8..04d531e6c2b 100644
--- a/arch/arm/src/tiva/common/tiva_hciuart.c
+++ b/arch/arm/src/tiva/common/tiva_hciuart.c
@@ -1721,25 +1721,25 @@ static void hciuart_pm_notify(struct pm_callback_s *cb, int domain,
 {
   switch (pmstate)
     {
-      case(PM_NORMAL):
+      case (PM_NORMAL):
         {
           /* Logic for PM_NORMAL goes here */
         }
         break;
 
-      case(PM_IDLE):
+      case (PM_IDLE):
         {
           /* Logic for PM_IDLE goes here */
         }
         break;
 
-      case(PM_STANDBY):
+      case (PM_STANDBY):
         {
           /* Logic for PM_STANDBY goes here */
         }
         break;
 
-      case(PM_SLEEP):
+      case (PM_SLEEP):
         {
           /* Logic for PM_SLEEP goes here */
         }
diff --git a/arch/arm/src/tiva/common/tiva_timerisr.c b/arch/arm/src/tiva/common/tiva_timerisr.c
index b2c03d41277..7f3fa3f1711 100644
--- a/arch/arm/src/tiva/common/tiva_timerisr.c
+++ b/arch/arm/src/tiva/common/tiva_timerisr.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/tiva/tiva_adc.h b/arch/arm/src/tiva/tiva_adc.h
index 87d9a219fe6..57a86a1d484 100644
--- a/arch/arm/src/tiva/tiva_adc.h
+++ b/arch/arm/src/tiva/tiva_adc.h
@@ -129,7 +129,7 @@ struct tiva_adc_step_cfg_s
   uint8_t  adc;   /* Parent peripheral */
   uint8_t  sse;   /* Parent sample sequencer (SSE) */
   uint8_t  step;  /* Which step in the sequencer */
-  uint8_t  shold; /* Sample and hold time */
+  uint8_t  hold;  /* Sample and hold time */
   uint8_t  flags; /* Last step? Interrupt enabled?
                    * Internal temperature sensor? */
   uint8_t  ain;   /* Which analog input */
@@ -629,13 +629,13 @@ void tiva_adc_sse_differential(uint8_t adc, uint8_t sse, uint8_t chn,
  *   adc - peripheral state
  *   sse - sample sequencer
  *   chn - sample sequencer channel
- *   shold - sample and hold time
+ *   hold - sample and hold time
  *
  ****************************************************************************/
 
 #ifdef CONFIG_EXPERIMENTAL
 void tiva_adc_sse_sample_hold_time(uint8_t adc, uint8_t sse, uint8_t chn,
-                                   uint32_t shold);
+                                   uint32_t hold);
 #endif
 
 /****************************************************************************
diff --git a/arch/arm/src/tlsr82/tlsr82_cpu.c b/arch/arm/src/tlsr82/tlsr82_cpu.c
index 32608125664..9430731a51f 100644
--- a/arch/arm/src/tlsr82/tlsr82_cpu.c
+++ b/arch/arm/src/tlsr82/tlsr82_cpu.c
@@ -29,6 +29,7 @@
 #include <stdint.h>
 
 #include <assert.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/irq.h>
 
diff --git a/arch/arm64/src/common/arm64_allocateheap.c b/arch/arm64/src/common/arm64_allocateheap.c
index c3567d3ca2e..a15214ad3ef 100644
--- a/arch/arm64/src/common/arm64_allocateheap.c
+++ b/arch/arm64/src/common/arm64_allocateheap.c
@@ -30,6 +30,7 @@
 #include <stdint.h>
 
 #include <assert.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
diff --git a/arch/arm64/src/common/arm64_createstack.c b/arch/arm64/src/common/arm64_createstack.c
index 477eaef8617..617e116f38a 100644
--- a/arch/arm64/src/common/arm64_createstack.c
+++ b/arch/arm64/src/common/arm64_createstack.c
@@ -28,6 +28,7 @@
 #include <sys/types.h>
 #include <stdint.h>
 #include <sched.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
diff --git a/arch/arm64/src/common/arm64_releasestack.c b/arch/arm64/src/common/arm64_releasestack.c
index c5a1afb515f..fc8acfac902 100644
--- a/arch/arm64/src/common/arm64_releasestack.c
+++ b/arch/arm64/src/common/arm64_releasestack.c
@@ -28,6 +28,7 @@
 #include <sys/types.h>
 #include <stdint.h>
 #include <sched.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
diff --git a/arch/arm64/src/common/arm64_stackframe.c b/arch/arm64/src/common/arm64_stackframe.c
index f45c3579cd4..a10ea0c1b81 100644
--- a/arch/arm64/src/common/arm64_stackframe.c
+++ b/arch/arm64/src/common/arm64_stackframe.c
@@ -29,6 +29,7 @@
 #include <sys/types.h>
 #include <stdint.h>
 #include <sched.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
diff --git a/arch/arm64/src/common/arm64_usestack.c b/arch/arm64/src/common/arm64_usestack.c
index 2a22a2d2ea0..5bd2099cdf2 100644
--- a/arch/arm64/src/common/arm64_usestack.c
+++ b/arch/arm64/src/common/arm64_usestack.c
@@ -29,6 +29,7 @@
 #include <sys/types.h>
 #include <stdint.h>
 #include <sched.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
diff --git a/arch/avr/src/at32uc3/at32uc3_timerisr.c b/arch/avr/src/at32uc3/at32uc3_timerisr.c
index 8a7640a3b1c..4e547b5e71d 100644
--- a/arch/avr/src/at32uc3/at32uc3_timerisr.c
+++ b/arch/avr/src/at32uc3/at32uc3_timerisr.c
@@ -27,6 +27,7 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/avr/src/avr/avr_switchcontext.c b/arch/avr/src/avr/avr_switchcontext.c
index 3f0c89ecbfc..4e1120c4c4c 100644
--- a/arch/avr/src/avr/avr_switchcontext.c
+++ b/arch/avr/src/avr/avr_switchcontext.c
@@ -28,6 +28,7 @@
 
 #include <sched.h>
 #include <assert.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <nuttx/sched.h>
diff --git a/arch/hc/src/common/hc_usestack.c b/arch/hc/src/common/hc_usestack.c
index c117801d240..bccbdcc9428 100644
--- a/arch/hc/src/common/hc_usestack.c
+++ b/arch/hc/src/common/hc_usestack.c
@@ -30,6 +30,7 @@
 #include <stdint.h>
 #include <sched.h>
 #include <assert.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
diff --git a/arch/hc/src/m9s12/m9s12_dumpgpio.c b/arch/hc/src/m9s12/m9s12_dumpgpio.c
index 4fd660ed6b6..7ee39e27774 100644
--- a/arch/hc/src/m9s12/m9s12_dumpgpio.c
+++ b/arch/hc/src/m9s12/m9s12_dumpgpio.c
@@ -34,6 +34,7 @@
 #define CONFIG_DEBUG_INFO 1
 
 #include <stdint.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/irq.h>
 
diff --git a/arch/renesas/src/rx65n/rx65n_timerisr.c b/arch/renesas/src/rx65n/rx65n_timerisr.c
index a17ae3ed674..c883a3e5e21 100644
--- a/arch/renesas/src/rx65n/rx65n_timerisr.c
+++ b/arch/renesas/src/rx65n/rx65n_timerisr.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
diff --git a/arch/risc-v/src/common/espressif/esp_sha.c b/arch/risc-v/src/common/espressif/esp_sha.c
index 359ea07bdd4..7ed9393c791 100644
--- a/arch/risc-v/src/common/espressif/esp_sha.c
+++ b/arch/risc-v/src/common/espressif/esp_sha.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <inttypes.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/mutex.h>
 
diff --git a/arch/risc-v/src/common/espressif/esp_spiflash.c b/arch/risc-v/src/common/espressif/esp_spiflash.c
index 9076221b1b8..8312b3ae8d2 100644
--- a/arch/risc-v/src/common/espressif/esp_spiflash.c
+++ b/arch/risc-v/src/common/espressif/esp_spiflash.c
@@ -31,6 +31,7 @@
 
 #include <stdint.h>
 #include <assert.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/mutex.h>
 #include <sys/types.h>
diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_bignum.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_bignum.c
index fadd90f6f82..1429328b7d7 100644
--- a/arch/risc-v/src/esp32c3-legacy/esp32c3_bignum.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_bignum.c
@@ -34,6 +34,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <sys/param.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/mutex.h>
 
diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_sha.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_sha.c
index 37c5e2741c1..83cd10350c6 100644
--- a/arch/risc-v/src/esp32c3-legacy/esp32c3_sha.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_sha.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <inttypes.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/mutex.h>
 
diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_wlan.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_wlan.c
index a39ae7a7949..e8a762ee054 100644
--- a/arch/risc-v/src/esp32c3-legacy/esp32c3_wlan.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_wlan.c
@@ -30,6 +30,7 @@
 
 #include <assert.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/crc64.h>
 #include <arpa/inet.h>
diff --git a/arch/risc-v/src/k210/k210_sysctl.c b/arch/risc-v/src/k210/k210_sysctl.c
index 32b4dec957c..7b0604c89f2 100644
--- a/arch/risc-v/src/k210/k210_sysctl.c
+++ b/arch/risc-v/src/k210/k210_sysctl.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 
diff --git a/arch/risc-v/src/mpfs/mpfs_plic.c b/arch/risc-v/src/mpfs/mpfs_plic.c
index 2794b5e94e7..239e91dcd45 100644
--- a/arch/risc-v/src/mpfs/mpfs_plic.c
+++ b/arch/risc-v/src/mpfs/mpfs_plic.c
@@ -29,6 +29,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <assert.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/spinlock.h>
 
diff --git a/arch/sim/src/sim/sim_switchcontext.c b/arch/sim/src/sim/sim_switchcontext.c
index 2fb5c206c22..af466c99779 100644
--- a/arch/sim/src/sim/sim_switchcontext.c
+++ b/arch/sim/src/sim/sim_switchcontext.c
@@ -28,6 +28,7 @@
 
 #include <sched.h>
 #include <assert.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <nuttx/sched.h>
diff --git a/arch/x86_64/src/common/x86_64_switchcontext.c b/arch/x86_64/src/common/x86_64_switchcontext.c
index 4c79e86b3d5..9ddf056f37a 100644
--- a/arch/x86_64/src/common/x86_64_switchcontext.c
+++ b/arch/x86_64/src/common/x86_64_switchcontext.c
@@ -28,6 +28,7 @@
 
 #include <sched.h>
 #include <assert.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/addrenv.h>
 #include <nuttx/arch.h>
diff --git a/arch/x86_64/src/intel64/intel64_regdump.c b/arch/x86_64/src/intel64/intel64_regdump.c
index cbfd21d79d7..2abf085e250 100644
--- a/arch/x86_64/src/intel64/intel64_regdump.c
+++ b/arch/x86_64/src/intel64/intel64_regdump.c
@@ -27,6 +27,7 @@
 #include <nuttx/config.h>
 
 #include <inttypes.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/irq.h>
 
diff --git a/arch/xtensa/src/common/espressif/esp_sha.c b/arch/xtensa/src/common/espressif/esp_sha.c
index 43f59d1905d..f6a1515d42c 100644
--- a/arch/xtensa/src/common/espressif/esp_sha.c
+++ b/arch/xtensa/src/common/espressif/esp_sha.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <inttypes.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/mutex.h>
 
diff --git a/arch/xtensa/src/common/espressif/esp_spiflash.c b/arch/xtensa/src/common/espressif/esp_spiflash.c
index 9e9cd87773b..b6fdd32350b 100644
--- a/arch/xtensa/src/common/espressif/esp_spiflash.c
+++ b/arch/xtensa/src/common/espressif/esp_spiflash.c
@@ -31,6 +31,7 @@
 
 #include <stdint.h>
 #include <assert.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/mutex.h>
 #include <sys/types.h>
diff --git a/arch/xtensa/src/esp32/esp32_himem.c b/arch/xtensa/src/esp32/esp32_himem.c
index bcaada2b1e3..ec06aa5992f 100644
--- a/arch/xtensa/src/esp32/esp32_himem.c
+++ b/arch/xtensa/src/esp32/esp32_himem.c
@@ -24,6 +24,7 @@
 
 #include <stdlib.h>
 #include <assert.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/himem/himem.h>
diff --git a/arch/xtensa/src/esp32/esp32_psram.c b/arch/xtensa/src/esp32/esp32_psram.c
index 7f2b42b46e3..c45b9879cbc 100644
--- a/arch/xtensa/src/esp32/esp32_psram.c
+++ b/arch/xtensa/src/esp32/esp32_psram.c
@@ -27,6 +27,7 @@
 #include <stdbool.h>
 #include <strings.h>
 #include <assert.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/config.h>
 #include <nuttx/signal.h>
diff --git a/arch/xtensa/src/esp32/esp32_sha.c b/arch/xtensa/src/esp32/esp32_sha.c
index ddf3f0f5021..7e44e5e1ad1 100644
--- a/arch/xtensa/src/esp32/esp32_sha.c
+++ b/arch/xtensa/src/esp32/esp32_sha.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <inttypes.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/mutex.h>
 
diff --git a/arch/xtensa/src/esp32s2/esp32s2_textheap.c b/arch/xtensa/src/esp32s2/esp32s2_textheap.c
index 383784f8b9f..e9646d1c5b5 100644
--- a/arch/xtensa/src/esp32s2/esp32s2_textheap.c
+++ b/arch/xtensa/src/esp32s2/esp32s2_textheap.c
@@ -28,6 +28,7 @@
 #include <nuttx/mm/mm.h>
 
 #include <sys/types.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/kmalloc.h>
 
diff --git a/arch/xtensa/src/esp32s3/esp32s3_himem.c b/arch/xtensa/src/esp32s3/esp32s3_himem.c
index 0a1e805f99c..83cd621c929 100644
--- a/arch/xtensa/src/esp32s3/esp32s3_himem.c
+++ b/arch/xtensa/src/esp32s3/esp32s3_himem.c
@@ -24,6 +24,7 @@
 
 #include <stdlib.h>
 #include <assert.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/himem/himem.h>
diff --git a/arch/xtensa/src/esp32s3/esp32s3_textheap.c b/arch/xtensa/src/esp32s3/esp32s3_textheap.c
index d6ebf5dcd38..e83143c24b4 100644
--- a/arch/xtensa/src/esp32s3/esp32s3_textheap.c
+++ b/arch/xtensa/src/esp32s3/esp32s3_textheap.c
@@ -28,6 +28,7 @@
 #include <nuttx/mm/mm.h>
 
 #include <sys/types.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/kmalloc.h>
 
diff --git a/arch/z80/src/common/z80_usestack.c b/arch/z80/src/common/z80_usestack.c
index b3e81e2423e..2966d4b5ff1 100644
--- a/arch/z80/src/common/z80_usestack.c
+++ b/arch/z80/src/common/z80_usestack.c
@@ -30,6 +30,7 @@
 #include <stdint.h>
 #include <sched.h>
 #include <assert.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
diff --git a/boards/arm/cxd56xx/common/src/cxd56_emmcdev.c b/boards/arm/cxd56xx/common/src/cxd56_emmcdev.c
index 77e6892d261..3a6605e298b 100644
--- a/boards/arm/cxd56xx/common/src/cxd56_emmcdev.c
+++ b/boards/arm/cxd56xx/common/src/cxd56_emmcdev.c
@@ -30,6 +30,7 @@
 
 #include <stdio.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/board.h>
 #include <nuttx/signal.h>
diff --git a/boards/arm/cxd56xx/common/src/cxd56_flash.c b/boards/arm/cxd56xx/common/src/cxd56_flash.c
index 841a562822b..a52ecf9500a 100644
--- a/boards/arm/cxd56xx/common/src/cxd56_flash.c
+++ b/boards/arm/cxd56xx/common/src/cxd56_flash.c
@@ -28,6 +28,7 @@
 
 #include <stdio.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/board.h>
 #include <nuttx/fs/fs.h>
diff --git a/boards/arm/cxd56xx/common/src/cxd56_gnss_addon.c b/boards/arm/cxd56xx/common/src/cxd56_gnss_addon.c
index 14c75aa9146..a854dd3d220 100644
--- a/boards/arm/cxd56xx/common/src/cxd56_gnss_addon.c
+++ b/boards/arm/cxd56xx/common/src/cxd56_gnss_addon.c
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/sensors/cxd5610_gnss.h>
 #include <nuttx/i2c/i2c_master.h>
diff --git a/boards/arm/kinetis/freedom-k66f/src/k66_rtc.c b/boards/arm/kinetis/freedom-k66f/src/k66_rtc.c
index 4a40fca3d24..e4cbd30b6e5 100644
--- a/boards/arm/kinetis/freedom-k66f/src/k66_rtc.c
+++ b/boards/arm/kinetis/freedom-k66f/src/k66_rtc.c
@@ -28,6 +28,7 @@
 
 #include <syslog.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/timers/rtc.h>
 
diff --git a/boards/arm/nrf53/nrf5340-dk/src/nrf53_gpio.c b/boards/arm/nrf53/nrf5340-dk/src/nrf53_gpio.c
index c4d87439d15..4b9cf40a3b3 100644
--- a/boards/arm/nrf53/nrf5340-dk/src/nrf53_gpio.c
+++ b/boards/arm/nrf53/nrf5340-dk/src/nrf53_gpio.c
@@ -28,6 +28,7 @@
 
 #include <arch/board/board.h>
 #include <assert.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/clock.h>
 #include <nuttx/config.h>
diff --git a/boards/arm/samv7/pic32czca70-curiosity/src/sam_bringup.c b/boards/arm/samv7/pic32czca70-curiosity/src/sam_bringup.c
index 90f637e8355..d5ad0026c46 100644
--- a/boards/arm/samv7/pic32czca70-curiosity/src/sam_bringup.c
+++ b/boards/arm/samv7/pic32czca70-curiosity/src/sam_bringup.c
@@ -31,6 +31,7 @@
 
 #include <stdbool.h>
 #include <syslog.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/signal.h>
 
diff --git a/boards/arm/samv7/samv71-xult/src/sam_bringup.c b/boards/arm/samv7/samv71-xult/src/sam_bringup.c
index 86c9ba8f05f..8bc67b5cd23 100644
--- a/boards/arm/samv7/samv71-xult/src/sam_bringup.c
+++ b/boards/arm/samv7/samv71-xult/src/sam_bringup.c
@@ -33,6 +33,7 @@
 #include <stdio.h>
 #include <syslog.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/signal.h>
 
diff --git a/boards/arm/stm32/olimex-stm32-h405/src/stm32_usb.c b/boards/arm/stm32/olimex-stm32-h405/src/stm32_usb.c
index be99b2f3a0d..ce10acef664 100644
--- a/boards/arm/stm32/olimex-stm32-h405/src/stm32_usb.c
+++ b/boards/arm/stm32/olimex-stm32-h405/src/stm32_usb.c
@@ -31,6 +31,7 @@
 #include <stdbool.h>
 #include <sched.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
diff --git a/boards/arm/stm32/stm32butterfly2/src/stm32_spi.c b/boards/arm/stm32/stm32butterfly2/src/stm32_spi.c
index b3d85cd3773..9044b910a78 100644
--- a/boards/arm/stm32/stm32butterfly2/src/stm32_spi.c
+++ b/boards/arm/stm32/stm32butterfly2/src/stm32_spi.c
@@ -25,6 +25,7 @@
  ****************************************************************************/
 
 #include <inttypes.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/spi/spi.h>
 
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_capture.c b/boards/arm/stm32/stm32f4discovery/src/stm32_capture.c
index b55f710a843..df94bdee2a6 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_capture.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_capture.c
@@ -27,6 +27,7 @@
 #include <nuttx/config.h>
 
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/timers/capture.h>
 #include <arch/board/board.h>
diff --git a/boards/arm/stm32f7/stm32f746-ws/src/stm32_appinitialize.c b/boards/arm/stm32f7/stm32f746-ws/src/stm32_appinitialize.c
index 4a171792fcd..0c5b2d40f17 100644
--- a/boards/arm/stm32f7/stm32f746-ws/src/stm32_appinitialize.c
+++ b/boards/arm/stm32f7/stm32f746-ws/src/stm32_appinitialize.c
@@ -26,6 +26,7 @@
 
 #include <nuttx/config.h>
 #include <syslog.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/i2c/i2c_master.h>
 #include <nuttx/leds/userled.h>
diff --git a/boards/arm/stm32l4/steval-stlcs01v1/src/stm32_usb.c b/boards/arm/stm32l4/steval-stlcs01v1/src/stm32_usb.c
index 9d7f85f6a56..933115652db 100644
--- a/boards/arm/stm32l4/steval-stlcs01v1/src/stm32_usb.c
+++ b/boards/arm/stm32l4/steval-stlcs01v1/src/stm32_usb.c
@@ -31,6 +31,7 @@
 #include <stdbool.h>
 #include <sched.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
diff --git a/boards/arm64/bcm2711/raspberrypi-4b/src/rpi4b_gpio.c b/boards/arm64/bcm2711/raspberrypi-4b/src/rpi4b_gpio.c
index ee6475165ed..c86247a201b 100644
--- a/boards/arm64/bcm2711/raspberrypi-4b/src/rpi4b_gpio.c
+++ b/boards/arm64/bcm2711/raspberrypi-4b/src/rpi4b_gpio.c
@@ -28,6 +28,7 @@
 
 #include <arch/irq.h>
 #include <assert.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/irq.h>
 #include <sys/types.h>
diff --git a/boards/risc-v/bl602/bl602evb/src/bl602_gpio.c b/boards/risc-v/bl602/bl602evb/src/bl602_gpio.c
index 211c631afe7..acc5109aad9 100644
--- a/boards/risc-v/bl602/bl602evb/src/bl602_gpio.c
+++ b/boards/risc-v/bl602/bl602evb/src/bl602_gpio.c
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <assert.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <nuttx/ioexpander/gpio.h>
diff --git a/boards/sim/sim/sim/configs/nsh2/defconfig b/boards/sim/sim/sim/configs/nsh2/defconfig
index 8f6eff80858..85172094440 100644
--- a/boards/sim/sim/sim/configs/nsh2/defconfig
+++ b/boards/sim/sim/sim/configs/nsh2/defconfig
@@ -5,52 +5,71 @@
 # You can then do "make savedefconfig" to generate a new defconfig file that includes your
 # modifications.
 #
-# CONFIG_EXAMPLES_NXHELLO_DEFAULT_FONT is not set
-# CONFIG_NX_DISABLE_32BPP is not set
-# CONFIG_NX_PACKEDMSFIRST is not set
+# CONFIG_NSH_CMDOPT_HEXDUMP is not set
 CONFIG_ARCH="sim"
 CONFIG_ARCH_BOARD="sim"
 CONFIG_ARCH_BOARD_SIM=y
 CONFIG_ARCH_CHIP="sim"
 CONFIG_ARCH_SIM=y
+CONFIG_BOARDCTL_APP_SYMTAB=y
+CONFIG_BOARDCTL_POWEROFF=y
+CONFIG_BOARD_LOOPSPERMSEC=0
+CONFIG_BOOT_RUNFROMEXTSRAM=y
 CONFIG_BUILTIN=y
+CONFIG_COVERAGE_ALL=y
+CONFIG_COVERAGE_TOOLCHAIN=y
+CONFIG_DEBUG_ASSERTIONS=y
+CONFIG_DEBUG_ASSERTIONS_EXPRESSION=y
+CONFIG_DEBUG_FEATURES=y
 CONFIG_DEBUG_SYMBOLS=y
-CONFIG_DISABLE_POSIX_TIMERS=y
-CONFIG_DRIVERS_VIDEO=y
+CONFIG_DEV_GPIO=y
+CONFIG_DEV_LOOP=y
 CONFIG_ETC_FATDEVNO=2
 CONFIG_ETC_ROMFS=y
 CONFIG_ETC_ROMFSDEVNO=1
-CONFIG_EXAMPLES_NX=y
-CONFIG_EXAMPLES_NXHELLO=y
-CONFIG_EXAMPLES_NXHELLO_FONTID=6
-CONFIG_EXAMPLES_NXLINES=y
-CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=4
-CONFIG_EXAMPLES_NXLINES_BPP=32
-CONFIG_EXAMPLES_TOUCHSCREEN=y
+CONFIG_EXAMPLES_GPIO=y
+CONFIG_EXAMPLES_HELLO=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
+CONFIG_FS_BINFS=y
 CONFIG_FS_FAT=y
+CONFIG_FS_HOSTFS=y
 CONFIG_FS_PROCFS=y
+CONFIG_FS_RAMMAP=y
 CONFIG_FS_ROMFS=y
-CONFIG_HAVE_CXX=y
+CONFIG_GPIO_LOWER_HALF=y
+CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_INIT_ENTRYPOINT="nsh_main"
-CONFIG_INPUT=y
-CONFIG_MQ_MAXMSGSIZE=64
+CONFIG_IOEXPANDER=y
+CONFIG_IOEXPANDER_DUMMY=y
+CONFIG_LIBC_ENVPATH=y
+CONFIG_LIBC_EXECFUNCS=y
+CONFIG_LIBC_LOCALE=y
+CONFIG_LIBC_LOCALE_CATALOG=y
+CONFIG_LIBC_LOCALE_GETTEXT=y
+CONFIG_LIBC_MAX_EXITFUNS=1
+CONFIG_LIBC_NUMBERED_ARGS=y
+CONFIG_NDEBUG=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
+CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NX=y
-CONFIG_NXFONT_SANS23X27=y
-CONFIG_NXFONT_SANS28X37B=y
-CONFIG_NX_BLOCKING=y
-CONFIG_NX_KBD=y
-CONFIG_NX_XYINPUT_MOUSE=y
+CONFIG_PATH_INITIAL="/bin"
+CONFIG_PIPES=y
+CONFIG_PSEUDOFS_ATTRIBUTES=y
+CONFIG_PSEUDOFS_FILE=y
+CONFIG_PSEUDOFS_SOFTLINKS=y
+CONFIG_READLINE_TABCOMPLETION=y
+CONFIG_SCHED_BACKTRACE=y
+CONFIG_SCHED_EVENTS=y
+CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_WAITPID=y
-CONFIG_SIM_TOUCHSCREEN=y
-CONFIG_SIM_X11FB=y
-CONFIG_START_DAY=6
-CONFIG_START_MONTH=10
-CONFIG_START_YEAR=2011
+CONFIG_SIM_HOSTFS=y
+CONFIG_SIM_WALLTIME_SIGNAL=y
+CONFIG_START_MONTH=6
+CONFIG_START_YEAR=2008
+CONFIG_SYSTEM_DUMPSTACK=y
+CONFIG_SYSTEM_GCOV=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_VIDEO_FB=y
+CONFIG_TESTING_OSTEST=y
diff --git a/boards/sparc/bm3803/xx3803/src/bm3803_am29lv.c b/boards/sparc/bm3803/xx3803/src/bm3803_am29lv.c
index f6af0771dda..bc7ce418a9a 100644
--- a/boards/sparc/bm3803/xx3803/src/bm3803_am29lv.c
+++ b/boards/sparc/bm3803/xx3803/src/bm3803_am29lv.c
@@ -32,6 +32,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/fs/fs.h>
 #ifdef CONFIG_MTD_AM29LV
diff --git a/drivers/1wire/1wire_ds2xxx.c b/drivers/1wire/1wire_ds2xxx.c
index 12d2c58be60..d7438a0c747 100644
--- a/drivers/1wire/1wire_ds2xxx.c
+++ b/drivers/1wire/1wire_ds2xxx.c
@@ -40,6 +40,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <inttypes.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/fs/fs.h>
 
diff --git a/drivers/audio/vs1053.c b/drivers/audio/vs1053.c
index 1ec14e3e8a8..8ec8b1bb1cb 100644
--- a/drivers/audio/vs1053.c
+++ b/drivers/audio/vs1053.c
@@ -373,7 +373,7 @@ static int vs1053_setfrequency(FAR struct vs1053_struct_s *dev,
       factor = 10.0;
     }
 
-  /* Calculate the clock mulit register based on the factor */
+  /* Calculate the clock multi register based on the factor */
 
   if ((int)factor == 10)
     {
diff --git a/drivers/coresight/coresight_etm3.c b/drivers/coresight/coresight_etm3.c
index 940399e8e69..8f41ec62446 100644
--- a/drivers/coresight/coresight_etm3.c
+++ b/drivers/coresight/coresight_etm3.c
@@ -25,6 +25,7 @@
  ****************************************************************************/
 
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/bits.h>
 #include <nuttx/kmalloc.h>
diff --git a/drivers/coresight/coresight_etm4.c b/drivers/coresight/coresight_etm4.c
index e3a4b027776..4a198fa707a 100644
--- a/drivers/coresight/coresight_etm4.c
+++ b/drivers/coresight/coresight_etm4.c
@@ -25,6 +25,7 @@
  ****************************************************************************/
 
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/arch.h>
 #include <nuttx/bits.h>
diff --git a/drivers/coresight/coresight_funnel.c b/drivers/coresight/coresight_funnel.c
index 78ceee11968..036bb268fb7 100644
--- a/drivers/coresight/coresight_funnel.c
+++ b/drivers/coresight/coresight_funnel.c
@@ -25,6 +25,7 @@
  ****************************************************************************/
 
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/irq.h>
diff --git a/drivers/coresight/coresight_replicator.c b/drivers/coresight/coresight_replicator.c
index c0293c4d015..29c53ab6ace 100644
--- a/drivers/coresight/coresight_replicator.c
+++ b/drivers/coresight/coresight_replicator.c
@@ -25,6 +25,7 @@
  ****************************************************************************/
 
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/irq.h>
diff --git a/drivers/coresight/coresight_stm.c b/drivers/coresight/coresight_stm.c
index 18ceb3918b5..f02d337d5aa 100644
--- a/drivers/coresight/coresight_stm.c
+++ b/drivers/coresight/coresight_stm.c
@@ -25,6 +25,7 @@
  ****************************************************************************/
 
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/list.h>
diff --git a/drivers/coresight/coresight_tmc_core.c b/drivers/coresight/coresight_tmc_core.c
index b173aae86f5..5c3c54ecc46 100644
--- a/drivers/coresight/coresight_tmc_core.c
+++ b/drivers/coresight/coresight_tmc_core.c
@@ -25,6 +25,7 @@
  ****************************************************************************/
 
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/bits.h>
 #include <nuttx/kmalloc.h>
diff --git a/drivers/coresight/coresight_tpiu.c b/drivers/coresight/coresight_tpiu.c
index 4744694602c..cc2cf8cb37d 100644
--- a/drivers/coresight/coresight_tpiu.c
+++ b/drivers/coresight/coresight_tpiu.c
@@ -25,6 +25,7 @@
  ****************************************************************************/
 
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/bits.h>
diff --git a/drivers/modem/alt1250/altmdm_timer.c b/drivers/modem/alt1250/altmdm_timer.c
index 80b3cacb071..c97ff5d6efe 100644
--- a/drivers/modem/alt1250/altmdm_timer.c
+++ b/drivers/modem/alt1250/altmdm_timer.c
@@ -27,6 +27,7 @@
 #include <nuttx/config.h>
 
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/irq.h>
 #include <nuttx/signal.h>
diff --git a/drivers/motor/drv8825.c b/drivers/motor/drv8825.c
index 1846419f1af..345d6f57b93 100644
--- a/drivers/motor/drv8825.c
+++ b/drivers/motor/drv8825.c
@@ -28,6 +28,7 @@
 #include <nuttx/motor/drv8825.h>
 
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/signal.h>
 
diff --git a/drivers/mtd/mtd_config.c b/drivers/mtd/mtd_config.c
index 5e37b68bdc3..9c063737925 100644
--- a/drivers/mtd/mtd_config.c
+++ b/drivers/mtd/mtd_config.c
@@ -42,6 +42,7 @@
 #include <fcntl.h>
 #include <assert.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/fs/fs.h>
 
diff --git a/drivers/mtd/mtd_config_nvs.c b/drivers/mtd/mtd_config_nvs.c
index 1219a48d07f..187af6ef92e 100644
--- a/drivers/mtd/mtd_config_nvs.c
+++ b/drivers/mtd/mtd_config_nvs.c
@@ -784,7 +784,7 @@ static bool nvs_ate_valid(FAR struct nvs_fs *fs,
  * Description:
  *   Validates an block close ate:
  *   A valid block close ate:
- *   - Calid ate.
+ *   - Valid ate.
  *   - Len = 0 and id = 0xFFFFFFFF.
  *   - Offset points to location at ate multiple from block size.
  *   Return true if valid, false otherwise.
diff --git a/drivers/mtd/ramtron.c b/drivers/mtd/ramtron.c
index 52d5d0a5097..7045c561fab 100644
--- a/drivers/mtd/ramtron.c
+++ b/drivers/mtd/ramtron.c
@@ -522,8 +522,8 @@ static inline int ramtron_readid(struct ramtron_dev_s *priv)
     }
 
   memory   = SPI_SEND(priv->dev, RAMTRON_DUMMY);
-  capacity = SPI_SEND(priv->dev, RAMTRON_DUMMY);  /* fram.id1 */
-  part     = SPI_SEND(priv->dev, RAMTRON_DUMMY);  /* fram.id2 */
+  capacity = SPI_SEND(priv->dev, RAMTRON_DUMMY);  /* FRAM ID1 */
+  part     = SPI_SEND(priv->dev, RAMTRON_DUMMY);  /* FRAM ID2 */
 
   /* Deselect the FLASH and unlock the bus */
 
diff --git a/drivers/sensors/goldfish_gnss_uorb.c b/drivers/sensors/goldfish_gnss_uorb.c
index 28668f28fc9..b099d292973 100644
--- a/drivers/sensors/goldfish_gnss_uorb.c
+++ b/drivers/sensors/goldfish_gnss_uorb.c
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/kthread.h>
diff --git a/drivers/sensors/goldfish_sensor_uorb.c b/drivers/sensors/goldfish_sensor_uorb.c
index 25bf868ad8c..9b3a1d65137 100644
--- a/drivers/sensors/goldfish_sensor_uorb.c
+++ b/drivers/sensors/goldfish_sensor_uorb.c
@@ -32,6 +32,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/kthread.h>
diff --git a/drivers/serial/serial_dma.c b/drivers/serial/serial_dma.c
index b941997096c..a2a800cba68 100644
--- a/drivers/serial/serial_dma.c
+++ b/drivers/serial/serial_dma.c
@@ -29,6 +29,7 @@
 #include <assert.h>
 #include <sys/types.h>
 #include <stdint.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/signal.h>
 
diff --git a/drivers/video/isx019.c b/drivers/video/isx019.c
index 77390081170..394b09d2c31 100644
--- a/drivers/video/isx019.c
+++ b/drivers/video/isx019.c
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/i2c/i2c_master.h>
 #include <nuttx/signal.h>
diff --git a/drivers/wireless/spirit/lib/spirit_csma.c b/drivers/wireless/spirit/lib/spirit_csma.c
index 3d42a9d1e51..ab4fec10d52 100644
--- a/drivers/wireless/spirit/lib/spirit_csma.c
+++ b/drivers/wireless/spirit/lib/spirit_csma.c
@@ -168,11 +168,11 @@ int spirit_csma_getinfo(FAR struct spirit_library_s *spirit,
       return ret;
     }
 
-  /* Reads the bu counter seed */
+  /* Reads the backoff counter seed */
 
   csmainit->seed = (uint16_t)regval[1] | (uint16_t)regval[0] << 8;
 
-  /* Reads the bu prescaler */
+  /* Reads the backoff prescaler */
 
   csmainit->prescaler = regval[2] >> 2;
 
diff --git a/fs/cromfs/fs_cromfs.c b/fs/cromfs/fs_cromfs.c
index 65492776e7b..3eddaceeddb 100644
--- a/fs/cromfs/fs_cromfs.c
+++ b/fs/cromfs/fs_cromfs.c
@@ -858,7 +858,7 @@ static ssize_t cromfs_read(FAR struct file *filep, FAR char *buffer,
   size_t remaining;
   uint32_t blkoffs;
   uint16_t ulen;
-  uint16_t clen;
+  uint16_t complen;
   unsigned int copysize;
   unsigned int copyoffs;
 
@@ -944,9 +944,9 @@ static ssize_t cromfs_read(FAR struct file *filep, FAR char *buffer,
 
               ulen    = (uint16_t)hdr1->lzf_ulen[0] << 8 |
                         (uint16_t)hdr1->lzf_ulen[1];
-              clen    = (uint16_t)hdr1->lzf_clen[0] << 8 |
+              complen = (uint16_t)hdr1->lzf_clen[0] << 8 |
                         (uint16_t)hdr1->lzf_clen[1];
-              blksize = (uint32_t)clen + LZF_TYPE1_HDR_SIZE;
+              blksize = (uint32_t)complen + LZF_TYPE1_HDR_SIZE;
             }
 
           nexthdr  = (FAR struct lzf_header_s *)
@@ -1006,7 +1006,8 @@ static ssize_t cromfs_read(FAR struct file *filep, FAR char *buffer,
                 {
                   unsigned int decomplen;
 
-                  decomplen = lzf_decompress(src, clen, dest, fs->cv_bsize);
+                  decomplen = lzf_decompress(src, complen, dest,
+                                             fs->cv_bsize);
 
                   ff->ff_offset = voloffs;
                   ff->ff_ulen   = decomplen;
@@ -1045,7 +1046,7 @@ static ssize_t cromfs_read(FAR struct file *filep, FAR char *buffer,
                 {
                   unsigned int decomplen;
 
-                  decomplen = lzf_decompress(src, clen, ff->ff_buffer,
+                  decomplen = lzf_decompress(src, complen, ff->ff_buffer,
                                              fs->cv_bsize);
 
                   ff->ff_offset = voloffs;
@@ -1053,9 +1054,9 @@ static ssize_t cromfs_read(FAR struct file *filep, FAR char *buffer,
                 }
 
               finfo("voloffs=%" PRIu32 " blkoffs=%" PRIu32 " ulen=%" PRIu16
-                    " clen=%" PRIu16 " ff_offset=%" PRIu32
+                    " complen=%" PRIu16 " ff_offset=%" PRIu32
                     "  copyoffs=%u copysize=%u\n",
-                    voloffs, blkoffs, ulen, clen, ff->ff_offset,
+                    voloffs, blkoffs, ulen, complen, ff->ff_offset,
                     copyoffs, copysize);
               DEBUGASSERT(ff->ff_ulen >= (copyoffs + copysize));
 
diff --git a/fs/driver/fs_blockmerge.c b/fs/driver/fs_blockmerge.c
index ff5506258cd..69506611c0e 100644
--- a/fs/driver/fs_blockmerge.c
+++ b/fs/driver/fs_blockmerge.c
@@ -27,6 +27,7 @@
 #include <sys/types.h>
 #include <sys/mount.h>
 #include <sys/param.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/kmalloc.h>
 #include <stdarg.h>
diff --git a/include/debug.h b/include/debug.h
index aa8a0b97b05..976057086a5 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -25,4 +25,8 @@
  * Please update your includes accordingly.
  */
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include <nuttx/debug.h>
diff --git a/include/nuttx/modem/alt1250.h b/include/nuttx/modem/alt1250.h
index bd2c9151fe5..07d014730ee 100644
--- a/include/nuttx/modem/alt1250.h
+++ b/include/nuttx/modem/alt1250.h
@@ -33,6 +33,7 @@
 #include <nuttx/queue.h>
 #include <nuttx/mutex.h>
 #include <semaphore.h>
+
 #include <nuttx/debug.h>
 #include <nuttx/irq.h>
 #include <pthread.h>
diff --git a/tools/nxstyle.c b/tools/nxstyle.c
index 7f5a9d79a1a..d464dc3fb01 100644
--- a/tools/nxstyle.c
+++ b/tools/nxstyle.c
@@ -725,6 +725,16 @@ static const char *g_white_files[] =
 
   "phy62xx/phyplus_wdt.c",
 
+  /* Skip Mixed case in vendor PHY62XX BLE/GPIO/timer/startup files
+   * and LPC43 SPIFI library glue.
+   */
+
+  "phy62xx/phy62xx_ble.c",
+  "phy62xx/phyplus_gpio.c",
+  "phy62xx/phyplus_tim.c",
+  "phy62xx/start.c",
+  "lpc4370-link2/src/lpc43_spifilib_init.c",
+
   /* Skip infineon illd files
    * Ref:
    * arch/tricore/src/illd