diff --git a/src/soc/amd/common/block/include/amdblocks/gpio_banks.h b/src/soc/amd/common/block/include/amdblocks/gpio_banks.h
index 11e1246e67..fdcd0f8ae4 100644
--- a/src/soc/amd/common/block/include/amdblocks/gpio_banks.h
+++ b/src/soc/amd/common/block/include/amdblocks/gpio_banks.h
@@ -3,9 +3,7 @@
 #ifndef __AMDBLOCK_GPIO_BANKS_H__
 #define __AMDBLOCK_GPIO_BANKS_H__
 
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
+#include <types.h>
 
 struct soc_amd_gpio {
 	uint8_t gpio;
diff --git a/src/soc/amd/common/block/include/amdblocks/spi.h b/src/soc/amd/common/block/include/amdblocks/spi.h
index 576f0c6231..b0080dae8e 100644
--- a/src/soc/amd/common/block/include/amdblocks/spi.h
+++ b/src/soc/amd/common/block/include/amdblocks/spi.h
@@ -3,7 +3,7 @@
 #ifndef __AMDBLOCKS_SPI_H__
 #define __AMDBLOCKS_SPI_H__
 
-#include <stdint.h>
+#include <types.h>
 
 #define SPI_CNTRL0			0x00
 #define   SPI_BUSY			BIT(31)
diff --git a/src/soc/amd/common/block/spi/fch_spi_ctrl.c b/src/soc/amd/common/block/spi/fch_spi_ctrl.c
index 1e0c31ab27..565fdbe149 100644
--- a/src/soc/amd/common/block/spi/fch_spi_ctrl.c
+++ b/src/soc/amd/common/block/spi/fch_spi_ctrl.c
@@ -8,6 +8,7 @@
 #include <device/pci_ops.h>
 #include <lib.h>
 #include <timer.h>
+#include <types.h>
 
 #define GRANULARITY_TEST_4k		0x0000f000		/* bits 15-12 */
 #define WORD_TO_DWORD_UPPER(x)		((x << 16) & 0xffff0000)
diff --git a/src/soc/amd/picasso/include/soc/i2c.h b/src/soc/amd/picasso/include/soc/i2c.h
index 20084f0eba..c1dd6ef6ff 100644
--- a/src/soc/amd/picasso/include/soc/i2c.h
+++ b/src/soc/amd/picasso/include/soc/i2c.h
@@ -3,6 +3,7 @@
 #ifndef __PICASSO_I2C_H__
 #define __PICASSO_I2C_H__
 
+#include <types.h>
 #include <soc/gpio.h>
 
 struct soc_amd_i2c_save {
diff --git a/src/soc/amd/stoneyridge/include/soc/i2c.h b/src/soc/amd/stoneyridge/include/soc/i2c.h
index 844ff1bf2d..63db7d4b16 100644
--- a/src/soc/amd/stoneyridge/include/soc/i2c.h
+++ b/src/soc/amd/stoneyridge/include/soc/i2c.h
@@ -3,6 +3,7 @@
 #ifndef __STONEYRIDGE_I2C_H__
 #define __STONEYRIDGE_I2C_H__
 
+#include <types.h>
 #include <soc/gpio.h>
 
 struct soc_amd_i2c_save {