From 71ccb36afc342accb0363720959c4612f5de1822 Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Sat, 5 May 2007 21:36:52 +0000
Subject: [PATCH] Massive file rename and moving orgy:

 - Everything in include/cpu/generic/x86/arch/* goes into
   include/arch/x86 now.

 - include/cpu/generic/x86/div64.h moves into include/arch/x86, too.

 - The former include/cpu/generic/x86/arch/elf.h moved to
   include/arch/x86/archelf.h, as elf.h already exists in include/
   and we must prevent a name clash.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@314 f3766cd6-281f-0410-b1cd-43a5c92072e9
---
 HACKING                                                   | 4 ++--
 Makefile                                                  | 2 +-
 arch/x86/Makefile                                         | 2 +-
 arch/x86/archtables.c                                     | 8 ++++----
 arch/x86/cachemain.c                                      | 4 ++--
 arch/x86/i8259.c                                          | 2 +-
 arch/x86/isa-dma.c                                        | 2 +-
 arch/x86/keyboard.c                                       | 2 +-
 arch/x86/linuxbios_table.c                                | 6 +++---
 arch/x86/mc146818rtc.c                                    | 4 ++--
 arch/x86/pci_ops_auto.c                                   | 6 +++---
 arch/x86/pci_ops_conf1.c                                  | 6 +++---
 arch/x86/pci_ops_conf2.c                                  | 6 +++---
 arch/x86/pci_ops_mmconf.c                                 | 7 +++----
 arch/x86/serial.c                                         | 2 +-
 arch/x86/speaker.c                                        | 2 +-
 arch/x86/udelay_io.c                                      | 2 +-
 console/console.c                                         | 4 ++--
 device/device.c                                           | 2 +-
 device/device_util.c                                      | 2 +-
 device/pci_device.c                                       | 4 ++--
 device/pci_ops.c                                          | 4 ++--
 device/pnp_device.c                                       | 4 ++--
 .../{cpu/generic/x86/arch/elf.h => arch/x86/archelf.h}    | 0
 include/{cpu/generic/x86/arch => arch/x86}/byteorder.h    | 2 +-
 include/{cpu/generic => arch}/x86/div64.h                 | 0
 include/{cpu/generic/x86/arch => arch/x86}/hlt.h          | 0
 include/{cpu/generic/x86/arch => arch/x86}/io.h           | 2 +-
 include/{cpu/generic/x86/arch => arch/x86}/pci_ops.h      | 0
 include/{cpu/generic/x86/arch => arch/x86}/pciconf.h      | 0
 include/{cpu/generic/x86/arch => arch/x86}/swab.h         | 0
 include/{cpu/generic/x86/arch => arch/x86}/types.h        | 0
 include/console.h                                         | 2 +-
 include/device/device.h                                   | 2 +-
 include/device/pci.h                                      | 2 +-
 include/device/pci_ops.h                                  | 4 ++--
 include/device/pci_rom.h                                  | 4 ++--
 include/device/pnp.h                                      | 2 +-
 include/device/resource.h                                 | 2 +-
 include/elf.h                                             | 4 ++--
 include/elf_boot.h                                        | 2 +-
 include/lar.h                                             | 2 +-
 include/string.h                                          | 2 +-
 lib/compute_ip_checksum.c                                 | 2 +-
 lib/elfboot.c                                             | 3 +--
 lib/lar.c                                                 | 2 +-
 lib/malloc.c                                              | 2 +-
 lib/mem.c                                                 | 2 +-
 lib/stage2.c                                              | 2 +-
 lib/tables.c                                              | 1 -
 lib/uart8250.c                                            | 2 +-
 mainboard/emulation/qemu-x86/vga.c                        | 2 +-
 northbridge/intel/i440bxemulation/i440bx.c                | 2 +-
 southbridge/intel/i82371eb/i82371eb.c                     | 2 +-
 superio/winbond/w83627hf/chip.h                           | 2 --
 superio/winbond/w83627hf/superio.c                        | 2 +-
 superio/winbond/w83627hf/w83627hf_early_init.c            | 1 -
 superio/winbond/w83627hf/w83627hf_early_serial.c          | 1 -
 util/x86emu/biosemu.c                                     | 2 +-
 util/x86emu/vm86.c                                        | 2 +-
 util/x86emu/x86emu/sys.c                                  | 2 +-
 61 files changed, 73 insertions(+), 80 deletions(-)
 rename include/{cpu/generic/x86/arch/elf.h => arch/x86/archelf.h} (100%)
 rename include/{cpu/generic/x86/arch => arch/x86}/byteorder.h (97%)
 rename include/{cpu/generic => arch}/x86/div64.h (100%)
 rename include/{cpu/generic/x86/arch => arch/x86}/hlt.h (100%)
 rename include/{cpu/generic/x86/arch => arch/x86}/io.h (99%)
 rename include/{cpu/generic/x86/arch => arch/x86}/pci_ops.h (100%)
 rename include/{cpu/generic/x86/arch => arch/x86}/pciconf.h (100%)
 rename include/{cpu/generic/x86/arch => arch/x86}/swab.h (100%)
 rename include/{cpu/generic/x86/arch => arch/x86}/types.h (100%)

diff --git a/HACKING b/HACKING
index d6ab5326a9..9b68206ef6 100644
--- a/HACKING
+++ b/HACKING
@@ -86,11 +86,11 @@ Third-party Code and License Overview
   Source: http://lxr.mozilla.org/mozilla1.8.0/source/js/src/jscpucfg.c
   Current version we use: CVS rev. 3.25
 
-* include/cpu/generic/x86/div64.h: GPLv2
+* include/arch/x86/div64.h: GPLv2
   Source: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
   Current version we use: e2afe67453e5b1499459ee3596b1e7924a5208f5
 
-* include/cpu/generic/x86/arch/swab.h: GPLv2
+* include/arch/x86/swab.h: GPLv2
   Source: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
   Current version we use: ?
 
diff --git a/Makefile b/Makefile
index 4afed2fe99..51c574164c 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,7 @@ MAINBOARDDIR=$(shell echo $(CONFIG_MAINBOARD_NAME))
 
 LINUXBIOSINCLUDE    :=  -I$(src) -Iinclude \
 			-I$(src)/include \
-			-I$(src)/include/cpu/generic/$(ARCH)/ \
+			-I$(src)/include/arch/$(ARCH)/ \
 			-include $(obj)/config.h \
 			-include $(obj)/build.h
 
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 84df45f2fe..039575a8c9 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -21,7 +21,7 @@
 
 ifeq ($(CONFIG_ARCH_X86),y)
 
-INITCFLAGS := $(CFLAGS) -I$(src)/include/cpu/generic/x86 -I$(src)/include \
+INITCFLAGS := $(CFLAGS) -I$(src)/include/arch/x86 -I$(src)/include \
 		-fno-builtin
 
 SILENT := &> /dev/null
diff --git a/arch/x86/archtables.c b/arch/x86/archtables.c
index 3210da17e2..951052954f 100644
--- a/arch/x86/archtables.c
+++ b/arch/x86/archtables.c
@@ -21,14 +21,14 @@
 
 /* 2006.1 yhlu add mptable cross 0x467 processing */
 
-#include <arch/types.h>
+#include <types.h>
 #include <console.h>
 #include <string.h>
 #include <tables.h>
 //#include <cpu/cpu.h>
-//#include <arch/pirq_routing.h>
-//#include <arch/smp/mpspec.h>
-//#include <arch/acpi.h>
+//#include <pirq_routing.h>
+//#include <smp/mpspec.h>
+//#include <acpi.h>
 
 // Global Descriptor Table, defined in c_start.S
 extern u8 gdt;
diff --git a/arch/x86/cachemain.c b/arch/x86/cachemain.c
index 3b333243f8..3983ded804 100644
--- a/arch/x86/cachemain.c
+++ b/arch/x86/cachemain.c
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <arch/types.h>
-#include <arch/io.h>
+#include <types.h>
+#include <io.h>
 #include <console.h>
 #include <lar.h>
 #include <tables.h>
diff --git a/arch/x86/i8259.c b/arch/x86/i8259.c
index 5fc348b0da..e58a5f7be8 100644
--- a/arch/x86/i8259.c
+++ b/arch/x86/i8259.c
@@ -11,7 +11,7 @@
 ! March 1993/June 1994 (Christoph.Niemann@linux.org)
 */
 
-#include <arch/io.h>
+#include <io.h>
 
 /*
 ! well, that went ok, I hope. Now we have to reprogram the interrupts :-(
diff --git a/arch/x86/isa-dma.c b/arch/x86/isa-dma.c
index 7b84afa98c..5d4fe457a5 100644
--- a/arch/x86/isa-dma.c
+++ b/arch/x86/isa-dma.c
@@ -1,4 +1,4 @@
-#include <arch/io.h>
+#include <io.h>
 #include <isa-dma.h>
 
 /* DMA controller registers */
diff --git a/arch/x86/keyboard.c b/arch/x86/keyboard.c
index c207ed9337..b927ed0ddc 100644
--- a/arch/x86/keyboard.c
+++ b/arch/x86/keyboard.c
@@ -1,7 +1,7 @@
 #include <console.h>
 #include <keyboard.h>
 #include <device/device.h>
-#include <arch/io.h>
+#include <io.h>
 
 static int kbd_empty_input_buffer(void)
 {
diff --git a/arch/x86/linuxbios_table.c b/arch/x86/linuxbios_table.c
index 28011f6c3d..7f836b37bc 100644
--- a/arch/x86/linuxbios_table.c
+++ b/arch/x86/linuxbios_table.c
@@ -26,9 +26,9 @@
 #include <tables.h>
 #include <mc146818rtc.h>
 //#include <cpu/cpu.h>
-//#include <arch/pirq_routing.h>
-//#include <arch/smp/mpspec.h>
-//#include <arch/acpi.h>
+//#include <pirq_routing.h>
+//#include <smp/mpspec.h>
+//#include <acpi.h>
 
 struct lb_header *lb_table_init(unsigned long addr)
 {
diff --git a/arch/x86/mc146818rtc.c b/arch/x86/mc146818rtc.c
index f3205c8f1b..28accfb7e9 100644
--- a/arch/x86/mc146818rtc.c
+++ b/arch/x86/mc146818rtc.c
@@ -19,8 +19,8 @@
  */
 
 
-#include <arch/types.h>
-#include <arch/io.h>
+#include <types.h>
+#include <io.h>
 #include <console.h>
 #include <tables.h>
 #include <mc146818rtc.h>
diff --git a/arch/x86/pci_ops_auto.c b/arch/x86/pci_ops_auto.c
index 37b3c168f7..7f7aa34a96 100644
--- a/arch/x86/pci_ops_auto.c
+++ b/arch/x86/pci_ops_auto.c
@@ -1,11 +1,11 @@
 #include <console.h>
 #include <device/device.h>
-#include <arch/pciconf.h>
+#include <pciconf.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <arch/types.h>
-#include <arch/io.h>
+#include <types.h>
+#include <io.h>
 
 /*
  * Before we decide to use direct hardware access mechanisms, we try to do some
diff --git a/arch/x86/pci_ops_conf1.c b/arch/x86/pci_ops_conf1.c
index aa67b9416c..af3e47298d 100644
--- a/arch/x86/pci_ops_conf1.c
+++ b/arch/x86/pci_ops_conf1.c
@@ -1,11 +1,11 @@
 #include <console.h>
 #include <device/device.h>
-#include <arch/pciconf.h>
+#include <pciconf.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <arch/types.h>
-#include <arch/io.h>
+#include <types.h>
+#include <io.h>
 
 /*
  * Functions for accessing PCI configuration space with type 1 accesses
diff --git a/arch/x86/pci_ops_conf2.c b/arch/x86/pci_ops_conf2.c
index ddd5a3eb6b..668af52e49 100644
--- a/arch/x86/pci_ops_conf2.c
+++ b/arch/x86/pci_ops_conf2.c
@@ -1,11 +1,11 @@
 #include <console.h>
 #include <device/device.h>
-#include <arch/pciconf.h>
+#include <pciconf.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <arch/types.h>
-#include <arch/io.h>
+#include <types.h>
+#include <io.h>
 
 /*
  * Functions for accessing PCI configuration space with type 2 accesses
diff --git a/arch/x86/pci_ops_mmconf.c b/arch/x86/pci_ops_mmconf.c
index 0a5715e504..6846192abf 100644
--- a/arch/x86/pci_ops_mmconf.c
+++ b/arch/x86/pci_ops_mmconf.c
@@ -1,11 +1,10 @@
-
 #include <console.h>
 #include <device/device.h>
-#include <arch/pciconf.h>
+#include <pciconf.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <arch/types.h>
+#include <types.h>
 
 
 /*
@@ -17,7 +16,7 @@
         (((DEVFN) & 0xFF) << 12) | \
         ((WHERE) & 0xFFF))
 
-#include <arch/mmio_conf.h>
+#include <mmio_conf.h>
 
 static uint8_t pci_mmconf_read_config8(struct bus *pbus, int bus, int devfn, int where)
 {
diff --git a/arch/x86/serial.c b/arch/x86/serial.c
index 05f291dfc5..c553301dbf 100644
--- a/arch/x86/serial.c
+++ b/arch/x86/serial.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
  */
 
-#include <arch/io.h>
+#include <io.h>
 #include <uart8250.h>
 
 void uart_init(void)
diff --git a/arch/x86/speaker.c b/arch/x86/speaker.c
index 55b7adbcbc..4344b27be2 100644
--- a/arch/x86/speaker.c
+++ b/arch/x86/speaker.c
@@ -25,7 +25,7 @@
  *  - Order number: 231244-006
  */
 
-#include <arch/io.h>
+#include <io.h>
 #include <lib.h>
 
 #define I82C54_CONTROL_WORD_REGISTER	0x43	/* Write-only. */
diff --git a/arch/x86/udelay_io.c b/arch/x86/udelay_io.c
index 288c76bb38..e75a79825e 100644
--- a/arch/x86/udelay_io.c
+++ b/arch/x86/udelay_io.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
  */
 
-#include <arch/io.h>
+#include <io.h>
 
 void udelay(unsigned int usecs)
 {
diff --git a/console/console.c b/console/console.c
index 2bf0db4a27..fa6351c1c6 100644
--- a/console/console.c
+++ b/console/console.c
@@ -1,5 +1,5 @@
-#include <arch/types.h>
-#include <arch/hlt.h>
+#include <types.h>
+#include <hlt.h>
 #include <console.h>
 #include <uart8250.h>
 // FIXME: we need this for varargs
diff --git a/device/device.c b/device/device.c
index 9b996ecdbe..7d7ccf717d 100644
--- a/device/device.c
+++ b/device/device.c
@@ -29,7 +29,7 @@
  */
 
 #include <console.h>
-#include <arch/io.h>
+#include <io.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/device/device_util.c b/device/device_util.c
index c19ec059d4..9d498b2827 100644
--- a/device/device_util.c
+++ b/device/device_util.c
@@ -23,7 +23,7 @@
  */
 
 #include <console.h>
-#include <arch/io.h>
+#include <io.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/device/pci_device.c b/device/pci_device.c
index 0234916f48..4d49d74b39 100644
--- a/device/pci_device.c
+++ b/device/pci_device.c
@@ -22,8 +22,8 @@
  * Copyright 1997 -- 1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
  */
 
-#include <arch/types.h>
-#include <arch/io.h>
+#include <types.h>
+#include <io.h>
 #include <string.h>
 #include <lib.h>
 #include <console.h>
diff --git a/device/pci_ops.c b/device/pci_ops.c
index 2bc7745ccd..6559438bd1 100644
--- a/device/pci_ops.c
+++ b/device/pci_ops.c
@@ -20,11 +20,11 @@
 
 #include <console.h>
 #include <device/device.h>
-#include <arch/pciconf.h>
+#include <pciconf.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <arch/types.h>
+#include <types.h>
 
 /**
  * Walk up the tree from the current dev, in an attempt to find a
diff --git a/device/pnp_device.c b/device/pnp_device.c
index 5dab4c8533..ae7251d87c 100644
--- a/device/pnp_device.c
+++ b/device/pnp_device.c
@@ -21,13 +21,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <arch/types.h>
+#include <types.h>
 #include <console.h>
 #include <stdlib.h>
 // #include <stdint.h>
 // #include <bitops.h>
 #include <string.h>
-#include <arch/io.h>
+#include <io.h>
 #include <device/device.h>
 #include <device/pnp.h>
 
diff --git a/include/cpu/generic/x86/arch/elf.h b/include/arch/x86/archelf.h
similarity index 100%
rename from include/cpu/generic/x86/arch/elf.h
rename to include/arch/x86/archelf.h
diff --git a/include/cpu/generic/x86/arch/byteorder.h b/include/arch/x86/byteorder.h
similarity index 97%
rename from include/cpu/generic/x86/arch/byteorder.h
rename to include/arch/x86/byteorder.h
index 02990ceb27..aec4861e24 100644
--- a/include/cpu/generic/x86/arch/byteorder.h
+++ b/include/arch/x86/byteorder.h
@@ -19,7 +19,7 @@
 
 #define __LITTLE_ENDIAN 1234
 
-#include <arch/swab.h>
+#include <swab.h>
 
 #define cpu_to_le32(x) ((unsigned int)(x))
 #define le32_to_cpu(x) ((unsigned int)(x))
diff --git a/include/cpu/generic/x86/div64.h b/include/arch/x86/div64.h
similarity index 100%
rename from include/cpu/generic/x86/div64.h
rename to include/arch/x86/div64.h
diff --git a/include/cpu/generic/x86/arch/hlt.h b/include/arch/x86/hlt.h
similarity index 100%
rename from include/cpu/generic/x86/arch/hlt.h
rename to include/arch/x86/hlt.h
diff --git a/include/cpu/generic/x86/arch/io.h b/include/arch/x86/io.h
similarity index 99%
rename from include/cpu/generic/x86/arch/io.h
rename to include/arch/x86/io.h
index 049729c7fd..5331c2ace1 100644
--- a/include/cpu/generic/x86/arch/io.h
+++ b/include/arch/x86/io.h
@@ -17,7 +17,7 @@
 #ifndef _ARCH_IO_H
 #define _ARCH_IO_H
 
-#include <arch/types.h>
+#include <types.h>
 
 /*
  * This file contains the definitions for the x86 IO instructions
diff --git a/include/cpu/generic/x86/arch/pci_ops.h b/include/arch/x86/pci_ops.h
similarity index 100%
rename from include/cpu/generic/x86/arch/pci_ops.h
rename to include/arch/x86/pci_ops.h
diff --git a/include/cpu/generic/x86/arch/pciconf.h b/include/arch/x86/pciconf.h
similarity index 100%
rename from include/cpu/generic/x86/arch/pciconf.h
rename to include/arch/x86/pciconf.h
diff --git a/include/cpu/generic/x86/arch/swab.h b/include/arch/x86/swab.h
similarity index 100%
rename from include/cpu/generic/x86/arch/swab.h
rename to include/arch/x86/swab.h
diff --git a/include/cpu/generic/x86/arch/types.h b/include/arch/x86/types.h
similarity index 100%
rename from include/cpu/generic/x86/arch/types.h
rename to include/arch/x86/types.h
diff --git a/include/console.h b/include/console.h
index 6780987fcf..2b209f8735 100644
--- a/include/console.h
+++ b/include/console.h
@@ -17,7 +17,7 @@
 #ifndef CONSOLE_CONSOLE_H_
 #define CONSOLE_CONSOLE_H_
 
-#include <arch/types.h>
+#include <types.h>
 
 #define BIOS_EMERG      0   /* system is unusable                   */
 #define BIOS_ALERT      1   /* action must be taken immediately     */
diff --git a/include/device/device.h b/include/device/device.h
index a9d72bcae4..988d94d116 100644
--- a/include/device/device.h
+++ b/include/device/device.h
@@ -20,7 +20,7 @@
 #ifndef DEVICE_H
 #define DEVICE_H
 
-#include <arch/types.h>
+#include <types.h>
 #include <device/resource.h>
 #include <device/path.h>
 
diff --git a/include/device/pci.h b/include/device/pci.h
index 82e6de88c7..b583179d0e 100644
--- a/include/device/pci.h
+++ b/include/device/pci.h
@@ -33,7 +33,7 @@
 #ifndef PCI_H
 #define PCI_H
 
-#include <arch/types.h>
+#include <types.h>
 #include <device/pci_def.h>
 #include <device/resource.h>
 #include <device/device.h>
diff --git a/include/device/pci_ops.h b/include/device/pci_ops.h
index 562b80c3fc..f843da2ef2 100644
--- a/include/device/pci_ops.h
+++ b/include/device/pci_ops.h
@@ -17,9 +17,9 @@
 #ifndef PCI_OPS_H
 #define PCI_OPS_H
 
-#include <arch/types.h>
+#include <types.h>
 #include <device/device.h>
-#include <arch/pci_ops.h>
+#include <pci_ops.h>
 
 u8 pci_read_config8(struct device * dev, unsigned where);
 u16 pci_read_config16(struct device * dev, unsigned where);
diff --git a/include/device/pci_rom.h b/include/device/pci_rom.h
index 46c98ac23d..5964eb7df8 100644
--- a/include/device/pci_rom.h
+++ b/include/device/pci_rom.h
@@ -16,8 +16,8 @@
 
 #ifndef PCI_ROM_H
 #define PCI_ROM_H
-#include <arch/types.h>
-#include <arch/byteorder.h>
+#include <types.h>
+#include <byteorder.h>
 
 #define PCI_ROM_HDR 0xAA55
 #define PCI_DATA_HDR (u32) ( ('R' << 24) | ('I' << 16) | ('C' << 8) | 'P' )
diff --git a/include/device/pnp.h b/include/device/pnp.h
index d100e8bde9..75f1a989a9 100644
--- a/include/device/pnp.h
+++ b/include/device/pnp.h
@@ -20,7 +20,7 @@
 #ifndef DEVICE_PNP_H
 #define DEVICE_PNP_H
 
-#include <arch/types.h>
+#include <types.h>
 #include <device/device.h>
 #include <device/pnp_def.h>
 
diff --git a/include/device/resource.h b/include/device/resource.h
index d47bae209c..4b5d4b51fe 100644
--- a/include/device/resource.h
+++ b/include/device/resource.h
@@ -17,7 +17,7 @@
 #ifndef RESOURCE_H
 #define RESOURCE_H
 
-#include <arch/types.h>
+#include <types.h>
 
 #define IORESOURCE_BITS		0x000000ff	/* Bus-specific bits */
 
diff --git a/include/elf.h b/include/elf.h
index 73aa5d5b1f..56057a0455 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -30,8 +30,8 @@
 #ifndef _ELF_H
 #define	_ELF_H 1
 
-#include <arch/types.h>
-#include <arch/elf.h>
+#include <types.h>
+#include <archelf.h>
 
 /* Standard ELF types.  */
 
diff --git a/include/elf_boot.h b/include/elf_boot.h
index b46cd69a65..1770b5d162 100644
--- a/include/elf_boot.h
+++ b/include/elf_boot.h
@@ -20,7 +20,7 @@
 #ifndef ELF_BOOT_H 
 #define ELF_BOOT_H 
 
-#include <arch/types.h>
+#include <types.h>
 
 /* This defines the structure of a table of parameters useful for ELF
  * bootable images.  These parameters are all passed and generated
diff --git a/include/lar.h b/include/lar.h
index 6f88c128bf..24df261b4c 100644
--- a/include/lar.h
+++ b/include/lar.h
@@ -47,7 +47,7 @@
  * ---------------------------------------------------------------------------
  */
 
-#include <arch/types.h>
+#include <types.h>
 
 #define MAGIC "LARCHIVE"
 #define MAX_PATHLEN 1024
diff --git a/include/string.h b/include/string.h
index 087bd8d4a3..3a86e9eb24 100644
--- a/include/string.h
+++ b/include/string.h
@@ -21,7 +21,7 @@
 #ifndef STRING_H
 #define STRING_H
 
-#include <arch/types.h>
+#include <types.h>
 
 /* Prototypes for functions from lib/mem.c. */
 void *memcpy(void *dest, const void *src, size_t len);
diff --git a/lib/compute_ip_checksum.c b/lib/compute_ip_checksum.c
index 5b41bc26b7..c2c07f99b9 100644
--- a/lib/compute_ip_checksum.c
+++ b/lib/compute_ip_checksum.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <arch/types.h>
+#include <types.h>
 #include <ip_checksum.h>
 #include <string.h>
 
diff --git a/lib/elfboot.c b/lib/elfboot.c
index 7135ad0cd4..73d18dedc7 100644
--- a/lib/elfboot.c
+++ b/lib/elfboot.c
@@ -26,9 +26,8 @@
  * no calls to malloc
  */
 
-#include <arch/types.h>
+#include <types.h>
 #include <string.h>
-
 #include <console.h>
 #include <tables.h>
 #include <elf.h>
diff --git a/lib/lar.c b/lib/lar.c
index 3c9f067f31..c03c880482 100644
--- a/lib/lar.c
+++ b/lib/lar.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
  */
 
-#include <arch/types.h>
+#include <types.h>
 #include <string.h>
 #include <lar.h>
 #include <console.h>
diff --git a/lib/malloc.c b/lib/malloc.c
index f5606493e7..b9e0370a09 100644
--- a/lib/malloc.c
+++ b/lib/malloc.c
@@ -23,7 +23,7 @@
  * has had this at some time or other. 
  */
 
-#include <arch/types.h>
+#include <types.h>
 #include <stdlib.h>
 #include <console.h>
 
diff --git a/lib/mem.c b/lib/mem.c
index 9e123bd191..58777e7143 100644
--- a/lib/mem.c
+++ b/lib/mem.c
@@ -23,7 +23,7 @@
  * these. Inlines are not as wonderful as people think.
  */
 
-#include <arch/types.h>
+#include <types.h>
 #include <string.h>
 
 /**
diff --git a/lib/stage2.c b/lib/stage2.c
index 171f134a42..6b4c19b5e3 100644
--- a/lib/stage2.c
+++ b/lib/stage2.c
@@ -22,7 +22,7 @@
 
 /* stage2 - LinuxBIOS RAM-based setup. */
 
-#include <arch/types.h>
+#include <types.h>
 #include <string.h>
 #include <lar.h>
 #include <console.h>
diff --git a/lib/tables.c b/lib/tables.c
index aec60e5261..ca4f545c63 100644
--- a/lib/tables.c
+++ b/lib/tables.c
@@ -22,7 +22,6 @@
 #include <console.h>
 //#include <cpu.h>
 #include <tables.h>
-#include <tables.h>
 
 struct lb_memory *
 write_tables(void)
diff --git a/lib/uart8250.c b/lib/uart8250.c
index 92c928422b..e9e75907f6 100644
--- a/lib/uart8250.c
+++ b/lib/uart8250.c
@@ -1,5 +1,5 @@
 /* Should support 8250, 16450, 16550, 16550A type uarts */
-#include <arch/io.h>
+#include <io.h>
 #include <uart8250.h>
 
 /* Data */
diff --git a/mainboard/emulation/qemu-x86/vga.c b/mainboard/emulation/qemu-x86/vga.c
index 0ab7383b9c..ddd5f475d6 100644
--- a/mainboard/emulation/qemu-x86/vga.c
+++ b/mainboard/emulation/qemu-x86/vga.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <arch/types.h>
+#include <types.h>
 #include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/northbridge/intel/i440bxemulation/i440bx.c b/northbridge/intel/i440bxemulation/i440bx.c
index 1616cd45b6..a4fee5735a 100644
--- a/northbridge/intel/i440bxemulation/i440bx.c
+++ b/northbridge/intel/i440bxemulation/i440bx.c
@@ -34,7 +34,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <arch/types.h>
+#include <types.h>
 #include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/southbridge/intel/i82371eb/i82371eb.c b/southbridge/intel/i82371eb/i82371eb.c
index 91ee3dbe71..c58474750c 100644
--- a/southbridge/intel/i82371eb/i82371eb.c
+++ b/southbridge/intel/i82371eb/i82371eb.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <arch/types.h>
+#include <types.h>
 #include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/superio/winbond/w83627hf/chip.h b/superio/winbond/w83627hf/chip.h
index af08bda695..f8c7bf2c8f 100644
--- a/superio/winbond/w83627hf/chip.h
+++ b/superio/winbond/w83627hf/chip.h
@@ -1,5 +1,3 @@
-
-
 #include <keyboard.h>
 #include <uart8250.h>
 
diff --git a/superio/winbond/w83627hf/superio.c b/superio/winbond/w83627hf/superio.c
index 6b900bde53..a19f14606d 100644
--- a/superio/winbond/w83627hf/superio.c
+++ b/superio/winbond/w83627hf/superio.c
@@ -6,7 +6,7 @@
  * This code is distributed without warranty under the GPL v2 (see COPYING) 
  */
 
-#include <arch/io.h>
+#include <io.h>
 #include <device/device.h>
 #include <device/pnp.h>
 #include <console.h>
diff --git a/superio/winbond/w83627hf/w83627hf_early_init.c b/superio/winbond/w83627hf/w83627hf_early_init.c
index ce4e623a68..62a99993d4 100644
--- a/superio/winbond/w83627hf/w83627hf_early_init.c
+++ b/superio/winbond/w83627hf/w83627hf_early_init.c
@@ -1,4 +1,3 @@
-#include <arch/romcc_io.h>
 #include "w83627hf.h"
 
 static void w83627hf_disable_dev(struct device *dev)
diff --git a/superio/winbond/w83627hf/w83627hf_early_serial.c b/superio/winbond/w83627hf/w83627hf_early_serial.c
index 80dc33b990..37ab982f76 100644
--- a/superio/winbond/w83627hf/w83627hf_early_serial.c
+++ b/superio/winbond/w83627hf/w83627hf_early_serial.c
@@ -1,4 +1,3 @@
-#include <arch/romcc_io.h>
 #include "w83627hf.h"
 
 static inline void pnp_enter_ext_func_mode(struct device *dev) 
diff --git a/util/x86emu/biosemu.c b/util/x86emu/biosemu.c
index a9adebff90..1ca2d8208c 100644
--- a/util/x86emu/biosemu.c
+++ b/util/x86emu/biosemu.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 <arch/io.h>
+#include <io.h>
 #include <console.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/util/x86emu/vm86.c b/util/x86emu/vm86.c
index 1fc9aa1f56..1269c95061 100644
--- a/util/x86emu/vm86.c
+++ b/util/x86emu/vm86.c
@@ -27,7 +27,7 @@
 #include <device/pci_ops.h>
 #include <console.h>
 #include <string.h>
-#include <arch/io.h>
+#include <io.h>
 
 
 /* Declare a temporary global descriptor table - 
diff --git a/util/x86emu/x86emu/sys.c b/util/x86emu/x86emu/sys.c
index 62e1a53259..25331030d9 100644
--- a/util/x86emu/x86emu/sys.c
+++ b/util/x86emu/x86emu/sys.c
@@ -46,7 +46,7 @@
 #include "debug.h"
 #include "prim_ops.h"
 #ifdef LINUXBIOS_VERSION
-#include "arch/io.h"
+#include "io.h"
 #else
 #include <sys/io.h>
 #endif