diff --git a/arch/arc/soc/em7d/arc_mpu_regions.c b/arch/arc/soc/em7d/arc_mpu_regions.c
index 1e854ab41d9..5853a253361 100644
--- a/arch/arc/soc/em7d/arc_mpu_regions.c
+++ b/arch/arc/soc/em7d/arc_mpu_regions.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
- #include <soc.h>
- #include <arch/arc/v2/mpu/arc_mpu.h>
+#include <soc.h>
+#include <arch/arc/v2/mpu/arc_mpu.h>
 
 static struct arc_mpu_region mpu_regions[] = {
 #if CONFIG_ICCM_SIZE > 0
diff --git a/arch/arm/soc/arm/beetle/arm_mpu_regions.c b/arch/arm/soc/arm/beetle/arm_mpu_regions.c
index 7417c76bcbd..c5cedc69fb3 100644
--- a/arch/arm/soc/arm/beetle/arm_mpu_regions.c
+++ b/arch/arm/soc/arm/beetle/arm_mpu_regions.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
- #include <soc.h>
- #include <arch/arm/cortex_m/mpu/arm_mpu.h>
+#include <soc.h>
+#include <arch/arm/cortex_m/mpu/arm_mpu.h>
 
 static struct arm_mpu_region mpu_regions[] = {
 	/* Region 0 */
diff --git a/arch/arm/soc/arm/beetle/soc.c b/arch/arm/soc/arm/beetle/soc.c
index d725257ebdd..38e5faf21fd 100644
--- a/arch/arm/soc/arm/beetle/soc.c
+++ b/arch/arm/soc/arm/beetle/soc.c
@@ -12,12 +12,12 @@
  * for the ARM LTD Beetle SoC.
  */
 
- #include <kernel.h>
- #include <device.h>
- #include <init.h>
- #include <soc.h>
+#include <kernel.h>
+#include <device.h>
+#include <init.h>
+#include <soc.h>
 
- #include <arch/cpu.h>
+#include <arch/cpu.h>
 
 /**
  * @brief Perform basic hardware initialization at boot.
diff --git a/arch/arm/soc/atmel_sam/sam3x/soc.h b/arch/arm/soc/atmel_sam/sam3x/soc.h
index ede47633065..6d1e03d1f59 100644
--- a/arch/arm/soc/atmel_sam/sam3x/soc.h
+++ b/arch/arm/soc/atmel_sam/sam3x/soc.h
@@ -22,17 +22,17 @@
 #define DONT_USE_PREDEFINED_PERIPHERALS_HANDLERS
 
 #if defined CONFIG_SOC_PART_NUMBER_SAM3X4C
-  #include <sam3x4c.h>
+#include <sam3x4c.h>
 #elif defined CONFIG_SOC_PART_NUMBER_SAM3X4E
-  #include <sam3x4e.h>
+#include <sam3x4e.h>
 #elif defined CONFIG_SOC_PART_NUMBER_SAM3X8C
-  #include <sam3x8c.h>
+#include <sam3x8c.h>
 #elif defined CONFIG_SOC_PART_NUMBER_SAM3X8E
-  #include <sam3x8e.h>
+#include <sam3x8e.h>
 #elif defined CONFIG_SOC_PART_NUMBER_SAM3X8H
-  #include <sam3x8h.h>
+#include <sam3x8h.h>
 #else
-  #error Library does not support the specified device.
+#error Library does not support the specified device.
 #endif
 
 #define ID_UART0   ID_UART
diff --git a/arch/arm/soc/atmel_sam/sam4s/soc.h b/arch/arm/soc/atmel_sam/sam4s/soc.h
index d1835255681..f5b52c38407 100644
--- a/arch/arm/soc/atmel_sam/sam4s/soc.h
+++ b/arch/arm/soc/atmel_sam/sam4s/soc.h
@@ -20,9 +20,9 @@
 #define DONT_USE_PREDEFINED_PERIPHERALS_HANDLERS
 
 #if defined(CONFIG_SOC_PART_NUMBER_SAM4S16C)
-	#include <sam4s16c.h>
+#include <sam4s16c.h>
 #else
-	#error Library does not support the specified device.
+#error Library does not support the specified device.
 #endif
 
 #include "soc_pinmap.h"
diff --git a/arch/arm/soc/atmel_sam/same70/soc.h b/arch/arm/soc/atmel_sam/same70/soc.h
index af397b137b1..1cd592711f4 100644
--- a/arch/arm/soc/atmel_sam/same70/soc.h
+++ b/arch/arm/soc/atmel_sam/same70/soc.h
@@ -20,23 +20,23 @@
 #define DONT_USE_PREDEFINED_PERIPHERALS_HANDLERS
 
 #if defined CONFIG_SOC_PART_NUMBER_SAME70J19
-  #include <same70j19.h>
+#include <same70j19.h>
 #elif defined CONFIG_SOC_PART_NUMBER_SAME70J20
-  #include <same70j20.h>
+#include <same70j20.h>
 #elif defined CONFIG_SOC_PART_NUMBER_SAME70J21
-  #include <same70j21.h>
+#include <same70j21.h>
 #elif defined CONFIG_SOC_PART_NUMBER_SAME70N19
-  #include <same70n19.h>
+#include <same70n19.h>
 #elif defined CONFIG_SOC_PART_NUMBER_SAME70N20
-  #include <same70n20.h>
+#include <same70n20.h>
 #elif defined CONFIG_SOC_PART_NUMBER_SAME70N21
-  #include <same70n21.h>
+#include <same70n21.h>
 #elif defined CONFIG_SOC_PART_NUMBER_SAME70Q19
-  #include <same70q19.h>
+#include <same70q19.h>
 #elif defined CONFIG_SOC_PART_NUMBER_SAME70Q20
-  #include <same70q20.h>
+#include <same70q20.h>
 #elif defined CONFIG_SOC_PART_NUMBER_SAME70Q21
-  #include <same70q21.h>
+#include <same70q21.h>
 #else
   #error Library does not support the specified device.
 #endif
diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c
index 72a7419d05e..c222b794aa6 100644
--- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c
+++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
- #include <sensor.h>
- #include <kernel.h>
- #include <device.h>
- #include <init.h>
- #include <i2c.h>
- #include <misc/byteorder.h>
- #include <misc/__assert.h>
+#include <sensor.h>
+#include <kernel.h>
+#include <device.h>
+#include <init.h>
+#include <i2c.h>
+#include <misc/byteorder.h>
+#include <misc/__assert.h>
 
- #include <gpio.h>
+#include <gpio.h>
 
- #include "lsm9ds0_gyro.h"
+#include "lsm9ds0_gyro.h"
 
 extern struct lsm9ds0_gyro_data lsm9ds0_gyro_data;
 
diff --git a/tests/kernel/fp_sharing/src/main.c b/tests/kernel/fp_sharing/src/main.c
index 80d09aba78a..5292537c43a 100644
--- a/tests/kernel/fp_sharing/src/main.c
+++ b/tests/kernel/fp_sharing/src/main.c
@@ -47,17 +47,17 @@
 #include <zephyr.h>
 
 #if defined(CONFIG_ISA_IA32)
-  #if defined(__GNUC__)
-    #include <float_regs_x86_gcc.h>
-  #else
-    #include <float_regs_x86_other.h>
-  #endif /* __GNUC__ */
+#if defined(__GNUC__)
+#include <float_regs_x86_gcc.h>
+#else
+#include <float_regs_x86_other.h>
+#endif /* __GNUC__ */
 #elif defined(CONFIG_CPU_CORTEX_M4)
-  #if defined(__GNUC__)
-    #include <float_regs_arm_gcc.h>
-  #else
-    #include <float_regs_arm_other.h>
-  #endif /* __GNUC__ */
+#if defined(__GNUC__)
+#include <float_regs_arm_gcc.h>
+#else
+#include <float_regs_arm_other.h>
+#endif /* __GNUC__ */
 #endif
 
 #include <arch/cpu.h>