From c247f62749b967143e58c33aa0e5e234711a628f Mon Sep 17 00:00:00 2001
From: Elyes Haouas <ehaouas@noos.fr>
Date: Sat, 8 Feb 2025 09:46:59 +0100
Subject: [PATCH] tree: remove duplicated includes

Change-Id: Iaf10e1b9fb8ce51605a75ec0a92ee33924c42aa6
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86330
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Jayvik Desai <jayvik@google.com>
Reviewed-by: Shuo Liu <shuo.liu@intel.com>
---
 src/commonlib/device_tree.c                               | 1 -
 src/mainboard/emulation/qemu-sbsa/mainboard.c             | 2 --
 src/mainboard/google/dedede/variants/baseboard/ramstage.c | 1 -
 src/northbridge/intel/haswell/broadwell_mrc/raminit.c     | 1 -
 src/soc/amd/genoa_poc/chip.c                              | 1 -
 src/soc/amd/genoa_poc/config.c                            | 1 -
 src/soc/amd/picasso/acpi.c                                | 1 -
 src/soc/intel/apollolake/cpu.c                            | 1 -
 src/soc/intel/denverton_ns/include/soc/pci_devs.h         | 1 -
 src/soc/intel/pantherlake/bootblock/report_platform.c     | 1 -
 util/superiotool/superiotool.h                            | 6 +-----
 11 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/commonlib/device_tree.c b/src/commonlib/device_tree.c
index 4d72fb0bbc..b5c0ede7f3 100644
--- a/src/commonlib/device_tree.c
+++ b/src/commonlib/device_tree.c
@@ -10,7 +10,6 @@
 #ifdef __COREBOOT__
 #include <console/console.h>
 #else
-#include <stdio.h>
 #define printk(level, ...) printf(__VA_ARGS__)
 #endif
 #include <stdio.h>
diff --git a/src/mainboard/emulation/qemu-sbsa/mainboard.c b/src/mainboard/emulation/qemu-sbsa/mainboard.c
index 9d64b73c6b..55e4c671e4 100644
--- a/src/mainboard/emulation/qemu-sbsa/mainboard.c
+++ b/src/mainboard/emulation/qemu-sbsa/mainboard.c
@@ -7,8 +7,6 @@
 #include <cbfs.h>
 #include <device/device.h>
 #include <commonlib/device_tree.h>
-#include <bootmem.h>
-#include <arch/mmu.h>
 #include <mainboard/addressmap.h>
 #include <stdint.h>
 #include <symbols.h>
diff --git a/src/mainboard/google/dedede/variants/baseboard/ramstage.c b/src/mainboard/google/dedede/variants/baseboard/ramstage.c
index f5a8f98d62..6833b70e09 100644
--- a/src/mainboard/google/dedede/variants/baseboard/ramstage.c
+++ b/src/mainboard/google/dedede/variants/baseboard/ramstage.c
@@ -6,7 +6,6 @@
 #include <drivers/usb/acpi/chip.h>
 #include <fw_config.h>
 #include <gpio.h>
-#include <soc/pci_devs.h>
 #include <ec/google/chromeec/ec.h>
 #include <device/pci_ops.h>
 #include <intelblocks/power_limit.h>
diff --git a/src/northbridge/intel/haswell/broadwell_mrc/raminit.c b/src/northbridge/intel/haswell/broadwell_mrc/raminit.c
index beae4965ff..5b2427b918 100644
--- a/src/northbridge/intel/haswell/broadwell_mrc/raminit.c
+++ b/src/northbridge/intel/haswell/broadwell_mrc/raminit.c
@@ -14,7 +14,6 @@
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
-#include <device/dram/ddr3.h>
 #include <northbridge/intel/haswell/chip.h>
 #include <northbridge/intel/haswell/haswell.h>
 #include <northbridge/intel/haswell/raminit.h>
diff --git a/src/soc/amd/genoa_poc/chip.c b/src/soc/amd/genoa_poc/chip.c
index 98a995fdd2..c76b71661f 100644
--- a/src/soc/amd/genoa_poc/chip.c
+++ b/src/soc/amd/genoa_poc/chip.c
@@ -5,7 +5,6 @@
 #include <device/device.h>
 #include <drivers/amd/opensil/opensil.h>
 #include <soc/southbridge.h>
-#include <soc/southbridge.h>
 
 static void soc_init(void *chip_info)
 {
diff --git a/src/soc/amd/genoa_poc/config.c b/src/soc/amd/genoa_poc/config.c
index eab1ae44bc..600ace6e1f 100644
--- a/src/soc/amd/genoa_poc/config.c
+++ b/src/soc/amd/genoa_poc/config.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <device/device.h>
 #include <amdblocks/chip.h>
 #include <device/device.h>
 #include <static.h>
diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c
index b95db5de94..d07b38ca57 100644
--- a/src/soc/amd/picasso/acpi.c
+++ b/src/soc/amd/picasso/acpi.c
@@ -19,7 +19,6 @@
 #include <amdblocks/chip.h>
 #include <amdblocks/cpu.h>
 #include <amdblocks/ioapic.h>
-#include <device/device.h>
 #include <soc/pci_devs.h>
 #include <soc/southbridge.h>
 #include "chip.h"
diff --git a/src/soc/intel/apollolake/cpu.c b/src/soc/intel/apollolake/cpu.c
index b8bf39197e..fb95009f7d 100644
--- a/src/soc/intel/apollolake/cpu.c
+++ b/src/soc/intel/apollolake/cpu.c
@@ -13,7 +13,6 @@
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/smm.h>
 #include <cpu/intel/em64t100_save_state.h>
-#include <cpu/intel/microcode.h>
 #include <cpu/intel/smm_reloc.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/soc/intel/denverton_ns/include/soc/pci_devs.h b/src/soc/intel/denverton_ns/include/soc/pci_devs.h
index f62ea2b5c3..5ad39cc3a9 100644
--- a/src/soc/intel/denverton_ns/include/soc/pci_devs.h
+++ b/src/soc/intel/denverton_ns/include/soc/pci_devs.h
@@ -22,7 +22,6 @@
 #if defined(__SIMPLE_DEVICE__)
 #define  SA_DEV_ROOT		PCI_DEV(0, SA_DEV_SLOT_ROOT, 0)
 #else
-#include <device/device.h>
 #define  SA_DEV_ROOT		pcidev_path_on_root(PCI_DEVFN(SA_DEV_SLOT_ROOT, 0))
 #endif
 #define SA_DEV 0x0
diff --git a/src/soc/intel/pantherlake/bootblock/report_platform.c b/src/soc/intel/pantherlake/bootblock/report_platform.c
index aa8b03077a..28ec7473af 100644
--- a/src/soc/intel/pantherlake/bootblock/report_platform.c
+++ b/src/soc/intel/pantherlake/bootblock/report_platform.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <device/pci_ops.h>
 #include <console/console.h>
 #include <cpu/cpu.h>
 #include <cpu/intel/cpu_ids.h>
diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h
index ef2bfd6685..1d41e12023 100644
--- a/util/superiotool/superiotool.h
+++ b/util/superiotool/superiotool.h
@@ -9,6 +9,7 @@
 #include <string.h>
 #include <getopt.h>
 #include <commonlib/bsd/helpers.h>
+#include <sys/types.h>
 #if defined(__linux__)
 #include <sys/io.h>
 #endif
@@ -25,11 +26,7 @@
 # endif
 #endif
 
-#include <sys/types.h>
-#include <stdint.h>
-
 #if defined(__FreeBSD__)
-#include <sys/types.h>
 #include <machine/cpufunc.h>
 #define OUTB(x, y) do { u_int tmp = (y); outb(tmp, (x)); } while (0)
 #define OUTW(x, y) do { u_int tmp = (y); outw(tmp, (x)); } while (0)
@@ -47,7 +44,6 @@
 #endif
 
 #if defined(__NetBSD__) && (defined(__i386__) || defined(__x86_64__))
-#include <sys/types.h>
 #include <machine/sysarch.h>
 #if defined(__i386__)
 #define iopl i386_iopl