Index: kernel/generic/src/ddi/device.c
===================================================================
--- kernel/generic/src/ddi/device.c	(revision f430f5823554539eb9aa453ce917d5621796edc0)
+++ kernel/generic/src/ddi/device.c	(revision 5cbb170bf59645e36db43f56cfde6eb73e70c204)
@@ -35,5 +35,5 @@
  */
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <ddi/device.h>
 #include <atomic.h>
Index: kernel/generic/src/ddi/irq.c
===================================================================
--- kernel/generic/src/ddi/irq.c	(revision f430f5823554539eb9aa453ce917d5621796edc0)
+++ kernel/generic/src/ddi/irq.c	(revision 5cbb170bf59645e36db43f56cfde6eb73e70c204)
@@ -71,5 +71,5 @@
 #include <adt/hash_table.h>
 #include <mm/slab.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/spinlock.h>
 #include <console/console.h>