10 files changed, 18 insertions, 15 deletions
diff --git a/src/include/cbmem.h b/src/include/cbmem.h
index 5b5191aab2..40a0acb510 100644
--- a/src/include/cbmem.h
+++ b/src/include/cbmem.h
@@ -3,7 +3,7 @@
 #ifndef _CBMEM_H_
 #define _CBMEM_H_
 
-#include <commonlib/bsd/cbmem_id.h>
+#include <commonlib/bsd/cbmem_id.h> /* IWYU pragma: export */
 #include <stddef.h>
 #include <stdint.h>
 #include <boot/coreboot_tables.h>
diff --git a/src/include/console/console.h b/src/include/console/console.h
index 49bce61470..6f44d7f95c 100644
--- a/src/include/console/console.h
+++ b/src/include/console/console.h
@@ -8,7 +8,7 @@
 #include <stdint.h>
 
 /* console.h is supposed to provide the log levels defined in here: */
-#include <commonlib/loglevel.h>
+#include <commonlib/loglevel.h> /* IWYU pragma: export */
 
 #define RAM_DEBUG (CONFIG(DEBUG_RAM_SETUP) ? BIOS_DEBUG : BIOS_NEVER)
 #define RAM_SPEW  (CONFIG(DEBUG_RAM_SETUP) ? BIOS_SPEW  : BIOS_NEVER)
diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h
index 66103684ba..e668de8ff4 100644
--- a/src/include/cpu/cpu.h
+++ b/src/include/cpu/cpu.h
@@ -3,7 +3,7 @@
 #ifndef CPU_CPU_H
 #define CPU_CPU_H
 
-#include <arch/cpu.h>
+#include <arch/cpu.h>  /* IWYU pragma: export */
 #include <stdint.h>
 
 void cpu_initialize(unsigned int cpu_index);
diff --git a/src/include/cpu/x86/msr.h b/src/include/cpu/x86/msr.h
index 999fdaae5b..f4e39859cf 100644
--- a/src/include/cpu/x86/msr.h
+++ b/src/include/cpu/x86/msr.h
@@ -3,7 +3,7 @@
 #ifndef CPU_X86_MSR_H
 #define CPU_X86_MSR_H
 
-#include <cpu/x86/msr_access.h>
+#include <cpu/x86/msr_access.h> /* IWYU pragma: export */
 
 /* Intel SDM: Table 2-1
  * IA-32 architectural MSR: Extended Feature Enable Register
diff --git a/src/include/device/mmio.h b/src/include/device/mmio.h
index b5b79ee5e6..2b9949e05a 100644
--- a/src/include/device/mmio.h
+++ b/src/include/device/mmio.h
@@ -3,7 +3,7 @@
 #ifndef __DEVICE_MMIO_H__
 #define __DEVICE_MMIO_H__
 
-#include <arch/mmio.h>
+#include <arch/mmio.h> /* IWYU pragma: export */
 #include <commonlib/helpers.h>
 #include <endian.h>
 #include <types.h>
diff --git a/src/include/device/pci.h b/src/include/device/pci.h
index f28f319d8c..88b955570a 100644
--- a/src/include/device/pci.h
+++ b/src/include/device/pci.h
@@ -19,14 +19,15 @@
 
 #if CONFIG(PCI)
 
-#include <stdint.h>
-#include <stddef.h>
-#include <device/pci_def.h>
-#include <device/resource.h>
+/* When <device/pci.h> is needed, it supposed to provide <device/pci_{def,type}.h> */
 #include <device/device.h>
+#include <device/pci_def.h> /* IWYU pragma: export */
 #include <device/pci_ops.h>
 #include <device/pci_rom.h>
-#include <device/pci_type.h>
+#include <device/pci_type.h> /* IWYU pragma: export */
+#include <device/resource.h>
+#include <stddef.h>
+#include <stdint.h>
 
 /* Common pci operations without a standard interface */
 struct pci_operations {
diff --git a/src/include/device/pci_ops.h b/src/include/device/pci_ops.h
index a1678255c4..b5d4e238aa 100644
--- a/src/include/device/pci_ops.h
+++ b/src/include/device/pci_ops.h
@@ -6,7 +6,7 @@
 #include <stdint.h>
 #include <device/device.h>
 #include <device/pci_type.h>
-#include <arch/pci_ops.h>
+#include <arch/pci_ops.h> /* IWYU pragma: export */
 
 void __noreturn pcidev_die(void);
 
diff --git a/src/include/device/pnp.h b/src/include/device/pnp.h
index e2a6dc2395..ac23a49501 100644
--- a/src/include/device/pnp.h
+++ b/src/include/device/pnp.h
@@ -6,8 +6,8 @@
 #include <stdint.h>
 #include <device/device.h>
 /* When <device/pnp.h> is needed, it supposed to provide <device/pnp_{def,type}.h> */
-#include <device/pnp_def.h>
-#include <device/pnp_type.h>
+#include <device/pnp_def.h> /* IWYU pragma: export */
+#include <device/pnp_type.h> /* IWYU pragma: export */
 #include <arch/io.h>
 
 #if !ENV_PNP_SIMPLE_DEVICE
diff --git a/src/include/string.h b/src/include/string.h
index f595c7ed2e..92ea5e5f7f 100644
--- a/src/include/string.h
+++ b/src/include/string.h
@@ -3,9 +3,9 @@
 #ifndef STRING_H
 #define STRING_H
 
-#include <stdarg.h>
+#include <stdarg.h> /* IWYU pragma: export */
 #include <stddef.h>
-#include <stdio.h>
+#include <stdio.h> /* IWYU pragma: export */
 
 void *memcpy(void *dest, const void *src, size_t n);
 void *memmove(void *dest, const void *src, size_t n);
diff --git a/src/include/types.h b/src/include/types.h
index 8724d4b01f..ca4571777c 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -4,11 +4,13 @@
 #define __TYPES_H
 
 /* types.h is supposed to provide the standard headers defined in here: */
+/* IWYU pragma: begin_exports */
 #include <commonlib/bsd/cb_err.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
+/* IWYU pragma: end_exports */
 
 /*
  * This may mean something else on architectures where the bits are numbered