From 8ed5835a1492070fb163ba79db892bd9c0df149e Mon Sep 17 00:00:00 2001
From: Elyes Haouas <ehaouas@noos.fr>
Date: Sat, 22 Oct 2022 22:17:28 +0200
Subject: [PATCH] soc/intel/common: Clean up includes

Change-Id: I0081fcf3c842d8772a7045f8dc5754a2e6c039b8
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68702
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
Reviewed-by: Martin Roth <martin.roth@amd.corp-partner.google.com>
---
 src/soc/intel/common/block/acpi/lpit.c                    | 1 +
 src/soc/intel/common/block/acpi/pep.c                     | 3 +++
 src/soc/intel/common/block/gpio/gpio_dev.c                | 2 +-
 src/soc/intel/common/block/gpmr/gpmr.c                    | 1 +
 src/soc/intel/common/block/include/intelblocks/graphics.h | 1 +
 src/soc/intel/common/block/pcie/pcie.c                    | 4 +++-
 src/soc/intel/common/block/pcr/pcr.c                      | 8 ++++++--
 src/soc/intel/common/block/smbus/smbus_early.c            | 3 +++
 src/soc/intel/common/block/spi/spi.c                      | 5 +++++
 src/soc/intel/common/block/systemagent/memmap.c           | 1 +
 src/soc/intel/common/block/usb4/pcie.c                    | 2 ++
 src/soc/intel/common/block/xdci/xdci.c                    | 1 +
 src/soc/intel/common/fsp_reset.c                          | 1 +
 src/soc/intel/common/hda_verb.c                           | 3 ++-
 src/soc/intel/common/smbios.h                             | 2 +-
 src/soc/intel/common/vbt.c                                | 3 ++-
 16 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/soc/intel/common/block/acpi/lpit.c b/src/soc/intel/common/block/acpi/lpit.c
index 5b9689cead..38a402f13d 100644
--- a/src/soc/intel/common/block/acpi/lpit.c
+++ b/src/soc/intel/common/block/acpi/lpit.c
@@ -4,6 +4,7 @@
 #include <cpu/intel/msr.h>
 #include <soc/iomap.h>
 #include <soc/pmc.h>
+#include <stdint.h>
 
 unsigned long acpi_fill_lpit(unsigned long current)
 {
diff --git a/src/soc/intel/common/block/acpi/pep.c b/src/soc/intel/common/block/acpi/pep.c
index 21e3d35753..cd1030cb8e 100644
--- a/src/soc/intel/common/block/acpi/pep.c
+++ b/src/soc/intel/common/block/acpi/pep.c
@@ -1,11 +1,14 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include <acpi/acpi.h>
 #include <acpi/acpigen.h>
 #include <assert.h>
+#include <commonlib/bsd/helpers.h>
 #include <console/console.h>
 #include <intelblocks/acpi.h>
 #include <intelblocks/pmc_ipc.h>
 #include <stdlib.h>
+#include <string.h>
 #include <types.h>
 
 #define LPI_S0_HELPER_UUID		"c4eb40a0-6cd2-11e2-bcfd-0800200c9a66"
diff --git a/src/soc/intel/common/block/gpio/gpio_dev.c b/src/soc/intel/common/block/gpio/gpio_dev.c
index a1794731ce..bea0363eb0 100644
--- a/src/soc/intel/common/block/gpio/gpio_dev.c
+++ b/src/soc/intel/common/block/gpio/gpio_dev.c
@@ -3,8 +3,8 @@
 #include <assert.h>
 #include <device/device.h>
 #include <device/gpio.h>
-#include <intelblocks/gpio.h>
 #include <gpio.h>
+#include <intelblocks/gpio.h>
 
 static struct gpio_operations gpio_ops = {
 	.get		= gpio_get,
diff --git a/src/soc/intel/common/block/gpmr/gpmr.c b/src/soc/intel/common/block/gpmr/gpmr.c
index 1b2a2d1e4d..cef2e57dfa 100644
--- a/src/soc/intel/common/block/gpmr/gpmr.c
+++ b/src/soc/intel/common/block/gpmr/gpmr.c
@@ -5,6 +5,7 @@
 #include <intelblocks/ioc.h>
 #include <intelblocks/pcr.h>
 #include <soc/pcr_ids.h>
+#include <types.h>
 
 /* GPMR Register read given offset */
 uint32_t gpmr_read32(uint16_t offset)
diff --git a/src/soc/intel/common/block/include/intelblocks/graphics.h b/src/soc/intel/common/block/include/intelblocks/graphics.h
index 63aa800dce..3093921991 100644
--- a/src/soc/intel/common/block/include/intelblocks/graphics.h
+++ b/src/soc/intel/common/block/include/intelblocks/graphics.h
@@ -4,6 +4,7 @@
 #define SOC_INTEL_COMMON_BLOCK_GRAPHICS_H
 
 #include <device/device.h>
+#include <stdint.h>
 
 /*
  * SoC overrides
diff --git a/src/soc/intel/common/block/pcie/pcie.c b/src/soc/intel/common/block/pcie/pcie.c
index d3fcbde38d..dd0b0ef989 100644
--- a/src/soc/intel/common/block/pcie/pcie.c
+++ b/src/soc/intel/common/block/pcie/pcie.c
@@ -1,11 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <console/console.h>
+#include <device/device.h>
 #include <device/pci.h>
-#include <device/pciexp.h>
 #include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
+#include <device/pciexp.h>
+#include <stdint.h>
 
 #define CACHE_LINE_SIZE	0x10
 
diff --git a/src/soc/intel/common/block/pcr/pcr.c b/src/soc/intel/common/block/pcr/pcr.c
index ba49f7c30f..897cd823e2 100644
--- a/src/soc/intel/common/block/pcr/pcr.c
+++ b/src/soc/intel/common/block/pcr/pcr.c
@@ -2,13 +2,17 @@
 
 #define __SIMPLE_DEVICE__
 
-#include <device/mmio.h>
 #include <assert.h>
+#include <commonlib/bsd/helpers.h>
 #include <console/console.h>
-#include <intelblocks/pcr.h>
+#include <device/mmio.h>
+#include <device/pci_def.h>
 #include <device/pci_ops.h>
+#include <device/pci_type.h>
+#include <intelblocks/pcr.h>
 #include <soc/pci_devs.h>
 #include <timer.h>
+#include <types.h>
 
 #if (CONFIG_PCR_BASE_ADDRESS == 0)
 #error "PCR_BASE_ADDRESS need to be non-zero!"
diff --git a/src/soc/intel/common/block/smbus/smbus_early.c b/src/soc/intel/common/block/smbus/smbus_early.c
index a3173f326a..273d29e66b 100644
--- a/src/soc/intel/common/block/smbus/smbus_early.c
+++ b/src/soc/intel/common/block/smbus/smbus_early.c
@@ -4,8 +4,11 @@
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <device/smbus_host.h>
+#include <device/pci_type.h>
 #include <intelblocks/smbus.h>
 #include <soc/pci_devs.h>
+#include <stdint.h>
+
 #include "smbuslib.h"
 
 void smbus_common_init(void)
diff --git a/src/soc/intel/common/block/spi/spi.c b/src/soc/intel/common/block/spi/spi.c
index 7bdaada2d9..f6a211ba75 100644
--- a/src/soc/intel/common/block/spi/spi.c
+++ b/src/soc/intel/common/block/spi/spi.c
@@ -2,17 +2,22 @@
 
 #define __SIMPLE_DEVICE__
 
+#include <assert.h>
+#include <commonlib/bsd/helpers.h>
 #include <device/device.h>
 #include <device/mmio.h>
 #include <device/pci.h>
+#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
+#include <device/pci_type.h>
 #include <device/spi.h>
 #include <intelblocks/fast_spi.h>
 #include <intelblocks/gspi.h>
 #include <intelblocks/spi.h>
 #include <soc/pci_devs.h>
 #include <spi-generic.h>
+#include <types.h>
 
 const struct spi_ctrlr_buses spi_ctrlr_bus_map[] = {
 	{ .ctrlr = &fast_spi_flash_ctrlr, .bus_start = 0, .bus_end = 0 },
diff --git a/src/soc/intel/common/block/systemagent/memmap.c b/src/soc/intel/common/block/systemagent/memmap.c
index 86ca4e1b84..97344cd8cd 100644
--- a/src/soc/intel/common/block/systemagent/memmap.c
+++ b/src/soc/intel/common/block/systemagent/memmap.c
@@ -2,6 +2,7 @@
 
 #include <arch/romstage.h>
 #include <cbmem.h>
+#include <commonlib/bsd/helpers.h>
 #include <console/console.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/smm.h>
diff --git a/src/soc/intel/common/block/usb4/pcie.c b/src/soc/intel/common/block/usb4/pcie.c
index 81496ce70a..85292e228f 100644
--- a/src/soc/intel/common/block/usb4/pcie.c
+++ b/src/soc/intel/common/block/usb4/pcie.c
@@ -1,10 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include <acpi/acpi_device.h>
 #include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/path.h>
 #include <string.h>
+
 #include "chip.h"
 
 #define PCI_HOTPLUG_IN_D3_UUID	"6211E2C0-58A3-4AF3-90E1-927A4E0C55A4"
diff --git a/src/soc/intel/common/block/xdci/xdci.c b/src/soc/intel/common/block/xdci/xdci.c
index 3300768a1a..495996ebf9 100644
--- a/src/soc/intel/common/block/xdci/xdci.c
+++ b/src/soc/intel/common/block/xdci/xdci.c
@@ -5,6 +5,7 @@
 #include <device/pci_ids.h>
 #include <intelblocks/xdci.h>
 #include <security/vboot/vboot_common.h>
+#include <stdbool.h>
 
 __weak void soc_xdci_init(struct device *dev) { /* no-op */ }
 
diff --git a/src/soc/intel/common/fsp_reset.c b/src/soc/intel/common/fsp_reset.c
index e89fe4cc53..bf26551524 100644
--- a/src/soc/intel/common/fsp_reset.c
+++ b/src/soc/intel/common/fsp_reset.c
@@ -3,6 +3,7 @@
 #include <console/console.h>
 #include <fsp/util.h>
 #include <soc/intel/common/reset.h>
+#include <stdint.h>
 
 void chipset_handle_reset(uint32_t status)
 {
diff --git a/src/soc/intel/common/hda_verb.c b/src/soc/intel/common/hda_verb.c
index 41ecac11c5..dceb03183e 100644
--- a/src/soc/intel/common/hda_verb.c
+++ b/src/soc/intel/common/hda_verb.c
@@ -1,9 +1,10 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <console/console.h>
+#include <delay.h>
 #include <device/azalia_device.h>
 #include <device/mmio.h>
-#include <delay.h>
+#include <stdint.h>
 
 #include "hda_verb.h"
 
diff --git a/src/soc/intel/common/smbios.h b/src/soc/intel/common/smbios.h
index c7da3b37b5..06a35c7e84 100644
--- a/src/soc/intel/common/smbios.h
+++ b/src/soc/intel/common/smbios.h
@@ -3,8 +3,8 @@
 #ifndef _COMMON_SMBIOS_H_
 #define _COMMON_SMBIOS_H_
 
-#include <stdint.h>
 #include <memory_info.h>
+#include <types.h>
 
 /* Offset info DIMM_INFO SpdSave for start of serial number */
 #define SPD_SAVE_OFFSET_SERIAL	5
diff --git a/src/soc/intel/common/vbt.c b/src/soc/intel/common/vbt.c
index 690fb5fc3a..c01db665a1 100644
--- a/src/soc/intel/common/vbt.c
+++ b/src/soc/intel/common/vbt.c
@@ -2,9 +2,10 @@
 
 #include <acpi/acpi.h>
 #include <bootmode.h>
+#include <drivers/intel/gma/opregion.h>
+#include <stddef.h>
 
 #include "vbt.h"
-#include <drivers/intel/gma/opregion.h>
 
 void *vbt_get(void)
 {