diff --git a/arch/x86/archelfboot.c b/arch/x86/archelfboot.c
index 8848876422..ee10fc5120 100644
--- a/arch/x86/archelfboot.c
+++ b/arch/x86/archelfboot.c
@@ -1,4 +1,4 @@
-#include <console/console.h>
+#include <console.h>
 // #include <ip_checksum.h>
 #include <elf.h>
 #include <elf_boot.h>
diff --git a/arch/x86/archtables.c b/arch/x86/archtables.c
index 81f40a95ec..3210da17e2 100644
--- a/arch/x86/archtables.c
+++ b/arch/x86/archtables.c
@@ -22,7 +22,7 @@
 /* 2006.1 yhlu add mptable cross 0x467 processing */
 
 #include <arch/types.h>
-#include <console/console.h>
+#include <console.h>
 #include <string.h>
 #include <tables.h>
 //#include <cpu/cpu.h>
diff --git a/arch/x86/cachemain.c b/arch/x86/cachemain.c
index d7dee63c06..3b333243f8 100644
--- a/arch/x86/cachemain.c
+++ b/arch/x86/cachemain.c
@@ -19,7 +19,7 @@
 
 #include <arch/types.h>
 #include <arch/io.h>
-#include <console/console.h>
+#include <console.h>
 #include <lar.h>
 #include <tables.h>
 #include <lib.h>
diff --git a/arch/x86/keyboard.c b/arch/x86/keyboard.c
index ea718ec781..c207ed9337 100644
--- a/arch/x86/keyboard.c
+++ b/arch/x86/keyboard.c
@@ -1,4 +1,4 @@
-#include <console/console.h>
+#include <console.h>
 #include <keyboard.h>
 #include <device/device.h>
 #include <arch/io.h>
diff --git a/arch/x86/linuxbios_table.c b/arch/x86/linuxbios_table.c
index 0bc43d477d..28011f6c3d 100644
--- a/arch/x86/linuxbios_table.c
+++ b/arch/x86/linuxbios_table.c
@@ -19,7 +19,7 @@
  *
  */
 
-#include <console/console.h>
+#include <console.h>
 #include <ip_checksum.h>
 #include <string.h>
 #include <device/device.h>
diff --git a/arch/x86/mc146818rtc.c b/arch/x86/mc146818rtc.c
index adb1f0a572..f3205c8f1b 100644
--- a/arch/x86/mc146818rtc.c
+++ b/arch/x86/mc146818rtc.c
@@ -21,7 +21,7 @@
 
 #include <arch/types.h>
 #include <arch/io.h>
-#include <console/console.h>
+#include <console.h>
 #include <tables.h>
 #include <mc146818rtc.h>
 #include <string.h>
diff --git a/arch/x86/pci_ops_auto.c b/arch/x86/pci_ops_auto.c
index 913ec764f9..37b3c168f7 100644
--- a/arch/x86/pci_ops_auto.c
+++ b/arch/x86/pci_ops_auto.c
@@ -1,4 +1,4 @@
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <arch/pciconf.h>
 #include <device/pci.h>
diff --git a/arch/x86/pci_ops_conf1.c b/arch/x86/pci_ops_conf1.c
index 27dd74b84e..aa67b9416c 100644
--- a/arch/x86/pci_ops_conf1.c
+++ b/arch/x86/pci_ops_conf1.c
@@ -1,4 +1,4 @@
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <arch/pciconf.h>
 #include <device/pci.h>
diff --git a/arch/x86/pci_ops_conf2.c b/arch/x86/pci_ops_conf2.c
index d17c2aa752..ddd5a3eb6b 100644
--- a/arch/x86/pci_ops_conf2.c
+++ b/arch/x86/pci_ops_conf2.c
@@ -1,4 +1,4 @@
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <arch/pciconf.h>
 #include <device/pci.h>
diff --git a/arch/x86/pci_ops_mmconf.c b/arch/x86/pci_ops_mmconf.c
index dcff736e39..0a5715e504 100644
--- a/arch/x86/pci_ops_mmconf.c
+++ b/arch/x86/pci_ops_mmconf.c
@@ -1,5 +1,5 @@
 
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <arch/pciconf.h>
 #include <device/pci.h>
diff --git a/console/console.c b/console/console.c
index a7ee6475f7..2bf0db4a27 100644
--- a/console/console.c
+++ b/console/console.c
@@ -1,6 +1,6 @@
 #include <arch/types.h>
 #include <arch/hlt.h>
-#include <console/console.h>
+#include <console.h>
 #include <uart8250.h>
 // FIXME: we need this for varargs
 #include <stdarg.h>
diff --git a/console/vsprintf.c b/console/vsprintf.c
index b87fdd8367..4f11b58534 100644
--- a/console/vsprintf.c
+++ b/console/vsprintf.c
@@ -26,7 +26,7 @@
 
 #include <stdarg.h>
 #include <string.h>
-#include <console/console.h>
+#include <console.h>
 
 int vtxprintf(void (*tx_byte) (unsigned char byte, void *arg), void *arg, const char *fmt,
 	      va_list args);
diff --git a/device/agp_device.c b/device/agp_device.c
index 2d73b4db6a..6f56c22b75 100644
--- a/device/agp_device.c
+++ b/device/agp_device.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/device/cardbus_device.c b/device/cardbus_device.c
index d975a9c868..ff76a227e5 100644
--- a/device/cardbus_device.c
+++ b/device/cardbus_device.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/device/device.c b/device/device.c
index ba16d7badb..9b996ecdbe 100644
--- a/device/device.c
+++ b/device/device.c
@@ -28,7 +28,7 @@
  * handle resource allocation for non-pci devices.
  */
 
-#include <console/console.h>
+#include <console.h>
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/device/device_util.c b/device/device_util.c
index c6fab0f0d5..c19ec059d4 100644
--- a/device/device_util.c
+++ b/device/device_util.c
@@ -22,7 +22,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <console/console.h>
+#include <console.h>
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/device/hypertransport.c b/device/hypertransport.c
index d7b65c7718..5444e7ff00 100644
--- a/device/hypertransport.c
+++ b/device/hypertransport.c
@@ -24,7 +24,7 @@
  */
 
 #include <bitops.h>
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/path.h>
 #include <device/pci.h>
diff --git a/device/pci_device.c b/device/pci_device.c
index ac1952564d..0234916f48 100644
--- a/device/pci_device.c
+++ b/device/pci_device.c
@@ -26,7 +26,7 @@
 #include <arch/io.h>
 #include <string.h>
 #include <lib.h>
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/device/pci_ops.c b/device/pci_ops.c
index 28d1519da3..2bc7745ccd 100644
--- a/device/pci_ops.c
+++ b/device/pci_ops.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <arch/pciconf.h>
 #include <device/pci.h>
diff --git a/device/pci_rom.c b/device/pci_rom.c
index 36b4e0c478..e4a66055eb 100644
--- a/device/pci_rom.c
+++ b/device/pci_rom.c
@@ -21,7 +21,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/device/pciexp_device.c b/device/pciexp_device.c
index 3025b4b3a1..6fe59ee01b 100644
--- a/device/pciexp_device.c
+++ b/device/pciexp_device.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/device/pcix_device.c b/device/pcix_device.c
index 65da8316b9..506274851c 100644
--- a/device/pcix_device.c
+++ b/device/pcix_device.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/device/pnp_device.c b/device/pnp_device.c
index 5962068c70..5dab4c8533 100644
--- a/device/pnp_device.c
+++ b/device/pnp_device.c
@@ -22,7 +22,7 @@
  */
 
 #include <arch/types.h>
-#include <console/console.h>
+#include <console.h>
 #include <stdlib.h>
 // #include <stdint.h>
 // #include <bitops.h>
diff --git a/device/root_device.c b/device/root_device.c
index 0ac1562d20..6a4a4373ec 100644
--- a/device/root_device.c
+++ b/device/root_device.c
@@ -22,7 +22,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 // #include <part/hard_reset.h>
diff --git a/device/smbus_ops.c b/device/smbus_ops.c
index 010040ddf8..1043e9478c 100644
--- a/device/smbus_ops.c
+++ b/device/smbus_ops.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <console/console.h>
+#include <console.h>
 #include <stdint.h>
 #include <device/device.h>
 #include <device/path.h>
diff --git a/include/console/console.h b/include/console.h
similarity index 100%
rename from include/console/console.h
rename to include/console.h
diff --git a/lib/elfboot.c b/lib/elfboot.c
index 9c06fb9cc6..7135ad0cd4 100644
--- a/lib/elfboot.c
+++ b/lib/elfboot.c
@@ -29,7 +29,7 @@
 #include <arch/types.h>
 #include <string.h>
 
-#include <console/console.h>
+#include <console.h>
 #include <tables.h>
 #include <elf.h>
 #include <elf_boot.h>
diff --git a/lib/lar.c b/lib/lar.c
index 25c0036669..3c9f067f31 100644
--- a/lib/lar.c
+++ b/lib/lar.c
@@ -21,7 +21,7 @@
 #include <arch/types.h>
 #include <string.h>
 #include <lar.h>
-#include <console/console.h>
+#include <console.h>
 
 #ifndef CONFIG_BIG_ENDIAN
 #define ntohl(x) ( ((x&0xff)<<24) | ((x&0xff00)<<8) | \
diff --git a/lib/malloc.c b/lib/malloc.c
index 32ab3c1edf..f5606493e7 100644
--- a/lib/malloc.c
+++ b/lib/malloc.c
@@ -25,7 +25,7 @@
 
 #include <arch/types.h>
 #include <stdlib.h>
-#include <console/console.h>
+#include <console.h>
 
 #if 0
 #define MALLOCDBG(x...)
diff --git a/lib/stage2.c b/lib/stage2.c
index 63f26372c5..171f134a42 100644
--- a/lib/stage2.c
+++ b/lib/stage2.c
@@ -25,7 +25,7 @@
 #include <arch/types.h>
 #include <string.h>
 #include <lar.h>
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <tables.h>
 
diff --git a/lib/tables.c b/lib/tables.c
index 85c1ae0b39..aec60e5261 100644
--- a/lib/tables.c
+++ b/lib/tables.c
@@ -19,7 +19,7 @@
  *
  */
 
-#include <console/console.h>
+#include <console.h>
 //#include <cpu.h>
 #include <tables.h>
 #include <tables.h>
diff --git a/mainboard/emulation/qemu-x86/initram.c b/mainboard/emulation/qemu-x86/initram.c
index 3921d17ce1..de6059b00a 100644
--- a/mainboard/emulation/qemu-x86/initram.c
+++ b/mainboard/emulation/qemu-x86/initram.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <console/console.h>
+#include <console.h>
 
 int main(void)
 {
diff --git a/mainboard/emulation/qemu-x86/vga.c b/mainboard/emulation/qemu-x86/vga.c
index 5c90bc8711..0ab7383b9c 100644
--- a/mainboard/emulation/qemu-x86/vga.c
+++ b/mainboard/emulation/qemu-x86/vga.c
@@ -19,7 +19,7 @@
  */
 
 #include <arch/types.h>
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
diff --git a/northbridge/intel/i440bxemulation/i440bx.c b/northbridge/intel/i440bxemulation/i440bx.c
index f2513ff4aa..1616cd45b6 100644
--- a/northbridge/intel/i440bxemulation/i440bx.c
+++ b/northbridge/intel/i440bxemulation/i440bx.c
@@ -35,7 +35,7 @@
  */
 
 #include <arch/types.h>
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
diff --git a/southbridge/intel/i82371eb/i82371eb.c b/southbridge/intel/i82371eb/i82371eb.c
index 35d8433fe2..91ee3dbe71 100644
--- a/southbridge/intel/i82371eb/i82371eb.c
+++ b/southbridge/intel/i82371eb/i82371eb.c
@@ -21,7 +21,7 @@
  */
 
 #include <arch/types.h>
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <mc146818rtc.h>
diff --git a/superio/winbond/w83627hf/superio.c b/superio/winbond/w83627hf/superio.c
index ad0cb03888..6b900bde53 100644
--- a/superio/winbond/w83627hf/superio.c
+++ b/superio/winbond/w83627hf/superio.c
@@ -9,7 +9,7 @@
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pnp.h>
-#include <console/console.h>
+#include <console.h>
 #include <string.h>
 //#include <bitops.h>
 #include <uart8250.h>
diff --git a/util/x86emu/biosemu.c b/util/x86emu/biosemu.c
index 8acabdd981..a9adebff90 100644
--- a/util/x86emu/biosemu.c
+++ b/util/x86emu/biosemu.c
@@ -36,7 +36,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 #include <arch/io.h>
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/util/x86emu/include/x86emu/x86emu.h b/util/x86emu/include/x86emu/x86emu.h
index 38874cb8dc..f45796639b 100644
--- a/util/x86emu/include/x86emu/x86emu.h
+++ b/util/x86emu/include/x86emu/x86emu.h
@@ -44,7 +44,7 @@
 
 /* FIXME: undefine printk for the moment */
 #ifdef LINUXBIOS_VERSION
-#include <console/console.h>
+#include <console.h>
 #define printk(x...) printk(BIOS_DEBUG, x)
 #else
 #define printk printf
diff --git a/util/x86emu/pcbios/pcibios.c b/util/x86emu/pcbios/pcibios.c
index 858a22d898..fdfdff8be8 100644
--- a/util/x86emu/pcbios/pcibios.c
+++ b/util/x86emu/pcbios/pcibios.c
@@ -35,7 +35,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
-#include <console/console.h>
+#include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/util/x86emu/vm86.c b/util/x86emu/vm86.c
index 7571bbb6e4..1fc9aa1f56 100644
--- a/util/x86emu/vm86.c
+++ b/util/x86emu/vm86.c
@@ -25,7 +25,7 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <console/console.h>
+#include <console.h>
 #include <string.h>
 #include <arch/io.h>