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>

6 files changed, 21 insertions, 6 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)