summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--baseboard/asurada/usb_pd_policy.c2
-rw-r--r--baseboard/brya/prochot.c1
-rw-r--r--baseboard/cherry/usb_pd_policy.c1
-rw-r--r--baseboard/goroh/usb_pd_policy.c1
-rw-r--r--baseboard/herobrine/usbc_config.c1
-rw-r--r--baseboard/honeybuns/usb_pd_policy.c1
-rw-r--r--baseboard/honeybuns/usbc_support.c1
-rw-r--r--baseboard/intelrvp/adlrvp.c1
-rw-r--r--baseboard/intelrvp/baseboard.c1
-rw-r--r--baseboard/intelrvp/chg_usb_pd.c1
-rw-r--r--baseboard/intelrvp/chg_usb_pd_mecc_1_0.c1
-rw-r--r--board/boldar/sensors.c1
-rw-r--r--board/brya/i2c.c1
-rw-r--r--board/coachz/usbc_config.c1
-rw-r--r--board/collis/sensors.c1
-rw-r--r--board/copano/sensors.c1
-rw-r--r--board/crota/i2c.c1
-rw-r--r--board/crota/sensors.c1
-rw-r--r--board/delbin/sensors.c1
-rw-r--r--board/eldrid/sensors.c1
-rw-r--r--board/gimble/sensors.c1
-rw-r--r--board/homestar/usbc_config.c1
-rw-r--r--board/it8xxx2_pdevb/board.c1
-rw-r--r--board/kano/sensors.c1
-rw-r--r--board/lazor/hibernate.c1
-rw-r--r--board/mrbland/usbc_config.c1
-rw-r--r--board/nocturne/battery.c1
-rw-r--r--board/pazquel/usbc_config.c1
-rw-r--r--board/pompom/usbc_config.c1
-rw-r--r--board/quackingstick/usbc_config.c1
-rw-r--r--board/redrix/sensors.c1
-rw-r--r--board/servo_v4p1/dacs.c1
-rw-r--r--board/servo_v4p1/ioexpanders.c1
-rw-r--r--board/terrador/sensors.c1
-rw-r--r--board/vell/sensors.c1
-rw-r--r--board/voema/sensors.c1
-rw-r--r--board/volet/sensors.c1
-rw-r--r--board/volteer/sensors.c1
-rw-r--r--board/voxel/sensors.c1
-rw-r--r--board/wormdingler/usbc_config.c1
-rw-r--r--chip/max32660/i2c_chip.c1
-rw-r--r--chip/stm32/i2c-stm32f4.c2
-rw-r--r--common/mock/dp_alt_mode_mock.c1
-rw-r--r--common/usb_common.c1
-rw-r--r--common/usb_pd_alt_mode_dfp.c1
-rw-r--r--common/usbc/dp_alt_mode.c1
-rw-r--r--common/usbc/usb_tc_drp_acc_trysrc_sm.c1
-rw-r--r--common/vboot/efs2.c1
-rw-r--r--driver/bc12/mt6360.c1
-rw-r--r--driver/ioexpander/pca9675.c1
-rw-r--r--driver/ioexpander/tca64xxa.c1
-rw-r--r--driver/ppc/syv682x.c1
-rw-r--r--driver/retimer/kb800x.c1
-rw-r--r--driver/retimer/pi3hdx1204.c1
-rw-r--r--driver/sb_rmi.c1
-rw-r--r--driver/tcpm/rt1718s.c1
-rw-r--r--driver/usb_mux/amd_fp5.c1
-rw-r--r--driver/usb_mux/amd_fp6.c1
-rw-r--r--include/i2c.h2
-rw-r--r--test/usb_pe_drp_old.c1
-rw-r--r--zephyr/projects/corsola/src/usb_pd_policy.c1
-rw-r--r--zephyr/test/drivers/src/smart.c1
62 files changed, 64 insertions, 1 deletions
diff --git a/baseboard/asurada/usb_pd_policy.c b/baseboard/asurada/usb_pd_policy.c
index 6a7621f450..03993fcbbe 100644
--- a/baseboard/asurada/usb_pd_policy.c
+++ b/baseboard/asurada/usb_pd_policy.c
@@ -7,6 +7,8 @@
#include "baseboard_common.h"
#include "charge_manager.h"
#include "chipset.h"
+#include "console.h"
+#include "gpio.h"
#include "timer.h"
#include "usb_dp_alt_mode.h"
#include "usb_mux.h"
diff --git a/baseboard/brya/prochot.c b/baseboard/brya/prochot.c
index 3ed12caaeb..666f2ca35b 100644
--- a/baseboard/brya/prochot.c
+++ b/baseboard/brya/prochot.c
@@ -9,6 +9,7 @@
#include "charger.h"
#include "console.h"
#include "driver/charger/bq257x0_regs.h"
+#include "gpio.h"
#include "hooks.h"
#include "i2c.h"
#include "math_util.h"
diff --git a/baseboard/cherry/usb_pd_policy.c b/baseboard/cherry/usb_pd_policy.c
index cae89bffcf..2412983616 100644
--- a/baseboard/cherry/usb_pd_policy.c
+++ b/baseboard/cherry/usb_pd_policy.c
@@ -8,6 +8,7 @@
#include "chipset.h"
#include "driver/tcpm/rt1718s.h"
#include "driver/tcpm/tcpci.h"
+#include "gpio.h"
#include "timer.h"
#include "usb_dp_alt_mode.h"
#include "usb_mux.h"
diff --git a/baseboard/goroh/usb_pd_policy.c b/baseboard/goroh/usb_pd_policy.c
index b5456c6af0..76e22e9350 100644
--- a/baseboard/goroh/usb_pd_policy.c
+++ b/baseboard/goroh/usb_pd_policy.c
@@ -4,6 +4,7 @@
*/
#include "charge_manager.h"
#include "chipset.h"
+#include "gpio.h"
#include "timer.h"
#include "usb_dp_alt_mode.h"
#include "usb_mux.h"
diff --git a/baseboard/herobrine/usbc_config.c b/baseboard/herobrine/usbc_config.c
index 5e613c40a5..f5ee9c157d 100644
--- a/baseboard/herobrine/usbc_config.c
+++ b/baseboard/herobrine/usbc_config.c
@@ -8,6 +8,7 @@
#include "charger.h"
#include "charger/isl923x_public.h"
#include "charge_state.h"
+#include "console.h"
#include "usb_pd.h"
#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args)
diff --git a/baseboard/honeybuns/usb_pd_policy.c b/baseboard/honeybuns/usb_pd_policy.c
index faaef9083f..ab95a7f9b6 100644
--- a/baseboard/honeybuns/usb_pd_policy.c
+++ b/baseboard/honeybuns/usb_pd_policy.c
@@ -10,6 +10,7 @@
#include "driver/mp4245.h"
#include "driver/tcpm/tcpci.h"
#include "driver/mp4245.h"
+#include "gpio.h"
#include "hooks.h"
#include "task.h"
#include "timer.h"
diff --git a/baseboard/honeybuns/usbc_support.c b/baseboard/honeybuns/usbc_support.c
index d1b23ef40b..c03e94f076 100644
--- a/baseboard/honeybuns/usbc_support.c
+++ b/baseboard/honeybuns/usbc_support.c
@@ -10,6 +10,7 @@
#include "driver/tcpm/tcpci.h"
#include "driver/tcpm/ps8xxx.h"
#include "sn5s330.h"
+#include "gpio.h"
#include "hooks.h"
#include "i2c.h"
#include "system.h"
diff --git a/baseboard/intelrvp/adlrvp.c b/baseboard/intelrvp/adlrvp.c
index 5e368ae350..93e521e14a 100644
--- a/baseboard/intelrvp/adlrvp.c
+++ b/baseboard/intelrvp/adlrvp.c
@@ -12,6 +12,7 @@
#include "common.h"
#include "driver/retimer/bb_retimer_public.h"
#include "extpower.h"
+#include "gpio.h"
#include "hooks.h"
#include "ioexpander.h"
#include "isl9241.h"
diff --git a/baseboard/intelrvp/baseboard.c b/baseboard/intelrvp/baseboard.c
index b8eb55b204..87b43f2297 100644
--- a/baseboard/intelrvp/baseboard.c
+++ b/baseboard/intelrvp/baseboard.c
@@ -9,6 +9,7 @@
#include "charge_state.h"
#include "espi.h"
#include "fan.h"
+#include "gpio.h"
#include "hooks.h"
#include "pca9555.h"
#include "peci.h"
diff --git a/baseboard/intelrvp/chg_usb_pd.c b/baseboard/intelrvp/chg_usb_pd.c
index 9f64cdd4e7..74e8fb88ae 100644
--- a/baseboard/intelrvp/chg_usb_pd.c
+++ b/baseboard/intelrvp/chg_usb_pd.c
@@ -7,6 +7,7 @@
#include "charge_manager.h"
#include "charge_state_v2.h"
+#include "gpio.h"
#include "hooks.h"
#include "tcpm/tcpci.h"
diff --git a/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c b/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c
index 0c091efead..06f788188f 100644
--- a/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c
+++ b/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c
@@ -9,6 +9,7 @@
#include "charge_state_v2.h"
#include "console.h"
#include "driver/ppc/sn5s330.h"
+#include "gpio.h"
#include "hooks.h"
#include "tcpm/tcpci.h"
#include "system.h"
diff --git a/board/boldar/sensors.c b/board/boldar/sensors.c
index 25fab11549..534065cde3 100644
--- a/board/boldar/sensors.c
+++ b/board/boldar/sensors.c
@@ -12,6 +12,7 @@
#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"
diff --git a/board/brya/i2c.c b/board/brya/i2c.c
index 3db2e0c17b..1e405f4216 100644
--- a/board/brya/i2c.c
+++ b/board/brya/i2c.c
@@ -5,6 +5,7 @@
#include "common.h"
#include "compile_time_macros.h"
+#include "console.h"
#include "hooks.h"
#include "i2c.h"
diff --git a/board/coachz/usbc_config.c b/board/coachz/usbc_config.c
index 8f3fb02c30..d6930586dd 100644
--- a/board/coachz/usbc_config.c
+++ b/board/coachz/usbc_config.c
@@ -8,6 +8,7 @@
#include "charger.h"
#include "charger/isl923x_public.h"
#include "charge_state.h"
+#include "gpio.h"
#include "usb_pd.h"
#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args)
diff --git a/board/collis/sensors.c b/board/collis/sensors.c
index 24284649a7..cdf6db971e 100644
--- a/board/collis/sensors.c
+++ b/board/collis/sensors.c
@@ -16,6 +16,7 @@
#include "driver/accelgyro_icm426xx.h"
#include "driver/sync.h"
#include "keyboard_scan.h"
+#include "gpio.h"
#include "hooks.h"
#include "i2c.h"
#include "task.h"
diff --git a/board/copano/sensors.c b/board/copano/sensors.c
index 6a483a5671..8aa9f5888b 100644
--- a/board/copano/sensors.c
+++ b/board/copano/sensors.c
@@ -16,6 +16,7 @@
#include "driver/accelgyro_icm426xx.h"
#include "driver/sync.h"
#include "keyboard_scan.h"
+#include "gpio.h"
#include "hooks.h"
#include "i2c.h"
#include "task.h"
diff --git a/board/crota/i2c.c b/board/crota/i2c.c
index 3b9290efaa..6feaa309a9 100644
--- a/board/crota/i2c.c
+++ b/board/crota/i2c.c
@@ -5,6 +5,7 @@
#include "common.h"
#include "compile_time_macros.h"
+#include "console.h"
#include "hooks.h"
#include "i2c.h"
diff --git a/board/crota/sensors.c b/board/crota/sensors.c
index 19bab5c2d5..7bcae696df 100644
--- a/board/crota/sensors.c
+++ b/board/crota/sensors.c
@@ -4,6 +4,7 @@
*/
#include "common.h"
+#include "console.h"
#include "accelgyro.h"
#include "adc.h"
#include "driver/accel_lis2dw12.h"
diff --git a/board/delbin/sensors.c b/board/delbin/sensors.c
index 8000295554..a3d5015e2b 100644
--- a/board/delbin/sensors.c
+++ b/board/delbin/sensors.c
@@ -15,6 +15,7 @@
#include "driver/accelgyro_icm_common.h"
#include "driver/accelgyro_icm426xx.h"
#include "keyboard_scan.h"
+#include "gpio.h"
#include "hooks.h"
#include "i2c.h"
#include "task.h"
diff --git a/board/eldrid/sensors.c b/board/eldrid/sensors.c
index aba3549cca..a9248938a3 100644
--- a/board/eldrid/sensors.c
+++ b/board/eldrid/sensors.c
@@ -11,6 +11,7 @@
#include "driver/accelgyro_bmi160.h"
#include "driver/sync.h"
#include "keyboard_scan.h"
+#include "gpio.h"
#include "hooks.h"
#include "i2c.h"
#include "task.h"
diff --git a/board/gimble/sensors.c b/board/gimble/sensors.c
index 1620f3c348..0e030846db 100644
--- a/board/gimble/sensors.c
+++ b/board/gimble/sensors.c
@@ -11,6 +11,7 @@
#include "driver/accel_bma422.h"
#include "driver/accelgyro_bmi_common.h"
#include "driver/accelgyro_lsm6dsm.h"
+#include "gpio.h"
#include "hooks.h"
#include "keyboard_scan.h"
#include "motion_sense.h"
diff --git a/board/homestar/usbc_config.c b/board/homestar/usbc_config.c
index 8f3fb02c30..aac136415d 100644
--- a/board/homestar/usbc_config.c
+++ b/board/homestar/usbc_config.c
@@ -8,6 +8,7 @@
#include "charger.h"
#include "charger/isl923x_public.h"
#include "charge_state.h"
+#include "console.h"
#include "usb_pd.h"
#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args)
diff --git a/board/it8xxx2_pdevb/board.c b/board/it8xxx2_pdevb/board.c
index 7c239866f0..9161b2ce2e 100644
--- a/board/it8xxx2_pdevb/board.c
+++ b/board/it8xxx2_pdevb/board.c
@@ -7,6 +7,7 @@
#include "adc_chip.h"
#include "battery.h"
#include "console.h"
+#include "gpio.h"
#include "it83xx_pd.h"
#include "pwm.h"
#include "pwm_chip.h"
diff --git a/board/kano/sensors.c b/board/kano/sensors.c
index 3b497ab3e0..fd7d0f01ad 100644
--- a/board/kano/sensors.c
+++ b/board/kano/sensors.c
@@ -12,6 +12,7 @@
#include "driver/accelgyro_icm426xx.h"
#include "driver/accelgyro_icm_common.h"
#include "driver/accel_kionix.h"
+#include "gpio.h"
#include "hooks.h"
#include "motion_sense.h"
#include "temp_sensor.h"
diff --git a/board/lazor/hibernate.c b/board/lazor/hibernate.c
index 1187348e31..d262a33121 100644
--- a/board/lazor/hibernate.c
+++ b/board/lazor/hibernate.c
@@ -4,6 +4,7 @@
*/
#include "common.h"
+#include "gpio.h"
#include "sku.h"
#include "system.h"
#include "usbc_ppc.h"
diff --git a/board/mrbland/usbc_config.c b/board/mrbland/usbc_config.c
index 8f3fb02c30..aac136415d 100644
--- a/board/mrbland/usbc_config.c
+++ b/board/mrbland/usbc_config.c
@@ -8,6 +8,7 @@
#include "charger.h"
#include "charger/isl923x_public.h"
#include "charge_state.h"
+#include "console.h"
#include "usb_pd.h"
#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args)
diff --git a/board/nocturne/battery.c b/board/nocturne/battery.c
index ff3f16fa33..0e568ca6f9 100644
--- a/board/nocturne/battery.c
+++ b/board/nocturne/battery.c
@@ -15,6 +15,7 @@
#include "console.h"
#include "ec_commands.h"
#include "extpower.h"
+#include "gpio.h"
#include "hooks.h"
#include "temp_sensor.h"
#include "usb_pd.h"
diff --git a/board/pazquel/usbc_config.c b/board/pazquel/usbc_config.c
index 8f3fb02c30..aac136415d 100644
--- a/board/pazquel/usbc_config.c
+++ b/board/pazquel/usbc_config.c
@@ -8,6 +8,7 @@
#include "charger.h"
#include "charger/isl923x_public.h"
#include "charge_state.h"
+#include "console.h"
#include "usb_pd.h"
#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args)
diff --git a/board/pompom/usbc_config.c b/board/pompom/usbc_config.c
index 8f3fb02c30..aac136415d 100644
--- a/board/pompom/usbc_config.c
+++ b/board/pompom/usbc_config.c
@@ -8,6 +8,7 @@
#include "charger.h"
#include "charger/isl923x_public.h"
#include "charge_state.h"
+#include "console.h"
#include "usb_pd.h"
#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args)
diff --git a/board/quackingstick/usbc_config.c b/board/quackingstick/usbc_config.c
index b41eb2ecf1..1873e916ad 100644
--- a/board/quackingstick/usbc_config.c
+++ b/board/quackingstick/usbc_config.c
@@ -8,6 +8,7 @@
#include "charger.h"
#include "charger/isl923x_public.h"
#include "charge_state.h"
+#include "console.h"
#include "temp_sensor.h"
#include "usb_pd.h"
#include "util.h"
diff --git a/board/redrix/sensors.c b/board/redrix/sensors.c
index 5d02b1633d..7b1ebb002e 100644
--- a/board/redrix/sensors.c
+++ b/board/redrix/sensors.c
@@ -11,6 +11,7 @@
#include "driver/accel_bma422.h"
#include "driver/accelgyro_lsm6dsm.h"
#include "driver/als_tcs3400_public.h"
+#include "gpio.h"
#include "hooks.h"
#include "motion_sense.h"
#include "temp_sensor.h"
diff --git a/board/servo_v4p1/dacs.c b/board/servo_v4p1/dacs.c
index 087a334873..838cdbbc8b 100644
--- a/board/servo_v4p1/dacs.c
+++ b/board/servo_v4p1/dacs.c
@@ -3,6 +3,7 @@
* found in the LICENSE file.
*/
+#include "console.h"
#include "dacs.h"
#include "i2c.h"
#include "ioexpanders.h"
diff --git a/board/servo_v4p1/ioexpanders.c b/board/servo_v4p1/ioexpanders.c
index 7482038879..40e7decc75 100644
--- a/board/servo_v4p1/ioexpanders.c
+++ b/board/servo_v4p1/ioexpanders.c
@@ -3,6 +3,7 @@
* found in the LICENSE file.
*/
+#include "console.h"
#include "hooks.h"
#include "i2c.h"
#include "ioexpander.h"
diff --git a/board/terrador/sensors.c b/board/terrador/sensors.c
index 9997591cb6..77b26515c0 100644
--- a/board/terrador/sensors.c
+++ b/board/terrador/sensors.c
@@ -12,6 +12,7 @@
#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"
diff --git a/board/vell/sensors.c b/board/vell/sensors.c
index 3fba272bc0..aad7fc4ae4 100644
--- a/board/vell/sensors.c
+++ b/board/vell/sensors.c
@@ -7,6 +7,7 @@
#include "accelgyro.h"
#include "adc.h"
#include "driver/als_tcs3400_public.h"
+#include "gpio.h"
#include "hooks.h"
#include "motion_sense.h"
#include "temp_sensor.h"
diff --git a/board/voema/sensors.c b/board/voema/sensors.c
index 071dc5247b..b55890b074 100644
--- a/board/voema/sensors.c
+++ b/board/voema/sensors.c
@@ -14,6 +14,7 @@
#include "driver/als_tcs3400.h"
#include "driver/sync.h"
#include "keyboard_scan.h"
+#include "gpio.h"
#include "hooks.h"
#include "i2c.h"
#include "system.h"
diff --git a/board/volet/sensors.c b/board/volet/sensors.c
index 49e879ea94..fb093729d3 100644
--- a/board/volet/sensors.c
+++ b/board/volet/sensors.c
@@ -17,6 +17,7 @@
#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"
diff --git a/board/volteer/sensors.c b/board/volteer/sensors.c
index 5f7e197924..c3e42cbf05 100644
--- a/board/volteer/sensors.c
+++ b/board/volteer/sensors.c
@@ -11,6 +11,7 @@
#include "driver/accelgyro_bmi260_public.h"
#include "driver/als_tcs3400_public.h"
#include "keyboard_scan.h"
+#include "gpio.h"
#include "hooks.h"
#include "i2c.h"
#include "task.h"
diff --git a/board/voxel/sensors.c b/board/voxel/sensors.c
index 9652463ae2..00092dfe4e 100644
--- a/board/voxel/sensors.c
+++ b/board/voxel/sensors.c
@@ -17,6 +17,7 @@
#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"
diff --git a/board/wormdingler/usbc_config.c b/board/wormdingler/usbc_config.c
index 8f3fb02c30..aac136415d 100644
--- a/board/wormdingler/usbc_config.c
+++ b/board/wormdingler/usbc_config.c
@@ -8,6 +8,7 @@
#include "charger.h"
#include "charger/isl923x_public.h"
#include "charge_state.h"
+#include "console.h"
#include "usb_pd.h"
#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args)
diff --git a/chip/max32660/i2c_chip.c b/chip/max32660/i2c_chip.c
index c4d8d1eb94..71c0af0535 100644
--- a/chip/max32660/i2c_chip.c
+++ b/chip/max32660/i2c_chip.c
@@ -9,6 +9,7 @@
#include <stddef.h>
#include "common.h"
#include "config_chip.h"
+#include "gpio.h"
#include "hooks.h"
#include "i2c.h"
#include "stdbool.h"
diff --git a/chip/stm32/i2c-stm32f4.c b/chip/stm32/i2c-stm32f4.c
index 840c151c62..bce81b14c9 100644
--- a/chip/stm32/i2c-stm32f4.c
+++ b/chip/stm32/i2c-stm32f4.c
@@ -1,3 +1,4 @@
+
/* Copyright 2016 The Chromium OS Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
@@ -8,6 +9,7 @@
#include "common.h"
#include "console.h"
#include "dma.h"
+#include "gpio.h"
#include "hooks.h"
#include "i2c.h"
#include "registers.h"
diff --git a/common/mock/dp_alt_mode_mock.c b/common/mock/dp_alt_mode_mock.c
index c489d39830..29f76bdb7a 100644
--- a/common/mock/dp_alt_mode_mock.c
+++ b/common/mock/dp_alt_mode_mock.c
@@ -9,6 +9,7 @@
* section 5.2
*/
+#include "console.h"
#include "usb_dp_alt_mode.h"
#include "mock/dp_alt_mode_mock.h"
diff --git a/common/usb_common.c b/common/usb_common.c
index 513dd4639c..dd06d1a310 100644
--- a/common/usb_common.c
+++ b/common/usb_common.c
@@ -15,6 +15,7 @@
#include "common.h"
#include "console.h"
#include "ec_commands.h"
+#include "gpio.h"
#include "hooks.h"
#include "mkbp_event.h"
#include "stdbool.h"
diff --git a/common/usb_pd_alt_mode_dfp.c b/common/usb_pd_alt_mode_dfp.c
index c7ad4fb4e7..c15060769d 100644
--- a/common/usb_pd_alt_mode_dfp.c
+++ b/common/usb_pd_alt_mode_dfp.c
@@ -7,6 +7,7 @@
#include "chipset.h"
#include "console.h"
+#include "gpio.h"
#include "task.h"
#include "task_id.h"
#include "timer.h"
diff --git a/common/usbc/dp_alt_mode.c b/common/usbc/dp_alt_mode.c
index 1ebc5d3d04..5cf3c03ba8 100644
--- a/common/usbc/dp_alt_mode.c
+++ b/common/usbc/dp_alt_mode.c
@@ -13,6 +13,7 @@
#include <stdint.h>
#include "assert.h"
#include "atomic.h"
+#include "console.h"
#include "usb_common.h"
#include "usb_dp_alt_mode.h"
#include "usb_pd.h"
diff --git a/common/usbc/usb_tc_drp_acc_trysrc_sm.c b/common/usbc/usb_tc_drp_acc_trysrc_sm.c
index e40efb380c..3fe9871bdd 100644
--- a/common/usbc/usb_tc_drp_acc_trysrc_sm.c
+++ b/common/usbc/usb_tc_drp_acc_trysrc_sm.c
@@ -7,6 +7,7 @@
#include "charge_state.h"
#include "common.h"
#include "console.h"
+#include "gpio.h"
#include "hooks.h"
#include "system.h"
#include "task.h"
diff --git a/common/vboot/efs2.c b/common/vboot/efs2.c
index e5c3b64f04..a410c274f5 100644
--- a/common/vboot/efs2.c
+++ b/common/vboot/efs2.c
@@ -16,6 +16,7 @@
#include "console.h"
#include "crc8.h"
#include "flash.h"
+#include "gpio.h"
#include "hooks.h"
#include "sha256.h"
#include "system.h"
diff --git a/driver/bc12/mt6360.c b/driver/bc12/mt6360.c
index 78d955fc9e..c84cb36ff3 100644
--- a/driver/bc12/mt6360.c
+++ b/driver/bc12/mt6360.c
@@ -9,6 +9,7 @@
#include "crc8.h"
#include "mt6360.h"
#include "ec_commands.h"
+#include "gpio.h"
#include "hooks.h"
#include "i2c.h"
#include "task.h"
diff --git a/driver/ioexpander/pca9675.c b/driver/ioexpander/pca9675.c
index 2bef06d19e..990eb764a4 100644
--- a/driver/ioexpander/pca9675.c
+++ b/driver/ioexpander/pca9675.c
@@ -5,6 +5,7 @@
* NXP PCA9675PW I/O Port expander driver source
*/
+#include "gpio.h"
#include "i2c.h"
#include "ioexpander.h"
#include "pca9675.h"
diff --git a/driver/ioexpander/tca64xxa.c b/driver/ioexpander/tca64xxa.c
index 5bbaf92521..b44dd7a686 100644
--- a/driver/ioexpander/tca64xxa.c
+++ b/driver/ioexpander/tca64xxa.c
@@ -4,6 +4,7 @@
*/
#include "common.h"
+#include "gpio.h"
#include "i2c.h"
#include "ioexpander.h"
#include "system.h"
diff --git a/driver/ppc/syv682x.c b/driver/ppc/syv682x.c
index 8affb711af..22ff51f3d2 100644
--- a/driver/ppc/syv682x.c
+++ b/driver/ppc/syv682x.c
@@ -9,6 +9,7 @@
#include "config.h"
#include "console.h"
#include "syv682x.h"
+#include "gpio.h"
#include "hooks.h"
#include "i2c.h"
#include "system.h"
diff --git a/driver/retimer/kb800x.c b/driver/retimer/kb800x.c
index 1adcf3a07f..44bd166c14 100644
--- a/driver/retimer/kb800x.c
+++ b/driver/retimer/kb800x.c
@@ -7,6 +7,7 @@
#include "common.h"
#include "console.h"
+#include "gpio.h"
#include "i2c.h"
#include "kb800x.h"
#include "time.h"
diff --git a/driver/retimer/pi3hdx1204.c b/driver/retimer/pi3hdx1204.c
index 3b0d80609f..0431610059 100644
--- a/driver/retimer/pi3hdx1204.c
+++ b/driver/retimer/pi3hdx1204.c
@@ -5,6 +5,7 @@
* PI3HDX1204 retimer.
*/
+#include "console.h"
#include "i2c.h"
#include "pi3hdx1204.h"
diff --git a/driver/sb_rmi.c b/driver/sb_rmi.c
index a7ceeeead4..49783188e1 100644
--- a/driver/sb_rmi.c
+++ b/driver/sb_rmi.c
@@ -7,6 +7,7 @@
#include "common.h"
#include "chipset.h"
+#include "console.h"
#include "i2c.h"
#include "sb_rmi.h"
#include "stdbool.h"
diff --git a/driver/tcpm/rt1718s.c b/driver/tcpm/rt1718s.c
index 82f9fc67b3..f68a1e4c27 100644
--- a/driver/tcpm/rt1718s.c
+++ b/driver/tcpm/rt1718s.c
@@ -11,6 +11,7 @@
#include "driver/tcpm/rt1718s.h"
#include "driver/tcpm/tcpci.h"
#include "driver/tcpm/tcpm.h"
+#include "gpio.h"
#include "stdint.h"
#include "system.h"
#include "task.h"
diff --git a/driver/usb_mux/amd_fp5.c b/driver/usb_mux/amd_fp5.c
index b77edf2826..c32e6992c2 100644
--- a/driver/usb_mux/amd_fp5.c
+++ b/driver/usb_mux/amd_fp5.c
@@ -8,6 +8,7 @@
#include "amd_fp5.h"
#include "chipset.h"
#include "common.h"
+#include "console.h"
#include "hooks.h"
#include "i2c.h"
#include "queue.h"
diff --git a/driver/usb_mux/amd_fp6.c b/driver/usb_mux/amd_fp6.c
index a692fbcf3e..4f31fae186 100644
--- a/driver/usb_mux/amd_fp6.c
+++ b/driver/usb_mux/amd_fp6.c
@@ -8,6 +8,7 @@
#include "amd_fp6.h"
#include "chipset.h"
#include "common.h"
+#include "console.h"
#include "hooks.h"
#include "i2c.h"
#include "queue.h"
diff --git a/include/i2c.h b/include/i2c.h
index 7b66d67589..aaffbd6c09 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -9,7 +9,7 @@
#define __CROS_EC_I2C_H
#include "common.h"
-#include "gpio.h"
+#include "gpio_signal.h"
#include "host_command.h"
#include "stddef.h"
diff --git a/test/usb_pe_drp_old.c b/test/usb_pe_drp_old.c
index e545667432..721976eae4 100644
--- a/test/usb_pe_drp_old.c
+++ b/test/usb_pe_drp_old.c
@@ -6,6 +6,7 @@
*/
#include "battery.h"
#include "common.h"
+#include "gpio.h"
#include "task.h"
#include "test_util.h"
#include "timer.h"
diff --git a/zephyr/projects/corsola/src/usb_pd_policy.c b/zephyr/projects/corsola/src/usb_pd_policy.c
index 790c830c17..e3d6bf45bb 100644
--- a/zephyr/projects/corsola/src/usb_pd_policy.c
+++ b/zephyr/projects/corsola/src/usb_pd_policy.c
@@ -4,6 +4,7 @@
*/
#include "atomic.h"
+#include "console.h"
#include "chipset.h"
#include "timer.h"
#include "usb_dp_alt_mode.h"
diff --git a/zephyr/test/drivers/src/smart.c b/zephyr/test/drivers/src/smart.c
index 08a4eafedd..efcc8ae003 100644
--- a/zephyr/test/drivers/src/smart.c
+++ b/zephyr/test/drivers/src/smart.c
@@ -9,6 +9,7 @@
#include <shell/shell_uart.h>
#include "common.h"
+#include "console.h"
#include "i2c.h"
#include "emul/emul_common_i2c.h"
#include "emul/emul_smart_battery.h"