diff --git a/src/mainboard/lenovo/m900_tiny/ramstage.c b/src/mainboard/lenovo/m900_tiny/ramstage.c
index 47add6f39a..6e66f3a7cc 100644
--- a/src/mainboard/lenovo/m900_tiny/ramstage.c
+++ b/src/mainboard/lenovo/m900_tiny/ramstage.c
@@ -5,7 +5,6 @@
 #include <drivers/intel/gma/int15.h>
 #include <gpio.h>
 #include <mainboard/gpio.h>
-#include <soc/gpio.h>
 #include <soc/ramstage.h>
 
 static void print_board_id(void)
diff --git a/src/mainboard/msi/ms7d25/die.c b/src/mainboard/msi/ms7d25/die.c
index 52b3338799..34fa75b1a3 100644
--- a/src/mainboard/msi/ms7d25/die.c
+++ b/src/mainboard/msi/ms7d25/die.c
@@ -2,7 +2,6 @@
 
 #include <console/console.h>
 #include <pc80/i8254.h>
-#include <soc/gpio.h>
 #include <delay.h>
 #include <gpio.h>
 
diff --git a/src/mainboard/msi/ms7e06/die.c b/src/mainboard/msi/ms7e06/die.c
index 52b3338799..34fa75b1a3 100644
--- a/src/mainboard/msi/ms7e06/die.c
+++ b/src/mainboard/msi/ms7e06/die.c
@@ -2,7 +2,6 @@
 
 #include <console/console.h>
 #include <pc80/i8254.h>
-#include <soc/gpio.h>
 #include <delay.h>
 #include <gpio.h>
 
diff --git a/src/mainboard/protectli/vault_cml/die.c b/src/mainboard/protectli/vault_cml/die.c
index 52b3338799..34fa75b1a3 100644
--- a/src/mainboard/protectli/vault_cml/die.c
+++ b/src/mainboard/protectli/vault_cml/die.c
@@ -2,7 +2,6 @@
 
 #include <console/console.h>
 #include <pc80/i8254.h>
-#include <soc/gpio.h>
 #include <delay.h>
 #include <gpio.h>
 
diff --git a/src/soc/qualcomm/common/pcie_common.c b/src/soc/qualcomm/common/pcie_common.c
index 65c294097e..b877563a49 100644
--- a/src/soc/qualcomm/common/pcie_common.c
+++ b/src/soc/qualcomm/common/pcie_common.c
@@ -9,7 +9,6 @@
 #include <device/pci_ids.h>
 #include <gpio.h>
 #include <soc/clock.h>
-#include <soc/gpio.h>
 #include <soc/qcom_qmp_phy.h>
 #include <soc/pcie.h>
 #include <timer.h>
diff --git a/src/soc/qualcomm/common/qspi.c b/src/soc/qualcomm/common/qspi.c
index 3340c00dd6..088c79d6f3 100644
--- a/src/soc/qualcomm/common/qspi.c
+++ b/src/soc/qualcomm/common/qspi.c
@@ -6,7 +6,6 @@
 #include <device/mmio.h>
 #include <soc/addressmap.h>
 #include <soc/qspi_common.h>
-#include <soc/gpio.h>
 #include <soc/clock.h>
 #include <symbols.h>
 #include <assert.h>
diff --git a/src/soc/qualcomm/sc7280/pcie.c b/src/soc/qualcomm/sc7280/pcie.c
index 84fa44c6c5..e9044558de 100644
--- a/src/soc/qualcomm/sc7280/pcie.c
+++ b/src/soc/qualcomm/sc7280/pcie.c
@@ -7,7 +7,6 @@
 #include <gpio.h>
 #include <soc/addressmap.h>
 #include <soc/clock.h>
-#include <soc/gpio.h>
 #include <soc/qcom_qmp_phy.h>
 #include <soc/pcie.h>
 
diff --git a/src/soc/rockchip/common/gpio.c b/src/soc/rockchip/common/gpio.c
index 73ddfd7424..5629e6bfdc 100644
--- a/src/soc/rockchip/common/gpio.c
+++ b/src/soc/rockchip/common/gpio.c
@@ -3,7 +3,6 @@
 #include <device/mmio.h>
 #include <assert.h>
 #include <gpio.h>
-#include <soc/gpio.h>
 #include <soc/grf.h>
 #include <soc/soc.h>
 #include <types.h>
diff --git a/src/soc/rockchip/rk3288/display.c b/src/soc/rockchip/rk3288/display.c
index 9d6cca18b5..f9f41e2f9c 100644
--- a/src/soc/rockchip/rk3288/display.c
+++ b/src/soc/rockchip/rk3288/display.c
@@ -13,7 +13,6 @@
 #include <soc/display.h>
 #include <soc/edp.h>
 #include <soc/hdmi.h>
-#include <soc/gpio.h>
 #include <soc/grf.h>
 #include <soc/soc.h>
 #include <soc/vop.h>
diff --git a/src/soc/rockchip/rk3288/gpio.c b/src/soc/rockchip/rk3288/gpio.c
index ed09d02fc4..a1da1d791b 100644
--- a/src/soc/rockchip/rk3288/gpio.c
+++ b/src/soc/rockchip/rk3288/gpio.c
@@ -2,7 +2,6 @@
 
 #include <gpio.h>
 #include <soc/addressmap.h>
-#include <soc/gpio.h>
 #include <soc/grf.h>
 #include <soc/pmu.h>
 #include <soc/soc.h>
diff --git a/src/soc/rockchip/rk3399/display.c b/src/soc/rockchip/rk3399/display.c
index 728f45d1a0..f0b7871303 100644
--- a/src/soc/rockchip/rk3399/display.c
+++ b/src/soc/rockchip/rk3399/display.c
@@ -12,7 +12,6 @@
 #include <soc/clock.h>
 #include <soc/display.h>
 #include <soc/edp.h>
-#include <soc/gpio.h>
 #include <soc/grf.h>
 #include <soc/mmu_operations.h>
 #include <soc/mipi.h>
diff --git a/src/soc/rockchip/rk3399/gpio.c b/src/soc/rockchip/rk3399/gpio.c
index 6c022d8f59..8c66987578 100644
--- a/src/soc/rockchip/rk3399/gpio.c
+++ b/src/soc/rockchip/rk3399/gpio.c
@@ -2,7 +2,6 @@
 
 #include <gpio.h>
 #include <soc/addressmap.h>
-#include <soc/gpio.h>
 #include <soc/grf.h>
 #include <soc/soc.h>
 
diff --git a/src/soc/sifive/fu740/clock.c b/src/soc/sifive/fu740/clock.c
index 91e79925be..299409de8e 100644
--- a/src/soc/sifive/fu740/clock.c
+++ b/src/soc/sifive/fu740/clock.c
@@ -7,7 +7,6 @@
 #include <device/mmio.h>
 #include <soc/addressmap.h>
 #include <soc/clock.h>
-#include <soc/gpio.h>
 #include <gpio.h>
 #include <stdint.h>
 
diff --git a/src/soc/sifive/fu740/gpio.c b/src/soc/sifive/fu740/gpio.c
index d5576f241b..a38e5902dd 100644
--- a/src/soc/sifive/fu740/gpio.c
+++ b/src/soc/sifive/fu740/gpio.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <soc/addressmap.h>
-#include <soc/gpio.h>
 #include <stdint.h>
 #include <arch/mmio.h>
 #include <assert.h>