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>

31 files changed, 136 insertions, 143 deletions

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);