zephyr/program: Sort header files

Sort all headers in zephyr/test 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 -j$(nproc) buildall_only runtests
TEST=zmake compare-builds

Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: Ibd81df9a27fc0c934b4134106d6f09487439c245
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4039149
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Aaron Massey <aaronmassey@google.com>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>

87 files changed, 286 insertions, 293 deletions

diff --git a/zephyr/program/brya/battery_present.c b/zephyr/program/brya/battery_present.c
index c487a01f36..b2af448271 100644
--- a/zephyr/program/brya/battery_present.c
+++ b/zephyr/program/brya/battery_present.c
@@ -2,11 +2,11 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include <zephyr/drivers/gpio.h>
-
 #include "battery.h"
 #include "cbi.h"
 
+#include <zephyr/drivers/gpio.h>
+
 enum battery_present battery_hw_present(void)
 {
 	const struct gpio_dt_spec *batt_pres;
diff --git a/zephyr/program/brya/kblight_hooks.c b/zephyr/program/brya/kblight_hooks.c
index d6d795f28e..8716537f5d 100644
--- a/zephyr/program/brya/kblight_hooks.c
+++ b/zephyr/program/brya/kblight_hooks.c
@@ -3,12 +3,14 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/drivers/gpio.h>
+#include "cbi.h"
+#include "hooks.h"
+
 #include <stdbool.h>
 
+#include <zephyr/drivers/gpio.h>
+
 #include <ap_power/ap_power.h>
-#include "cbi.h"
-#include "hooks.h"
 
 /* Enable/Disable keyboard backlight gpio */
 static inline void kbd_backlight_enable(bool enable)
diff --git a/zephyr/program/corsola/src/board.c b/zephyr/program/corsola/src/board.c
index 93a2443191..bd0ee739b5 100644
--- a/zephyr/program/corsola/src/board.c
+++ b/zephyr/program/corsola/src/board.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "baseboard_usbc_config.h"
 #include "console.h"
 #include "hooks.h"
 #include "typec_control.h"
@@ -11,8 +12,6 @@
 #include "usb_pd.h"
 #include "usbc_ppc.h"
 
-#include "baseboard_usbc_config.h"
-
 #define CPRINTS(format, args...) cprints(CC_USB, format, ##args)
 
 static void ccd_interrupt_deferred(void)
diff --git a/zephyr/program/corsola/src/board_chipset.c b/zephyr/program/corsola/src/board_chipset.c
index 54e96bc631..e534bfafcb 100644
--- a/zephyr/program/corsola/src/board_chipset.c
+++ b/zephyr/program/corsola/src/board_chipset.c
@@ -5,10 +5,12 @@
 
 /* Corsola baseboard-chipset specific configuration */
 
+#include "gpio.h"
+
+#include <zephyr/drivers/gpio.h>
 #include <zephyr/init.h>
+
 #include <ap_power/ap_power.h>
-#include <zephyr/drivers/gpio.h>
-#include "gpio.h"
 
 static void board_backlight_handler(struct ap_power_ev_callback *cb,
 				    struct ap_power_ev_data data)
diff --git a/zephyr/program/corsola/src/hibernate.c b/zephyr/program/corsola/src/hibernate.c
index 56c085e077..2b7ed9795d 100644
--- a/zephyr/program/corsola/src/hibernate.c
+++ b/zephyr/program/corsola/src/hibernate.c
@@ -2,12 +2,12 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include <zephyr/drivers/gpio.h>
-
 #include "charger.h"
 #include "driver/charger/isl923x_public.h"
 #include "system.h"
 
+#include <zephyr/drivers/gpio.h>
+
 /* Corsola board specific hibernate implementation */
 __override void board_hibernate(void)
 {
diff --git a/zephyr/program/corsola/src/kingler/board_steelix.c b/zephyr/program/corsola/src/kingler/board_steelix.c
index 8b88a6d7c7..b4faf5af0c 100644
--- a/zephyr/program/corsola/src/kingler/board_steelix.c
+++ b/zephyr/program/corsola/src/kingler/board_steelix.c
@@ -8,9 +8,6 @@
  * Steelix is convertible but Rusty is clamshell
  * so some functions should be disabled for clamshell.
  */
-#include <zephyr/logging/log.h>
-#include <zephyr/drivers/gpio.h>
-
 #include "accelgyro.h"
 #include "common.h"
 #include "cros_cbi.h"
@@ -22,6 +19,9 @@
 #include "motionsense_sensors.h"
 #include "tablet_mode.h"
 
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
+
 LOG_MODULE_REGISTER(board_init, LOG_LEVEL_ERR);
 
 static bool board_is_clamshell;
diff --git a/zephyr/program/corsola/src/kingler/i2c.c b/zephyr/program/corsola/src/kingler/i2c.c
index f2bbff3749..5bd8aef7d5 100644
--- a/zephyr/program/corsola/src/kingler/i2c.c
+++ b/zephyr/program/corsola/src/kingler/i2c.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "i2c/i2c.h"
 #include "i2c.h"
+#include "i2c/i2c.h"
 
 /* Kingler and Steelix board specific i2c implementation */
 
diff --git a/zephyr/program/corsola/src/kingler/led_steelix.c b/zephyr/program/corsola/src/kingler/led_steelix.c
index 87b76128e8..1188c4f95e 100644
--- a/zephyr/program/corsola/src/kingler/led_steelix.c
+++ b/zephyr/program/corsola/src/kingler/led_steelix.c
@@ -5,9 +5,6 @@
  * Battery LED control for Steelix
  */
 
-#include <zephyr/drivers/pwm.h>
-#include <zephyr/logging/log.h>
-
 #include "board_led.h"
 #include "common.h"
 #include "cros_cbi.h"
@@ -15,6 +12,9 @@
 #include "led_onoff_states.h"
 #include "util.h"
 
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/logging/log.h>
+
 LOG_MODULE_REGISTER(board_led, LOG_LEVEL_ERR);
 
 #define BOARD_LED_PWM_PERIOD_NS BOARD_LED_HZ_TO_PERIOD_NS(100)
diff --git a/zephyr/program/corsola/src/kingler/usb_pd_policy.c b/zephyr/program/corsola/src/kingler/usb_pd_policy.c
index 3de2857ad1..c9e26f6681 100644
--- a/zephyr/program/corsola/src/kingler/usb_pd_policy.c
+++ b/zephyr/program/corsola/src/kingler/usb_pd_policy.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "baseboard_usbc_config.h"
 #include "charge_manager.h"
 #include "console.h"
 #include "driver/ppc/rt1718s.h"
@@ -12,8 +13,6 @@
 #include "usbc_ppc.h"
 #include "util.h"
 
-#include "baseboard_usbc_config.h"
-
 #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ##args)
 #define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ##args)
 
diff --git a/zephyr/program/corsola/src/kingler/usbc_config.c b/zephyr/program/corsola/src/kingler/usbc_config.c
index 5b243bae93..2e05d3720e 100644
--- a/zephyr/program/corsola/src/kingler/usbc_config.c
+++ b/zephyr/program/corsola/src/kingler/usbc_config.c
@@ -10,6 +10,7 @@
 #undef __REQUIRE_ZEPHYR_GPIOS__
 #endif
 
+#include "baseboard_usbc_config.h"
 #include "charger.h"
 #include "console.h"
 #include "driver/bc12/pi3usb9201_public.h"
@@ -19,6 +20,7 @@
 #include "driver/tcpm/anx7447.h"
 #include "driver/tcpm/rt1718s.h"
 #include "driver/usb_mux/ps8743.h"
+#include "gpio.h"
 #include "gpio/gpio_int.h"
 #include "hooks.h"
 #include "timer.h"
@@ -26,12 +28,8 @@
 #include "usb_mux.h"
 #include "usb_pd_tcpm.h"
 #include "usbc_ppc.h"
-
-#include "baseboard_usbc_config.h"
 #include "variant_db_detection.h"
 
-#include "gpio.h"
-
 #define CPRINTS(format, args...) cprints(CC_USBPD, format, ##args)
 #define CPRINTF(format, args...) cprintf(CC_USBPD, format, ##args)
 
diff --git a/zephyr/program/corsola/src/krabby/charger_workaround.c b/zephyr/program/corsola/src/krabby/charger_workaround.c
index d7fd05cc00..be046a947b 100644
--- a/zephyr/program/corsola/src/krabby/charger_workaround.c
+++ b/zephyr/program/corsola/src/krabby/charger_workaround.c
@@ -3,14 +3,14 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/sys/util.h>
-
 #include "charger.h"
 #include "driver/charger/rt9490.h"
 #include "hooks.h"
 #include "i2c.h"
 #include "system.h"
 
+#include <zephyr/sys/util.h>
+
 /*
  * This workaround and the board id checks only apply to krabby and early
  * tentacruel devices.
diff --git a/zephyr/program/corsola/src/krabby/hooks.c b/zephyr/program/corsola/src/krabby/hooks.c
index 1eb4f600f2..2582998b9c 100644
--- a/zephyr/program/corsola/src/krabby/hooks.c
+++ b/zephyr/program/corsola/src/krabby/hooks.c
@@ -3,17 +3,18 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/init.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/drivers/pinctrl.h>
-
-#include <ap_power/ap_power.h>
 #include "charger.h"
 #include "driver/charger/rt9490.h"
 #include "extpower.h"
 #include "gpio.h"
 #include "hooks.h"
 
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/init.h>
+
+#include <ap_power/ap_power.h>
+
 #define I2C3_NODE DT_NODELABEL(i2c3)
 PINCTRL_DT_DEFINE(I2C3_NODE);
 
diff --git a/zephyr/program/corsola/src/krabby/i2c.c b/zephyr/program/corsola/src/krabby/i2c.c
index a83af77dbd..66b88b09b0 100644
--- a/zephyr/program/corsola/src/krabby/i2c.c
+++ b/zephyr/program/corsola/src/krabby/i2c.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "i2c/i2c.h"
 #include "i2c.h"
+#include "i2c/i2c.h"
 
 /* Krabby board specific i2c implementation */
 
diff --git a/zephyr/program/corsola/src/krabby/ppc_krabby.c b/zephyr/program/corsola/src/krabby/ppc_krabby.c
index d4f574a725..dbbfee57b5 100644
--- a/zephyr/program/corsola/src/krabby/ppc_krabby.c
+++ b/zephyr/program/corsola/src/krabby/ppc_krabby.c
@@ -6,9 +6,9 @@
 /* Krabby PPC/BC12 (RT1739) configuration */
 
 #include "baseboard_usbc_config.h"
-#include "gpio/gpio_int.h"
 #include "driver/ppc/rt1739.h"
 #include "driver/ppc/syv682x.h"
+#include "gpio/gpio_int.h"
 #include "hooks.h"
 #include "variant_db_detection.h"
 
diff --git a/zephyr/program/corsola/src/krabby/sensor_magikarp.c b/zephyr/program/corsola/src/krabby/sensor_magikarp.c
index 269bc26fae..48e6f6c23c 100644
--- a/zephyr/program/corsola/src/krabby/sensor_magikarp.c
+++ b/zephyr/program/corsola/src/krabby/sensor_magikarp.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "common.h"
 #include "accelgyro.h"
+#include "common.h"
 #include "cros_cbi.h"
 #include "driver/accelgyro_bmi323.h"
 #include "driver/accelgyro_icm42607.h"
diff --git a/zephyr/program/corsola/src/krabby/sensor_tentacruel.c b/zephyr/program/corsola/src/krabby/sensor_tentacruel.c
index 269bc26fae..48e6f6c23c 100644
--- a/zephyr/program/corsola/src/krabby/sensor_tentacruel.c
+++ b/zephyr/program/corsola/src/krabby/sensor_tentacruel.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "common.h"
 #include "accelgyro.h"
+#include "common.h"
 #include "cros_cbi.h"
 #include "driver/accelgyro_bmi323.h"
 #include "driver/accelgyro_icm42607.h"
diff --git a/zephyr/program/corsola/src/krabby/temp_tentacruel.c b/zephyr/program/corsola/src/krabby/temp_tentacruel.c
index 5d2c304f76..08d5204e28 100644
--- a/zephyr/program/corsola/src/krabby/temp_tentacruel.c
+++ b/zephyr/program/corsola/src/krabby/temp_tentacruel.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "charger.h"
 #include "charge_state.h"
+#include "charger.h"
 #include "common.h"
 #include "config.h"
 #include "console.h"
diff --git a/zephyr/program/corsola/src/krabby/usbc_config.c b/zephyr/program/corsola/src/krabby/usbc_config.c
index 8e03e8dbad..1307538922 100644
--- a/zephyr/program/corsola/src/krabby/usbc_config.c
+++ b/zephyr/program/corsola/src/krabby/usbc_config.c
@@ -14,7 +14,6 @@
 #include "i2c.h"
 #include "usb_pd.h"
 #include "usbc_ppc.h"
-
 #include "variant_db_detection.h"
 
 #define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ##args)
diff --git a/zephyr/program/corsola/src/usb_pd_policy.c b/zephyr/program/corsola/src/usb_pd_policy.c
index a885362c61..a5f3f11134 100644
--- a/zephyr/program/corsola/src/usb_pd_policy.c
+++ b/zephyr/program/corsola/src/usb_pd_policy.c
@@ -4,8 +4,9 @@
  */
 
 #include "atomic.h"
-#include "console.h"
+#include "baseboard_usbc_config.h"
 #include "chipset.h"
+#include "console.h"
 #include "hooks.h"
 #include "timer.h"
 #include "typec_control.h"
@@ -14,8 +15,6 @@
 #include "usb_pd.h"
 #include "usbc_ppc.h"
 
-#include "baseboard_usbc_config.h"
-
 #define CPRINTS(format, args...) cprints(CC_USBPD, format, ##args)
 #define CPRINTF(format, args...) cprintf(CC_USBPD, format, ##args)
 
diff --git a/zephyr/program/corsola/src/usbc_config.c b/zephyr/program/corsola/src/usbc_config.c
index 838f676694..c96f3b5e32 100644
--- a/zephyr/program/corsola/src/usbc_config.c
+++ b/zephyr/program/corsola/src/usbc_config.c
@@ -5,14 +5,11 @@
 
 /* Corsola baseboard-specific USB-C configuration */
 
-#include <zephyr/drivers/gpio.h>
-#include <ap_power/ap_power.h>
-
 #include "adc.h"
 #include "baseboard_usbc_config.h"
 #include "button.h"
-#include "charger.h"
 #include "charge_state_v2.h"
+#include "charger.h"
 #include "console.h"
 #include "ec_commands.h"
 #include "extpower.h"
@@ -20,13 +17,13 @@
 #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 "uart.h"
 #include "usb_charge.h"
 #include "usb_mux.h"
@@ -34,9 +31,12 @@
 #include "usb_tc_sm.h"
 #include "usbc/usb_muxes.h"
 #include "usbc_ppc.h"
-
 #include "variant_db_detection.h"
 
+#include <zephyr/drivers/gpio.h>
+
+#include <ap_power/ap_power.h>
+
 #define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ##args)
 #define CPRINTF(format, args...) cprintf(CC_SYSTEM, format, ##args)
 
diff --git a/zephyr/program/corsola/src/variant_db_detection.c b/zephyr/program/corsola/src/variant_db_detection.c
index f68d9c8fad..9ade144513 100644
--- a/zephyr/program/corsola/src/variant_db_detection.c
+++ b/zephyr/program/corsola/src/variant_db_detection.c
@@ -4,17 +4,16 @@
  */
 
 /* Corsola daughter board detection */
-#include <zephyr/drivers/gpio.h>
-
 #include "baseboard_usbc_config.h"
 #include "console.h"
 #include "cros_cbi.h"
 #include "gpio/gpio_int.h"
 #include "hooks.h"
 #include "usb_mux.h"
-
 #include "variant_db_detection.h"
 
+#include <zephyr/drivers/gpio.h>
+
 #define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ##args)
 #define CPRINTF(format, args...) cprintf(CC_SYSTEM, format, ##args)
 
diff --git a/zephyr/program/herobrine/herobrine/src/alt_dev_replacement.c b/zephyr/program/herobrine/herobrine/src/alt_dev_replacement.c
index 00acd509f4..e1e9250ec4 100644
--- a/zephyr/program/herobrine/herobrine/src/alt_dev_replacement.c
+++ b/zephyr/program/herobrine/herobrine/src/alt_dev_replacement.c
@@ -2,10 +2,11 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include <zephyr/logging/log.h>
-#include "usbc/ppc.h"
-#include "hooks.h"
 #include "cros_board_info.h"
+#include "hooks.h"
+#include "usbc/ppc.h"
+
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(alt_dev_replacement);
 
diff --git a/zephyr/program/herobrine/src/board_chipset.c b/zephyr/program/herobrine/src/board_chipset.c
index 2312bdb1c4..dece9708ff 100644
--- a/zephyr/program/herobrine/src/board_chipset.c
+++ b/zephyr/program/herobrine/src/board_chipset.c
@@ -5,17 +5,16 @@
 
 /* Herobrine chipset-specific configuration */
 
+#include "battery.h"
+#include "board_chipset.h"
 #include "charger.h"
 #include "common.h"
 #include "console.h"
-#include "battery.h"
 #include "gpio.h"
 #include "hooks.h"
 #include "timer.h"
 #include "usb_pd.h"
 
-#include "board_chipset.h"
-
 #define CPRINTS(format, args...) cprints(CC_HOOK, format, ##args)
 #define CPRINTF(format, args...) cprintf(CC_HOOK, format, ##args)
 
diff --git a/zephyr/program/herobrine/src/i2c.c b/zephyr/program/herobrine/src/i2c.c
index 88b722c42d..8cf2cfc232 100644
--- a/zephyr/program/herobrine/src/i2c.c
+++ b/zephyr/program/herobrine/src/i2c.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "i2c/i2c.h"
 #include "i2c.h"
+#include "i2c/i2c.h"
 
 /* Herobrine-NPCX9 board specific i2c implementation */
 
diff --git a/zephyr/program/herobrine/src/usb_pd_policy.c b/zephyr/program/herobrine/src/usb_pd_policy.c
index adc517d3cb..ad34f3b6e4 100644
--- a/zephyr/program/herobrine/src/usb_pd_policy.c
+++ b/zephyr/program/herobrine/src/usb_pd_policy.c
@@ -3,8 +3,6 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/drivers/gpio.h>
-
 #include "charge_manager.h"
 #include "chipset.h"
 #include "console.h"
@@ -13,6 +11,8 @@
 #include "usbc_ppc.h"
 #include "util.h"
 
+#include <zephyr/drivers/gpio.h>
+
 #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ##args)
 #define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ##args)
 
diff --git a/zephyr/program/herobrine/src/usbc_config.c b/zephyr/program/herobrine/src/usbc_config.c
index 1c0ab8205b..e757e3f2e1 100644
--- a/zephyr/program/herobrine/src/usbc_config.c
+++ b/zephyr/program/herobrine/src/usbc_config.c
@@ -5,12 +5,10 @@
 
 /* Herobrine board-specific USB-C configuration */
 
-#include <zephyr/drivers/gpio.h>
-
-#include "charger.h"
-#include "charger/isl923x_public.h"
 #include "charge_manager.h"
 #include "charge_state.h"
+#include "charger.h"
+#include "charger/isl923x_public.h"
 #include "common.h"
 #include "config.h"
 #include "cros_board_info.h"
@@ -22,11 +20,13 @@
 #include "tcpm/ps8xxx_public.h"
 #include "tcpm/tcpci.h"
 #include "timer.h"
-#include "usb_pd.h"
 #include "usb_mux.h"
+#include "usb_pd.h"
+#include "usbc/ppc.h"
 #include "usbc_ocp.h"
 #include "usbc_ppc.h"
-#include "usbc/ppc.h"
+
+#include <zephyr/drivers/gpio.h>
 
 #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ##args)
 #define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ##args)
diff --git a/zephyr/program/intelrvp/adlrvp/src/adlrvp.c b/zephyr/program/intelrvp/adlrvp/src/adlrvp.c
index ce5196c60d..d7d192b1af 100644
--- a/zephyr/program/intelrvp/adlrvp/src/adlrvp.c
+++ b/zephyr/program/intelrvp/adlrvp/src/adlrvp.c
@@ -4,19 +4,19 @@
  */
 
 /* TODO: b/218904113: Convert to using Zephyr GPIOs */
-#include "gpio_signal.h"
 #include "adlrvp_zephyr.h"
-#include "common.h"
-#include "console.h"
-#include "intelrvp.h"
-#include "intel_rvp_board_id.h"
-#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 "console.h"
 #include "driver/retimer/bb_retimer_public.h"
 #include "extpower.h"
+#include "gpio_signal.h"
 #include "hooks.h"
+#include "intel_rvp_board_id.h"
+#include "intelrvp.h"
 #include "ioexpander.h"
 #include "isl9241.h"
 #include "power/icelake.h"
diff --git a/zephyr/program/intelrvp/mtlrvp/src/board_power.c b/zephyr/program/intelrvp/mtlrvp/src/board_power.c
index 301402bf0f..e35450b8b5 100644
--- a/zephyr/program/intelrvp/mtlrvp/src/board_power.c
+++ b/zephyr/program/intelrvp/mtlrvp/src/board_power.c
@@ -3,9 +3,12 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/sys/atomic.h>
-#include <zephyr/logging/log.h>
+#include "gpio/gpio.h"
+#include "gpio_signal.h"
+
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/atomic.h>
 
 #include <ap_power/ap_power.h>
 #include <ap_power/ap_power_events.h>
@@ -14,9 +17,6 @@
 #include <power_signals.h>
 #include <x86_power_signals.h>
 
-#include "gpio_signal.h"
-#include "gpio/gpio.h"
-
 LOG_MODULE_DECLARE(ap_pwrseq, LOG_LEVEL_INF);
 
 #if CONFIG_X86_NON_DSX_PWRSEQ_MTL
diff --git a/zephyr/program/intelrvp/mtlrvp/src/mtlrvp.c b/zephyr/program/intelrvp/mtlrvp/src/mtlrvp.c
index 9d96a08712..d6bd0f85b7 100644
--- a/zephyr/program/intelrvp/mtlrvp/src/mtlrvp.c
+++ b/zephyr/program/intelrvp/mtlrvp/src/mtlrvp.c
@@ -17,8 +17,8 @@
 #include "gpio/gpio_int.h"
 #include "hooks.h"
 #include "i2c.h"
-#include "intelrvp.h"
 #include "intel_rvp_board_id.h"
+#include "intelrvp.h"
 #include "ioexpander.h"
 #include "isl9241.h"
 #include "keyboard_raw.h"
diff --git a/zephyr/program/intelrvp/src/intel_rvp_board_id.c b/zephyr/program/intelrvp/src/intel_rvp_board_id.c
index 77d4e93afd..7062cb74b9 100644
--- a/zephyr/program/intelrvp/src/intel_rvp_board_id.c
+++ b/zephyr/program/intelrvp/src/intel_rvp_board_id.c
@@ -3,9 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
 #include "intel_rvp_board_id.h"
 
+#include <zephyr/devicetree.h>
+
 #define DT_DRV_COMPAT intel_rvp_board_id
 
 BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) <= 1,
diff --git a/zephyr/program/it8xxx2_evb/include/i2c_map.h b/zephyr/program/it8xxx2_evb/include/i2c_map.h
index e83a238d3a..a6878e8bae 100644
--- a/zephyr/program/it8xxx2_evb/include/i2c_map.h
+++ b/zephyr/program/it8xxx2_evb/include/i2c_map.h
@@ -6,10 +6,10 @@
 #ifndef __ZEPHYR_CHROME_I2C_MAP_H
 #define __ZEPHYR_CHROME_I2C_MAP_H
 
-#include <zephyr/devicetree.h>
-
 #include "config.h"
 
+#include <zephyr/devicetree.h>
+
 /* We need registers.h to get the chip specific defines for now */
 #include "i2c/i2c.h"
 
diff --git a/zephyr/program/nissa/craask/src/charger.c b/zephyr/program/nissa/craask/src/charger.c
index d4723e4a0a..3984045a19 100644
--- a/zephyr/program/nissa/craask/src/charger.c
+++ b/zephyr/program/nissa/craask/src/charger.c
@@ -3,15 +3,15 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/logging/log.h>
-
 #include "battery.h"
 #include "charger.h"
 #include "charger/isl923x_public.h"
 #include "console.h"
 #include "extpower.h"
-#include "usb_pd.h"
 #include "nissa_common.h"
+#include "usb_pd.h"
+
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/nissa/craask/src/form_factor.c b/zephyr/program/nissa/craask/src/form_factor.c
index 9f3267ab3d..56d0c50f73 100644
--- a/zephyr/program/nissa/craask/src/form_factor.c
+++ b/zephyr/program/nissa/craask/src/form_factor.c
@@ -3,9 +3,6 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/logging/log.h>
-
 #include "accelgyro.h"
 #include "button.h"
 #include "cros_board_info.h"
@@ -16,11 +13,13 @@
 #include "driver/accelgyro_lsm6dso.h"
 #include "gpio/gpio_int.h"
 #include "hooks.h"
-#include "motionsense_sensors.h"
 #include "motion_sense.h"
+#include "motionsense_sensors.h"
+#include "nissa_common.h"
 #include "tablet_mode.h"
 
-#include "nissa_common.h"
+#include <zephyr/devicetree.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/nissa/craask/src/usbc.c b/zephyr/program/nissa/craask/src/usbc.c
index a15460a212..a32cc41331 100644
--- a/zephyr/program/nissa/craask/src/usbc.c
+++ b/zephyr/program/nissa/craask/src/usbc.c
@@ -3,19 +3,18 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/logging/log.h>
-
 #include "charge_state_v2.h"
 #include "chipset.h"
-#include "hooks.h"
-#include "usb_mux.h"
-#include "system.h"
 #include "driver/charger/isl923x_public.h"
 #include "driver/retimer/anx7483_public.h"
-#include "driver/tcpm/tcpci.h"
 #include "driver/tcpm/raa489000.h"
-
+#include "driver/tcpm/tcpci.h"
+#include "hooks.h"
 #include "nissa_common.h"
+#include "system.h"
+#include "usb_mux.h"
+
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/nissa/joxer/src/charger.c b/zephyr/program/nissa/joxer/src/charger.c
index b9454d8b80..4bb7de7ecb 100644
--- a/zephyr/program/nissa/joxer/src/charger.c
+++ b/zephyr/program/nissa/joxer/src/charger.c
@@ -3,15 +3,15 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/logging/log.h>
-
 #include "battery.h"
 #include "charger.h"
 #include "console.h"
 #include "driver/charger/sm5803.h"
 #include "extpower.h"
-#include "usb_pd.h"
 #include "nissa_common.h"
+#include "usb_pd.h"
+
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/nissa/joxer/src/fan.c b/zephyr/program/nissa/joxer/src/fan.c
index 6d234b2fc3..82be341da5 100644
--- a/zephyr/program/nissa/joxer/src/fan.c
+++ b/zephyr/program/nissa/joxer/src/fan.c
@@ -3,17 +3,16 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/logging/log.h>
-
 #include "cros_cbi.h"
 #include "fan.h"
 #include "gpio/gpio.h"
 #include "hooks.h"
-
 #include "nissa_common.h"
 
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
+
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
 /*
diff --git a/zephyr/program/nissa/joxer/src/keyboard.c b/zephyr/program/nissa/joxer/src/keyboard.c
index 48db40f53f..e9e20194f0 100644
--- a/zephyr/program/nissa/joxer/src/keyboard.c
+++ b/zephyr/program/nissa/joxer/src/keyboard.c
@@ -3,10 +3,6 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/logging/log.h>
-
 #include "cros_cbi.h"
 #include "ec_commands.h"
 #include "gpio/gpio.h"
@@ -14,6 +10,10 @@
 #include "keyboard_8042_sharedlib.h"
 #include "nissa_common.h"
 
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
+
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
 static const struct ec_response_keybd_config joxer_kb_legacy = {
diff --git a/zephyr/program/nissa/joxer/src/led.c b/zephyr/program/nissa/joxer/src/led.c
index d66e5b27a6..c617ee9507 100644
--- a/zephyr/program/nissa/joxer/src/led.c
+++ b/zephyr/program/nissa/joxer/src/led.c
@@ -4,8 +4,6 @@
  *
  * Battery LED control for nissa
  */
-#include <stdint.h>
-
 #include "charge_manager.h"
 #include "common.h"
 #include "compile_time_macros.h"
@@ -16,6 +14,8 @@
 #include "pwm.h"
 #include "util.h"
 
+#include <stdint.h>
+
 #define BAT_LED_ON_LVL 0
 #define BAT_LED_OFF_LVL 1
 
diff --git a/zephyr/program/nissa/joxer/src/usbc.c b/zephyr/program/nissa/joxer/src/usbc.c
index 5fec9ab544..8c81d596dc 100644
--- a/zephyr/program/nissa/joxer/src/usbc.c
+++ b/zephyr/program/nissa/joxer/src/usbc.c
@@ -3,20 +3,20 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/logging/log.h>
-#include <ap_power/ap_power.h>
-
 #include "charge_state_v2.h"
 #include "chipset.h"
-#include "hooks.h"
-#include "usb_mux.h"
-#include "system.h"
 #include "driver/charger/sm5803.h"
 #include "driver/tcpm/it83xx_pd.h"
 #include "driver/tcpm/ps8xxx_public.h"
 #include "driver/tcpm/tcpci.h"
-
+#include "hooks.h"
 #include "nissa_common.h"
+#include "system.h"
+#include "usb_mux.h"
+
+#include <zephyr/logging/log.h>
+
+#include <ap_power/ap_power.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/nissa/nereid/src/charger.c b/zephyr/program/nissa/nereid/src/charger.c
index 181e9a61fd..dc4eda9291 100644
--- a/zephyr/program/nissa/nereid/src/charger.c
+++ b/zephyr/program/nissa/nereid/src/charger.c
@@ -3,15 +3,15 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/logging/log.h>
-
 #include "battery.h"
 #include "charger.h"
 #include "console.h"
 #include "driver/charger/sm5803.h"
 #include "extpower.h"
-#include "usb_pd.h"
 #include "nissa_common.h"
+#include "usb_pd.h"
+
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/nissa/nereid/src/hdmi.c b/zephyr/program/nissa/nereid/src/hdmi.c
index 7e5708c6eb..5025472c6d 100644
--- a/zephyr/program/nissa/nereid/src/hdmi.c
+++ b/zephyr/program/nissa/nereid/src/hdmi.c
@@ -3,9 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include <cros_board_info.h>
 #include "nissa_hdmi.h"
 
+#include <cros_board_info.h>
+
 __override void nissa_configure_hdmi_power_gpios(void)
 {
 	/*
diff --git a/zephyr/program/nissa/nereid/src/usbc.c b/zephyr/program/nissa/nereid/src/usbc.c
index 48f7cfd9cb..01e48e79e0 100644
--- a/zephyr/program/nissa/nereid/src/usbc.c
+++ b/zephyr/program/nissa/nereid/src/usbc.c
@@ -3,20 +3,20 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/logging/log.h>
-#include <ap_power/ap_power.h>
-
 #include "charge_state_v2.h"
 #include "chipset.h"
-#include "hooks.h"
-#include "usb_mux.h"
-#include "system.h"
 #include "driver/charger/sm5803.h"
 #include "driver/tcpm/it83xx_pd.h"
 #include "driver/tcpm/ps8xxx_public.h"
 #include "driver/tcpm/tcpci.h"
-
+#include "hooks.h"
 #include "nissa_common.h"
+#include "system.h"
+#include "usb_mux.h"
+
+#include <zephyr/logging/log.h>
+
+#include <ap_power/ap_power.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/nissa/nivviks/src/charger.c b/zephyr/program/nissa/nivviks/src/charger.c
index e2f9f966e7..234bcbbd55 100644
--- a/zephyr/program/nissa/nivviks/src/charger.c
+++ b/zephyr/program/nissa/nivviks/src/charger.c
@@ -3,15 +3,15 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/logging/log.h>
-
 #include "battery.h"
 #include "charger.h"
 #include "charger/isl923x_public.h"
 #include "console.h"
 #include "extpower.h"
-#include "usb_pd.h"
 #include "nissa_common.h"
+#include "usb_pd.h"
+
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/nissa/nivviks/src/fan.c b/zephyr/program/nissa/nivviks/src/fan.c
index 840049722c..3111a70e03 100644
--- a/zephyr/program/nissa/nivviks/src/fan.c
+++ b/zephyr/program/nissa/nivviks/src/fan.c
@@ -3,17 +3,16 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/logging/log.h>
-
 #include "cros_cbi.h"
 #include "fan.h"
 #include "gpio/gpio.h"
 #include "hooks.h"
-
 #include "nissa_common.h"
 
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
+
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
 /*
diff --git a/zephyr/program/nissa/nivviks/src/form_factor.c b/zephyr/program/nissa/nivviks/src/form_factor.c
index 602b22baff..08dfa5c04b 100644
--- a/zephyr/program/nissa/nivviks/src/form_factor.c
+++ b/zephyr/program/nissa/nivviks/src/form_factor.c
@@ -3,16 +3,15 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/logging/log.h>
-
 #include "accelgyro.h"
 #include "cros_cbi.h"
 #include "hooks.h"
 #include "motionsense_sensors.h"
-
 #include "nissa_common.h"
 
+#include <zephyr/devicetree.h>
+#include <zephyr/logging/log.h>
+
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
 /*
diff --git a/zephyr/program/nissa/nivviks/src/usbc.c b/zephyr/program/nissa/nivviks/src/usbc.c
index 14fc5a071d..5b0eed5aea 100644
--- a/zephyr/program/nissa/nivviks/src/usbc.c
+++ b/zephyr/program/nissa/nivviks/src/usbc.c
@@ -3,19 +3,18 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/logging/log.h>
-
 #include "charge_state_v2.h"
 #include "chipset.h"
-#include "hooks.h"
-#include "usb_mux.h"
-#include "system.h"
 #include "driver/charger/isl923x_public.h"
 #include "driver/retimer/anx7483_public.h"
-#include "driver/tcpm/tcpci.h"
 #include "driver/tcpm/raa489000.h"
-
+#include "driver/tcpm/tcpci.h"
+#include "hooks.h"
 #include "nissa_common.h"
+#include "system.h"
+#include "usb_mux.h"
+
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/nissa/pujjo/src/charger.c b/zephyr/program/nissa/pujjo/src/charger.c
index f1f1d57790..8763f24793 100644
--- a/zephyr/program/nissa/pujjo/src/charger.c
+++ b/zephyr/program/nissa/pujjo/src/charger.c
@@ -3,18 +3,18 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/logging/log.h>
-
 #include "battery.h"
 #include "charger.h"
 #include "charger/isl923x_public.h"
-#include "driver/tcpm/raa489000.h"
-#include "driver/charger/isl923x.h"
 #include "console.h"
+#include "driver/charger/isl923x.h"
+#include "driver/tcpm/raa489000.h"
 #include "extpower.h"
-#include "usb_pd.h"
-#include "nissa_common.h"
 #include "hooks.h"
+#include "nissa_common.h"
+#include "usb_pd.h"
+
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/nissa/pujjo/src/fan.c b/zephyr/program/nissa/pujjo/src/fan.c
index 97323a7edf..8b8634a653 100644
--- a/zephyr/program/nissa/pujjo/src/fan.c
+++ b/zephyr/program/nissa/pujjo/src/fan.c
@@ -3,17 +3,16 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/logging/log.h>
-
 #include "cros_cbi.h"
 #include "fan.h"
 #include "gpio/gpio.h"
 #include "hooks.h"
-
 #include "nissa_common.h"
 
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
+
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
 /*
diff --git a/zephyr/program/nissa/pujjo/src/form_factor.c b/zephyr/program/nissa/pujjo/src/form_factor.c
index 1b096e8fa4..f160c88d78 100644
--- a/zephyr/program/nissa/pujjo/src/form_factor.c
+++ b/zephyr/program/nissa/pujjo/src/form_factor.c
@@ -3,9 +3,6 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/logging/log.h>
-
 #include "accelgyro.h"
 #include "button.h"
 #include "cros_board_info.h"
@@ -16,11 +13,13 @@
 #include "driver/accelgyro_lsm6dsm.h"
 #include "gpio/gpio_int.h"
 #include "hooks.h"
-#include "motionsense_sensors.h"
 #include "motion_sense.h"
+#include "motionsense_sensors.h"
+#include "nissa_common.h"
 #include "tablet_mode.h"
 
-#include "nissa_common.h"
+#include <zephyr/devicetree.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/nissa/pujjo/src/led.c b/zephyr/program/nissa/pujjo/src/led.c
index bd04af5a25..4d859f2764 100644
--- a/zephyr/program/nissa/pujjo/src/led.c
+++ b/zephyr/program/nissa/pujjo/src/led.c
@@ -10,9 +10,9 @@
  */
 
 #include "common.h"
-#include "led_onoff_states.h"
-#include "led_common.h"
 #include "gpio.h"
+#include "led_common.h"
+#include "led_onoff_states.h"
 
 #define CPRINTS(format, args...) cprints(CC_CHARGER, format, ##args)
 #define CPRINTF(format, args...) cprintf(CC_CHARGER, format, ##args)
diff --git a/zephyr/program/nissa/pujjo/src/usbc.c b/zephyr/program/nissa/pujjo/src/usbc.c
index 5d3d94c243..b56e36049c 100644
--- a/zephyr/program/nissa/pujjo/src/usbc.c
+++ b/zephyr/program/nissa/pujjo/src/usbc.c
@@ -3,19 +3,18 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/logging/log.h>
-
 #include "charge_state_v2.h"
 #include "chipset.h"
-#include "hooks.h"
-#include "usb_mux.h"
-#include "system.h"
 #include "driver/charger/isl923x_public.h"
 #include "driver/retimer/anx7483_public.h"
-#include "driver/tcpm/tcpci.h"
 #include "driver/tcpm/raa489000.h"
-
+#include "driver/tcpm/tcpci.h"
+#include "hooks.h"
 #include "nissa_common.h"
+#include "system.h"
+#include "usb_mux.h"
+
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/nissa/src/board_power.c b/zephyr/program/nissa/src/board_power.c
index d7fb4aeffe..858076686b 100644
--- a/zephyr/program/nissa/src/board_power.c
+++ b/zephyr/program/nissa/src/board_power.c
@@ -3,9 +3,12 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/sys/atomic.h>
-#include <zephyr/logging/log.h>
+#include "gpio/gpio.h"
+#include "gpio_signal.h"
+
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/atomic.h>
 
 #include <ap_power/ap_power.h>
 #include <ap_power/ap_power_events.h>
@@ -14,9 +17,6 @@
 #include <power_signals.h>
 #include <x86_power_signals.h>
 
-#include "gpio_signal.h"
-#include "gpio/gpio.h"
-
 LOG_MODULE_DECLARE(ap_pwrseq, LOG_LEVEL_INF);
 
 #define X86_NON_DSX_ADLP_NONPWRSEQ_FORCE_SHUTDOWN_TO_MS 5
diff --git a/zephyr/program/nissa/src/common.c b/zephyr/program/nissa/src/common.c
index 4f27d1d84f..bfcbabcbaa 100644
--- a/zephyr/program/nissa/src/common.c
+++ b/zephyr/program/nissa/src/common.c
@@ -3,21 +3,20 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/device.h>
-#include <ap_power/ap_power.h>
-
 #include "battery.h"
-#include "charger.h"
 #include "charge_state_v2.h"
+#include "charger.h"
 #include "chipset.h"
 #include "cros_cbi.h"
 #include "hooks.h"
-#include "usb_mux.h"
-#include "system.h"
-
 #include "nissa_common.h"
+#include "system.h"
+#include "usb_mux.h"
 
+#include <zephyr/device.h>
 #include <zephyr/logging/log.h>
+
+#include <ap_power/ap_power.h>
 LOG_MODULE_REGISTER(nissa, CONFIG_NISSA_LOG_LEVEL);
 
 static uint8_t cached_usb_pd_port_count;
diff --git a/zephyr/program/nissa/src/sub_board.c b/zephyr/program/nissa/src/sub_board.c
index f50c0bdca8..830e361ac1 100644
--- a/zephyr/program/nissa/src/sub_board.c
+++ b/zephyr/program/nissa/src/sub_board.c
@@ -5,24 +5,24 @@
 
 /* Nissa sub-board hardware configuration */
 
-#include <ap_power/ap_power.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/drivers/pinctrl.h>
-#include <zephyr/init.h>
-#include <zephyr/kernel.h>
-#include <zephyr/sys/printk.h>
-
 #include "cros_board_info.h"
 #include "driver/tcpm/tcpci.h"
 #include "gpio/gpio_int.h"
 #include "hooks.h"
+#include "nissa_common.h"
+#include "nissa_hdmi.h"
+#include "task.h"
 #include "usb_charge.h"
 #include "usb_pd.h"
 #include "usbc/usb_muxes.h"
-#include "task.h"
 
-#include "nissa_common.h"
-#include "nissa_hdmi.h"
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
+
+#include <ap_power/ap_power.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/nissa/xivu/src/charger.c b/zephyr/program/nissa/xivu/src/charger.c
index 5021a55758..a3d9d16443 100644
--- a/zephyr/program/nissa/xivu/src/charger.c
+++ b/zephyr/program/nissa/xivu/src/charger.c
@@ -3,15 +3,15 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/logging/log.h>
-
 #include "battery.h"
 #include "charger.h"
 #include "charger/isl923x_public.h"
 #include "console.h"
 #include "extpower.h"
-#include "usb_pd.h"
 #include "nissa_common.h"
+#include "usb_pd.h"
+
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/nissa/xivu/src/usbc.c b/zephyr/program/nissa/xivu/src/usbc.c
index 773ffc0e9c..54a9244ecc 100644
--- a/zephyr/program/nissa/xivu/src/usbc.c
+++ b/zephyr/program/nissa/xivu/src/usbc.c
@@ -3,19 +3,19 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/logging/log.h>
-
 #include "charge_state_v2.h"
 #include "chipset.h"
-#include "hooks.h"
-#include "usb_mux.h"
-#include "system.h"
 #include "driver/charger/isl923x_public.h"
 #include "driver/retimer/anx7483_public.h"
-#include "driver/tcpm/tcpci.h"
 #include "driver/tcpm/raa489000.h"
-#include "temp_sensor/temp_sensor.h"
+#include "driver/tcpm/tcpci.h"
+#include "hooks.h"
 #include "nissa_common.h"
+#include "system.h"
+#include "temp_sensor/temp_sensor.h"
+#include "usb_mux.h"
+
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/nissa/yaviks/src/charger.c b/zephyr/program/nissa/yaviks/src/charger.c
index 9be2e685b0..ec2247f4b4 100644
--- a/zephyr/program/nissa/yaviks/src/charger.c
+++ b/zephyr/program/nissa/yaviks/src/charger.c
@@ -3,16 +3,16 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/logging/log.h>
-
 #include "battery.h"
+#include "battery_fuel_gauge.h"
 #include "charger.h"
 #include "console.h"
 #include "driver/charger/sm5803.h"
 #include "extpower.h"
-#include "usb_pd.h"
 #include "nissa_common.h"
-#include "battery_fuel_gauge.h"
+#include "usb_pd.h"
+
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/nissa/yaviks/src/fan.c b/zephyr/program/nissa/yaviks/src/fan.c
index 23c3ec1143..c01ee3d752 100644
--- a/zephyr/program/nissa/yaviks/src/fan.c
+++ b/zephyr/program/nissa/yaviks/src/fan.c
@@ -2,14 +2,15 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include <zephyr/devicetree.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/logging/log.h>
 #include "cros_cbi.h"
 #include "fan.h"
 #include "gpio/gpio.h"
 #include "hooks.h"
 #include "nissa_common.h"
+
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
 static void fan_init(void)
diff --git a/zephyr/program/nissa/yaviks/src/keyboard.c b/zephyr/program/nissa/yaviks/src/keyboard.c
index 46d6083dbf..54f8750e98 100644
--- a/zephyr/program/nissa/yaviks/src/keyboard.c
+++ b/zephyr/program/nissa/yaviks/src/keyboard.c
@@ -2,8 +2,6 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include <zephyr/logging/log.h>
-
 #include "cros_cbi.h"
 #include "ec_commands.h"
 #include "hooks.h"
@@ -11,6 +9,8 @@
 #include "keyboard_scan.h"
 #include "timer.h"
 
+#include <zephyr/logging/log.h>
+
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
 /* Keyboard scan setting */
diff --git a/zephyr/program/nissa/yaviks/src/led.c b/zephyr/program/nissa/yaviks/src/led.c
index 88a476f1b0..7671bd3a92 100644
--- a/zephyr/program/nissa/yaviks/src/led.c
+++ b/zephyr/program/nissa/yaviks/src/led.c
@@ -3,17 +3,17 @@
  * found in the LICENSE file.
  */
 
-#include <stdint.h>
-
 #include "battery.h"
 #include "charge_manager.h"
 #include "charge_state.h"
 #include "chipset.h"
 #include "ec_commands.h"
 #include "gpio.h"
+#include "hooks.h"
 #include "host_command.h"
 #include "led_common.h"
-#include "hooks.h"
+
+#include <stdint.h>
 
 #define BAT_LED_ON 0
 #define BAT_LED_OFF 1
diff --git a/zephyr/program/nissa/yaviks/src/thermal.c b/zephyr/program/nissa/yaviks/src/thermal.c
index 43b30f0497..4522f8bd09 100644
--- a/zephyr/program/nissa/yaviks/src/thermal.c
+++ b/zephyr/program/nissa/yaviks/src/thermal.c
@@ -3,13 +3,14 @@
  * found in the LICENSE file.
  */
 
-#include <ap_power/ap_power_interface.h>
 #include "common.h"
 #include "fan.h"
 #include "temp_sensor/temp_sensor.h"
 #include "thermal.h"
 #include "util.h"
 
+#include <ap_power/ap_power_interface.h>
+
 #define TEMP_CPU TEMP_SENSOR_ID(DT_NODELABEL(temp_cpu))
 #define TEMP_5V TEMP_SENSOR_ID(DT_NODELABEL(temp_5v_regulator))
 #define TEMP_CHARGER TEMP_SENSOR_ID(DT_NODELABEL(temp_charger))
diff --git a/zephyr/program/nissa/yaviks/src/usbc.c b/zephyr/program/nissa/yaviks/src/usbc.c
index 48f7cfd9cb..01e48e79e0 100644
--- a/zephyr/program/nissa/yaviks/src/usbc.c
+++ b/zephyr/program/nissa/yaviks/src/usbc.c
@@ -3,20 +3,20 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/logging/log.h>
-#include <ap_power/ap_power.h>
-
 #include "charge_state_v2.h"
 #include "chipset.h"
-#include "hooks.h"
-#include "usb_mux.h"
-#include "system.h"
 #include "driver/charger/sm5803.h"
 #include "driver/tcpm/it83xx_pd.h"
 #include "driver/tcpm/ps8xxx_public.h"
 #include "driver/tcpm/tcpci.h"
-
+#include "hooks.h"
 #include "nissa_common.h"
+#include "system.h"
+#include "usb_mux.h"
+
+#include <zephyr/logging/log.h>
+
+#include <ap_power/ap_power.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/rex/src/board_power.c b/zephyr/program/rex/src/board_power.c
index c7f12d024e..655edaa452 100644
--- a/zephyr/program/rex/src/board_power.c
+++ b/zephyr/program/rex/src/board_power.c
@@ -3,8 +3,11 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/logging/log.h>
+#include "gpio/gpio.h"
+#include "gpio_signal.h"
+
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #include <ap_power/ap_power.h>
 #include <ap_power/ap_power_events.h>
@@ -13,9 +16,6 @@
 #include <power_signals.h>
 #include <x86_power_signals.h>
 
-#include "gpio_signal.h"
-#include "gpio/gpio.h"
-
 LOG_MODULE_DECLARE(ap_pwrseq, LOG_LEVEL_INF);
 
 #if CONFIG_X86_NON_DSX_PWRSEQ_MTL
diff --git a/zephyr/program/rex/src/usb_pd_policy.c b/zephyr/program/rex/src/usb_pd_policy.c
index 7e9876f9c1..7c78c4ebae 100644
--- a/zephyr/program/rex/src/usb_pd_policy.c
+++ b/zephyr/program/rex/src/usb_pd_policy.c
@@ -5,8 +5,6 @@
 
 /* Shared USB-C policy for Rex boards */
 
-#include <zephyr/drivers/gpio.h>
-
 #include "charge_manager.h"
 #include "chipset.h"
 #include "common.h"
@@ -20,6 +18,8 @@
 #include "usbc_ppc.h"
 #include "util.h"
 
+#include <zephyr/drivers/gpio.h>
+
 int pd_check_vconn_swap(int port)
 {
 	/* Allow VCONN swaps if the AP is on. */
diff --git a/zephyr/program/rex/src/usbc_config.c b/zephyr/program/rex/src/usbc_config.c
index 66f3a1f45d..6f09887eed 100644
--- a/zephyr/program/rex/src/usbc_config.c
+++ b/zephyr/program/rex/src/usbc_config.c
@@ -3,16 +3,14 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/drivers/gpio.h>
-
 #include "battery_fuel_gauge.h"
-#include "charger.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 "driver/charger/isl9241.h"
+#include "driver/ppc/nx20p348x.h"
 #include "driver/retimer/bb_retimer_public.h"
 #include "driver/tcpm/nct38xx.h"
 #include "driver/tcpm/ps8xxx_public.h"
@@ -21,13 +19,14 @@
 #include "hooks.h"
 #include "i2c.h"
 #include "ioexpander.h"
-#include "driver/ppc/nx20p348x.h"
 #include "ppc/syv682x_public.h"
 #include "system.h"
 #include "task.h"
 #include "usb_mux.h"
 #include "usbc_ppc.h"
 
+#include <zephyr/drivers/gpio.h>
+
 #define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ##args)
 #define CPRINTFUSB(format, args...) cprintf(CC_USBCHARGE, format, ##args)
 
diff --git a/zephyr/program/skyrim/src/frostflow/keyboard_customization.c b/zephyr/program/skyrim/src/frostflow/keyboard_customization.c
index d176323d80..bd02940e03 100644
--- a/zephyr/program/skyrim/src/frostflow/keyboard_customization.c
+++ b/zephyr/program/skyrim/src/frostflow/keyboard_customization.c
@@ -3,14 +3,14 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/drivers/gpio.h>
-
 #include "common.h"
 #include "gpio.h"
 #include "keyboard_customization.h"
 #include "keyboard_protocol.h"
 #include "keyboard_raw.h"
 
+#include <zephyr/drivers/gpio.h>
+
 static uint16_t scancode_set2[KEYBOARD_COLS_MAX][KEYBOARD_ROWS] = {
 	{ 0x0000, 0x0000, 0x0014, 0xe01f, 0xe014, 0x0000, 0x0000, 0x0000 },
 	{ 0x001f, 0x0076, 0x0017, 0x000e, 0x001c, 0x003a, 0x000d, 0x0016 },
diff --git a/zephyr/program/skyrim/src/frostflow/ppc_config.c b/zephyr/program/skyrim/src/frostflow/ppc_config.c
index 6072a788eb..513c025dec 100644
--- a/zephyr/program/skyrim/src/frostflow/ppc_config.c
+++ b/zephyr/program/skyrim/src/frostflow/ppc_config.c
@@ -5,12 +5,12 @@
 
 /* Frostflow board-specific PPC code */
 
-#include <zephyr/drivers/gpio.h>
-
-#include "driver/ppc/nx20p348x.h"
 #include "driver/ppc/aoz1380_public.h"
+#include "driver/ppc/nx20p348x.h"
 #include "usbc_ppc.h"
 
+#include <zephyr/drivers/gpio.h>
+
 #define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ##args)
 #define CPRINTFUSB(format, args...) cprintf(CC_USBCHARGE, format, ##args)
 
diff --git a/zephyr/program/skyrim/src/morthal/ppc_config.c b/zephyr/program/skyrim/src/morthal/ppc_config.c
index f3ec1d312e..8108742fdc 100644
--- a/zephyr/program/skyrim/src/morthal/ppc_config.c
+++ b/zephyr/program/skyrim/src/morthal/ppc_config.c
@@ -5,12 +5,12 @@
 
 /* Morthal board-specific PPC code */
 
-#include <zephyr/drivers/gpio.h>
-
-#include "driver/ppc/nx20p348x.h"
 #include "driver/ppc/aoz1380_public.h"
+#include "driver/ppc/nx20p348x.h"
 #include "usbc_ppc.h"
 
+#include <zephyr/drivers/gpio.h>
+
 #define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ##args)
 #define CPRINTFUSB(format, args...) cprintf(CC_USBCHARGE, format, ##args)
 
diff --git a/zephyr/program/skyrim/src/morthal/usb_mux_config.c b/zephyr/program/skyrim/src/morthal/usb_mux_config.c
index 8fe76233e2..f4b6502b35 100644
--- a/zephyr/program/skyrim/src/morthal/usb_mux_config.c
+++ b/zephyr/program/skyrim/src/morthal/usb_mux_config.c
@@ -5,8 +5,6 @@
 
 /* Morthal board-specific USB-C mux configuration */
 
-#include <zephyr/drivers/gpio.h>
-
 #include "console.h"
 #include "cros_board_info.h"
 #include "cros_cbi.h"
@@ -16,6 +14,8 @@
 #include "usb_mux.h"
 #include "usbc/usb_muxes.h"
 
+#include <zephyr/drivers/gpio.h>
+
 #define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ##args)
 #define CPRINTFUSB(format, args...) cprintf(CC_USBCHARGE, format, ##args)
 
diff --git a/zephyr/program/skyrim/src/power_signals.c b/zephyr/program/skyrim/src/power_signals.c
index 5d372d35ae..04ed3d441d 100644
--- a/zephyr/program/skyrim/src/power_signals.c
+++ b/zephyr/program/skyrim/src/power_signals.c
@@ -7,8 +7,8 @@
 #include "charger.h"
 #include "chipset.h"
 #include "config.h"
-#include "gpio_signal.h"
 #include "gpio/gpio_int.h"
+#include "gpio_signal.h"
 #include "hooks.h"
 #include "i2c.h"
 #include "ioexpander.h"
diff --git a/zephyr/program/skyrim/src/skyrim/alt_charger.c b/zephyr/program/skyrim/src/skyrim/alt_charger.c
index 4b717901cd..91e5af8426 100644
--- a/zephyr/program/skyrim/src/skyrim/alt_charger.c
+++ b/zephyr/program/skyrim/src/skyrim/alt_charger.c
@@ -3,15 +3,15 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/logging/log.h>
-
 #include "charger_chips.h"
 #include "common.h"
 #include "cros_board_info.h"
 #include "cros_cbi.h"
 #include "hooks.h"
 
+#include <zephyr/devicetree.h>
+#include <zephyr/logging/log.h>
+
 LOG_MODULE_DECLARE(skyrim, CONFIG_SKYRIM_LOG_LEVEL);
 
 static void alt_charger_init(void)
diff --git a/zephyr/program/skyrim/src/skyrim/fan.c b/zephyr/program/skyrim/src/skyrim/fan.c
index 0a368ee6f0..c584022a92 100644
--- a/zephyr/program/skyrim/src/skyrim/fan.c
+++ b/zephyr/program/skyrim/src/skyrim/fan.c
@@ -3,16 +3,16 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/logging/log.h>
-
 #include "cros_board_info.h"
 #include "cros_cbi.h"
 #include "fan.h"
 #include "gpio/gpio.h"
 #include "hooks.h"
 
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
+
 LOG_MODULE_DECLARE(skyrim, CONFIG_SKYRIM_LOG_LEVEL);
 
 /*
diff --git a/zephyr/program/skyrim/src/skyrim/form_factor.c b/zephyr/program/skyrim/src/skyrim/form_factor.c
index f137c6db31..b13d905364 100644
--- a/zephyr/program/skyrim/src/skyrim/form_factor.c
+++ b/zephyr/program/skyrim/src/skyrim/form_factor.c
@@ -3,14 +3,15 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/logging/log.h>
-#include "common.h"
 #include "accelgyro.h"
+#include "common.h"
 #include "cros_board_info.h"
 #include "hooks.h"
 #include "motionsense_sensors.h"
 
+#include <zephyr/devicetree.h>
+#include <zephyr/logging/log.h>
+
 LOG_MODULE_DECLARE(skyrim, CONFIG_SKYRIM_LOG_LEVEL);
 
 /*
diff --git a/zephyr/program/skyrim/src/skyrim/ppc_config.c b/zephyr/program/skyrim/src/skyrim/ppc_config.c
index bebc8adcc7..047103baee 100644
--- a/zephyr/program/skyrim/src/skyrim/ppc_config.c
+++ b/zephyr/program/skyrim/src/skyrim/ppc_config.c
@@ -5,12 +5,12 @@
 
 /* Skyrim board-specific PPC code */
 
-#include <zephyr/drivers/gpio.h>
-
-#include "driver/ppc/nx20p348x.h"
 #include "driver/ppc/aoz1380_public.h"
+#include "driver/ppc/nx20p348x.h"
 #include "usbc_ppc.h"
 
+#include <zephyr/drivers/gpio.h>
+
 #define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ##args)
 #define CPRINTFUSB(format, args...) cprintf(CC_USBCHARGE, format, ##args)
 
diff --git a/zephyr/program/skyrim/src/skyrim/usb_mux_config.c b/zephyr/program/skyrim/src/skyrim/usb_mux_config.c
index 6c65e56d9e..8d409dffdd 100644
--- a/zephyr/program/skyrim/src/skyrim/usb_mux_config.c
+++ b/zephyr/program/skyrim/src/skyrim/usb_mux_config.c
@@ -5,8 +5,6 @@
 
 /* Skyrim board-specific USB-C mux configuration */
 
-#include <zephyr/drivers/gpio.h>
-
 #include "console.h"
 #include "cros_board_info.h"
 #include "cros_cbi.h"
@@ -16,6 +14,8 @@
 #include "usb_mux.h"
 #include "usbc/usb_muxes.h"
 
+#include <zephyr/drivers/gpio.h>
+
 #define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ##args)
 #define CPRINTFUSB(format, args...) cprintf(CC_USBCHARGE, format, ##args)
 
diff --git a/zephyr/program/skyrim/src/usb_pd_policy.c b/zephyr/program/skyrim/src/usb_pd_policy.c
index ec9f873863..745d95bc00 100644
--- a/zephyr/program/skyrim/src/usb_pd_policy.c
+++ b/zephyr/program/skyrim/src/usb_pd_policy.c
@@ -5,8 +5,6 @@
 
 /* Shared USB-C policy for Zork boards */
 
-#include <zephyr/drivers/gpio.h>
-
 #include "charge_manager.h"
 #include "chipset.h"
 #include "common.h"
@@ -20,6 +18,8 @@
 #include "usbc_ppc.h"
 #include "util.h"
 
+#include <zephyr/drivers/gpio.h>
+
 int pd_check_vconn_swap(int port)
 {
 	/*
diff --git a/zephyr/program/skyrim/src/usbc_config.c b/zephyr/program/skyrim/src/usbc_config.c
index 1795cb2b1e..1b728f1cf0 100644
--- a/zephyr/program/skyrim/src/usbc_config.c
+++ b/zephyr/program/skyrim/src/usbc_config.c
@@ -5,16 +5,14 @@
 
 /* Skyrim family-specific USB-C configuration */
 
-#include <zephyr/drivers/gpio.h>
-
-#include "cros_board_info.h"
-#include "cros_cbi.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 "cros_board_info.h"
+#include "cros_cbi.h"
 #include "driver/bc12/pi3usb9201.h"
 #include "driver/charger/isl9241.h"
 #include "driver/ppc/nx20p348x.h"
@@ -29,8 +27,10 @@
 #include "power.h"
 #include "usb_mux.h"
 #include "usb_pd_tcpm.h"
-#include "usbc_ppc.h"
 #include "usbc/usb_muxes.h"
+#include "usbc_ppc.h"
+
+#include <zephyr/drivers/gpio.h>
 
 #define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ##args)
 #define CPRINTFUSB(format, args...) cprintf(CC_USBCHARGE, format, ##args)
diff --git a/zephyr/program/skyrim/src/winterhold/battery_present.c b/zephyr/program/skyrim/src/winterhold/battery_present.c
index eb5a5bba90..290955a242 100644
--- a/zephyr/program/skyrim/src/winterhold/battery_present.c
+++ b/zephyr/program/skyrim/src/winterhold/battery_present.c
@@ -2,12 +2,12 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include <zephyr/drivers/gpio.h>
-
 #include "battery.h"
 #include "battery_smart.h"
 #include "common.h"
 
+#include <zephyr/drivers/gpio.h>
+
 static enum battery_present batt_pres_prev = BP_NOT_SURE;
 
 __overridable bool board_battery_is_initialized(void)
diff --git a/zephyr/program/skyrim/src/winterhold/kb_backlight.c b/zephyr/program/skyrim/src/winterhold/kb_backlight.c
index 049b99e3a1..cbbfc0a4e9 100644
--- a/zephyr/program/skyrim/src/winterhold/kb_backlight.c
+++ b/zephyr/program/skyrim/src/winterhold/kb_backlight.c
@@ -3,14 +3,14 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/logging/log.h>
-
 #include "board_config.h"
 #include "common.h"
 #include "cros_board_info.h"
 #include "cros_cbi.h"
 
+#include <zephyr/devicetree.h>
+#include <zephyr/logging/log.h>
+
 LOG_MODULE_DECLARE(skyrim, CONFIG_SKYRIM_LOG_LEVEL);
 
 __override uint32_t board_override_feature_flags0(uint32_t flags0)
diff --git a/zephyr/program/skyrim/src/winterhold/ppc_config.c b/zephyr/program/skyrim/src/winterhold/ppc_config.c
index 72ddb6ce6c..d6adb145ff 100644
--- a/zephyr/program/skyrim/src/winterhold/ppc_config.c
+++ b/zephyr/program/skyrim/src/winterhold/ppc_config.c
@@ -5,11 +5,11 @@
 
 /* Winterhold board-specific PPC code */
 
-#include <zephyr/drivers/gpio.h>
-
 #include "driver/ppc/nx20p348x.h"
 #include "usbc_ppc.h"
 
+#include <zephyr/drivers/gpio.h>
+
 void ppc_interrupt(enum gpio_signal signal)
 {
 	switch (signal) {
diff --git a/zephyr/program/skyrim/src/winterhold/usb_mux_config.c b/zephyr/program/skyrim/src/winterhold/usb_mux_config.c
index 1eff945ed7..19153eb676 100644
--- a/zephyr/program/skyrim/src/winterhold/usb_mux_config.c
+++ b/zephyr/program/skyrim/src/winterhold/usb_mux_config.c
@@ -5,8 +5,6 @@
 
 /* Winterhold board-specific USB-C mux configuration */
 
-#include <zephyr/drivers/gpio.h>
-
 #include "console.h"
 #include "cros_board_info.h"
 #include "cros_cbi.h"
@@ -16,6 +14,8 @@
 #include "usb_mux.h"
 #include "usbc/usb_muxes.h"
 
+#include <zephyr/drivers/gpio.h>
+
 #define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ##args)
 #define CPRINTFUSB(format, args...) cprintf(CC_USBCHARGE, format, ##args)
 
diff --git a/zephyr/program/trogdor/lazor/src/i2c.c b/zephyr/program/trogdor/lazor/src/i2c.c
index 6d737b410f..e572bbdf37 100644
--- a/zephyr/program/trogdor/lazor/src/i2c.c
+++ b/zephyr/program/trogdor/lazor/src/i2c.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "i2c/i2c.h"
 #include "i2c.h"
+#include "i2c/i2c.h"
 
 /* Lazor board specific i2c implementation */
 
diff --git a/zephyr/program/trogdor/lazor/src/power.c b/zephyr/program/trogdor/lazor/src/power.c
index 96f9bc43c5..ee99c77196 100644
--- a/zephyr/program/trogdor/lazor/src/power.c
+++ b/zephyr/program/trogdor/lazor/src/power.c
@@ -3,13 +3,14 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/init.h>
+#include "gpio.h"
+#include "power.h"
+#include "task.h"
+
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/init.h>
 
 #include <ap_power/ap_power.h>
-#include "power.h"
-#include "task.h"
-#include "gpio.h"
 
 static void board_power_change(struct ap_power_ev_callback *cb,
 			       struct ap_power_ev_data data)
diff --git a/zephyr/program/trogdor/lazor/src/sku.c b/zephyr/program/trogdor/lazor/src/sku.c
index 1d88437031..a6187d422f 100644
--- a/zephyr/program/trogdor/lazor/src/sku.c
+++ b/zephyr/program/trogdor/lazor/src/sku.c
@@ -7,10 +7,10 @@
 #include "config.h"
 #include "console.h"
 #include "driver/ln9310.h"
-#include "tcpm/ps8xxx_public.h"
 #include "hooks.h"
 #include "sku.h"
 #include "system.h"
+#include "tcpm/ps8xxx_public.h"
 #include "util.h"
 
 #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ##args)
diff --git a/zephyr/program/trogdor/lazor/src/switchcap.c b/zephyr/program/trogdor/lazor/src/switchcap.c
index d8205cbcfc..77413fb336 100644
--- a/zephyr/program/trogdor/lazor/src/switchcap.c
+++ b/zephyr/program/trogdor/lazor/src/switchcap.c
@@ -3,8 +3,6 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/drivers/gpio.h>
-
 #include "common.h"
 #include "config.h"
 #include "console.h"
@@ -13,8 +11,10 @@
 #include "hooks.h"
 #include "i2c.h"
 #include "power/qcom.h"
-#include "system.h"
 #include "sku.h"
+#include "system.h"
+
+#include <zephyr/drivers/gpio.h>
 
 #define CPRINTS(format, args...) cprints(CC_I2C, format, ##args)
 #define CPRINTF(format, args...) cprintf(CC_I2C, format, ##args)
diff --git a/zephyr/program/trogdor/lazor/src/usb_pd_policy.c b/zephyr/program/trogdor/lazor/src/usb_pd_policy.c
index 8d046826f9..32e3376ca0 100644
--- a/zephyr/program/trogdor/lazor/src/usb_pd_policy.c
+++ b/zephyr/program/trogdor/lazor/src/usb_pd_policy.c
@@ -3,8 +3,6 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/drivers/gpio.h>
-
 #include "charge_manager.h"
 #include "chipset.h"
 #include "console.h"
@@ -13,6 +11,8 @@
 #include "usbc_ppc.h"
 #include "util.h"
 
+#include <zephyr/drivers/gpio.h>
+
 #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ##args)
 #define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ##args)
 
diff --git a/zephyr/program/trogdor/lazor/src/usbc_config.c b/zephyr/program/trogdor/lazor/src/usbc_config.c
index 2e40223c4c..9639b556a0 100644
--- a/zephyr/program/trogdor/lazor/src/usbc_config.c
+++ b/zephyr/program/trogdor/lazor/src/usbc_config.c
@@ -7,23 +7,23 @@
 
 #include "battery_fuel_gauge.h"
 #include "bc12/pi3usb9201_public.h"
-#include "charger.h"
-#include "charger/isl923x_public.h"
 #include "charge_manager.h"
 #include "charge_state.h"
+#include "charger.h"
+#include "charger/isl923x_public.h"
 #include "common.h"
 #include "config.h"
 #include "driver/ln9310.h"
-#include "gpio_signal.h"
 #include "gpio/gpio_int.h"
+#include "gpio_signal.h"
 #include "hooks.h"
 #include "ppc/sn5s330_public.h"
 #include "system.h"
 #include "tcpm/ps8xxx_public.h"
 #include "tcpm/tcpci.h"
 #include "timer.h"
-#include "usb_pd.h"
 #include "usb_mux.h"
+#include "usb_pd.h"
 #include "usbc_ocp.h"
 #include "usbc_ppc.h"