baseboard: Sort header files

Sort all includes in baseboard with the clang-format rules used by
the zephyr project.

BRANCH=None
BUG=b:247100970
TEST=zmake build -a
TEST=./twister --clobber -v -i
TEST=make -j72 buildall_only runtests
TEST=zmake compare-builds

Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: I259d3bae478d1f649623bc56339e2f8423ede0dc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4049441
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Commit-Queue: Simon Glass <sjg@chromium.org>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Auto-Submit: Jeremy Bettis <jbettis@chromium.org>

42 files changed, 97 insertions, 105 deletions

diff --git a/baseboard/asurada/baseboard.c b/baseboard/asurada/baseboard.c
index 3a881c275a..c315841a6a 100644
--- a/baseboard/asurada/baseboard.c
+++ b/baseboard/asurada/baseboard.c
@@ -8,15 +8,14 @@
 #include "adc.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charger.h"
-#include "charger.h"
 #include "charge_state.h"
 #include "charge_state_v2.h"
+#include "charger.h"
 #include "chipset.h"
 #include "common.h"
 #include "console.h"
-#include "driver/accelgyro_bmi_common.h"
 #include "driver/accel_lis2dw12.h"
+#include "driver/accelgyro_bmi_common.h"
 #include "driver/als_tcs3400.h"
 #include "driver/bc12/mt6360.h"
 #include "driver/charger/isl923x.h"
@@ -31,8 +30,8 @@
 #include "keyboard_scan.h"
 #include "lid_switch.h"
 #include "motion_sense.h"
-#include "power_button.h"
 #include "power.h"
+#include "power_button.h"
 #include "regulator.h"
 #include "spi.h"
 #include "switch.h"
@@ -42,6 +41,7 @@
 #include "timer.h"
 #include "uart.h"
 
+/* This must be last. */
 #include "gpio_list.h"
 
 /* Wake-up pins for hibernate */
diff --git a/baseboard/asurada/baseboard.h b/baseboard/asurada/baseboard.h
index 62f74e1f57..b40f2f50de 100644
--- a/baseboard/asurada/baseboard.h
+++ b/baseboard/asurada/baseboard.h
@@ -183,8 +183,8 @@
 #ifndef __ASSEMBLER__
 
 #include "gpio_signal.h"
-#include "registers.h"
 #include "power/mt8192.h"
+#include "registers.h"
 
 void board_reset_pd_mcu(void);
 enum board_sub_board board_get_sub_board(void);
diff --git a/baseboard/asurada/regulator.c b/baseboard/asurada/regulator.c
index e2731c8385..0487f8faa6 100644
--- a/baseboard/asurada/regulator.c
+++ b/baseboard/asurada/regulator.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "common.h"
 #include "bc12/mt6360_public.h"
+#include "common.h"
 
 /* SD Card */
 int board_regulator_get_info(uint32_t index, char *name, uint16_t *num_voltages,
diff --git a/baseboard/asurada/usbc_config.c b/baseboard/asurada/usbc_config.c
index 0be43d343a..ecc882659f 100644
--- a/baseboard/asurada/usbc_config.c
+++ b/baseboard/asurada/usbc_config.c
@@ -7,11 +7,11 @@
 
 #include "adc.h"
 #include "baseboard_common.h"
-#include "bc12/pi3usb9201_public.h"
 #include "bc12/mt6360_public.h"
+#include "bc12/pi3usb9201_public.h"
 #include "button.h"
-#include "charger.h"
 #include "charge_state_v2.h"
+#include "charger.h"
 #include "charger/isl923x_public.h"
 #include "console.h"
 #include "ec_commands.h"
@@ -20,20 +20,19 @@
 #include "hooks.h"
 #include "i2c.h"
 #include "lid_switch.h"
-#include "task.h"
-#include "ppc/syv682x_public.h"
 #include "power.h"
 #include "power_button.h"
+#include "ppc/syv682x_public.h"
 #include "spi.h"
 #include "switch.h"
 #include "tablet_mode.h"
+#include "task.h"
 #include "tcpm/it8xxx2_pd_public.h"
 #include "uart.h"
-#include "usbc_ppc.h"
 #include "usb_charge.h"
 #include "usb_mux.h"
-#include "usb_mux/ps8743_public.h"
 #include "usb_mux/it5205_public.h"
+#include "usb_mux/ps8743_public.h"
 #include "usb_pd_tcpm.h"
 #include "usbc_ppc.h"
 
diff --git a/baseboard/brask/baseboard.c b/baseboard/brask/baseboard.c
index 5a96ba49ca..33a3d9acf4 100644
--- a/baseboard/brask/baseboard.c
+++ b/baseboard/brask/baseboard.c
@@ -5,7 +5,6 @@
 
 #include "common.h"
 #include "compile_time_macros.h"
-
 #include "gpio_signal.h"
 
 /* Wake up pins */
diff --git a/baseboard/brask/baseboard.h b/baseboard/brask/baseboard.h
index 3fb3a5955f..8f10ebb8aa 100644
--- a/baseboard/brask/baseboard.h
+++ b/baseboard/brask/baseboard.h
@@ -189,13 +189,13 @@
 
 #ifndef __ASSEMBLER__
 
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "common.h"
 #include "baseboard_usbc_config.h"
+#include "common.h"
 #include "extpower.h"
 
+#include <stdbool.h>
+#include <stdint.h>
+
 /*
  * Configure run-time data structures and operation based on CBI data. This
  * typically includes customization for changes in the BOARD_VERSION and
diff --git a/baseboard/brask/cbi.c b/baseboard/brask/cbi.c
index 0dcfcca253..0ff0e4c7f7 100644
--- a/baseboard/brask/cbi.c
+++ b/baseboard/brask/cbi.c
@@ -3,13 +3,13 @@
  * found in the LICENSE file.
  */
 
-#include <stdint.h>
-
-#include "console.h"
 #include "common.h"
+#include "console.h"
 #include "cros_board_info.h"
 #include "hooks.h"
 
+#include <stdint.h>
+
 #define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ##args)
 #define CPRINTF(format, args...) cprintf(CC_SYSTEM, format, ##args)
 
diff --git a/baseboard/brask/usb_pd_policy.c b/baseboard/brask/usb_pd_policy.c
index 0503415a9d..e20ad13f98 100644
--- a/baseboard/brask/usb_pd_policy.c
+++ b/baseboard/brask/usb_pd_policy.c
@@ -5,9 +5,6 @@
 
 /* Shared USB-C policy for Brask boards */
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include "charge_manager.h"
 #include "chipset.h"
 #include "common.h"
@@ -16,15 +13,17 @@
 #include "ec_commands.h"
 #include "gpio.h"
 #include "timer.h"
-#include "usbc_ppc.h"
 #include "usb_mux.h"
 #include "usb_pd.h"
-#include "usb_pd.h"
 #include "usb_pd_tbt.h"
 #include "usb_pd_tcpm.h"
 #include "usb_pd_vdo.h"
+#include "usbc_ppc.h"
 #include "util.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #define CPRINTF(format, args...) cprintf(CC_USBPD, format, ##args)
 #define CPRINTS(format, args...) cprints(CC_USBPD, format, ##args)
 
diff --git a/baseboard/brya/baseboard.h b/baseboard/brya/baseboard.h
index 84fefa9b53..6748a8a777 100644
--- a/baseboard/brya/baseboard.h
+++ b/baseboard/brya/baseboard.h
@@ -240,14 +240,14 @@
 
 #ifndef __ASSEMBLER__
 
-#include <stdbool.h>
-#include <stdint.h>
-
+#include "baseboard_usbc_config.h"
 #include "cbi.h"
 #include "common.h"
-#include "baseboard_usbc_config.h"
 #include "extpower.h"
 
+#include <stdbool.h>
+#include <stdint.h>
+
 /*
  * Check battery disconnect state.
  * This function will return if battery is initialized or not.
diff --git a/baseboard/brya/battery_presence.c b/baseboard/brya/battery_presence.c
index 1e4ab4ed44..ad055c1d12 100644
--- a/baseboard/brya/battery_presence.c
+++ b/baseboard/brya/battery_presence.c
@@ -6,12 +6,12 @@
  * Each board should implement board_battery_info[] to define the specific
  * battery packs supported.
  */
-#include <stdbool.h>
-
 #include "battery.h"
 #include "battery_smart.h"
 #include "common.h"
 
+#include <stdbool.h>
+
 static enum battery_present batt_pres_prev = BP_NOT_SURE;
 
 __overridable bool board_battery_is_initialized(void)
diff --git a/baseboard/brya/cbi.c b/baseboard/brya/cbi.c
index 7bc8dad117..f6e5034561 100644
--- a/baseboard/brya/cbi.c
+++ b/baseboard/brya/cbi.c
@@ -3,13 +3,13 @@
  * found in the LICENSE file.
  */
 
-#include <stdint.h>
-
-#include "console.h"
 #include "common.h"
+#include "console.h"
 #include "cros_board_info.h"
 #include "hooks.h"
 
+#include <stdint.h>
+
 #define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ##args)
 #define CPRINTF(format, args...) cprintf(CC_SYSTEM, format, ##args)
 
diff --git a/baseboard/brya/charger_bq25720.c b/baseboard/brya/charger_bq25720.c
index 7fabd2082e..4976abdea6 100644
--- a/baseboard/brya/charger_bq25720.c
+++ b/baseboard/brya/charger_bq25720.c
@@ -3,16 +3,15 @@
  * found in the LICENSE file.
  */
 
-#include "common.h"
-
 #include "charge_manager.h"
 #include "charge_state_v2.h"
 #include "charger.h"
+#include "common.h"
 #include "compile_time_macros.h"
 #include "console.h"
 #include "driver/charger/bq25710.h"
-#include "usbc_ppc.h"
 #include "usb_pd.h"
+#include "usbc_ppc.h"
 #include "util.h"
 
 #define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ##args)
diff --git a/baseboard/brya/usb_pd_policy.c b/baseboard/brya/usb_pd_policy.c
index e902fbc4a6..377ef0462e 100644
--- a/baseboard/brya/usb_pd_policy.c
+++ b/baseboard/brya/usb_pd_policy.c
@@ -5,9 +5,6 @@
 
 /* Shared USB-C policy for Brya boards */
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include "charge_manager.h"
 #include "chipset.h"
 #include "common.h"
@@ -16,15 +13,17 @@
 #include "ec_commands.h"
 #include "gpio.h"
 #include "timer.h"
-#include "usbc_ppc.h"
 #include "usb_mux.h"
 #include "usb_pd.h"
-#include "usb_pd.h"
 #include "usb_pd_tbt.h"
 #include "usb_pd_tcpm.h"
 #include "usb_pd_vdo.h"
+#include "usbc_ppc.h"
 #include "util.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #define CPRINTF(format, args...) cprintf(CC_USBPD, format, ##args)
 #define CPRINTS(format, args...) cprints(CC_USBPD, format, ##args)
 
diff --git a/baseboard/cherry/baseboard.c b/baseboard/cherry/baseboard.c
index 3f5f5c0e64..4e0a00e1ad 100644
--- a/baseboard/cherry/baseboard.c
+++ b/baseboard/cherry/baseboard.c
@@ -8,9 +8,9 @@
 #include "adc.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charger.h"
 #include "charge_state.h"
 #include "charge_state_v2.h"
+#include "charger.h"
 #include "chipset.h"
 #include "common.h"
 #include "console.h"
@@ -29,8 +29,8 @@
 #include "i2c.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
-#include "power_button.h"
 #include "power.h"
+#include "power_button.h"
 #include "regulator.h"
 #include "spi.h"
 #include "switch.h"
@@ -41,10 +41,10 @@
 #include "timer.h"
 #include "uart.h"
 #include "usb_charge.h"
-#include "usbc_ppc.h"
 #include "usb_pd.h"
 #include "usb_pd_tcpm.h"
 #include "usb_tc_sm.h"
+#include "usbc_ppc.h"
 
 static void bc12_interrupt(enum gpio_signal signal);
 static void ppc_interrupt(enum gpio_signal signal);
diff --git a/baseboard/cherry/baseboard.h b/baseboard/cherry/baseboard.h
index 2b0d03a436..de3acda1d3 100644
--- a/baseboard/cherry/baseboard.h
+++ b/baseboard/cherry/baseboard.h
@@ -212,8 +212,8 @@
 #ifndef __ASSEMBLER__
 
 #include "gpio_signal.h"
-#include "registers.h"
 #include "power/mt8192.h"
+#include "registers.h"
 
 enum adc_channel {
 	ADC_VBUS, /* ADC 0 */
diff --git a/baseboard/goroh/baseboard.c b/baseboard/goroh/baseboard.c
index f70f070fac..8422030619 100644
--- a/baseboard/goroh/baseboard.c
+++ b/baseboard/goroh/baseboard.c
@@ -10,15 +10,14 @@
 #include "baseboard_usbc_config.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charger.h"
-#include "charger.h"
 #include "charge_state.h"
 #include "charge_state_v2.h"
+#include "charger.h"
 #include "chipset.h"
 #include "common.h"
 #include "console.h"
-#include "driver/accelgyro_bmi_common.h"
 #include "driver/accel_lis2dw12.h"
+#include "driver/accelgyro_bmi_common.h"
 #include "driver/als_tcs3400.h"
 #include "driver/charger/isl923x.h"
 #include "driver/ppc/syv682x.h"
@@ -31,9 +30,8 @@
 #include "keyboard_scan.h"
 #include "lid_switch.h"
 #include "motion_sense.h"
-#include "power_button.h"
-#include "power.h"
 #include "power.h"
+#include "power_button.h"
 #include "spi.h"
 #include "switch.h"
 #include "tablet_mode.h"
@@ -41,11 +39,12 @@
 #include "temp_sensor.h"
 #include "timer.h"
 #include "uart.h"
-#include "usbc_ppc.h"
 #include "usb_mux.h"
 #include "usb_pd.h"
 #include "usb_pd_tcpm.h"
+#include "usbc_ppc.h"
 
+/* Must be last. */
 #include "gpio_list.h"
 
 #define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ##args)
diff --git a/baseboard/goroh/baseboard.h b/baseboard/goroh/baseboard.h
index 1488bb6fcf..05c26d74a0 100644
--- a/baseboard/goroh/baseboard.h
+++ b/baseboard/goroh/baseboard.h
@@ -185,8 +185,8 @@
 #ifndef __ASSEMBLER__
 
 #include "gpio_signal.h"
-#include "registers.h"
 #include "power/falconlite.h"
+#include "registers.h"
 
 int board_get_version(void);
 void board_reset_pd_mcu(void);
diff --git a/baseboard/goroh/usbc_config.c b/baseboard/goroh/usbc_config.c
index 3df1e47fbd..f604a090d1 100644
--- a/baseboard/goroh/usbc_config.c
+++ b/baseboard/goroh/usbc_config.c
@@ -4,22 +4,22 @@
  */
 
 /* Goroh family-specific USB-C configuration */
-#include <stdint.h>
-#include <stdbool.h>
-
 #include "common.h"
 #include "compile_time_macros.h"
 #include "config.h"
 #include "console.h"
-#include "hooks.h"
-#include "driver/tcpm/it8xxx2_pd_public.h"
 #include "driver/ppc/syv682x_public.h"
 #include "driver/retimer/ps8818_public.h"
+#include "driver/tcpm/it8xxx2_pd_public.h"
 #include "driver/tcpm/tcpci.h"
-#include "usb_pd.h"
-#include "usbc_ppc.h"
 #include "gpio.h"
 #include "gpio_signal.h"
+#include "hooks.h"
+#include "usb_pd.h"
+#include "usbc_ppc.h"
+
+#include <stdbool.h>
+#include <stdint.h>
 
 #define CPRINTS(format, args...) cprints(CC_CHIPSET, format, ##args)
 
diff --git a/baseboard/guybrush/baseboard.c b/baseboard/guybrush/baseboard.c
index 8afcb09fb4..654f73e7fe 100644
--- a/baseboard/guybrush/baseboard.c
+++ b/baseboard/guybrush/baseboard.c
@@ -5,25 +5,25 @@
 
 /* Guybrush family-specific configuration */
 
-#include "cros_board_info.h"
 #include "base_fw_config.h"
 #include "battery_fuel_gauge.h"
 #include "charge_manager.h"
 #include "charge_ramp.h"
-#include "charge_state_v2.h"
 #include "charge_state.h"
+#include "charge_state_v2.h"
 #include "charger.h"
 #include "chip/npcx/ps2_chip.h"
 #include "chip/npcx/pwm_chip.h"
 #include "chipset.h"
+#include "cros_board_info.h"
 #include "driver/ppc/aoz1380_public.h"
 #include "driver/ppc/nx20p348x.h"
 #include "driver/retimer/anx7491.h"
 #include "driver/retimer/ps8811.h"
 #include "driver/retimer/ps8818_public.h"
 #include "driver/tcpm/nct38xx.h"
-#include "driver/usb_mux/anx7451.h"
 #include "driver/usb_mux/amd_fp6.h"
+#include "driver/usb_mux/anx7451.h"
 #include "fan.h"
 #include "fan_chip.h"
 #include "gpio.h"
diff --git a/baseboard/guybrush/cbi.c b/baseboard/guybrush/cbi.c
index 6ce6fe0eb7..1baf506297 100644
--- a/baseboard/guybrush/cbi.c
+++ b/baseboard/guybrush/cbi.c
@@ -6,8 +6,8 @@
 /* Guybrush CrOS Board Info(CBI) utilities */
 
 #include "base_fw_config.h"
-#include "console.h"
 #include "common.h"
+#include "console.h"
 #include "cros_board_info.h"
 #include "hooks.h"
 
diff --git a/baseboard/herobrine/usbc_config.c b/baseboard/herobrine/usbc_config.c
index 2ebb8ae029..a5df0a0d4c 100644
--- a/baseboard/herobrine/usbc_config.c
+++ b/baseboard/herobrine/usbc_config.c
@@ -5,9 +5,9 @@
 
 /* Herobrine family-specific USB-C configuration */
 
+#include "charge_state.h"
 #include "charger.h"
 #include "charger/isl923x_public.h"
-#include "charge_state.h"
 #include "console.h"
 #include "usb_pd.h"
 
diff --git a/baseboard/honeybuns/baseboard.c b/baseboard/honeybuns/baseboard.c
index 506eb6f265..430eb488e7 100644
--- a/baseboard/honeybuns/baseboard.c
+++ b/baseboard/honeybuns/baseboard.c
@@ -7,15 +7,15 @@
 #include "console.h"
 #include "cros_board_info.h"
 #include "driver/mp4245.h"
+#include "driver/tcpm/tcpm.h"
 #include "gpio.h"
 #include "hooks.h"
 #include "i2c.h"
-#include "usb_pd.h"
 #include "system.h"
 #include "task.h"
 #include "timer.h"
+#include "usb_pd.h"
 #include "usbc_ppc.h"
-#include "driver/tcpm/tcpm.h"
 #include "util.h"
 
 #define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ##args)
diff --git a/baseboard/honeybuns/usb_pd_policy.c b/baseboard/honeybuns/usb_pd_policy.c
index 956a73e7fb..f2e13d9ed9 100644
--- a/baseboard/honeybuns/usb_pd_policy.c
+++ b/baseboard/honeybuns/usb_pd_policy.c
@@ -3,13 +3,12 @@
  * found in the LICENSE file.
  */
 
+#include "chip/stm32/ucpd-stm32gx.h"
 #include "common.h"
 #include "console.h"
-#include "chip/stm32/ucpd-stm32gx.h"
 #include "cros_board_info.h"
 #include "driver/mp4245.h"
 #include "driver/tcpm/tcpci.h"
-#include "driver/mp4245.h"
 #include "gpio.h"
 #include "hooks.h"
 #include "task.h"
diff --git a/baseboard/honeybuns/usbc_support.c b/baseboard/honeybuns/usbc_support.c
index db68ad527c..9c94f3f0ba 100644
--- a/baseboard/honeybuns/usbc_support.c
+++ b/baseboard/honeybuns/usbc_support.c
@@ -7,21 +7,21 @@
 
 #include "common.h"
 #include "console.h"
-#include "driver/tcpm/tcpci.h"
 #include "driver/tcpm/ps8xxx.h"
-#include "sn5s330.h"
+#include "driver/tcpm/tcpci.h"
 #include "gpio.h"
 #include "hooks.h"
 #include "i2c.h"
+#include "registers.h"
+#include "sn5s330.h"
 #include "system.h"
 #include "timer.h"
+#include "ucpd-stm32gx.h"
 #include "usb_charge.h"
-#include "usb_pd_tcpm.h"
 #include "usb_pd.h"
+#include "usb_pd_tcpm.h"
 #include "usbc_ppc.h"
 #include "util.h"
-#include "registers.h"
-#include "ucpd-stm32gx.h"
 
 #define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ##args)
 #define CPRINTF(format, args...) cprintf(CC_SYSTEM, format, ##args)
diff --git a/baseboard/intelrvp/adlrvp.c b/baseboard/intelrvp/adlrvp.c
index 35ed0edf32..5f307ac066 100644
--- a/baseboard/intelrvp/adlrvp.c
+++ b/baseboard/intelrvp/adlrvp.c
@@ -5,10 +5,10 @@
 
 /* Intel ADLRVP board-specific common configuration */
 
-#include "battery_fuel_gauge.h"
-#include "charger.h"
 #include "battery.h"
+#include "battery_fuel_gauge.h"
 #include "bq25710.h"
+#include "charger.h"
 #include "common.h"
 #include "driver/retimer/bb_retimer_public.h"
 #include "extpower.h"
diff --git a/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c b/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c
index cbc61e8402..ee8c67c7b6 100644
--- a/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c
+++ b/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c
@@ -11,8 +11,8 @@
 #include "driver/ppc/sn5s330.h"
 #include "gpio.h"
 #include "hooks.h"
-#include "tcpm/tcpci.h"
 #include "system.h"
+#include "tcpm/tcpci.h"
 #include "usbc_ppc.h"
 
 #ifdef CONFIG_ZEPHYR
diff --git a/baseboard/ite_evb/baseboard.c b/baseboard/ite_evb/baseboard.c
index 70f50f054b..4c82a91d4b 100644
--- a/baseboard/ite_evb/baseboard.c
+++ b/baseboard/ite_evb/baseboard.c
@@ -25,6 +25,8 @@
 #include "timer.h"
 #include "uart.h"
 #include "util.h"
+
+/* Must be last. */
 #include "gpio_list.h"
 
 #if defined(CONFIG_FANS) || defined(CONFIG_PWM)
diff --git a/baseboard/ite_evb/usb_pd_policy.c b/baseboard/ite_evb/usb_pd_policy.c
index 71af9d2b1c..c7d10787bb 100644
--- a/baseboard/ite_evb/usb_pd_policy.c
+++ b/baseboard/ite_evb/usb_pd_policy.c
@@ -6,8 +6,8 @@
 /* Shared USB-C policy for ite_evb baseboard */
 
 #include "adc.h"
-#include "config.h"
 #include "common.h"
+#include "config.h"
 #include "console.h"
 #include "gpio.h"
 #include "hooks.h"
@@ -16,9 +16,9 @@
 #include "system.h"
 #include "task.h"
 #include "timer.h"
-#include "util.h"
 #include "usb_mux.h"
 #include "usb_pd_pdo.h"
+#include "util.h"
 
 #define CPRINTF(format, args...) cprintf(CC_USBPD, format, ##args)
 #define CPRINTS(format, args...) cprints(CC_USBPD, format, ##args)
diff --git a/baseboard/kalista/baseboard.c b/baseboard/kalista/baseboard.c
index e929e5449c..7b20ea6a43 100644
--- a/baseboard/kalista/baseboard.c
+++ b/baseboard/kalista/baseboard.c
@@ -15,13 +15,12 @@
 #include "console.h"
 #include "cros_board_info.h"
 #include "driver/pmic_tps650x30.h"
-#include "driver/temp_sensor/tmp432.h"
 #include "driver/tcpm/ps8xxx.h"
 #include "driver/tcpm/tcpci.h"
 #include "driver/tcpm/tcpm.h"
+#include "driver/temp_sensor/tmp432.h"
 #include "espi.h"
 #include "extpower.h"
-#include "espi.h"
 #include "fan.h"
 #include "fan_chip.h"
 #include "gpio.h"
diff --git a/baseboard/kalista/usb_pd_policy.c b/baseboard/kalista/usb_pd_policy.c
index 017c340a1b..b2f4656519 100644
--- a/baseboard/kalista/usb_pd_policy.c
+++ b/baseboard/kalista/usb_pd_policy.c
@@ -4,12 +4,12 @@
  */
 
 #include "atomic.h"
-#include "extpower.h"
 #include "charge_manager.h"
 #include "common.h"
 #include "console.h"
 #include "driver/tcpm/anx74xx.h"
 #include "driver/tcpm/ps8xxx.h"
+#include "extpower.h"
 #include "gpio.h"
 #include "hooks.h"
 #include "host_command.h"
@@ -17,11 +17,11 @@
 #include "system.h"
 #include "task.h"
 #include "timer.h"
-#include "util.h"
 #include "usb_mux.h"
 #include "usb_pd.h"
 #include "usb_pd_pdo.h"
 #include "usb_pd_tcpm.h"
+#include "util.h"
 
 #define CPRINTF(format, args...) cprintf(CC_USBPD, format, ##args)
 #define CPRINTS(format, args...) cprints(CC_USBPD, format, ##args)
diff --git a/baseboard/kukui/emmc.c b/baseboard/kukui/emmc.c
index 8731d7259c..416d44c634 100644
--- a/baseboard/kukui/emmc.c
+++ b/baseboard/kukui/emmc.c
@@ -28,6 +28,7 @@
  * case we interrupt the transfer, and the BootROM will try again.
  */
 
+#include "bootblock_data.h"
 #include "chipset.h"
 #include "clock.h"
 #include "console.h"
@@ -41,8 +42,6 @@
 #include "timer.h"
 #include "util.h"
 
-#include "bootblock_data.h"
-
 #define CPRINTS(format, args...) cprints(CC_SPI, format, ##args)
 #define CPRINTF(format, args...) cprintf(CC_SPI, format, ##args)
 
diff --git a/baseboard/kukui/emmc_ite.c b/baseboard/kukui/emmc_ite.c
index 2767199be0..6ac0200c1d 100644
--- a/baseboard/kukui/emmc_ite.c
+++ b/baseboard/kukui/emmc_ite.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "bootblock_data.h"
 #include "chipset.h"
 #include "console.h"
 #include "endian.h"
@@ -15,8 +16,6 @@
 #include "timer.h"
 #include "util.h"
 
-#include "bootblock_data.h"
-
 #define CPRINTS(format, args...) cprints(CC_SPI, format, ##args)
 
 enum emmc_cmd {
diff --git a/baseboard/octopus/variant_usbc_ec_tcpcs.c b/baseboard/octopus/variant_usbc_ec_tcpcs.c
index 983887bc08..a93dfe3535 100644
--- a/baseboard/octopus/variant_usbc_ec_tcpcs.c
+++ b/baseboard/octopus/variant_usbc_ec_tcpcs.c
@@ -10,10 +10,10 @@
 #include "console.h"
 #include "driver/ppc/sn5s330.h"
 #include "driver/tcpm/it83xx_pd.h"
-#include "driver/usb_mux/it5205.h"
 #include "driver/tcpm/ps8xxx.h"
 #include "driver/tcpm/tcpci.h"
 #include "driver/tcpm/tcpm.h"
+#include "driver/usb_mux/it5205.h"
 #include "gpio.h"
 #include "hooks.h"
 #include "system.h"
diff --git a/baseboard/volteer/baseboard.c b/baseboard/volteer/baseboard.c
index fd36aef81f..b9f10fd360 100644
--- a/baseboard/volteer/baseboard.c
+++ b/baseboard/volteer/baseboard.c
@@ -7,8 +7,8 @@
 #include "adc.h"
 #include "button.h"
 #include "cbi_ec_fw_config.h"
-#include "charger.h"
 #include "charge_ramp.h"
+#include "charger.h"
 #include "cros_board_info.h"
 #include "driver/charger/isl9241.h"
 #include "driver/tcpm/ps8xxx.h"
diff --git a/baseboard/volteer/baseboard.h b/baseboard/volteer/baseboard.h
index 3b8e475fe5..10bea07eeb 100644
--- a/baseboard/volteer/baseboard.h
+++ b/baseboard/volteer/baseboard.h
@@ -243,10 +243,10 @@
 
 #ifndef __ASSEMBLER__
 
-#include "gpio_signal.h"
-#include "common.h"
 #include "baseboard_usbc_config.h"
 #include "cbi.h"
+#include "common.h"
+#include "gpio_signal.h"
 
 enum adc_channel {
 	ADC_TEMP_SENSOR_1_CHARGER,
diff --git a/baseboard/volteer/battery_presence.c b/baseboard/volteer/battery_presence.c
index f143b67c91..d656b7b626 100644
--- a/baseboard/volteer/battery_presence.c
+++ b/baseboard/volteer/battery_presence.c
@@ -6,12 +6,12 @@
  * Each board should implement board_battery_info[] to define the specific
  * battery packs supported.
  */
-#include <stdbool.h>
-
 #include "battery.h"
 #include "battery_smart.h"
 #include "gpio.h"
 
+#include <stdbool.h>
+
 static enum battery_present batt_pres_prev = BP_NOT_SURE;
 
 enum battery_present battery_hw_present(void)
diff --git a/baseboard/volteer/cbi_ec_fw_config.c b/baseboard/volteer/cbi_ec_fw_config.c
index 7506278e16..f925498774 100644
--- a/baseboard/volteer/cbi_ec_fw_config.c
+++ b/baseboard/volteer/cbi_ec_fw_config.c
@@ -3,9 +3,9 @@
  * found in the LICENSE file.
  */
 
+#include "cbi_ec_fw_config.h"
 #include "common.h"
 #include "console.h"
-#include "cbi_ec_fw_config.h"
 #include "cros_board_info.h"
 
 #define CPRINTS(format, args...) cprints(CC_CHIPSET, format, ##args)
diff --git a/baseboard/volteer/charger.c b/baseboard/volteer/charger.c
index 84fa4e037c..73b80e17b8 100644
--- a/baseboard/volteer/charger.c
+++ b/baseboard/volteer/charger.c
@@ -4,10 +4,10 @@
  */
 
 /* Volteer family-specific configuration */
-#include "common.h"
-#include "charger.h"
 #include "charge_manager.h"
 #include "charge_state.h"
+#include "charger.h"
+#include "common.h"
 #include "driver/charger/isl9241_public.h"
 #include "gpio.h"
 #ifdef CONFIG_ZEPHYR
diff --git a/baseboard/volteer/usb_pd_policy.c b/baseboard/volteer/usb_pd_policy.c
index 81e02b769f..18c24b64ef 100644
--- a/baseboard/volteer/usb_pd_policy.c
+++ b/baseboard/volteer/usb_pd_policy.c
@@ -8,11 +8,11 @@
 #include "compile_time_macros.h"
 #include "console.h"
 #include "gpio.h"
+#include "system.h"
 #include "usb_common.h"
 #include "usb_mux.h"
-#include "usbc_ppc.h"
 #include "usb_pd.h"
-#include "system.h"
+#include "usbc_ppc.h"
 
 #define CPRINTF(format, args...) cprintf(CC_USBPD, format, ##args)
 #define CPRINTS(format, args...) cprints(CC_USBPD, format, ##args)
diff --git a/baseboard/volteer/usbc_config.c b/baseboard/volteer/usbc_config.c
index 001f47e45f..1d1181ee41 100644
--- a/baseboard/volteer/usbc_config.c
+++ b/baseboard/volteer/usbc_config.c
@@ -5,21 +5,21 @@
 
 /* Volteer family-specific USB-C configuration */
 
-#include "common.h"
 #include "charge_manager.h"
 #include "charge_ramp.h"
 #include "charge_state.h"
+#include "common.h"
 #include "gpio.h"
 #include "task.h"
 #ifdef CONFIG_ZEPHYR
-#include "usbc_config.h"
 #include "baseboard_usbc_config.h"
+#include "usbc_config.h"
 #endif
-#include "usbc_ppc.h"
-#include "usb_pd.h"
+#include "driver/charger/isl9241_public.h"
 #include "usb_charge.h"
+#include "usb_pd.h"
+#include "usbc_ppc.h"
 #include "util.h"
-#include "driver/charger/isl9241_public.h"
 
 /******************************************************************************/
 void tcpc_alert_event(enum gpio_signal signal)
diff --git a/baseboard/zork/baseboard.c b/baseboard/zork/baseboard.c
index 593bcf1168..a9e4324aad 100644
--- a/baseboard/zork/baseboard.c
+++ b/baseboard/zork/baseboard.c
@@ -24,8 +24,8 @@
 #include "extpower.h"
 #include "gpio.h"
 #include "hooks.h"
-#include "ioexpander.h"
 #include "i2c.h"
+#include "ioexpander.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
 #include "motion_sense.h"
diff --git a/baseboard/zork/cbi_ec_fw_config.c b/baseboard/zork/cbi_ec_fw_config.c
index 4482a5cf40..555aeab9d7 100644
--- a/baseboard/zork/cbi_ec_fw_config.c
+++ b/baseboard/zork/cbi_ec_fw_config.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "common.h"
 #include "cbi_ec_fw_config.h"
+#include "common.h"
 #include "cros_board_info.h"
 
 /****************************************************************************