diff --git a/src/mainboard/amd/bilby/early_gpio.c b/src/mainboard/amd/bilby/early_gpio.c
index 466b4fc..1d35ab2 100644
--- a/src/mainboard/amd/bilby/early_gpio.c
+++ b/src/mainboard/amd/bilby/early_gpio.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
-#include <soc/gpio.h>
+
+#include <gpio.h>
 #include "gpio.h"
 
 /* GPIO pins used by coreboot should be initialized in bootblock */
diff --git a/src/mainboard/amd/bilby/emmc_gpio.c b/src/mainboard/amd/bilby/emmc_gpio.c
index f72437b..048b432 100644
--- a/src/mainboard/amd/bilby/emmc_gpio.c
+++ b/src/mainboard/amd/bilby/emmc_gpio.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <soc/gpio.h>
+#include <gpio.h>
 #include "gpio.h"
 
 /* eMMC controller driving either an SD card or eMMC device. */
diff --git a/src/mainboard/amd/bilby/gpio.c b/src/mainboard/amd/bilby/gpio.c
index 18ee482..29774ea 100644
--- a/src/mainboard/amd/bilby/gpio.c
+++ b/src/mainboard/amd/bilby/gpio.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <soc/gpio.h>
+#include <gpio.h>
 #include "gpio.h"
 
 /*
diff --git a/src/mainboard/amd/birman/early_gpio.c b/src/mainboard/amd/birman/early_gpio.c
index a337e1e..9089f6a 100644
--- a/src/mainboard/amd/birman/early_gpio.c
+++ b/src/mainboard/amd/birman/early_gpio.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <soc/gpio.h>
+#include <gpio.h>
 #include "gpio.h"
 
 /* GPIO pins used by coreboot should be initialized in bootblock */
diff --git a/src/mainboard/amd/birman/gpio.c b/src/mainboard/amd/birman/gpio.c
index d70fefd..74d929d 100644
--- a/src/mainboard/amd/birman/gpio.c
+++ b/src/mainboard/amd/birman/gpio.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <soc/gpio.h>
+#include <gpio.h>
 #include "gpio.h"
 
 /*
diff --git a/src/mainboard/amd/birman/port_descriptors.c b/src/mainboard/amd/birman/port_descriptors.c
index f2ed5c5..35dcf65 100644
--- a/src/mainboard/amd/birman/port_descriptors.c
+++ b/src/mainboard/amd/birman/port_descriptors.c
@@ -2,7 +2,7 @@
 
 #include <console/console.h>
 #include <device/i2c_simple.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <soc/platform_descriptors.h>
 #include <types.h>
 
diff --git a/src/mainboard/amd/chausie/early_gpio.c b/src/mainboard/amd/chausie/early_gpio.c
index 0929c7b..75a3a8e 100644
--- a/src/mainboard/amd/chausie/early_gpio.c
+++ b/src/mainboard/amd/chausie/early_gpio.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <soc/gpio.h>
+#include <gpio.h>
 #include "gpio.h"
 
 /* GPIO pins used by coreboot should be initialized in bootblock */
diff --git a/src/mainboard/amd/chausie/gpio.c b/src/mainboard/amd/chausie/gpio.c
index 4411bea..f496472 100644
--- a/src/mainboard/amd/chausie/gpio.c
+++ b/src/mainboard/amd/chausie/gpio.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <soc/gpio.h>
+#include <gpio.h>
 #include "gpio.h"
 
 /*
diff --git a/src/mainboard/amd/chausie/port_descriptors.c b/src/mainboard/amd/chausie/port_descriptors.c
index b10abfa..3105cf0 100644
--- a/src/mainboard/amd/chausie/port_descriptors.c
+++ b/src/mainboard/amd/chausie/port_descriptors.c
@@ -2,7 +2,7 @@
 
 #include <console/console.h>
 #include <device/i2c_simple.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <soc/platform_descriptors.h>
 #include <types.h>
 
diff --git a/src/mainboard/amd/gardenia/bootblock/bootblock.c b/src/mainboard/amd/gardenia/bootblock/bootblock.c
index 0543c31..1c4d9e0 100644
--- a/src/mainboard/amd/gardenia/bootblock/bootblock.c
+++ b/src/mainboard/amd/gardenia/bootblock/bootblock.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <bootblock_common.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <soc/southbridge.h>
 
 #include "../gpio.h"
diff --git a/src/mainboard/amd/gardenia/gpio.c b/src/mainboard/amd/gardenia/gpio.c
index 38e1d44..127b3dd 100644
--- a/src/mainboard/amd/gardenia/gpio.c
+++ b/src/mainboard/amd/gardenia/gpio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <gpio.h>
 #include <soc/southbridge.h>
-#include <soc/gpio.h>
 
 #include "gpio.h"
 
diff --git a/src/mainboard/amd/gardenia/gpio.h b/src/mainboard/amd/gardenia/gpio.h
index d01bdfd..72098c0 100644
--- a/src/mainboard/amd/gardenia/gpio.h
+++ b/src/mainboard/amd/gardenia/gpio.h
@@ -3,7 +3,7 @@
 #ifndef MAINBOARD_GPIO_H
 #define MAINBOARD_GPIO_H
 
-#include <soc/gpio.h>
+#include <gpio.h>
 
 const struct soc_amd_gpio *early_gpio_table(size_t *size);
 const struct soc_amd_gpio *gpio_table(size_t *size);
diff --git a/src/mainboard/amd/gardenia/mainboard.c b/src/mainboard/amd/gardenia/mainboard.c
index ad95617..39f1697 100644
--- a/src/mainboard/amd/gardenia/mainboard.c
+++ b/src/mainboard/amd/gardenia/mainboard.c
@@ -3,7 +3,7 @@
 #include <device/device.h>
 #include <amdblocks/agesawrapper.h>
 #include <amdblocks/amd_pci_util.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <soc/southbridge.h>
 
 #include "gpio.h"
diff --git a/src/mainboard/amd/majolica/early_gpio.c b/src/mainboard/amd/majolica/early_gpio.c
index cd5028a..c555b09 100644
--- a/src/mainboard/amd/majolica/early_gpio.c
+++ b/src/mainboard/amd/majolica/early_gpio.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <soc/gpio.h>
+#include <gpio.h>
 #include "gpio.h"
 
 /* GPIO pins used by coreboot should be initialized in bootblock */
diff --git a/src/mainboard/amd/majolica/port_descriptors.c b/src/mainboard/amd/majolica/port_descriptors.c
index 47c9d58..3221698 100644
--- a/src/mainboard/amd/majolica/port_descriptors.c
+++ b/src/mainboard/amd/majolica/port_descriptors.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <soc/platform_descriptors.h>
 #include <types.h>
 #include <amdblocks/cpu.h>
diff --git a/src/mainboard/amd/mandolin/emmc_gpio.c b/src/mainboard/amd/mandolin/emmc_gpio.c
index f72437b..048b432 100644
--- a/src/mainboard/amd/mandolin/emmc_gpio.c
+++ b/src/mainboard/amd/mandolin/emmc_gpio.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <soc/gpio.h>
+#include <gpio.h>
 #include "gpio.h"
 
 /* eMMC controller driving either an SD card or eMMC device. */
diff --git a/src/mainboard/amd/mandolin/variants/cereme/early_gpio.c b/src/mainboard/amd/mandolin/variants/cereme/early_gpio.c
index 66d81ed..d43c84e 100644
--- a/src/mainboard/amd/mandolin/variants/cereme/early_gpio.c
+++ b/src/mainboard/amd/mandolin/variants/cereme/early_gpio.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <soc/gpio.h>
+#include <gpio.h>
 #include "../../gpio.h"
 
 /* GPIO pins used by coreboot should be initialized in bootblock */
diff --git a/src/mainboard/amd/mandolin/variants/cereme/gpio.c b/src/mainboard/amd/mandolin/variants/cereme/gpio.c
index 0ac02d9..e3aad5f 100644
--- a/src/mainboard/amd/mandolin/variants/cereme/gpio.c
+++ b/src/mainboard/amd/mandolin/variants/cereme/gpio.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <soc/gpio.h>
+#include <gpio.h>
 #include "../../gpio.h"
 
 /*
diff --git a/src/mainboard/amd/mandolin/variants/mandolin/early_gpio.c b/src/mainboard/amd/mandolin/variants/mandolin/early_gpio.c
index 75cdb10..6a92abf 100644
--- a/src/mainboard/amd/mandolin/variants/mandolin/early_gpio.c
+++ b/src/mainboard/amd/mandolin/variants/mandolin/early_gpio.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <soc/gpio.h>
+#include <gpio.h>
 #include "../../gpio.h"
 
 /* GPIO pins used by coreboot should be initialized in bootblock */
diff --git a/src/mainboard/amd/mandolin/variants/mandolin/gpio.c b/src/mainboard/amd/mandolin/variants/mandolin/gpio.c
index f341750..87bbaa1 100644
--- a/src/mainboard/amd/mandolin/variants/mandolin/gpio.c
+++ b/src/mainboard/amd/mandolin/variants/mandolin/gpio.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <soc/gpio.h>
+#include <gpio.h>
 #include "../../gpio.h"
 
 /*
diff --git a/src/mainboard/amd/mayan/early_gpio.c b/src/mainboard/amd/mayan/early_gpio.c
index 19b1066..dbda552 100644
--- a/src/mainboard/amd/mayan/early_gpio.c
+++ b/src/mainboard/amd/mayan/early_gpio.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <soc/gpio.h>
+#include <gpio.h>
 #include "gpio.h"
 
 /* GPIO pins used by coreboot should be initialized in bootblock */
diff --git a/src/mainboard/amd/mayan/gpio.c b/src/mainboard/amd/mayan/gpio.c
index 2245e3b..b6b3a85 100644
--- a/src/mainboard/amd/mayan/gpio.c
+++ b/src/mainboard/amd/mayan/gpio.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <soc/gpio.h>
+#include <gpio.h>
 #include "gpio.h"
 
 /*
diff --git a/src/mainboard/amd/mayan/port_descriptors.c b/src/mainboard/amd/mayan/port_descriptors.c
index 151ad14..f52abcd 100644
--- a/src/mainboard/amd/mayan/port_descriptors.c
+++ b/src/mainboard/amd/mayan/port_descriptors.c
@@ -2,7 +2,7 @@
 
 #include <console/console.h>
 #include <device/i2c_simple.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <soc/platform_descriptors.h>
 #include <types.h>
 
diff --git a/src/mainboard/amd/pademelon/bootblock/bootblock.c b/src/mainboard/amd/pademelon/bootblock/bootblock.c
index 4b28e20..3356e7e 100644
--- a/src/mainboard/amd/pademelon/bootblock/bootblock.c
+++ b/src/mainboard/amd/pademelon/bootblock/bootblock.c
@@ -4,7 +4,7 @@
 #include <soc/southbridge.h>
 #include <amdblocks/lpc.h>
 #include <device/pci_ops.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <soc/pci_devs.h>
 #include <drivers/uart/uart8250reg.h>
 #include <arch/io.h>
diff --git a/src/mainboard/amd/pademelon/gpio.c b/src/mainboard/amd/pademelon/gpio.c
index 0de2c0a..6731085 100644
--- a/src/mainboard/amd/pademelon/gpio.c
+++ b/src/mainboard/amd/pademelon/gpio.c
@@ -2,7 +2,7 @@
 
 #include <amdblocks/agesawrapper.h>
 #include <amdblocks/BiosCallOuts.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <soc/southbridge.h>
 #include "gpio.h"
 
diff --git a/src/mainboard/amd/pademelon/gpio.h b/src/mainboard/amd/pademelon/gpio.h
index d01bdfd..72098c0 100644
--- a/src/mainboard/amd/pademelon/gpio.h
+++ b/src/mainboard/amd/pademelon/gpio.h
@@ -3,7 +3,7 @@
 #ifndef MAINBOARD_GPIO_H
 #define MAINBOARD_GPIO_H
 
-#include <soc/gpio.h>
+#include <gpio.h>
 
 const struct soc_amd_gpio *early_gpio_table(size_t *size);
 const struct soc_amd_gpio *gpio_table(size_t *size);
diff --git a/src/mainboard/amd/pademelon/mainboard.c b/src/mainboard/amd/pademelon/mainboard.c
index 12f0443..d10de26 100644
--- a/src/mainboard/amd/pademelon/mainboard.c
+++ b/src/mainboard/amd/pademelon/mainboard.c
@@ -3,7 +3,7 @@
 #include <device/device.h>
 #include <amdblocks/agesawrapper.h>
 #include <amdblocks/amd_pci_util.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <soc/pci_devs.h>
 #include <soc/southbridge.h>