brya: Include-what-you-use scrub

This updates the list of header files included by brya board files to
match what is actually used.

BRANCH=none
BUG=b:192010784
TEST=buildall passes

Change-Id: I18d143882babfd17935fbf0cf92f235842df17c3
Signed-off-by: Caveh Jalali <caveh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2987159
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Commit-Queue: Boris Mittelberg <bmbm@google.com>

17 files changed, 54 insertions, 13 deletions

diff --git a/baseboard/brya/baseboard.c b/baseboard/brya/baseboard.c
index cca61ccfac..976831812f 100644
--- a/baseboard/brya/baseboard.c
+++ b/baseboard/brya/baseboard.c
@@ -4,6 +4,7 @@
  */
 
 #include "common.h"
+#include "compile_time_macros.h"
 
 #include "gpio_signal.h"
 
diff --git a/baseboard/brya/baseboard.h b/baseboard/brya/baseboard.h
index 448a38c6b7..bc7e4ae13d 100644
--- a/baseboard/brya/baseboard.h
+++ b/baseboard/brya/baseboard.h
@@ -210,6 +210,7 @@
 #ifndef __ASSEMBLER__
 
 #include <stdbool.h>
+#include <stdint.h>
 
 #include "common.h"
 #include "baseboard_usbc_config.h"
diff --git a/baseboard/brya/battery_presence.c b/baseboard/brya/battery_presence.c
index 8efda188ed..94c9926820 100644
--- a/baseboard/brya/battery_presence.c
+++ b/baseboard/brya/battery_presence.c
@@ -10,7 +10,7 @@
 
 #include "battery.h"
 #include "battery_smart.h"
-#include "gpio.h"
+#include "common.h"
 
 static enum battery_present batt_pres_prev = BP_NOT_SURE;
 
diff --git a/baseboard/brya/cbi.c b/baseboard/brya/cbi.c
index a0a7275a7c..6d9e2b93fa 100644
--- a/baseboard/brya/cbi.c
+++ b/baseboard/brya/cbi.c
@@ -3,10 +3,12 @@
  * found in the LICENSE file.
  */
 
+#include <stdint.h>
+
+#include "console.h"
 #include "common.h"
 #include "cros_board_info.h"
 #include "hooks.h"
-#include "system.h"
 
 #define CPRINTS(format, args...) cprints(CC_CHIPSET, format, ## args)
 #define CPRINTF(format, args...) cprintf(CC_CHIPSET, format, ## args)
diff --git a/baseboard/brya/charger.c b/baseboard/brya/charger.c
index d55503ea81..04be67147d 100644
--- a/baseboard/brya/charger.c
+++ b/baseboard/brya/charger.c
@@ -5,14 +5,16 @@
 
 #include "common.h"
 
-#include "charger.h"
 #include "charge_manager.h"
+#include "charge_state_v2.h"
+#include "charger.h"
+#include "compile_time_macros.h"
+#include "console.h"
 #include "driver/charger/bq25710.h"
 #include "usbc_ppc.h"
 #include "usb_pd.h"
 #include "util.h"
 
-#include "charge_state_v2.h"
 
 #define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ## args)
 #define CPRINTFUSB(format, args...) cprintf(CC_USBCHARGE, format, ## args)
diff --git a/baseboard/brya/usb_pd_policy.c b/baseboard/brya/usb_pd_policy.c
index 9b94a774f0..919bab2a27 100644
--- a/baseboard/brya/usb_pd_policy.c
+++ b/baseboard/brya/usb_pd_policy.c
@@ -2,18 +2,27 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 /* Shared USB-C policy for Brya boards */
+
+#include <stddef.h>
+#include <stdint.h>
+
 #include "charge_manager.h"
 #include "chipset.h"
 #include "common.h"
 #include "compile_time_macros.h"
 #include "console.h"
+#include "ec_commands.h"
 #include "gpio.h"
-#include "system.h"
-#include "usb_common.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 "util.h"
 
 #define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args)
 #define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
diff --git a/board/brya/battery.c b/board/brya/battery.c
index 91ecfe0583..a18ab029b6 100644
--- a/board/brya/battery.c
+++ b/board/brya/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/brya/board.c b/board/brya/board.c
index f974b992d0..1935988607 100644
--- a/board/brya/board.c
+++ b/board/brya/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_lis2dw12.h"
 #include "driver/accelgyro_lsm6dso.h"
 #include "driver/als_tcs3400.h"
@@ -18,9 +21,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/brya/board.h b/board/brya/board.h
index eecdb130d1..c24874f30e 100644
--- a/board/brya/board.h
+++ b/board/brya/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/brya/fans.c b/board/brya/fans.c
index 1427499e79..d966056331 100644
--- a/board/brya/fans.c
+++ b/board/brya/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/brya/fw_config.c b/board/brya/fw_config.c
index 2d9ee6de25..fb8acb635d 100644
--- a/board/brya/fw_config.c
+++ b/board/brya/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/brya/fw_config.h b/board/brya/fw_config.h
index 31843e759e..6e4eb3ef58 100644
--- a/board/brya/fw_config.h
+++ b/board/brya/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/brya/i2c.c b/board/brya/i2c.c
index 02890a3a16..bb55b13d0c 100644
--- a/board/brya/i2c.c
+++ b/board/brya/i2c.c
@@ -4,6 +4,7 @@
  */
 
 #include "common.h"
+#include "compile_time_macros.h"
 
 #include "i2c.h"
 
diff --git a/board/brya/led.c b/board/brya/led.c
index aa8da52778..38caa38d37 100644
--- a/board/brya/led.c
+++ b/board/brya/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/brya/pwm.c b/board/brya/pwm.c
index a6b65b038c..263e494650 100644
--- a/board/brya/pwm.c
+++ b/board/brya/pwm.c
@@ -4,8 +4,9 @@
  */
 
 #include "common.h"
-#include "hooks.h"
 
+#include "compile_time_macros.h"
+#include "hooks.h"
 #include "pwm.h"
 #include "pwm_chip.h"
 
diff --git a/board/brya/tune_mp2964.c b/board/brya/tune_mp2964.c
index c95f06d7fd..198f06d8eb 100644
--- a/board/brya/tune_mp2964.c
+++ b/board/brya/tune_mp2964.c
@@ -5,6 +5,8 @@
 
 /* Tune the MP2964 IMVP9.1 parameters for brya */
 
+#include "common.h"
+#include "compile_time_macros.h"
 #include "console.h"
 #include "hooks.h"
 #include "mp2964.h"
diff --git a/board/brya/usbc_config.c b/board/brya/usbc_config.c
index ddad81f7da..4c84b814aa 100644
--- a/board/brya/usbc_config.c
+++ b/board/brya/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/nct38xx.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)