Index: kernel/genarch/include/acpi/acpi.h
===================================================================
--- kernel/genarch/include/acpi/acpi.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/acpi/acpi.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -36,5 +36,5 @@
 #define KERN_ACPI_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /* Root System Description Pointer */
Index: kernel/genarch/include/drivers/dsrln/dsrlnin.h
===================================================================
--- kernel/genarch/include/drivers/dsrln/dsrlnin.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/drivers/dsrln/dsrlnin.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -39,5 +39,4 @@
 
 #include <ddi/irq.h>
-#include <arch/types.h>
 #include <console/chardev.h>
 #include <typedefs.h>
Index: kernel/genarch/include/drivers/dsrln/dsrlnout.h
===================================================================
--- kernel/genarch/include/drivers/dsrln/dsrlnout.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/drivers/dsrln/dsrlnout.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -38,5 +38,4 @@
 #define KERN_DSRLNOUT_H_
 
-#include <arch/types.h>
 #include <typedefs.h>
 #include <console/chardev.h>
Index: kernel/genarch/include/drivers/ega/ega.h
===================================================================
--- kernel/genarch/include/drivers/ega/ega.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/drivers/ega/ega.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -36,5 +36,4 @@
 #define KERN_EGA_H_
 
-#include <arch/types.h>
 #include <typedefs.h>
 #include <console/chardev.h>
Index: kernel/genarch/include/drivers/i8042/i8042.h
===================================================================
--- kernel/genarch/include/drivers/i8042/i8042.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/drivers/i8042/i8042.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -37,5 +37,4 @@
 
 #include <ddi/irq.h>
-#include <arch/types.h>
 #include <console/chardev.h>
 #include <typedefs.h>
Index: kernel/genarch/include/drivers/legacy/ia32/io.h
===================================================================
--- kernel/genarch/include/drivers/legacy/ia32/io.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/drivers/legacy/ia32/io.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -38,5 +38,5 @@
 #define KERN_LEGACY_IA32_IO_H
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define I8042_BASE    ((ioport8_t *) 0x60)
Index: kernel/genarch/include/drivers/ns16550/ns16550.h
===================================================================
--- kernel/genarch/include/drivers/ns16550/ns16550.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/drivers/ns16550/ns16550.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -39,5 +39,5 @@
 
 #include <ddi/irq.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <console/chardev.h>
 
Index: kernel/genarch/include/drivers/pl050/pl050.h
===================================================================
--- kernel/genarch/include/drivers/pl050/pl050.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/drivers/pl050/pl050.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -42,5 +42,4 @@
 
 #include <ddi/irq.h>
-#include <arch/types.h>
 #include <console/chardev.h>
 #include <typedefs.h>
Index: kernel/genarch/include/drivers/via-cuda/cuda.h
===================================================================
--- kernel/genarch/include/drivers/via-cuda/cuda.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/drivers/via-cuda/cuda.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -37,5 +37,5 @@
 
 #include <ddi/irq.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <console/chardev.h>
 #include <synch/spinlock.h>
Index: kernel/genarch/include/drivers/z8530/z8530.h
===================================================================
--- kernel/genarch/include/drivers/z8530/z8530.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/drivers/z8530/z8530.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -39,5 +39,5 @@
 
 #include <ddi/irq.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <console/chardev.h>
 
Index: kernel/genarch/include/fb/fb.h
===================================================================
--- kernel/genarch/include/fb/fb.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/fb/fb.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -36,5 +36,5 @@
 #define KERN_FB_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <console/chardev.h>
 #include <genarch/fb/visuals.h>
Index: kernel/genarch/include/fb/logo-196x66.h
===================================================================
--- kernel/genarch/include/fb/logo-196x66.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/fb/logo-196x66.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -40,5 +40,5 @@
 #define LOGO_COLOR   0xffffff
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 extern uint32_t fb_logo[LOGO_WIDTH * LOGO_HEIGHT];
Index: kernel/genarch/include/mm/as_ht.h
===================================================================
--- kernel/genarch/include/mm/as_ht.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/mm/as_ht.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -38,5 +38,5 @@
 #include <mm/mm.h>
 #include <adt/list.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef struct {
Index: kernel/genarch/include/mm/page_ht.h
===================================================================
--- kernel/genarch/include/mm/page_ht.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/mm/page_ht.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -40,5 +40,5 @@
 #define KERN_PAGE_HT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <mm/as.h>
 #include <mm/page.h>
Index: kernel/genarch/include/mm/page_pt.h
===================================================================
--- kernel/genarch/include/mm/page_pt.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/mm/page_pt.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -47,5 +47,5 @@
 #include <mm/page.h>
 #include <arch/mm/page.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /*
Index: kernel/genarch/include/multiboot/multiboot.h
===================================================================
--- kernel/genarch/include/multiboot/multiboot.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/multiboot/multiboot.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -36,5 +36,5 @@
 #define KERN_MULTIBOOT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/boot/memmap.h>
 
Index: kernel/genarch/include/ofw/ebus.h
===================================================================
--- kernel/genarch/include/ofw/ebus.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/ofw/ebus.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -31,5 +31,5 @@
 
 #include <genarch/ofw/ofw_tree.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <ddi/irq.h>
 #include <typedefs.h>
Index: kernel/genarch/include/ofw/fhc.h
===================================================================
--- kernel/genarch/include/ofw/fhc.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/ofw/fhc.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -31,5 +31,5 @@
 
 #include <genarch/ofw/ofw_tree.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <ddi/irq.h>
 #include <typedefs.h>
Index: kernel/genarch/include/ofw/ofw_tree.h
===================================================================
--- kernel/genarch/include/ofw/ofw_tree.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/ofw/ofw_tree.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -30,5 +30,4 @@
 #define KERN_OFW_TREE_H_
 
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/genarch/include/ofw/pci.h
===================================================================
--- kernel/genarch/include/ofw/pci.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/ofw/pci.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -31,5 +31,5 @@
 
 #include <genarch/ofw/ofw_tree.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <ddi/irq.h>
 #include <typedefs.h>
Index: kernel/genarch/include/ofw/sbus.h
===================================================================
--- kernel/genarch/include/ofw/sbus.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/ofw/sbus.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -31,5 +31,5 @@
 
 #include <genarch/ofw/ofw_tree.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <ddi/irq.h>
 #include <typedefs.h>
Index: kernel/genarch/include/ofw/upa.h
===================================================================
--- kernel/genarch/include/ofw/upa.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/genarch/include/ofw/upa.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -31,5 +31,5 @@
 
 #include <genarch/ofw/ofw_tree.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <ddi/irq.h>
 #include <typedefs.h>