diff --git a/src/arch/x86/cbmem.c b/src/arch/x86/cbmem.c
index ef53553777..52f8f8a5de 100644
--- a/src/arch/x86/cbmem.c
+++ b/src/arch/x86/cbmem.c
@@ -12,7 +12,6 @@
  */
 
 #include <stdlib.h>
-#include <console/console.h>
 #include <cbmem.h>
 #include <compiler.h>
 #include <arch/acpi.h>
diff --git a/src/arch/x86/cpu_common.c b/src/arch/x86/cpu_common.c
index 26cf69f6b9..d328fe9030 100644
--- a/src/arch/x86/cpu_common.c
+++ b/src/arch/x86/cpu_common.c
@@ -11,15 +11,7 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <cpu/cpu.h>
-#include <arch/io.h>
-#include <string.h>
-#include <cpu/x86/lapic.h>
-#include <arch/cpu.h>
-#include <device/path.h>
-#include <device/device.h>
-#include <smp/spinlock.h>
 
 #ifndef __x86_64__
 /* Standard macro to see if a specific flag is changeable */
diff --git a/src/arch/x86/pci_ops_conf1.c b/src/arch/x86/pci_ops_conf1.c
index a92fd3108f..30cbcb46f1 100644
--- a/src/arch/x86/pci_ops_conf1.c
+++ b/src/arch/x86/pci_ops_conf1.c
@@ -11,10 +11,8 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <arch/io.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <device/pci_ops.h>
 /*
  * Functions for accessing PCI configuration space with type 1 accesses