diff --git a/src/arch/arm/armv7/mmu.c b/src/arch/arm/armv7/mmu.c
index 6c085e920e..4123bb4d65 100644
--- a/src/arch/arm/armv7/mmu.c
+++ b/src/arch/arm/armv7/mmu.c
@@ -29,7 +29,6 @@
  */
 
 #include <assert.h>
-#include <config.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <symbols.h>
diff --git a/src/arch/arm/include/armv4/arch/cache.h b/src/arch/arm/include/armv4/arch/cache.h
index 65f59662a6..ed3b96fffe 100644
--- a/src/arch/arm/include/armv4/arch/cache.h
+++ b/src/arch/arm/include/armv4/arch/cache.h
@@ -32,7 +32,6 @@
 #ifndef ARM_CACHE_H
 #define ARM_CACHE_H
 
-#include <config.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/src/arch/arm64/include/armv8/arch/cache.h b/src/arch/arm64/include/armv8/arch/cache.h
index 64afd62fb6..84f051d533 100644
--- a/src/arch/arm64/include/armv8/arch/cache.h
+++ b/src/arch/arm64/include/armv8/arch/cache.h
@@ -32,7 +32,6 @@
 #ifndef ARM_ARM64_CACHE_H
 #define ARM_ARM64_CACHE_H
 
-#include <config.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <arch/barrier.h>
diff --git a/src/commonlib/configstring.c b/src/commonlib/configstring.c
index 4eca6af39a..fc91a4b9de 100644
--- a/src/commonlib/configstring.c
+++ b/src/commonlib/configstring.c
@@ -27,7 +27,6 @@
  * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  */
 
-#include <config.h>
 #include <string.h>
 #include <commonlib/configstring.h>
 
diff --git a/src/cpu/allwinner/a10/ram_segs.h b/src/cpu/allwinner/a10/ram_segs.h
index fa3684f0b6..fa915cd203 100644
--- a/src/cpu/allwinner/a10/ram_segs.h
+++ b/src/cpu/allwinner/a10/ram_segs.h
@@ -17,7 +17,6 @@
  * How we use DRAM on Allwinner CPUs
  */
 
-#include <config.h>
 #include <symbols.h>
 
 /*
diff --git a/src/cpu/dmp/vortex86ex/biosdata_ex.S b/src/cpu/dmp/vortex86ex/biosdata_ex.S
index 386cd0749d..59d7ff19be 100644
--- a/src/cpu/dmp/vortex86ex/biosdata_ex.S
+++ b/src/cpu/dmp/vortex86ex/biosdata_ex.S
@@ -13,8 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include "config.h"
-
 /*
 PLL Freq = 25 * NS /(MS * 2^RS)
 CPU Freq = PLL/(CPU_DIV+2)
diff --git a/src/cpu/ti/am335x/header.c b/src/cpu/ti/am335x/header.c
index 6837ef8c85..d59e29749d 100644
--- a/src/cpu/ti/am335x/header.c
+++ b/src/cpu/ti/am335x/header.c
@@ -12,7 +12,6 @@
  * GNU General Public License for more details.
  */
 
-#include <config.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <symbols.h>
diff --git a/src/cpu/ti/am335x/pinmux.c b/src/cpu/ti/am335x/pinmux.c
index 6fea9ad9c8..1e45142145 100644
--- a/src/cpu/ti/am335x/pinmux.c
+++ b/src/cpu/ti/am335x/pinmux.c
@@ -16,7 +16,6 @@
 #include "pinmux.h"
 
 #include <arch/io.h>
-#include <config.h>
 
 static struct am335x_pinmux_regs *regs =
 	(struct am335x_pinmux_regs *)(uintptr_t)AM335X_PINMUX_REG_ADDR;
diff --git a/src/cpu/ti/am335x/uart.c b/src/cpu/ti/am335x/uart.c
index a329298b8a..45a693a953 100644
--- a/src/cpu/ti/am335x/uart.c
+++ b/src/cpu/ti/am335x/uart.c
@@ -13,7 +13,6 @@
  */
 
 #include <stdlib.h>
-#include <config.h>
 #include <types.h>
 #include <console/uart.h>
 #include <arch/io.h>
diff --git a/src/cpu/x86/smm/smmhandler.S b/src/cpu/x86/smm/smmhandler.S
index db21539873..a16b3ec110 100644
--- a/src/cpu/x86/smm/smmhandler.S
+++ b/src/cpu/x86/smm/smmhandler.S
@@ -21,8 +21,6 @@
  * to 64k if we can though.
  */
 
-#include <kconfig.h>
-#include <config.h>
 #define LAPIC_BASE_MSR 0x1b
 
 /*
diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index 05d4051315..06294d00c7 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -47,7 +47,6 @@
 #include <device/pciexp.h>
 #include <device/hypertransport.h>
 #include <pc80/i8259.h>
-#include <kconfig.h>
 #include <vboot/vbnv.h>
 
 u8 pci_moving_config8(struct device *dev, unsigned int reg)
diff --git a/src/drivers/ricoh/rce822/rce822.c b/src/drivers/ricoh/rce822/rce822.c
index 30aeabe3b8..7bc3b4083f 100644
--- a/src/drivers/ricoh/rce822/rce822.c
+++ b/src/drivers/ricoh/rce822/rce822.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <kconfig.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index cfc3938e3d..b08509493e 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.c
@@ -19,7 +19,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <ec/acpi/ec.h>
-#include <kconfig.h>
 #include <stdlib.h>
 #include <string.h>
 #include <smbios.h>
diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
index 37f81c5094..4886bb27c8 100644
--- a/src/northbridge/intel/gm45/gma.c
+++ b/src/northbridge/intel/gm45/gma.c
@@ -24,7 +24,6 @@
 #include <device/pci_ops.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
-#include <kconfig.h>
 #include <commonlib/helpers.h>
 
 #include "drivers/intel/gma/i915_reg.h"
diff --git a/src/northbridge/intel/pineview/gma.c b/src/northbridge/intel/pineview/gma.c
index d67019888b..c92428e36c 100644
--- a/src/northbridge/intel/pineview/gma.c
+++ b/src/northbridge/intel/pineview/gma.c
@@ -25,7 +25,6 @@
 #include <device/pci_ops.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
-#include <kconfig.h>
 
 #include <drivers/intel/gma/i915_reg.h>
 #include "chip.h"
diff --git a/src/northbridge/intel/x4x/gma.c b/src/northbridge/intel/x4x/gma.c
index 62e28aafc4..76ab893896 100644
--- a/src/northbridge/intel/x4x/gma.c
+++ b/src/northbridge/intel/x4x/gma.c
@@ -25,7 +25,6 @@
 #include <device/pci_ops.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
-#include <kconfig.h>
 #include <commonlib/helpers.h>
 
 #include "drivers/intel/gma/i915_reg.h"
diff --git a/src/northbridge/via/vx900/chrome9hd.c b/src/northbridge/via/vx900/chrome9hd.c
index c99f10e889..333b28d487 100644
--- a/src/northbridge/via/vx900/chrome9hd.c
+++ b/src/northbridge/via/vx900/chrome9hd.c
@@ -15,7 +15,6 @@
  */
 
 #include <arch/io.h>
-#include <config.h>
 #include <console/console.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/intel/bd82x6x/usb_ehci.c b/src/southbridge/intel/bd82x6x/usb_ehci.c
index c0cb1a9092..2712a5b158 100644
--- a/src/southbridge/intel/bd82x6x/usb_ehci.c
+++ b/src/southbridge/intel/bd82x6x/usb_ehci.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <kconfig.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/vendorcode/amd/pi/00730F01/Porting.h b/src/vendorcode/amd/pi/00730F01/Porting.h
index 8b1fe65ddb..b77dffe99d 100644
--- a/src/vendorcode/amd/pi/00730F01/Porting.h
+++ b/src/vendorcode/amd/pi/00730F01/Porting.h
@@ -278,7 +278,6 @@
 #include "gcc-intrin.h"
 
 #include <assert.h>
-#include <config.h>
 #include <console/console.h>
 #include <commonlib/loglevel.h>