10 files changed, 30 insertions, 8 deletions
diff --git a/board/gimble/battery.c b/board/gimble/battery.c
index 91ecfe0583..a18ab029b6 100644
--- a/board/gimble/battery.c
+++ b/board/gimble/battery.c
@@ -7,7 +7,7 @@
 
 #include "battery_fuel_gauge.h"
 #include "common.h"
-#include "util.h"
+#include "compile_time_macros.h"
 
 /*
  * Battery info for all Brya battery types. Note that the fields
diff --git a/board/gimble/board.c b/board/gimble/board.c
index ad70d0f2bf..7f940d3736 100644
--- a/board/gimble/board.c
+++ b/board/gimble/board.c
@@ -3,13 +3,16 @@
  * found in the LICENSE file.
  */
 
-#include "common.h"
-
 #include "battery.h"
 #include "button.h"
 #include "charge_ramp.h"
 #include "charger.h"
+#include "common.h"
+#include "compile_time_macros.h"
 #include "console.h"
+#include "gpio.h"
+#include "gpio_signal.h"
+#include "hooks.h"
 #include "driver/accel_bma2x2_public.h"
 #include "driver/accelgyro_bmi160.h"
 #include "fw_config.h"
@@ -17,9 +20,11 @@
 #include "lid_switch.h"
 #include "power_button.h"
 #include "power.h"
+#include "registers.h"
 #include "switch.h"
 #include "tablet_mode.h"
 #include "throttle_ap.h"
+#include "usbc_config.h"
 
 #include "gpio_list.h" /* Must come after other header files. */
 
diff --git a/board/gimble/board.h b/board/gimble/board.h
index 2965ddc6ae..1d658c4219 100644
--- a/board/gimble/board.h
+++ b/board/gimble/board.h
@@ -8,6 +8,8 @@
 #ifndef __CROS_EC_BOARD_H
 #define __CROS_EC_BOARD_H
 
+#include "compile_time_macros.h"
+
 /*
  * Early brya boards are not set up for vivaldi
  */
diff --git a/board/gimble/fans.c b/board/gimble/fans.c
index 1427499e79..d966056331 100644
--- a/board/gimble/fans.c
+++ b/board/gimble/fans.c
@@ -6,11 +6,11 @@
 /* Physical fans. These are logically separate from pwm_channels. */
 
 #include "common.h"
+#include "compile_time_macros.h"
 #include "console.h"
 #include "fan_chip.h"
 #include "fan.h"
 #include "hooks.h"
-#include "pwm_chip.h"
 #include "pwm.h"
 
 /* MFT channels. These are logically separate from pwm_channels. */
diff --git a/board/gimble/fw_config.c b/board/gimble/fw_config.c
index 2d9ee6de25..fb8acb635d 100644
--- a/board/gimble/fw_config.c
+++ b/board/gimble/fw_config.c
@@ -4,6 +4,7 @@
  */
 
 #include "common.h"
+#include "compile_time_macros.h"
 #include "console.h"
 #include "cros_board_info.h"
 #include "fw_config.h"
diff --git a/board/gimble/fw_config.h b/board/gimble/fw_config.h
index 31843e759e..6e4eb3ef58 100644
--- a/board/gimble/fw_config.h
+++ b/board/gimble/fw_config.h
@@ -6,7 +6,7 @@
 #ifndef __BOARD_BRYA_FW_CONFIG_H_
 #define __BOARD_BRYA_FW_CONFIG_H_
 
-#include "stdint.h"
+#include <stdint.h>
 
 /****************************************************************************
  * CBI FW_CONFIG layout for Brya board.
diff --git a/board/gimble/i2c.c b/board/gimble/i2c.c
index b1e0986a16..95b626e3eb 100644
--- a/board/gimble/i2c.c
+++ b/board/gimble/i2c.c
@@ -4,7 +4,7 @@
  */
 
 #include "common.h"
-
+#include "compile_time_macros.h"
 #include "i2c.h"
 
 /* I2C port map configuration */
diff --git a/board/gimble/led.c b/board/gimble/led.c
index aa8da52778..38caa38d37 100644
--- a/board/gimble/led.c
+++ b/board/gimble/led.c
@@ -9,7 +9,10 @@
  * amber while charging the battery and white when the battery is charged.
  */
 
+#include <stdint.h>
+
 #include "common.h"
+#include "compile_time_macros.h"
 #include "ec_commands.h"
 #include "led_pwm.h"
 #include "pwm.h"
diff --git a/board/gimble/pwm.c b/board/gimble/pwm.c
index a6b65b038c..75d028a02f 100644
--- a/board/gimble/pwm.c
+++ b/board/gimble/pwm.c
@@ -4,8 +4,8 @@
  */
 
 #include "common.h"
+#include "compile_time_macros.h"
 #include "hooks.h"
-
 #include "pwm.h"
 #include "pwm_chip.h"
 
diff --git a/board/gimble/usbc_config.c b/board/gimble/usbc_config.c
index 150e3b5444..947feef35b 100644
--- a/board/gimble/usbc_config.c
+++ b/board/gimble/usbc_config.c
@@ -3,8 +3,12 @@
  * found in the LICENSE file.
  */
 
-#include "common.h"
+#include <stdint.h>
+#include <stdbool.h>
 
+#include "common.h"
+#include "compile_time_macros.h"
+#include "console.h"
 #include "driver/bc12/pi3usb9201_public.h"
 #include "driver/ppc/nx20p348x.h"
 #include "driver/ppc/syv682x_public.h"
@@ -12,14 +16,21 @@
 #include "driver/tcpm/ps8xxx.h"
 #include "driver/tcpm/ps8xxx_public.h"
 #include "driver/tcpm/tcpci.h"
+#include "ec_commands.h"
 #include "fw_config.h"
+#include "gpio.h"
+#include "gpio_signal.h"
 #include "hooks.h"
 #include "ioexpander.h"
 #include "system.h"
+#include "task.h"
+#include "task_id.h"
 #include "timer.h"
 #include "usbc_config.h"
 #include "usbc_ppc.h"
+#include "usb_charge.h"
 #include "usb_mux.h"
+#include "usb_pd.h"
 #include "usb_pd_tcpm.h"
 
 #define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args)