diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c
index a736726bc3a..79c4adaa02e 100644
--- a/arch/arm/src/c5471/c5471_ethernet.c
+++ b/arch/arm/src/c5471/c5471_ethernet.c
@@ -2240,7 +2240,7 @@ void up_netinitialize(void)
   g_c5471[0].c_dev.d_ifup    = c5471_ifup;     /* I/F down callback */
   g_c5471[0].c_dev.d_ifdown  = c5471_ifdown;   /* I/F up (new IP address) callback */
   g_c5471[0].c_dev.d_txavail = c5471_txavail;  /* New TX data callback */
- #ifdef CONFIG_NET_IGMP
+#ifdef CONFIG_NET_IGMP
   g_c5471[0].c_dev.d_addmac  = c5471_addmac;   /* Add multicast MAC address */
   g_c5471[0].c_dev.d_rmmac   = c5471_rmmac;    /* Remove multicast MAC address */
 #endif
diff --git a/arch/arm/src/efm32/chip/efm32_dma.h b/arch/arm/src/efm32/chip/efm32_dma.h
index 63cf91095fa..d7ef85e3112 100644
--- a/arch/arm/src/efm32/chip/efm32_dma.h
+++ b/arch/arm/src/efm32/chip/efm32_dma.h
@@ -76,7 +76,7 @@
  * Pre-processor Definitions
  *******************************************************************************************************************************/
 
- #if defined(CONFIG_EFM32_EFM32GG)
+#if defined(CONFIG_EFM32_EFM32GG)
 #  define EFM32_DMA_NCHANNELS            12
 #elif defined(CONFIG_EFM32_EFM32G)
 #  define EFM32_DMA_NCHANNELS            8
diff --git a/arch/arm/src/efm32/efm32_pm.h b/arch/arm/src/efm32/efm32_pm.h
index 64783e19b16..6846de31a39 100644
--- a/arch/arm/src/efm32/efm32_pm.h
+++ b/arch/arm/src/efm32/efm32_pm.h
@@ -59,7 +59,7 @@
  * Public Data
  ****************************************************************************/
 
- #ifndef __ASSEMBLY__
+#ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
 extern "C"
diff --git a/arch/arm/src/lpc11xx/chip/lpc111x_pinconfig.h b/arch/arm/src/lpc11xx/chip/lpc111x_pinconfig.h
index 8bf4e667ab7..da9b120320e 100644
--- a/arch/arm/src/lpc11xx/chip/lpc111x_pinconfig.h
+++ b/arch/arm/src/lpc11xx/chip/lpc111x_pinconfig.h
@@ -119,4 +119,4 @@
  * Public Function Prototypes
  ************************************************************************************/
 
- #endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC116X_PINCONFIG_H */
+#endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC116X_PINCONFIG_H */
diff --git a/arch/arm/src/lpc11xx/chip/lpc11_memorymap.h b/arch/arm/src/lpc11xx/chip/lpc11_memorymap.h
index 302de1a17e0..00dd64d7e70 100644
--- a/arch/arm/src/lpc11xx/chip/lpc11_memorymap.h
+++ b/arch/arm/src/lpc11xx/chip/lpc11_memorymap.h
@@ -70,4 +70,4 @@
  * Public Function Prototypes
  ************************************************************************************/
 
- #endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_MEMORYMAP_H */
diff --git a/arch/arm/src/lpc11xx/chip/lpc11_pinconfig.h b/arch/arm/src/lpc11xx/chip/lpc11_pinconfig.h
index cae57481f0e..48fd69edd36 100644
--- a/arch/arm/src/lpc11xx/chip/lpc11_pinconfig.h
+++ b/arch/arm/src/lpc11xx/chip/lpc11_pinconfig.h
@@ -70,4 +70,4 @@
  * Public Function Prototypes
  ************************************************************************************/
 
- #endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_PINCONFIG_H */
+#endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_PINCONFIG_H */
diff --git a/arch/arm/src/lpc11xx/lpc11_i2c.c b/arch/arm/src/lpc11xx/lpc11_i2c.c
index f17a318595f..9b6462c6763 100644
--- a/arch/arm/src/lpc11xx/lpc11_i2c.c
+++ b/arch/arm/src/lpc11xx/lpc11_i2c.c
@@ -77,20 +77,20 @@
  *******************************************************************************/
 
 #ifndef GPIO_I2C1_SCL
- #define GPIO_I2C1_SCL GPIO_I2C1_SCL_1
- #define GPIO_I2C1_SDA GPIO_I2C1_SDA_1
+#  define GPIO_I2C1_SCL GPIO_I2C1_SCL_1
+#  define GPIO_I2C1_SDA GPIO_I2C1_SDA_1
 #endif
 
 #ifndef CONFIG_I2C0_FREQ
- #define CONFIG_I2C0_FREQ 100000
+#  define CONFIG_I2C0_FREQ 100000
 #endif
 
 #ifndef CONFIG_I2C1_FREQ
- #define CONFIG_I2C1_FREQ 100000
+#  define CONFIG_I2C1_FREQ 100000
 #endif
 
 #ifndef CONFIG_I2C2_FREQ
- #define CONFIG_I2C2_FREQ 100000
+#  define CONFIG_I2C2_FREQ 100000
 #endif
 
 #define I2C_TIMEOUT     ((20 * CLK_TCK) / 1000) /* 20 mS */
diff --git a/arch/arm/src/lpc17xx/chip/lpc176x_pinconfig.h b/arch/arm/src/lpc17xx/chip/lpc176x_pinconfig.h
index 8f586714c26..cd80c602a22 100644
--- a/arch/arm/src/lpc17xx/chip/lpc176x_pinconfig.h
+++ b/arch/arm/src/lpc17xx/chip/lpc176x_pinconfig.h
@@ -231,4 +231,4 @@
  * Public Function Prototypes
  ************************************************************************************/
 
- #endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_PINCONFIG_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_PINCONFIG_H */
diff --git a/arch/arm/src/lpc17xx/chip/lpc178x_pinconfig.h b/arch/arm/src/lpc17xx/chip/lpc178x_pinconfig.h
index aed495a9965..f4007a89c98 100644
--- a/arch/arm/src/lpc17xx/chip/lpc178x_pinconfig.h
+++ b/arch/arm/src/lpc17xx/chip/lpc178x_pinconfig.h
@@ -656,4 +656,4 @@
  * Public Function Prototypes
  ************************************************************************************/
 
- #endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_PINCONFIG_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_PINCONFIG_H */
diff --git a/arch/arm/src/lpc17xx/chip/lpc17_memorymap.h b/arch/arm/src/lpc17xx/chip/lpc17_memorymap.h
index 524bb46526c..53214c8a5d9 100644
--- a/arch/arm/src/lpc17xx/chip/lpc17_memorymap.h
+++ b/arch/arm/src/lpc17xx/chip/lpc17_memorymap.h
@@ -72,4 +72,4 @@
  * Public Function Prototypes
  ************************************************************************************/
 
- #endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_MEMORYMAP_H */
diff --git a/arch/arm/src/lpc17xx/chip/lpc17_pinconfig.h b/arch/arm/src/lpc17xx/chip/lpc17_pinconfig.h
index 270191a6209..c0090dbc1a4 100644
--- a/arch/arm/src/lpc17xx/chip/lpc17_pinconfig.h
+++ b/arch/arm/src/lpc17xx/chip/lpc17_pinconfig.h
@@ -72,4 +72,4 @@
  * Public Function Prototypes
  ************************************************************************************/
 
- #endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PINCONFIG_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PINCONFIG_H */
diff --git a/arch/arm/src/lpc17xx/lpc17_i2c.c b/arch/arm/src/lpc17xx/lpc17_i2c.c
index c46d8002aa5..bcab38befee 100644
--- a/arch/arm/src/lpc17xx/lpc17_i2c.c
+++ b/arch/arm/src/lpc17xx/lpc17_i2c.c
@@ -73,20 +73,20 @@
 #if defined(CONFIG_LPC17_I2C0) || defined(CONFIG_LPC17_I2C1) || defined(CONFIG_LPC17_I2C2)
 
 #ifndef GPIO_I2C1_SCL
- #define GPIO_I2C1_SCL GPIO_I2C1_SCL_1
- #define GPIO_I2C1_SDA GPIO_I2C1_SDA_1
+#  define GPIO_I2C1_SCL GPIO_I2C1_SCL_1
+#  define GPIO_I2C1_SDA GPIO_I2C1_SDA_1
 #endif
 
 #ifndef CONFIG_I2C0_FREQ
- #define CONFIG_I2C0_FREQ 100000
+#  define CONFIG_I2C0_FREQ 100000
 #endif
 
 #ifndef CONFIG_I2C1_FREQ
- #define CONFIG_I2C1_FREQ 100000
+#  define CONFIG_I2C1_FREQ 100000
 #endif
 
 #ifndef CONFIG_I2C2_FREQ
- #define CONFIG_I2C2_FREQ 100000
+#  define CONFIG_I2C2_FREQ 100000
 #endif
 
 /*******************************************************************************
diff --git a/arch/arm/src/lpc43xx/lpc43_i2c.c b/arch/arm/src/lpc43xx/lpc43_i2c.c
index 31194a39abe..2f7d9372809 100644
--- a/arch/arm/src/lpc43xx/lpc43_i2c.c
+++ b/arch/arm/src/lpc43xx/lpc43_i2c.c
@@ -78,17 +78,20 @@
 #if defined(CONFIG_LPC43_I2C0) || defined(CONFIG_LPC43_I2C1)
 
 #ifndef GPIO_I2C1_SCL
- #define GPIO_I2C1_SCL GPIO_I2C1_SCL_1
- #define GPIO_I2C1_SDA GPIO_I2C1_SDA_1
+#  define GPIO_I2C1_SCL GPIO_I2C1_SCL_1
+#  define GPIO_I2C1_SDA GPIO_I2C1_SDA_1
 #endif
+
 #ifndef CONFIG_I2C0_FREQ
- #define CONFIG_I2C0_FREQ 100000
+#  define CONFIG_I2C0_FREQ 100000
 #endif
+
 #ifndef CONFIG_I2C1_FREQ
- #define CONFIG_I2C1_FREQ 100000
+#  define CONFIG_I2C1_FREQ 100000
 #endif
+
 #ifndef CONFIG_I2C2_FREQ
- #define CONFIG_I2C2_FREQ 100000
+#  define CONFIG_I2C2_FREQ 100000
 #endif
 
 /*******************************************************************************
diff --git a/arch/arm/src/sam34/chip/sam4l_lcdca.h b/arch/arm/src/sam34/chip/sam4l_lcdca.h
index f9ba397ffff..7255ecda18e 100644
--- a/arch/arm/src/sam34/chip/sam4l_lcdca.h
+++ b/arch/arm/src/sam34/chip/sam4l_lcdca.h
@@ -159,7 +159,7 @@
 #define LCDCA_TIM_PRESC            (1 << 0)  /* Bit 0:  LCD Prescaler Select */
 #define LCDCA_TIM_CLKDIV_SHIFT     (1)       /* Bits 1-3: LCD Clock Division */
 #define LCDCA_TIM_CLKDIV_MASK      (7 << LCDCA_TIM_CLKDIV_SHIFT)
- #define LCDCA_TIM_CLKDIV(n)       (((n)-1) << LCDCA_TIM_CLKDIV_SHIFT) /* n=1..8 */
+#  define LCDCA_TIM_CLKDIV(n)      (((n)-1) << LCDCA_TIM_CLKDIV_SHIFT) /* n=1..8 */
 #define LCDCA_TIM_FC0_SHIFT        (8)       /* Bits 8-12: Frame Counter 0 */
 #define LCDCA_TIM_FC0_MASK         (31 << LCDCA_TIM_FC0_SHIFT)
 #  define LCDCA_TIM_FC0(n)         ((n) << LCDCA_TIM_FC0_SHIFT) /* n=0-31 */
diff --git a/arch/arm/src/sam34/sam3u_gpio.h b/arch/arm/src/sam34/sam3u_gpio.h
index 92b7e20e909..6d31b3087f8 100644
--- a/arch/arm/src/sam34/sam3u_gpio.h
+++ b/arch/arm/src/sam34/sam3u_gpio.h
@@ -193,7 +193,7 @@ extern "C"
  * Public Function Prototypes
  ************************************************************************************/
 
- #undef EXTERN
+#undef EXTERN
 #if defined(__cplusplus)
 }
 #endif
diff --git a/arch/arm/src/sam34/sam3x_gpio.h b/arch/arm/src/sam34/sam3x_gpio.h
index 99fd17baea3..0519f2c8091 100644
--- a/arch/arm/src/sam34/sam3x_gpio.h
+++ b/arch/arm/src/sam34/sam3x_gpio.h
@@ -196,7 +196,7 @@ extern "C"
  * Public Function Prototypes
  ************************************************************************************/
 
- #undef EXTERN
+#undef EXTERN
 #if defined(__cplusplus)
 }
 #endif
diff --git a/arch/arm/src/sam34/sam4e_gpio.h b/arch/arm/src/sam34/sam4e_gpio.h
index 0e2a678aeb4..c475886103c 100644
--- a/arch/arm/src/sam34/sam4e_gpio.h
+++ b/arch/arm/src/sam34/sam4e_gpio.h
@@ -200,7 +200,7 @@ extern "C"
  * Public Function Prototypes
  ************************************************************************************/
 
- #undef EXTERN
+#undef EXTERN
 #if defined(__cplusplus)
 }
 #endif
diff --git a/arch/arm/src/sam34/sam_twi.c b/arch/arm/src/sam34/sam_twi.c
index c1b768b347e..32edc655a37 100644
--- a/arch/arm/src/sam34/sam_twi.c
+++ b/arch/arm/src/sam34/sam_twi.c
@@ -82,7 +82,7 @@
 #endif
 
 #ifndef CONFIG_SAM34_TWI1_FREQUENCY
- #define CONFIG_SAM34_TWI1_FREQUENCY 100000
+#  define CONFIG_SAM34_TWI1_FREQUENCY 100000
 #endif
 
 /* Driver internal definitions *************************************************/
diff --git a/arch/arm/src/sama5/sam_twi.c b/arch/arm/src/sama5/sam_twi.c
index df022660f08..d45a12c406c 100644
--- a/arch/arm/src/sama5/sam_twi.c
+++ b/arch/arm/src/sama5/sam_twi.c
@@ -84,15 +84,15 @@
 #endif
 
 #ifndef CONFIG_SAMA5_TWI1_FREQUENCY
- #define CONFIG_SAMA5_TWI1_FREQUENCY 100000
+#  define CONFIG_SAMA5_TWI1_FREQUENCY 100000
 #endif
 
 #ifndef CONFIG_SAMA5_TWI2_FREQUENCY
- #define CONFIG_SAMA5_TWI2_FREQUENCY 100000
+#  define CONFIG_SAMA5_TWI2_FREQUENCY 100000
 #endif
 
 #ifndef CONFIG_SAMA5_TWI3_FREQUENCY
- #define CONFIG_SAMA5_TWI3_FREQUENCY 100000
+#  define CONFIG_SAMA5_TWI3_FREQUENCY 100000
 #endif
 
 /* Driver internal definitions *************************************************/
diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c
index d932c2d49d6..9f1009653cb 100644
--- a/arch/arm/src/samv7/sam_twihs.c
+++ b/arch/arm/src/samv7/sam_twihs.c
@@ -84,11 +84,11 @@
 #endif
 
 #ifndef CONFIG_SAMV7_TWIHS1_FREQUENCY
- #define CONFIG_SAMV7_TWIHS1_FREQUENCY 100000
+#  define CONFIG_SAMV7_TWIHS1_FREQUENCY 100000
 #endif
 
 #ifndef CONFIG_SAMV7_TWIHS2_FREQUENCY
- #define CONFIG_SAMV7_TWIHS2_FREQUENCY 100000
+#  define CONFIG_SAMV7_TWIHS2_FREQUENCY 100000
 #endif
 
 /* Driver internal definitions *************************************************/
diff --git a/arch/arm/src/stm32/chip/stm32f44xxx_pinmap.h b/arch/arm/src/stm32/chip/stm32f44xxx_pinmap.h
index ba231e690ad..82ca5c81ab3 100644
--- a/arch/arm/src/stm32/chip/stm32f44xxx_pinmap.h
+++ b/arch/arm/src/stm32/chip/stm32f44xxx_pinmap.h
@@ -816,11 +816,11 @@
 #define GPIO_SAI2_SCK_A_2     (GPIO_ALT|GPIO_AF8|GPIO_PORTD|GPIO_PIN14)
 #define GPIO_SAI2_SCK_B_1     (GPIO_ALT|GPIO_AF10|GPIO_PORTE|GPIO_PIN12)
 #define GPIO_SAI2_SCK_B_2     (GPIO_ALT|GPIO_AF8|GPIO_PORTA|GPIO_PIN2)
- #define GPIO_SAI2_SD_A_1      (GPIO_ALT|GPIO_AF10|GPIO_PORTD|GPIO_PIN11)
- #define GPIO_SAI2_SD_A_2      (GPIO_ALT|GPIO_AF10|GPIO_PORTB|GPIO_PIN11)
- #define GPIO_SAI2_SD_B_1      (GPIO_ALT|GPIO_AF10|GPIO_PORTG|GPIO_PIN10)
- #define GPIO_SAI2_SD_B_2      (GPIO_ALT|GPIO_AF10|GPIO_PORTE|GPIO_PIN11)
- #define GPIO_SAI2_SD_B_3      (GPIO_ALT|GPIO_AF10|GPIO_PORTF|GPIO_PIN11)
+#define GPIO_SAI2_SD_A_1      (GPIO_ALT|GPIO_AF10|GPIO_PORTD|GPIO_PIN11)
+#define GPIO_SAI2_SD_A_2      (GPIO_ALT|GPIO_AF10|GPIO_PORTB|GPIO_PIN11)
+#define GPIO_SAI2_SD_B_1      (GPIO_ALT|GPIO_AF10|GPIO_PORTG|GPIO_PIN10)
+#define GPIO_SAI2_SD_B_2      (GPIO_ALT|GPIO_AF10|GPIO_PORTE|GPIO_PIN11)
+#define GPIO_SAI2_SD_B_3      (GPIO_ALT|GPIO_AF10|GPIO_PORTF|GPIO_PIN11)
 
 /* HDMI-CEC Controller */
 
diff --git a/arch/arm/src/stm32/stm32_adc.c b/arch/arm/src/stm32/stm32_adc.c
index 2fc9e3a7701..73cbe624b27 100644
--- a/arch/arm/src/stm32/stm32_adc.c
+++ b/arch/arm/src/stm32/stm32_adc.c
@@ -546,7 +546,7 @@ static void adc_tim_dumpregs(struct stm32_dev_s *priv, FAR const char *msg)
  *
  ****************************************************************************/
 
- #ifdef ADC_HAVE_TIMER
+#ifdef ADC_HAVE_TIMER
 static void adc_timstart(struct stm32_dev_s *priv, bool enable)
 {
   uint16_t regval;
diff --git a/arch/arm/src/stm32/stm32_ltdc.c b/arch/arm/src/stm32/stm32_ltdc.c
index 0eeeddbb8df..c54c1bc1a3a 100644
--- a/arch/arm/src/stm32/stm32_ltdc.c
+++ b/arch/arm/src/stm32/stm32_ltdc.c
@@ -2095,7 +2095,7 @@ static void stm32_ltdc_linit(int lid)
 # ifdef STM32_LAYER_CLUT_SIZE
   ltdc->setclut      = stm32_setclut;
   ltdc->getclut      = stm32_getclut;
- #endif
+#endif
   ltdc->setcolor     = stm32_setcolor;
   ltdc->getcolor     = stm32_getcolor;
   ltdc->setcolorkey  = stm32_setcolorkey;
@@ -2107,11 +2107,11 @@ static void stm32_ltdc_linit(int lid)
   ltdc->setarea      = stm32_setarea;
   ltdc->getarea      = stm32_getarea;
   ltdc->update       = stm32_update;
- #ifdef CONFIG_STM32_DMA2D
+#ifdef CONFIG_STM32_DMA2D
   ltdc->blit         = stm32_blit;
   ltdc->blend        = stm32_blend;
   ltdc->fillarea     = stm32_fillarea;
- #endif
+#endif
 #endif
 
   /* Initialize the layer state */
diff --git a/arch/arm/src/stm32/stm32_pm.h b/arch/arm/src/stm32/stm32_pm.h
index 88e06fa9d88..7fc93ba688f 100644
--- a/arch/arm/src/stm32/stm32_pm.h
+++ b/arch/arm/src/stm32/stm32_pm.h
@@ -59,7 +59,7 @@
  * Public Data
  ****************************************************************************/
 
- #ifndef __ASSEMBLY__
+#ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
 extern "C"
diff --git a/arch/avr/src/at32uc3/at32uc3_internal.h b/arch/avr/src/at32uc3/at32uc3_internal.h
index 6d1c3abf066..718e78fc129 100644
--- a/arch/avr/src/at32uc3/at32uc3_internal.h
+++ b/arch/avr/src/at32uc3/at32uc3_internal.h
@@ -65,7 +65,7 @@
  * F... .... .... ....
  */
 
- #define GPIO_GLITCH               (1 << 15) /* Bit 15: Glitch filter enable */
+#define GPIO_GLITCH                (1 << 15) /* Bit 15: Glitch filter enable */
 
 /* Interrupt modes (valid only if GPIO_INTR==1)
  * .MM. .... .... ....
diff --git a/arch/hc/src/m9s12/m9s12_timerisr.c b/arch/hc/src/m9s12/m9s12_timerisr.c
index 356db69b5b2..da31020bdd8 100644
--- a/arch/hc/src/m9s12/m9s12_timerisr.c
+++ b/arch/hc/src/m9s12/m9s12_timerisr.c
@@ -115,8 +115,8 @@
  * OSCCLK / (CLK_TCK * PRER_DIV) - 1
  */
 
- #define MODCNT_DENOM  ((uint32_t)CLK_TCK * (uint32_t)PRER_DIV)
- #define MODCNT_VALUE  ((((uint32_t)HCS12_OSCCLK  + (MODCNT_DENOM/2))/ MODCNT_DENOM) - 1)
+#define MODCNT_DENOM  ((uint32_t)CLK_TCK * (uint32_t)PRER_DIV)
+#define MODCNT_VALUE  ((((uint32_t)HCS12_OSCCLK  + (MODCNT_DENOM/2))/ MODCNT_DENOM) - 1)
 
 /****************************************************************************
  * Private Types
diff --git a/arch/sh/src/m16c/m16c_lowputc.c b/arch/sh/src/m16c/m16c_lowputc.c
index be9dd8e0e38..b064bec29da 100644
--- a/arch/sh/src/m16c/m16c_lowputc.c
+++ b/arch/sh/src/m16c/m16c_lowputc.c
@@ -263,7 +263,7 @@ static inline void up_lowserialsetup(void)
 
   /* Set port direction registers for Rx/TX pins */
 
- #if defined(CONFIG_UART0_SERIAL_CONSOLE)
+#if defined(CONFIG_UART0_SERIAL_CONSOLE)
   regval  = getreg8(M16C_PD6);
   regval &= ~(1 << 2);                         /* PD6-2:RxD1 */
   regval |=  (1 << 3);                         /* PD6-3:TxD1 */
diff --git a/arch/x86/include/i486/io.h b/arch/x86/include/i486/io.h
index 47431b0eddb..bb4aa5c5573 100644
--- a/arch/x86/include/i486/io.h
+++ b/arch/x86/include/i486/io.h
@@ -55,7 +55,7 @@
  * Public Types
  ****************************************************************************/
 
- #ifndef __ASSEMBLY__
+#ifndef __ASSEMBLY__
 
 /****************************************************************************
  * Inline functions
diff --git a/arch/x86/src/i486/i486_utils.S b/arch/x86/src/i486/i486_utils.S
index bcde275336a..db3af06e5b1 100644
--- a/arch/x86/src/i486/i486_utils.S
+++ b/arch/x86/src/i486/i486_utils.S
@@ -48,7 +48,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
- #define KSEG 0x10
+#define KSEG 0x10
 
 /****************************************************************************
  * Globals
diff --git a/arch/z80/src/ez80/chip.h b/arch/z80/src/ez80/chip.h
index 981ad769e47..637a0cd3e02 100644
--- a/arch/z80/src/ez80/chip.h
+++ b/arch/z80/src/ez80/chip.h
@@ -89,7 +89,7 @@ EXTERN uint32_t ez80_systemclock;
  * Public Function Prototypes
  ************************************************************************************/
 
- #undef EXTERN
+#undef EXTERN
 #ifdef __cplusplus
 }
 #endif