Index: kernel/genarch/include/drivers/dsrln/dsrlnin.h
===================================================================
--- kernel/genarch/include/drivers/dsrln/dsrlnin.h	(revision a71c158ef82122abfeef92f86344709bbad55d17)
+++ 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 a71c158ef82122abfeef92f86344709bbad55d17)
+++ 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 a71c158ef82122abfeef92f86344709bbad55d17)
+++ 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 a71c158ef82122abfeef92f86344709bbad55d17)
+++ 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 a71c158ef82122abfeef92f86344709bbad55d17)
+++ 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 a71c158ef82122abfeef92f86344709bbad55d17)
+++ 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 a71c158ef82122abfeef92f86344709bbad55d17)
+++ 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 a71c158ef82122abfeef92f86344709bbad55d17)
+++ 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 a71c158ef82122abfeef92f86344709bbad55d17)
+++ 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>