18 files changed, 7 insertions, 24 deletions

diff --git a/include/ahci.h b/include/ahci.h
index eb05cc687f6..470cda006de 100644
--- a/include/ahci.h
+++ b/include/ahci.h
@@ -7,7 +7,7 @@
 #ifndef _AHCI_H_
 #define _AHCI_H_
 
-#include <pci.h>
+#include <linux/types.h>
 
 #define AHCI_PCI_BAR		0x24
 #define AHCI_MAX_SG		56 /* hardware max is 64K */
diff --git a/include/arm_ffa.h b/include/arm_ffa.h
index db9b1be995e..2994d8ee3ae 100644
--- a/include/arm_ffa.h
+++ b/include/arm_ffa.h
@@ -9,7 +9,7 @@
 #ifndef __ARM_FFA_H
 #define __ARM_FFA_H
 
-#include <linux/printk.h>
+#include <linux/types.h>
 
 /*
  * This header is public. It can be used by clients to access
diff --git a/include/bios_emul.h b/include/bios_emul.h
index a7e6d73972c..47a45296cc3 100644
--- a/include/bios_emul.h
+++ b/include/bios_emul.h
@@ -8,7 +8,7 @@
 
 /* Include the register header directly here */
 #include "../drivers/bios_emulator/include/x86emu/regs.h"
-#include <pci.h>
+#include <linux/types.h>
 
 /****************************************************************************
 REMARKS:
diff --git a/include/bootflow.h b/include/bootflow.h
index 8dcc8f96e11..32422067723 100644
--- a/include/bootflow.h
+++ b/include/bootflow.h
@@ -11,7 +11,7 @@
 #include <bootdev.h>
 #include <image.h>
 #include <dm/ofnode_decl.h>
-#include <linux/list.h>
+#include <linux/types.h>
 
 struct bootstd_priv;
 struct expo;
diff --git a/include/bootstd.h b/include/bootstd.h
index 2bc464756dd..f2fb5f55faa 100644
--- a/include/bootstd.h
+++ b/include/bootstd.h
@@ -11,7 +11,6 @@
 
 #include <alist.h>
 #include <dm/ofnode_decl.h>
-#include <linux/list.h>
 #include <linux/types.h>
 
 struct udevice;
diff --git a/include/cadence-nand.h b/include/cadence-nand.h
index 27ed217b1ed..f08dce19cb9 100644
--- a/include/cadence-nand.h
+++ b/include/cadence-nand.h
@@ -12,7 +12,7 @@
 #define _CADENCE_NAND_H_
 #include <clk.h>
 #include <reset.h>
-#include <linux/mtd/mtd.h>
+#include <linux/types.h>
 #include <linux/mtd/rawnand.h>
 
 /*
diff --git a/include/cbfs.h b/include/cbfs.h
index 2bc5de2297e..1244dbdba0d 100644
--- a/include/cbfs.h
+++ b/include/cbfs.h
@@ -6,8 +6,8 @@
 #ifndef __CBFS_H
 #define __CBFS_H
 
-#include <compiler.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
 struct cbfs_priv;
 
diff --git a/include/compiler.h b/include/compiler.h
index ef7b2cb1f7e..f2e1e09c598 100644
--- a/include/compiler.h
+++ b/include/compiler.h
@@ -60,8 +60,6 @@
 # define __BIG_ENDIAN BIG_ENDIAN
 #endif
 
-#include <time.h>
-
 typedef uint8_t __u8;
 typedef uint16_t __u16;
 typedef uint32_t __u32;
diff --git a/include/dfu.h b/include/dfu.h
index 12f9dfcdfcd..80593a906fd 100644
--- a/include/dfu.h
+++ b/include/dfu.h
@@ -173,7 +173,6 @@ struct dfu_entity {
 	unsigned int inited:1;
 };
 
-struct list_head;
 extern struct list_head dfu_list;
 
 #ifdef CONFIG_SET_DFU_ALT_INFO
diff --git a/include/dw_hdmi.h b/include/dw_hdmi.h
index b73518207ef..fab5aafea19 100644
--- a/include/dw_hdmi.h
+++ b/include/dw_hdmi.h
@@ -9,8 +9,6 @@
 #ifndef _DW_HDMI_H
 #define _DW_HDMI_H
 
-#include <edid.h>
-
 #define HDMI_EDID_BLOCK_SIZE            128
 
 /* Identification Registers */
diff --git a/include/dwmmc.h b/include/dwmmc.h
index 6edb9e1a59c..87ca127cd6c 100644
--- a/include/dwmmc.h
+++ b/include/dwmmc.h
@@ -7,7 +7,6 @@
 #ifndef __DWMMC_HW_H
 #define __DWMMC_HW_H
 
-#include <asm/cache.h>
 #include <asm/io.h>
 #include <mmc.h>
 #include <linux/bitops.h>
diff --git a/include/efi_loader.h b/include/efi_loader.h
index b3beda5de7b..8fd09aad2d0 100644
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -11,15 +11,11 @@
 #include <blk.h>
 #include <efi_device_path.h>
 #include <event.h>
-#include <log.h>
-#include <part_efi.h>
 #include <efi_api.h>
 #include <image.h>
-#include <pe.h>
 #include <setjmp.h>
 #include <linux/list.h>
 #include <linux/sizes.h>
-#include <linux/oid_registry.h>
 
 struct blk_desc;
 struct bootflow;
diff --git a/include/efi_tcg2.h b/include/efi_tcg2.h
index 7ed88809913..34a3d4a0434 100644
--- a/include/efi_tcg2.h
+++ b/include/efi_tcg2.h
@@ -17,6 +17,7 @@
 #define _EFI_TCG2_PROTOCOL_H_
 
 #include <efi_api.h>
+#include <part_efi.h>
 #include <tpm-v2.h>
 #include <tpm_tcg2.h>
 
diff --git a/include/fat.h b/include/fat.h
index ca97880de12..bdf430f7067 100644
--- a/include/fat.h
+++ b/include/fat.h
@@ -11,7 +11,6 @@
 
 #include <fs.h>
 #include <asm/byteorder.h>
-#include <asm/cache.h>
 
 struct disk_partition;
 
diff --git a/include/fwu.h b/include/fwu.h
index 6441de370c9..77e60167fc7 100644
--- a/include/fwu.h
+++ b/include/fwu.h
@@ -9,7 +9,6 @@
 #include <blk.h>
 #include <efi.h>
 #include <fwu_mdata.h>
-#include <mtd.h>
 #include <u-boot/uuid.h>
 
 #include <linux/types.h>
diff --git a/include/ide.h b/include/ide.h
index 2c25e74ede0..550b3305621 100644
--- a/include/ide.h
+++ b/include/ide.h
@@ -7,8 +7,6 @@
 #ifndef	_IDE_H
 #define _IDE_H
 
-#include <blk.h>
-
 #define IDE_BUS(dev)	(dev / (CONFIG_SYS_IDE_MAXDEVICE / CONFIG_SYS_IDE_MAXBUS))
 
 /**
diff --git a/include/mmc.h b/include/mmc.h
index eead666ae44..87f7ef131b6 100644
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -11,8 +11,6 @@
 
 #include <linux/bitops.h>
 #include <linux/list.h>
-#include <linux/sizes.h>
-#include <linux/compiler.h>
 #include <linux/dma-direction.h>
 #include <cyclic.h>
 #include <part.h>
diff --git a/include/part.h b/include/part.h
index 3e6eb0ec33f..7075b2cb116 100644
--- a/include/part.h
+++ b/include/part.h
@@ -7,7 +7,6 @@
 #define _PART_H
 
 #include <blk.h>
-#include <ide.h>
 #include <u-boot/uuid.h>
 #include <linker_lists.h>
 #include <linux/errno.h>