diff --git a/arch/arm/src/dm320/dm320_uart.h b/arch/arm/src/dm320/dm320_uart.h
index f7a1bb6c662..dd6f849d66e 100644
--- a/arch/arm/src/dm320/dm320_uart.h
+++ b/arch/arm/src/dm320/dm320_uart.h
@@ -26,7 +26,7 @@
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_can.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_can.c
index ea927125045..2560446b3c8 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_can.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_can.c
@@ -72,15 +72,15 @@
 #include <nuttx/arch.h>
 
 #if defined(CHRDEV_CAN)
-# include <nuttx/can/can.h>
+#  include <nuttx/can/can.h>
 #endif
 
 #if defined(SOCKET_CAN)
-# include <nuttx/can.h>
-# include <nuttx/net/netdev.h>
-# include <nuttx/net/can.h>
-# include <nuttx/wqueue.h>
-# include <string.h>
+#  include <nuttx/can.h>
+#  include <nuttx/net/netdev.h>
+#  include <nuttx/net/can.h>
+#  include <nuttx/wqueue.h>
+#  include <string.h>
 #endif
 
 #include "arm_internal.h"
diff --git a/arch/avr/include/arch.h b/arch/avr/include/arch.h
index 2c6283aa1b4..e46d5b1be30 100644
--- a/arch/avr/include/arch.h
+++ b/arch/avr/include/arch.h
@@ -32,9 +32,9 @@
 #include <nuttx/config.h>
 
 #ifdef CONFIG_ARCH_FAMILY_AVR32
-# include <arch/avr32/arch.h>
+#  include <arch/avr32/arch.h>
 #else
-# include <arch/avr/arch.h>
+#  include <arch/avr/arch.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/avr/include/irq.h b/arch/avr/include/irq.h
index 5e712cbe229..60cd9197a04 100644
--- a/arch/avr/include/irq.h
+++ b/arch/avr/include/irq.h
@@ -47,9 +47,9 @@
  */
 
 #ifdef CONFIG_ARCH_FAMILY_AVR32
-# include <arch/avr32/irq.h>
+#  include <arch/avr32/irq.h>
 #else
-# include <arch/avr/irq.h>
+#  include <arch/avr/irq.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/avr/include/limits.h b/arch/avr/include/limits.h
index 4dd865f7ab3..36717d5b04f 100644
--- a/arch/avr/include/limits.h
+++ b/arch/avr/include/limits.h
@@ -28,9 +28,9 @@
 /* Include AVR architecture-specific limits */
 
 #ifdef CONFIG_ARCH_FAMILY_AVR32
-# include <arch/avr32/limits.h>
+#  include <arch/avr32/limits.h>
 #else
-# include <arch/avr/limits.h>
+#  include <arch/avr/limits.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/avr/include/types.h b/arch/avr/include/types.h
index 88b861a7af3..4eb2c437ed0 100644
--- a/arch/avr/include/types.h
+++ b/arch/avr/include/types.h
@@ -32,9 +32,9 @@
 /* Include AVR architecture-specific types definitions */
 
 #ifdef CONFIG_ARCH_FAMILY_AVR32
-# include <arch/avr32/types.h>
+#  include <arch/avr32/types.h>
 #else
-# include <arch/avr/types.h>
+#  include <arch/avr/types.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/avr/src/common/avr_internal.h b/arch/avr/src/common/avr_internal.h
index e7d208233e0..8c31735def3 100644
--- a/arch/avr/src/common/avr_internal.h
+++ b/arch/avr/src/common/avr_internal.h
@@ -34,9 +34,9 @@
 #endif
 
 #ifdef CONFIG_ARCH_FAMILY_AVR32
-# include "avr32.h"
+#  include "avr32.h"
 #else
-# include "avr.h"
+#  include "avr.h"
 #endif
 
 /****************************************************************************
diff --git a/arch/hc/include/irq.h b/arch/hc/include/irq.h
index 9ac8687b8d3..01d604548b6 100644
--- a/arch/hc/include/irq.h
+++ b/arch/hc/include/irq.h
@@ -47,9 +47,9 @@
  */
 
 #if defined(CONFIG_ARCH_HC12)
-# include <arch/hc12/irq.h>
+#  include <arch/hc12/irq.h>
 #elif defined(CONFIG_ARCH_HCS12)
-# include <arch/hcs12/irq.h>
+#  include <arch/hcs12/irq.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/hc/include/limits.h b/arch/hc/include/limits.h
index ac846308762..9fbd220d31f 100644
--- a/arch/hc/include/limits.h
+++ b/arch/hc/include/limits.h
@@ -28,9 +28,9 @@
 /* Include architecture-specific limits definitions */
 
 #if defined(CONFIG_ARCH_HC12)
-# include <arch/hc12/limits.h>
+#  include <arch/hc12/limits.h>
 #elif defined(CONFIG_ARCH_HCS12)
-# include <arch/hcs12/limits.h>
+#  include <arch/hcs12/limits.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/hc/include/types.h b/arch/hc/include/types.h
index 967ceaf2fcc..23a02d19ce2 100644
--- a/arch/hc/include/types.h
+++ b/arch/hc/include/types.h
@@ -32,9 +32,9 @@
 /* Include architecture-specific limits definitions */
 
 #if defined(CONFIG_ARCH_HC12)
-# include <arch/hc12/types.h>
+#  include <arch/hc12/types.h>
 #elif defined(CONFIG_ARCH_HCS12)
-# include <arch/hcs12/types.h>
+#  include <arch/hcs12/types.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/mips/include/irq.h b/arch/mips/include/irq.h
index 9ba6381f36a..9c9ca59f728 100644
--- a/arch/mips/include/irq.h
+++ b/arch/mips/include/irq.h
@@ -47,7 +47,7 @@
  */
 
 #ifdef CONFIG_ARCH_MIPS32
-# include <arch/mips32/irq.h>
+#  include <arch/mips32/irq.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/misoc/include/irq.h b/arch/misoc/include/irq.h
index 32a212630ce..ea5d6f9592b 100644
--- a/arch/misoc/include/irq.h
+++ b/arch/misoc/include/irq.h
@@ -38,10 +38,10 @@
 #include <arch/chip/irq.h>
 
 #ifdef CONFIG_ARCH_CHIP_LM32
-# include <arch/lm32/irq.h>
+#  include <arch/lm32/irq.h>
 #endif
 #ifdef CONFIG_ARCH_CHIP_MINERVA
-# include <arch/minerva/irq.h>
+#  include <arch/minerva/irq.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/risc-v/src/bl602/bl602_start.c b/arch/risc-v/src/bl602/bl602_start.c
index 404fffae6b5..e50f77bd864 100644
--- a/arch/risc-v/src/bl602/bl602_start.c
+++ b/arch/risc-v/src/bl602/bl602_start.c
@@ -33,7 +33,7 @@
 #include <syslog.h>
 
 #ifdef CONFIG_STACK_OVERFLOW_CHECK
-# include "sched/sched.h"
+#  include "sched/sched.h"
 #endif
 
 #include "riscv_internal.h"
diff --git a/arch/sim/src/sim/sim_deviceimage.c b/arch/sim/src/sim/sim_deviceimage.c
index b18c6c96c82..d9e6777729f 100644
--- a/arch/sim/src/sim/sim_deviceimage.c
+++ b/arch/sim/src/sim/sim_deviceimage.c
@@ -23,21 +23,21 @@
  ****************************************************************************/
 
 #ifdef VFAT_STANDALONE
-# include <stdio.h>
-# include <stdlib.h>
-# include <syslog.h>
-# include <zlib.h>
+#  include <stdio.h>
+#  include <stdlib.h>
+#  include <syslog.h>
+#  include <zlib.h>
 #else
-# include <nuttx/config.h>
+#  include <nuttx/config.h>
 
-# include <syslog.h>
-# include <stdlib.h>
-# include <debug.h>
-# include <zlib.h>
+#  include <syslog.h>
+#  include <stdlib.h>
+#  include <debug.h>
+#  include <zlib.h>
 
-# include <nuttx/kmalloc.h>
+#  include <nuttx/kmalloc.h>
 
-# include "sim_internal.h"
+#  include "sim_internal.h"
 #endif
 
 /****************************************************************************
diff --git a/arch/sparc/include/irq.h b/arch/sparc/include/irq.h
index 96cbef6a824..2378b657ecf 100644
--- a/arch/sparc/include/irq.h
+++ b/arch/sparc/include/irq.h
@@ -47,7 +47,7 @@
  */
 
 #ifdef CONFIG_ARCH_SPARC_V8
-# include <arch/sparc_v8/irq.h>
+#  include <arch/sparc_v8/irq.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/sparc/src/common/sparc_internal.h b/arch/sparc/src/common/sparc_internal.h
index 23b7a291115..e6e15249850 100644
--- a/arch/sparc/src/common/sparc_internal.h
+++ b/arch/sparc/src/common/sparc_internal.h
@@ -34,7 +34,7 @@
 #  include <stdbool.h>
 #endif
 
-# include "sparc_v8.h"
+#  include "sparc_v8.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/x86/include/arch.h b/arch/x86/include/arch.h
index 53736f03142..d97241ddfed 100644
--- a/arch/x86/include/arch.h
+++ b/arch/x86/include/arch.h
@@ -33,12 +33,12 @@
 
 /* Include chip-specific definitions */
 
-# include <arch/chip/arch.h>
+#  include <arch/chip/arch.h>
 
 /* Include architecture-specific definitions */
 
 #ifdef CONFIG_ARCH_I486
-# include <arch/i486/arch.h>
+#  include <arch/i486/arch.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/x86/include/io.h b/arch/x86/include/io.h
index 96a64420e72..14928656c1f 100644
--- a/arch/x86/include/io.h
+++ b/arch/x86/include/io.h
@@ -30,7 +30,7 @@
  */
 
 #ifdef CONFIG_ARCH_I486
-# include <arch/i486/io.h>
+#  include <arch/i486/io.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/x86/include/limits.h b/arch/x86/include/limits.h
index a124dc188e8..32606034a58 100644
--- a/arch/x86/include/limits.h
+++ b/arch/x86/include/limits.h
@@ -28,7 +28,7 @@
 /* Include architecture-specific limits */
 
 #ifdef CONFIG_ARCH_I486
-# include <arch/i486/limits.h>
+#  include <arch/i486/limits.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/x86/include/types.h b/arch/x86/include/types.h
index 6494781caf9..27911e9af5e 100644
--- a/arch/x86/include/types.h
+++ b/arch/x86/include/types.h
@@ -32,7 +32,7 @@
 /* Include architecture-specific limits */
 
 #ifdef CONFIG_ARCH_I486
-# include <arch/i486/types.h>
+#  include <arch/i486/types.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/x86_64/include/arch.h b/arch/x86_64/include/arch.h
index 1795067fa69..40c5b067284 100644
--- a/arch/x86_64/include/arch.h
+++ b/arch/x86_64/include/arch.h
@@ -33,12 +33,12 @@
 
 /* Include chip-specific definitions */
 
-# include <arch/chip/arch.h>
+#  include <arch/chip/arch.h>
 
 /* Include architecture-specific definitions */
 
 #ifdef CONFIG_ARCH_INTEL64
-# include <arch/intel64/arch.h>
+#  include <arch/intel64/arch.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/x86_64/include/io.h b/arch/x86_64/include/io.h
index 0e8f49bd95e..111d6ee61e7 100644
--- a/arch/x86_64/include/io.h
+++ b/arch/x86_64/include/io.h
@@ -30,7 +30,7 @@
  */
 
 #ifdef CONFIG_ARCH_INTEL64
-# include <arch/intel64/io.h>
+#  include <arch/intel64/io.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/x86_64/include/irq.h b/arch/x86_64/include/irq.h
index 98b7cc7f820..80994301bed 100644
--- a/arch/x86_64/include/irq.h
+++ b/arch/x86_64/include/irq.h
@@ -42,7 +42,7 @@
  */
 
 #ifdef CONFIG_ARCH_INTEL64
-# include <arch/intel64/irq.h>
+#  include <arch/intel64/irq.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/x86_64/include/limits.h b/arch/x86_64/include/limits.h
index 57c858fab65..f5bd0566cc5 100644
--- a/arch/x86_64/include/limits.h
+++ b/arch/x86_64/include/limits.h
@@ -28,7 +28,7 @@
 /* Include architecture-specific limits */
 
 #ifdef CONFIG_ARCH_INTEL64
-# include <arch/intel64/limits.h>
+#  include <arch/intel64/limits.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/x86_64/include/types.h b/arch/x86_64/include/types.h
index eeb0ef2439b..b483e669d8a 100644
--- a/arch/x86_64/include/types.h
+++ b/arch/x86_64/include/types.h
@@ -32,7 +32,7 @@
 /* Include architecture-specific limits */
 
 #ifdef CONFIG_ARCH_INTEL64
-# include <arch/intel64/types.h>
+#  include <arch/intel64/types.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/gd32f4/gd32f450zk-eval/include/board.h b/boards/arm/gd32f4/gd32f450zk-eval/include/board.h
index 508d047d18a..f9d3280f7ed 100644
--- a/boards/arm/gd32f4/gd32f450zk-eval/include/board.h
+++ b/boards/arm/gd32f4/gd32f450zk-eval/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 #define GD32_BOARD_SYSCLK_PLL_HXTAL
diff --git a/boards/arm/kinetis/freedom-k28f/include/board.h b/boards/arm/kinetis/freedom-k28f/include/board.h
index ed07d65728d..198126b775d 100644
--- a/boards/arm/kinetis/freedom-k28f/include/board.h
+++ b/boards/arm/kinetis/freedom-k28f/include/board.h
@@ -28,10 +28,10 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
-# include <stdbool.h>
+#  include <stdint.h>
+#  include <stdbool.h>
 
-# include <arch/chip/kinetis_mcg.h>
+#  include <arch/chip/kinetis_mcg.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/kinetis/kwikstik-k40/include/board.h b/boards/arm/kinetis/kwikstik-k40/include/board.h
index 5b37d37b943..a0140604c9b 100644
--- a/boards/arm/kinetis/kwikstik-k40/include/board.h
+++ b/boards/arm/kinetis/kwikstik-k40/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/kinetis/teensy-3.x/include/board.h b/boards/arm/kinetis/teensy-3.x/include/board.h
index 3eda123feb5..2b71b0b666a 100644
--- a/boards/arm/kinetis/teensy-3.x/include/board.h
+++ b/boards/arm/kinetis/teensy-3.x/include/board.h
@@ -28,8 +28,8 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
-# include <stdbool.h>
+#  include <stdint.h>
+#  include <stdbool.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/kinetis/twr-k60n512/include/board.h b/boards/arm/kinetis/twr-k60n512/include/board.h
index 458401adb7f..b1ed5e37afe 100644
--- a/boards/arm/kinetis/twr-k60n512/include/board.h
+++ b/boards/arm/kinetis/twr-k60n512/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/kinetis/twr-k64f120m/include/board.h b/boards/arm/kinetis/twr-k64f120m/include/board.h
index 2c720bbd03d..5cab0f8294e 100644
--- a/boards/arm/kinetis/twr-k64f120m/include/board.h
+++ b/boards/arm/kinetis/twr-k64f120m/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/kl/freedom-kl25z/include/board.h b/boards/arm/kl/freedom-kl25z/include/board.h
index 186dc9ceda5..47ed702bf5b 100644
--- a/boards/arm/kl/freedom-kl25z/include/board.h
+++ b/boards/arm/kl/freedom-kl25z/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/kl/freedom-kl26z/include/board.h b/boards/arm/kl/freedom-kl26z/include/board.h
index 6514d776660..589f7dcd1a6 100644
--- a/boards/arm/kl/freedom-kl26z/include/board.h
+++ b/boards/arm/kl/freedom-kl26z/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/kl/teensy-lc/include/board.h b/boards/arm/kl/teensy-lc/include/board.h
index 5d33738aff7..b7eb3a19b0d 100644
--- a/boards/arm/kl/teensy-lc/include/board.h
+++ b/boards/arm/kl/teensy-lc/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/lpc31xx/ea3131/include/board.h b/boards/arm/lpc31xx/ea3131/include/board.h
index 688e0bd6c63..4ad559d8861 100644
--- a/boards/arm/lpc31xx/ea3131/include/board.h
+++ b/boards/arm/lpc31xx/ea3131/include/board.h
@@ -27,8 +27,8 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
-# include "lpc31_cgudrvr.h"
+#  include <stdint.h>
+#  include "lpc31_cgudrvr.h"
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/lpc31xx/ea3152/include/board.h b/boards/arm/lpc31xx/ea3152/include/board.h
index 4b2aa24498a..396962753da 100644
--- a/boards/arm/lpc31xx/ea3152/include/board.h
+++ b/boards/arm/lpc31xx/ea3152/include/board.h
@@ -27,8 +27,8 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
-# include "lpc31_cgudrvr.h"
+#  include <stdint.h>
+#  include "lpc31_cgudrvr.h"
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/include/board.h b/boards/arm/lpc31xx/olimex-lpc-h3131/include/board.h
index 5f6ae01782d..9d54ec1d4d9 100644
--- a/boards/arm/lpc31xx/olimex-lpc-h3131/include/board.h
+++ b/boards/arm/lpc31xx/olimex-lpc-h3131/include/board.h
@@ -27,8 +27,8 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
-# include "lpc31_cgudrvr.h"
+#  include <stdint.h>
+#  include "lpc31_cgudrvr.h"
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/nuc1xx/nutiny-nuc120/include/board.h b/boards/arm/nuc1xx/nutiny-nuc120/include/board.h
index 807ab8111ca..1acfa755b36 100644
--- a/boards/arm/nuc1xx/nutiny-nuc120/include/board.h
+++ b/boards/arm/nuc1xx/nutiny-nuc120/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/phy62xx/phy6222/include/board.h b/boards/arm/phy62xx/phy6222/include/board.h
index 750bb8c578f..0b1f0e87ee6 100644
--- a/boards/arm/phy62xx/phy6222/include/board.h
+++ b/boards/arm/phy62xx/phy6222/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 #define HCLK_FREQUENCY    32000000ul       /* HSI48 for USB, only some STM32F0xx */
diff --git a/boards/arm/rp2040/adafruit-feather-rp2040/include/board.h b/boards/arm/rp2040/adafruit-feather-rp2040/include/board.h
index 021f547ac99..233a9b0ee19 100644
--- a/boards/arm/rp2040/adafruit-feather-rp2040/include/board.h
+++ b/boards/arm/rp2040/adafruit-feather-rp2040/include/board.h
@@ -34,7 +34,7 @@
 #include "rp2040_spisd.h"
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/rp2040/adafruit-kb2040/include/board.h b/boards/arm/rp2040/adafruit-kb2040/include/board.h
index 093c68ed41b..cd1eac660f5 100644
--- a/boards/arm/rp2040/adafruit-kb2040/include/board.h
+++ b/boards/arm/rp2040/adafruit-kb2040/include/board.h
@@ -34,7 +34,7 @@
 #include "rp2040_spisd.h"
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/rp2040/adafruit-qt-py-rp2040/include/board.h b/boards/arm/rp2040/adafruit-qt-py-rp2040/include/board.h
index 00e8e36dbae..01ed3683896 100644
--- a/boards/arm/rp2040/adafruit-qt-py-rp2040/include/board.h
+++ b/boards/arm/rp2040/adafruit-qt-py-rp2040/include/board.h
@@ -34,7 +34,7 @@
 #include "rp2040_spisd.h"
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/rp2040/pimoroni-tiny2040/include/board.h b/boards/arm/rp2040/pimoroni-tiny2040/include/board.h
index 8931e45b82b..d82d612625d 100644
--- a/boards/arm/rp2040/pimoroni-tiny2040/include/board.h
+++ b/boards/arm/rp2040/pimoroni-tiny2040/include/board.h
@@ -34,7 +34,7 @@
 #include "rp2040_spisd.h"
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/rp2040/raspberrypi-pico-w/include/board.h b/boards/arm/rp2040/raspberrypi-pico-w/include/board.h
index f7d3eb79576..f72f17729d9 100644
--- a/boards/arm/rp2040/raspberrypi-pico-w/include/board.h
+++ b/boards/arm/rp2040/raspberrypi-pico-w/include/board.h
@@ -34,7 +34,7 @@
 #include "rp2040_spisd.h"
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/rp2040/raspberrypi-pico/include/board.h b/boards/arm/rp2040/raspberrypi-pico/include/board.h
index 05462609f54..e22882ee6f2 100644
--- a/boards/arm/rp2040/raspberrypi-pico/include/board.h
+++ b/boards/arm/rp2040/raspberrypi-pico/include/board.h
@@ -34,7 +34,7 @@
 #include "rp2040_spisd.h"
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/include/board.h b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/include/board.h
index 271cce1a53d..2d3de4c92ae 100644
--- a/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/include/board.h
+++ b/boards/arm/rp2040/waveshare-rp2040-lcd-1.28/include/board.h
@@ -34,7 +34,7 @@
 #include "rp2040_spisd.h"
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32/cloudctrl/include/board.h b/boards/arm/stm32/cloudctrl/include/board.h
index af7c1b8c747..f19fd6920e1 100644
--- a/boards/arm/stm32/cloudctrl/include/board.h
+++ b/boards/arm/stm32/cloudctrl/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
diff --git a/boards/arm/stm32/et-stm32-stamp/include/board.h b/boards/arm/stm32/et-stm32-stamp/include/board.h
index d475bd9b776..9f320938fbd 100644
--- a/boards/arm/stm32/et-stm32-stamp/include/board.h
+++ b/boards/arm/stm32/et-stm32-stamp/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
diff --git a/boards/arm/stm32/fire-stm32v2/include/board.h b/boards/arm/stm32/fire-stm32v2/include/board.h
index 262346cb622..ec66055d856 100644
--- a/boards/arm/stm32/fire-stm32v2/include/board.h
+++ b/boards/arm/stm32/fire-stm32v2/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
diff --git a/boards/arm/stm32/maple/include/board.h b/boards/arm/stm32/maple/include/board.h
index dd83eaa8802..be1dc4162bb 100644
--- a/boards/arm/stm32/maple/include/board.h
+++ b/boards/arm/stm32/maple/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
diff --git a/boards/arm/stm32/mikroe-stm32f4/include/board.h b/boards/arm/stm32/mikroe-stm32f4/include/board.h
index b5df55fbe05..1c4334b9618 100644
--- a/boards/arm/stm32/mikroe-stm32f4/include/board.h
+++ b/boards/arm/stm32/mikroe-stm32f4/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 #include "stm32_rcc.h"
diff --git a/boards/arm/stm32/nucleo-f410rb/include/board.h b/boards/arm/stm32/nucleo-f410rb/include/board.h
index f789b93650c..9af176003a7 100644
--- a/boards/arm/stm32/nucleo-f410rb/include/board.h
+++ b/boards/arm/stm32/nucleo-f410rb/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 #ifdef __KERNEL__
diff --git a/boards/arm/stm32/nucleo-f412zg/include/board.h b/boards/arm/stm32/nucleo-f412zg/include/board.h
index d411a7915f0..15e99186905 100644
--- a/boards/arm/stm32/nucleo-f412zg/include/board.h
+++ b/boards/arm/stm32/nucleo-f412zg/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 #include <stm32.h>
diff --git a/boards/arm/stm32/nucleo-f429zi/include/board.h b/boards/arm/stm32/nucleo-f429zi/include/board.h
index 7d5209469e6..071d604a7b7 100644
--- a/boards/arm/stm32/nucleo-f429zi/include/board.h
+++ b/boards/arm/stm32/nucleo-f429zi/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /* Do not include STM32 F4 header files here */
diff --git a/boards/arm/stm32/nucleo-f446re/include/board.h b/boards/arm/stm32/nucleo-f446re/include/board.h
index b19019693d4..fdbec261b69 100644
--- a/boards/arm/stm32/nucleo-f446re/include/board.h
+++ b/boards/arm/stm32/nucleo-f446re/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 #include <stm32.h>
diff --git a/boards/arm/stm32/nucleo-f4x1re/include/board.h b/boards/arm/stm32/nucleo-f4x1re/include/board.h
index ef11d9ad520..96f1b7ee131 100644
--- a/boards/arm/stm32/nucleo-f4x1re/include/board.h
+++ b/boards/arm/stm32/nucleo-f4x1re/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /* Clocking *****************************************************************/
diff --git a/boards/arm/stm32/nucleo-f4x1re/include/nucleo-f401re.h b/boards/arm/stm32/nucleo-f4x1re/include/nucleo-f401re.h
index 62b59073a26..5eb7e46f41c 100644
--- a/boards/arm/stm32/nucleo-f4x1re/include/nucleo-f401re.h
+++ b/boards/arm/stm32/nucleo-f4x1re/include/nucleo-f401re.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32/nucleo-f4x1re/include/nucleo-f411re.h b/boards/arm/stm32/nucleo-f4x1re/include/nucleo-f411re.h
index aeaab87b443..0f2993bedde 100644
--- a/boards/arm/stm32/nucleo-f4x1re/include/nucleo-f411re.h
+++ b/boards/arm/stm32/nucleo-f4x1re/include/nucleo-f411re.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32/olimex-stm32-h405/include/board.h b/boards/arm/stm32/olimex-stm32-h405/include/board.h
index 7e6c69b6cfb..7b08b24128e 100644
--- a/boards/arm/stm32/olimex-stm32-h405/include/board.h
+++ b/boards/arm/stm32/olimex-stm32-h405/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 #include "stm32_rcc.h"
 #include "stm32.h"
diff --git a/boards/arm/stm32/olimex-stm32-p107/include/board.h b/boards/arm/stm32/olimex-stm32-p107/include/board.h
index cba0b1219ec..70011140ed5 100644
--- a/boards/arm/stm32/olimex-stm32-p107/include/board.h
+++ b/boards/arm/stm32/olimex-stm32-p107/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
diff --git a/boards/arm/stm32/olimex-stm32-p207/include/board.h b/boards/arm/stm32/olimex-stm32-p207/include/board.h
index 7475c68c88c..7529b45ffec 100644
--- a/boards/arm/stm32/olimex-stm32-p207/include/board.h
+++ b/boards/arm/stm32/olimex-stm32-p207/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 #include "stm32_rcc.h"
 #include "stm32.h"
diff --git a/boards/arm/stm32/olimex-stm32-p407/include/board.h b/boards/arm/stm32/olimex-stm32-p407/include/board.h
index d39d24663ab..7b618d7a8df 100644
--- a/boards/arm/stm32/olimex-stm32-p407/include/board.h
+++ b/boards/arm/stm32/olimex-stm32-p407/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32/olimexino-stm32/include/board.h b/boards/arm/stm32/olimexino-stm32/include/board.h
index 008f86e1142..28fcc560f1d 100644
--- a/boards/arm/stm32/olimexino-stm32/include/board.h
+++ b/boards/arm/stm32/olimexino-stm32/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
diff --git a/boards/arm/stm32/shenzhou/include/board.h b/boards/arm/stm32/shenzhou/include/board.h
index 1bb317b2c92..2def16658d1 100644
--- a/boards/arm/stm32/shenzhou/include/board.h
+++ b/boards/arm/stm32/shenzhou/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
diff --git a/boards/arm/stm32/stm3220g-eval/include/board.h b/boards/arm/stm32/stm3220g-eval/include/board.h
index a500e0f319a..a6ad0f2bbae 100644
--- a/boards/arm/stm32/stm3220g-eval/include/board.h
+++ b/boards/arm/stm32/stm3220g-eval/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 #include "stm32_rcc.h"
diff --git a/boards/arm/stm32/stm3240g-eval/include/board.h b/boards/arm/stm32/stm3240g-eval/include/board.h
index 9a9b69cd6ea..f66c1b67328 100644
--- a/boards/arm/stm32/stm3240g-eval/include/board.h
+++ b/boards/arm/stm32/stm3240g-eval/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /* Logic in arch/arm/src and boards/ may need to include these file prior to
diff --git a/boards/arm/stm32/stm32_tiny/include/board.h b/boards/arm/stm32/stm32_tiny/include/board.h
index f76b96fd774..144824627a4 100644
--- a/boards/arm/stm32/stm32_tiny/include/board.h
+++ b/boards/arm/stm32/stm32_tiny/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
diff --git a/boards/arm/stm32/stm32butterfly2/include/board.h b/boards/arm/stm32/stm32butterfly2/include/board.h
index 00b5082a43a..2f8c2533a18 100644
--- a/boards/arm/stm32/stm32butterfly2/include/board.h
+++ b/boards/arm/stm32/stm32butterfly2/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 #include "stm32_rcc.h"
diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_hyt271.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_hyt271.c
index 2ad0d526127..627ba18b7e3 100644
--- a/boards/arm/stm32/stm32f103-minimum/src/stm32_hyt271.c
+++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_hyt271.c
@@ -33,7 +33,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 #ifdef CONFIG_SENSORS_HYT271
-# include <nuttx/sensors/hyt271.h>
+#  include <nuttx/sensors/hyt271.h>
 #endif
 
 #include "chip.h"
diff --git a/boards/arm/stm32/stm32f3discovery/include/board.h b/boards/arm/stm32/stm32f3discovery/include/board.h
index 39ced07e589..2fce70f079f 100644
--- a/boards/arm/stm32/stm32f3discovery/include/board.h
+++ b/boards/arm/stm32/stm32f3discovery/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 #include "stm32_rcc.h"
diff --git a/boards/arm/stm32/stm32f411-minimum/include/board.h b/boards/arm/stm32/stm32f411-minimum/include/board.h
index cdb7be09eff..492ad5ed0f6 100644
--- a/boards/arm/stm32/stm32f411-minimum/include/board.h
+++ b/boards/arm/stm32/stm32f411-minimum/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 #include <stm32.h>
diff --git a/boards/arm/stm32/stm32f411e-disco/include/board.h b/boards/arm/stm32/stm32f411e-disco/include/board.h
index 7f6b488ba02..434549f7264 100644
--- a/boards/arm/stm32/stm32f411e-disco/include/board.h
+++ b/boards/arm/stm32/stm32f411e-disco/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 #include <stm32.h>
diff --git a/boards/arm/stm32/stm32f429i-disco/include/board.h b/boards/arm/stm32/stm32f429i-disco/include/board.h
index 2eebe37ca73..bb3b8bb9896 100644
--- a/boards/arm/stm32/stm32f429i-disco/include/board.h
+++ b/boards/arm/stm32/stm32f429i-disco/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /* DO NOT include STM32 internal header files here */
diff --git a/boards/arm/stm32/stm32ldiscovery/include/board.h b/boards/arm/stm32/stm32ldiscovery/include/board.h
index 7693a4091b1..c6fbfd0417d 100644
--- a/boards/arm/stm32/stm32ldiscovery/include/board.h
+++ b/boards/arm/stm32/stm32ldiscovery/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 #include <sys/types.h>
diff --git a/boards/arm/stm32/stm32vldiscovery/include/board.h b/boards/arm/stm32/stm32vldiscovery/include/board.h
index 0ae1ee04f9d..3a1de139b82 100644
--- a/boards/arm/stm32/stm32vldiscovery/include/board.h
+++ b/boards/arm/stm32/stm32vldiscovery/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 #include "stm32_rcc.h"
 #include "stm32.h"
diff --git a/boards/arm/stm32/viewtool-stm32f107/include/board-stm32f103vct6.h b/boards/arm/stm32/viewtool-stm32f107/include/board-stm32f103vct6.h
index 7ddbf73be0d..ea70717d481 100644
--- a/boards/arm/stm32/viewtool-stm32f107/include/board-stm32f103vct6.h
+++ b/boards/arm/stm32/viewtool-stm32f107/include/board-stm32f103vct6.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 #include "stm32_rcc.h"
diff --git a/boards/arm/stm32/viewtool-stm32f107/include/board-stm32f107vct6.h b/boards/arm/stm32/viewtool-stm32f107/include/board-stm32f107vct6.h
index 663fc0589fe..5c1432bd624 100644
--- a/boards/arm/stm32/viewtool-stm32f107/include/board-stm32f107vct6.h
+++ b/boards/arm/stm32/viewtool-stm32f107/include/board-stm32f107vct6.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 #include "stm32_rcc.h"
diff --git a/boards/arm/stm32/viewtool-stm32f107/include/board.h b/boards/arm/stm32/viewtool-stm32f107/include/board.h
index 197ff65d998..15ca0718dc8 100644
--- a/boards/arm/stm32/viewtool-stm32f107/include/board.h
+++ b/boards/arm/stm32/viewtool-stm32f107/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 #include "stm32_rcc.h"
@@ -38,9 +38,9 @@
 /* Clocking *****************************************************************/
 
 #if defined(CONFIG_ARCH_CHIP_STM32F107VC)
-# include <arch/board/board-stm32f107vct6.h>
+#  include <arch/board/board-stm32f107vct6.h>
 #elif defined(CONFIG_ARCH_CHIP_STM32F103VC)
-# include <arch/board/board-stm32f103vct6.h>
+#  include <arch/board/board-stm32f103vct6.h>
 #else
 #  error Unrecognized STM32 chip
 #endif
diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/include/board.h b/boards/arm/stm32f0l0g0/nucleo-f072rb/include/board.h
index f42c986e0fa..64f47aeb164 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f072rb/include/board.h
+++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/include/board.h b/boards/arm/stm32f0l0g0/nucleo-f091rc/include/board.h
index 506088716ba..82f44fdc4d1 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f091rc/include/board.h
+++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32f0l0g0/stm32f051-discovery/include/board.h b/boards/arm/stm32f0l0g0/stm32f051-discovery/include/board.h
index 4c2413c1570..2331131ce66 100644
--- a/boards/arm/stm32f0l0g0/stm32f051-discovery/include/board.h
+++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32f0l0g0/stm32f072-discovery/include/board.h b/boards/arm/stm32f0l0g0/stm32f072-discovery/include/board.h
index ba8f2134782..dab7547deb2 100644
--- a/boards/arm/stm32f0l0g0/stm32f072-discovery/include/board.h
+++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32f7/nucleo-144/include/board.h b/boards/arm/stm32f7/nucleo-144/include/board.h
index 81212b30832..4f6ee4f737f 100644
--- a/boards/arm/stm32f7/nucleo-144/include/board.h
+++ b/boards/arm/stm32f7/nucleo-144/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /* Do not include STM32 F7 header files here */
diff --git a/boards/arm/stm32f7/steval-eth001v1/include/board.h b/boards/arm/stm32f7/steval-eth001v1/include/board.h
index 8062dcfb37f..954b1008758 100644
--- a/boards/arm/stm32f7/steval-eth001v1/include/board.h
+++ b/boards/arm/stm32f7/steval-eth001v1/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32f7/stm32f746-ws/include/board.h b/boards/arm/stm32f7/stm32f746-ws/include/board.h
index 47edc212fb7..93a65df95a2 100644
--- a/boards/arm/stm32f7/stm32f746-ws/include/board.h
+++ b/boards/arm/stm32f7/stm32f746-ws/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /* Do not include STM32 F7 header files here */
diff --git a/boards/arm/stm32f7/stm32f746g-disco/include/board.h b/boards/arm/stm32f7/stm32f746g-disco/include/board.h
index d06ce9c647d..09a698dfacf 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/include/board.h
+++ b/boards/arm/stm32f7/stm32f746g-disco/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /* No not include STM32 F7 header files here. */
diff --git a/boards/arm/stm32f7/stm32f769i-disco/include/board.h b/boards/arm/stm32f7/stm32f769i-disco/include/board.h
index e205200f065..0b1c5182870 100644
--- a/boards/arm/stm32f7/stm32f769i-disco/include/board.h
+++ b/boards/arm/stm32f7/stm32f769i-disco/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /* Do not include STM32F7 header files here */
diff --git a/boards/arm/stm32f7/stm32f777zit6-meadow/include/board.h b/boards/arm/stm32f7/stm32f777zit6-meadow/include/board.h
index 2da74986f42..b9fd9c35d80 100644
--- a/boards/arm/stm32f7/stm32f777zit6-meadow/include/board.h
+++ b/boards/arm/stm32f7/stm32f777zit6-meadow/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /* Do not include STM32F7 header files here */
diff --git a/boards/arm/stm32h7/nucleo-h743zi/include/board.h b/boards/arm/stm32h7/nucleo-h743zi/include/board.h
index 6b8d91588b0..6151e3f5297 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/include/board.h
+++ b/boards/arm/stm32h7/nucleo-h743zi/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /* Do not include STM32 H7 header files here */
diff --git a/boards/arm/stm32h7/nucleo-h743zi2/include/board.h b/boards/arm/stm32h7/nucleo-h743zi2/include/board.h
index d5c40cebd11..2fdea2144d4 100644
--- a/boards/arm/stm32h7/nucleo-h743zi2/include/board.h
+++ b/boards/arm/stm32h7/nucleo-h743zi2/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /* Do not include STM32 H7 header files here */
diff --git a/boards/arm/stm32h7/stm32h747i-disco/include/board.h b/boards/arm/stm32h7/stm32h747i-disco/include/board.h
index f591aa4a963..47f6d96869c 100644
--- a/boards/arm/stm32h7/stm32h747i-disco/include/board.h
+++ b/boards/arm/stm32h7/stm32h747i-disco/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /* Do not include STM32 H7 header files here */
diff --git a/boards/arm/stm32l4/b-l475e-iot01a/include/b-l475e-iot01a_clock.h b/boards/arm/stm32l4/b-l475e-iot01a/include/b-l475e-iot01a_clock.h
index 16e90adf880..cddefca2cd7 100644
--- a/boards/arm/stm32l4/b-l475e-iot01a/include/b-l475e-iot01a_clock.h
+++ b/boards/arm/stm32l4/b-l475e-iot01a/include/b-l475e-iot01a_clock.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/nucleo-l432kc/include/board.h b/boards/arm/stm32l4/nucleo-l432kc/include/board.h
index 562608b4280..d8ed16e774c 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/include/board.h
+++ b/boards/arm/stm32l4/nucleo-l432kc/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /* Clocking *****************************************************************/
diff --git a/boards/arm/stm32l4/nucleo-l432kc/include/nucleo-l432kc.h b/boards/arm/stm32l4/nucleo-l432kc/include/nucleo-l432kc.h
index 61baeee94b4..acaf86e1a46 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/include/nucleo-l432kc.h
+++ b/boards/arm/stm32l4/nucleo-l432kc/include/nucleo-l432kc.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/nucleo-l452re/include/board.h b/boards/arm/stm32l4/nucleo-l452re/include/board.h
index 1e1f852168b..a0328083ca4 100644
--- a/boards/arm/stm32l4/nucleo-l452re/include/board.h
+++ b/boards/arm/stm32l4/nucleo-l452re/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /* Clocking *****************************************************************/
diff --git a/boards/arm/stm32l4/nucleo-l452re/include/nucleo-l452re.h b/boards/arm/stm32l4/nucleo-l452re/include/nucleo-l452re.h
index 66a373ca19a..9eb69276c5b 100644
--- a/boards/arm/stm32l4/nucleo-l452re/include/nucleo-l452re.h
+++ b/boards/arm/stm32l4/nucleo-l452re/include/nucleo-l452re.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/nucleo-l476rg/include/board.h b/boards/arm/stm32l4/nucleo-l476rg/include/board.h
index 714427de0c4..d9d7ebb9c63 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/include/board.h
+++ b/boards/arm/stm32l4/nucleo-l476rg/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /* Clocking *****************************************************************/
diff --git a/boards/arm/stm32l4/nucleo-l476rg/include/nucleo-l476rg.h b/boards/arm/stm32l4/nucleo-l476rg/include/nucleo-l476rg.h
index 0525d598bb0..19bbb4886eb 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/include/nucleo-l476rg.h
+++ b/boards/arm/stm32l4/nucleo-l476rg/include/nucleo-l476rg.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/nucleo-l496zg/include/board.h b/boards/arm/stm32l4/nucleo-l496zg/include/board.h
index 0c3c703463c..f493e76e4c1 100644
--- a/boards/arm/stm32l4/nucleo-l496zg/include/board.h
+++ b/boards/arm/stm32l4/nucleo-l496zg/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /* Do not include STM32 L4 header files here */
diff --git a/boards/arm/stm32l4/stm32l476-mdk/include/board.h b/boards/arm/stm32l4/stm32l476-mdk/include/board.h
index d99ac7ac05f..f5b8b0f782d 100644
--- a/boards/arm/stm32l4/stm32l476-mdk/include/board.h
+++ b/boards/arm/stm32l4/stm32l476-mdk/include/board.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /* Clocking *****************************************************************/
diff --git a/boards/arm/stm32l4/stm32l476-mdk/include/stm32l476-mdk-clocking.h b/boards/arm/stm32l4/stm32l476-mdk/include/stm32l476-mdk-clocking.h
index ef0beb7c88e..5f4c352a699 100644
--- a/boards/arm/stm32l4/stm32l476-mdk/include/stm32l476-mdk-clocking.h
+++ b/boards/arm/stm32l4/stm32l476-mdk/include/stm32l476-mdk-clocking.h
@@ -43,7 +43,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/stm32l476vg-disco/include/board.h b/boards/arm/stm32l4/stm32l476vg-disco/include/board.h
index 7dbb9178b7f..cf953f59f1d 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/include/board.h
+++ b/boards/arm/stm32l4/stm32l476vg-disco/include/board.h
@@ -27,10 +27,10 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
-/* Do not include STM32 L4 header files here */
+#include <arch/board/stm32l476vg-disco-clocking.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -38,8 +38,6 @@
 
 /* Clocking *****************************************************************/
 
-#include <arch/board/stm32l476vg-disco-clocking.h>
-
 /* DMA Channel/Stream Selections ********************************************/
 
 /* Stream selections are arbitrary for now but might become important in the
diff --git a/boards/arm/stm32l4/stm32l476vg-disco/include/stm32l476vg-disco-clocking.h b/boards/arm/stm32l4/stm32l476vg-disco/include/stm32l476vg-disco-clocking.h
index a048e7c8586..c5f06bcffd5 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/include/stm32l476vg-disco-clocking.h
+++ b/boards/arm/stm32l4/stm32l476vg-disco/include/stm32l476vg-disco-clocking.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/include/board.h b/boards/arm/stm32l4/stm32l4r9ai-disco/include/board.h
index dde2b36630d..4cdef41eaee 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/include/board.h
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /* Do not include STM32 L4 header files here */
diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/include/stm32l4r9ai-disco-clocking.h b/boards/arm/stm32l4/stm32l4r9ai-disco/include/stm32l4r9ai-disco-clocking.h
index b28663dd673..85762071ab9 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/include/stm32l4r9ai-disco-clocking.h
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/include/stm32l4r9ai-disco-clocking.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32l5/nucleo-l552ze/include/board.h b/boards/arm/stm32l5/nucleo-l552ze/include/board.h
index 31e0a23e7c3..c3bcd139424 100644
--- a/boards/arm/stm32l5/nucleo-l552ze/include/board.h
+++ b/boards/arm/stm32l5/nucleo-l552ze/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32l5/stm32l562e-dk/include/board.h b/boards/arm/stm32l5/stm32l562e-dk/include/board.h
index 20e3c369bbf..d7e7b8bbd16 100644
--- a/boards/arm/stm32l5/stm32l562e-dk/include/board.h
+++ b/boards/arm/stm32l5/stm32l562e-dk/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32u5/b-u585i-iot02a/include/board.h b/boards/arm/stm32u5/b-u585i-iot02a/include/board.h
index 3882eb0b483..8e815d78113 100644
--- a/boards/arm/stm32u5/b-u585i-iot02a/include/board.h
+++ b/boards/arm/stm32u5/b-u585i-iot02a/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 #include <stm32_gpio.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32wb/nucleo-wb55rg/include/board.h b/boards/arm/stm32wb/nucleo-wb55rg/include/board.h
index 2156741ccee..4fd91243cd0 100644
--- a/boards/arm/stm32wb/nucleo-wb55rg/include/board.h
+++ b/boards/arm/stm32wb/nucleo-wb55rg/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /* Clocking *****************************************************************/
diff --git a/boards/arm/stm32wb/nucleo-wb55rg/include/nucleo-wb55rg.h b/boards/arm/stm32wb/nucleo-wb55rg/include/nucleo-wb55rg.h
index 79ae8bb8c4c..7d79e40c6c0 100644
--- a/boards/arm/stm32wb/nucleo-wb55rg/include/nucleo-wb55rg.h
+++ b/boards/arm/stm32wb/nucleo-wb55rg/include/nucleo-wb55rg.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/stm32wl5/nucleo-wl55jc/include/board.h b/boards/arm/stm32wl5/nucleo-wl55jc/include/board.h
index 6902c1f5f86..eb6c1dc6b57 100644
--- a/boards/arm/stm32wl5/nucleo-wl55jc/include/board.h
+++ b/boards/arm/stm32wl5/nucleo-wl55jc/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /* Clocking *****************************************************************/
diff --git a/boards/arm/str71x/olimex-strp711/include/board.h b/boards/arm/str71x/olimex-strp711/include/board.h
index 05797cb465c..f62e34f552a 100644
--- a/boards/arm/str71x/olimex-strp711/include/board.h
+++ b/boards/arm/str71x/olimex-strp711/include/board.h
@@ -56,7 +56,7 @@
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 #include "chip.h"
 
diff --git a/boards/hc/m9s12/demo9s12ne64/include/board.h b/boards/hc/m9s12/demo9s12ne64/include/board.h
index 7058807b403..d0bfcda8301 100644
--- a/boards/hc/m9s12/demo9s12ne64/include/board.h
+++ b/boards/hc/m9s12/demo9s12ne64/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/hc/m9s12/ne64badge/include/board.h b/boards/hc/m9s12/ne64badge/include/board.h
index 976696966ee..c969873f085 100644
--- a/boards/hc/m9s12/ne64badge/include/board.h
+++ b/boards/hc/m9s12/ne64badge/include/board.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/renesas/rx65n/rx65n-grrose/include/board.h b/boards/renesas/rx65n/rx65n-grrose/include/board.h
index d7f01851c14..8b1aad632f7 100644
--- a/boards/renesas/rx65n/rx65n-grrose/include/board.h
+++ b/boards/renesas/rx65n/rx65n-grrose/include/board.h
@@ -26,7 +26,7 @@
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/renesas/rx65n/rx65n-rsk1mb/include/board.h b/boards/renesas/rx65n/rx65n-rsk1mb/include/board.h
index 7a74c77fd6f..8c1d0859032 100644
--- a/boards/renesas/rx65n/rx65n-rsk1mb/include/board.h
+++ b/boards/renesas/rx65n/rx65n-rsk1mb/include/board.h
@@ -26,7 +26,7 @@
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/include/board.h b/boards/renesas/rx65n/rx65n-rsk2mb/include/board.h
index 4c0052ea549..6d2237b1034 100644
--- a/boards/renesas/rx65n/rx65n-rsk2mb/include/board.h
+++ b/boards/renesas/rx65n/rx65n-rsk2mb/include/board.h
@@ -26,7 +26,7 @@
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/renesas/rx65n/rx65n/include/board.h b/boards/renesas/rx65n/rx65n/include/board.h
index 509cfa95b9a..b07dbbfaa59 100644
--- a/boards/renesas/rx65n/rx65n/include/board.h
+++ b/boards/renesas/rx65n/rx65n/include/board.h
@@ -26,7 +26,7 @@
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/renesas/sh1/us7032evb1/include/board.h b/boards/renesas/sh1/us7032evb1/include/board.h
index 3ff31b44613..e4d068ae04c 100644
--- a/boards/renesas/sh1/us7032evb1/include/board.h
+++ b/boards/renesas/sh1/us7032evb1/include/board.h
@@ -26,7 +26,7 @@
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 #include "chip.h"
 
diff --git a/boards/risc-v/c906/smartl-c906/include/board.h b/boards/risc-v/c906/smartl-c906/include/board.h
index de24f37fb68..bd8298b8f4f 100644
--- a/boards/risc-v/c906/smartl-c906/include/board.h
+++ b/boards/risc-v/c906/smartl-c906/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 #include "c906.h"
diff --git a/boards/risc-v/k210/maix-bit/include/board.h b/boards/risc-v/k210/maix-bit/include/board.h
index bf69b830c26..2ece07afcd6 100644
--- a/boards/risc-v/k210/maix-bit/include/board.h
+++ b/boards/risc-v/k210/maix-bit/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 #include "k210.h"
diff --git a/boards/risc-v/mpfs/icicle/include/board.h b/boards/risc-v/mpfs/icicle/include/board.h
index a77ce71cd5b..33bb946a7a5 100644
--- a/boards/risc-v/mpfs/icicle/include/board.h
+++ b/boards/risc-v/mpfs/icicle/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 #include "mpfs_gpio.h"
diff --git a/boards/risc-v/mpfs/m100pfsevp/include/board.h b/boards/risc-v/mpfs/m100pfsevp/include/board.h
index b84d3a873a8..e108a4a059a 100644
--- a/boards/risc-v/mpfs/m100pfsevp/include/board.h
+++ b/boards/risc-v/mpfs/m100pfsevp/include/board.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 #include "mpfs_gpio.h"
diff --git a/boards/z80/ez80/ez80f910200zco/src/ez80f910200zco.h b/boards/z80/ez80/ez80f910200zco/src/ez80f910200zco.h
index 6c365ce8422..d2ff4bc6309 100644
--- a/boards/z80/ez80/ez80f910200zco/src/ez80f910200zco.h
+++ b/boards/z80/ez80/ez80f910200zco/src/ez80f910200zco.h
@@ -26,7 +26,7 @@
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/z80/ez80/makerlisp/src/makerlisp.h b/boards/z80/ez80/makerlisp/src/makerlisp.h
index b9205ffd5c8..78498045ec2 100644
--- a/boards/z80/ez80/makerlisp/src/makerlisp.h
+++ b/boards/z80/ez80/makerlisp/src/makerlisp.h
@@ -26,7 +26,7 @@
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/boards/z80/ez80/z20x/src/z20x.h b/boards/z80/ez80/z20x/src/z20x.h
index 76d20e2254e..e277051759a 100644
--- a/boards/z80/ez80/z20x/src/z20x.h
+++ b/boards/z80/ez80/z20x/src/z20x.h
@@ -26,7 +26,7 @@
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
+#  include <stdint.h>
 #endif
 
 /****************************************************************************
diff --git a/include/debug.h b/include/debug.h
index 1fca920282e..eb133d902bb 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -29,10 +29,10 @@
 #include <nuttx/compiler.h>
 
 #ifdef CONFIG_ARCH_DEBUG_H
-# include <arch/debug.h>
+#  include <arch/debug.h>
 #endif
 #ifdef CONFIG_ARCH_CHIP_DEBUG_H
-# include <arch/chip/debug.h>
+#  include <arch/chip/debug.h>
 #endif
 
 #include <syslog.h>
diff --git a/include/nuttx/irq.h b/include/nuttx/irq.h
index da445182396..7c3c4c1b527 100644
--- a/include/nuttx/irq.h
+++ b/include/nuttx/irq.h
@@ -28,8 +28,8 @@
 #include <nuttx/config.h>
 
 #ifndef __ASSEMBLY__
-# include <stdint.h>
-# include <stdbool.h>
+#  include <stdint.h>
+#  include <stdbool.h>
 #endif
 
 /* Now include architecture-specific types */
diff --git a/include/nuttx/usb/cdcecm.h b/include/nuttx/usb/cdcecm.h
index dfd459831a0..75f1f2dfb17 100644
--- a/include/nuttx/usb/cdcecm.h
+++ b/include/nuttx/usb/cdcecm.h
@@ -28,7 +28,7 @@
 #include <nuttx/config.h>
 
 #ifdef CONFIG_CDCECM_COMPOSITE
-# include <nuttx/usb/composite.h>
+#  include <nuttx/usb/composite.h>
 #endif
 
 /****************************************************************************
diff --git a/sched/init/nx_bringup.c b/sched/init/nx_bringup.c
index 24c3c5fbfee..6bf2f732e1b 100644
--- a/sched/init/nx_bringup.c
+++ b/sched/init/nx_bringup.c
@@ -41,7 +41,7 @@
 #include <nuttx/binfmt/binfmt.h>
 
 #ifdef CONFIG_PAGING
-# include "paging/paging.h"
+#  include "paging/paging.h"
 #endif
 
 #include "sched/sched.h"