3 files changed, 15 insertions, 14 deletions
diff --git a/board/voxel/board.c b/board/voxel/board.c
index 4c8badeb1c..9faef2db6b 100644
--- a/board/voxel/board.c
+++ b/board/voxel/board.c
@@ -4,20 +4,20 @@
  */
 
 /* Volteer board-specific configuration */
-#include "button.h"
-#include "common.h"
 #include "accelgyro.h"
+#include "button.h"
 #include "cbi_ec_fw_config.h"
+#include "common.h"
 #include "driver/accel_bma2x2.h"
 #include "driver/accelgyro_bmi160.h"
 #include "driver/als_tcs3400.h"
 #include "driver/bc12/pi3usb9201.h"
 #include "driver/ppc/syv682x.h"
-#include "driver/tcpm/tcpci.h"
-#include "driver/tcpm/tusb422.h"
-#include "driver/tcpm/rt1715.h"
 #include "driver/retimer/bb_retimer_public.h"
 #include "driver/sync.h"
+#include "driver/tcpm/rt1715.h"
+#include "driver/tcpm/tcpci.h"
+#include "driver/tcpm/tusb422.h"
 #include "extpower.h"
 #include "fan.h"
 #include "fan_chip.h"
@@ -31,8 +31,8 @@
 #include "pwm_chip.h"
 #include "switch.h"
 #include "system.h"
-#include "task.h"
 #include "tablet_mode.h"
+#include "task.h"
 #include "throttle_ap.h"
 #include "uart.h"
 #include "usb_mux.h"
@@ -42,7 +42,8 @@
 #include "usbc_ppc.h"
 #include "util.h"
 
-#include "gpio_list.h" /* Must come after other header files. */
+/* Must come after other header files and interrupt handler declarations */
+#include "gpio_list.h"
 
 #define CPRINTS(format, args...) cprints(CC_CHIPSET, format, ##args)
 
diff --git a/board/voxel/led.c b/board/voxel/led.c
index 5b15c9620f..acd00f8941 100644
--- a/board/voxel/led.c
+++ b/board/voxel/led.c
@@ -5,11 +5,11 @@
  * Power and battery LED control for Volteer
  */
 
+#include "chipset.h"
 #include "ec_commands.h"
 #include "gpio.h"
 #include "led_common.h"
 #include "led_onoff_states.h"
-#include "chipset.h"
 
 #define LED_ON_LVL 0
 #define LED_OFF_LVL 1
diff --git a/board/voxel/sensors.c b/board/voxel/sensors.c
index c3c074da9d..81e6b13b57 100644
--- a/board/voxel/sensors.c
+++ b/board/voxel/sensors.c
@@ -4,25 +4,25 @@
  */
 
 /* Volteer family-specific sensor configuration */
-#include "common.h"
 #include "accelgyro.h"
 #include "cbi_ec_fw_config.h"
 #include "cbi_ssfc.h"
+#include "common.h"
 #include "driver/accel_bma2x2.h"
 #include "driver/accel_kionix.h"
-#include "driver/accelgyro_bmi_common.h"
 #include "driver/accelgyro_bmi160.h"
-#include "driver/accelgyro_icm_common.h"
-#include "driver/accelgyro_icm426xx.h"
+#include "driver/accelgyro_bmi_common.h"
 #include "driver/accelgyro_icm42607.h"
+#include "driver/accelgyro_icm426xx.h"
+#include "driver/accelgyro_icm_common.h"
 #include "driver/als_tcs3400.h"
 #include "driver/sync.h"
-#include "keyboard_scan.h"
 #include "gpio.h"
 #include "hooks.h"
 #include "i2c.h"
-#include "task.h"
+#include "keyboard_scan.h"
 #include "tablet_mode.h"
+#include "task.h"
 #include "util.h"
 
 #define CPRINTS(format, args...) cprints(CC_MOTION_SENSE, format, ##args)