Index: kernel/genarch/src/acpi/madt.c
===================================================================
--- kernel/genarch/src/acpi/madt.c	(revision 51baa8ad19af87e921ddfb1497fd4610a93ad7a9)
+++ kernel/genarch/src/acpi/madt.c	(revision dad59517515e53c29f935bc4cbe535d802b998c0)
@@ -36,5 +36,4 @@
 
 #include <arch/types.h>
-#include <typedefs.h>
 #include <genarch/acpi/acpi.h>
 #include <genarch/acpi/madt.h>
Index: kernel/genarch/src/fb/fb.c
===================================================================
--- kernel/genarch/src/fb/fb.c	(revision 51baa8ad19af87e921ddfb1497fd4610a93ad7a9)
+++ kernel/genarch/src/fb/fb.c	(revision dad59517515e53c29f935bc4cbe535d802b998c0)
@@ -47,5 +47,4 @@
 #include <ddi/ddi.h>
 #include <arch/types.h>
-#include <typedefs.h>
 
 #include "helenos.xbm"
Index: kernel/genarch/src/kbd/i8042.c
===================================================================
--- kernel/genarch/src/kbd/i8042.c	(revision 51baa8ad19af87e921ddfb1497fd4610a93ad7a9)
+++ kernel/genarch/src/kbd/i8042.c	(revision dad59517515e53c29f935bc4cbe535d802b998c0)
@@ -45,10 +45,9 @@
 #include <arch/asm.h>
 #include <arch.h>
-#include <typedefs.h>
 #include <console/chardev.h>
 #include <console/console.h>
 #include <interrupt.h>
 #include <sysinfo/sysinfo.h>
-#include <ddi/irq.h>
+#include <ipc/irq.h>
 
 /* Keyboard commands. */
Index: kernel/genarch/src/kbd/key.c
===================================================================
--- kernel/genarch/src/kbd/key.c	(revision 51baa8ad19af87e921ddfb1497fd4610a93ad7a9)
+++ kernel/genarch/src/kbd/key.c	(revision dad59517515e53c29f935bc4cbe535d802b998c0)
@@ -45,5 +45,4 @@
 #include <synch/spinlock.h>
 #include <console/chardev.h>
-#include <typedefs.h>
 #include <macros.h>
 
Index: kernel/genarch/src/kbd/ns16550.c
===================================================================
--- kernel/genarch/src/kbd/ns16550.c	(revision 51baa8ad19af87e921ddfb1497fd4610a93ad7a9)
+++ kernel/genarch/src/kbd/ns16550.c	(revision dad59517515e53c29f935bc4cbe535d802b998c0)
@@ -46,5 +46,4 @@
 #include <arch/asm.h>
 #include <arch.h>
-#include <typedefs.h>
 #include <console/chardev.h>
 #include <console/console.h>
Index: kernel/genarch/src/kbd/z8530.c
===================================================================
--- kernel/genarch/src/kbd/z8530.c	(revision 51baa8ad19af87e921ddfb1497fd4610a93ad7a9)
+++ kernel/genarch/src/kbd/z8530.c	(revision dad59517515e53c29f935bc4cbe535d802b998c0)
@@ -48,5 +48,4 @@
 #include <arch/asm.h>
 #include <arch.h>
-#include <typedefs.h>
 #include <console/chardev.h>
 #include <console/console.h>
Index: kernel/genarch/src/mm/as_ht.c
===================================================================
--- kernel/genarch/src/mm/as_ht.c	(revision 51baa8ad19af87e921ddfb1497fd4610a93ad7a9)
+++ kernel/genarch/src/mm/as_ht.c	(revision dad59517515e53c29f935bc4cbe535d802b998c0)
@@ -36,4 +36,5 @@
  */
 
+#include <arch/mm/as.h>
 #include <genarch/mm/as_ht.h>
 #include <genarch/mm/page_ht.h>
@@ -41,5 +42,4 @@
 #include <mm/frame.h>
 #include <arch/types.h>
-#include <typedefs.h>
 #include <memstr.h>
 #include <adt/hash_table.h>
Index: kernel/genarch/src/mm/as_pt.c
===================================================================
--- kernel/genarch/src/mm/as_pt.c	(revision 51baa8ad19af87e921ddfb1497fd4610a93ad7a9)
+++ kernel/genarch/src/mm/as_pt.c	(revision dad59517515e53c29f935bc4cbe535d802b998c0)
@@ -44,5 +44,4 @@
 #include <arch/mm/as.h>
 #include <arch/types.h>
-#include <typedefs.h>
 #include <memstr.h>
 #include <arch.h>
Index: kernel/genarch/src/mm/asid_fifo.c
===================================================================
--- kernel/genarch/src/mm/asid_fifo.c	(revision 51baa8ad19af87e921ddfb1497fd4610a93ad7a9)
+++ kernel/genarch/src/mm/asid_fifo.c	(revision dad59517515e53c29f935bc4cbe535d802b998c0)
@@ -43,5 +43,4 @@
 #include <arch/mm/asid.h>
 #include <mm/asid.h>
-#include <typedefs.h>
 #include <adt/fifo.h>
 
Index: kernel/genarch/src/mm/page_ht.c
===================================================================
--- kernel/genarch/src/mm/page_ht.c	(revision 51baa8ad19af87e921ddfb1497fd4610a93ad7a9)
+++ kernel/genarch/src/mm/page_ht.c	(revision dad59517515e53c29f935bc4cbe535d802b998c0)
@@ -44,5 +44,4 @@
 #include <arch/mm/asid.h>
 #include <arch/types.h>
-#include <typedefs.h>
 #include <arch/asm.h>
 #include <synch/spinlock.h>
Index: kernel/genarch/src/mm/page_pt.c
===================================================================
--- kernel/genarch/src/mm/page_pt.c	(revision 51baa8ad19af87e921ddfb1497fd4610a93ad7a9)
+++ kernel/genarch/src/mm/page_pt.c	(revision dad59517515e53c29f935bc4cbe535d802b998c0)
@@ -43,5 +43,4 @@
 #include <arch/mm/as.h>
 #include <arch/types.h>
-#include <typedefs.h>
 #include <arch/asm.h>
 #include <memstr.h>