Index: kernel/generic/include/ipc/event.h
===================================================================
--- kernel/generic/include/ipc/event.h	(revision 827d73f23124302d0257a467a1990e68bd7a15e7)
+++ kernel/generic/include/ipc/event.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -37,5 +37,5 @@
 
 #include <ipc/event_types.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/spinlock.h>
 #include <ipc/ipc.h>
Index: kernel/generic/include/ipc/irq.h
===================================================================
--- kernel/generic/include/ipc/irq.h	(revision 827d73f23124302d0257a467a1990e68bd7a15e7)
+++ kernel/generic/include/ipc/irq.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -41,5 +41,5 @@
 #include <ipc/ipc.h>
 #include <ddi/irq.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
 
Index: kernel/generic/include/ipc/sysipc.h
===================================================================
--- kernel/generic/include/ipc/sysipc.h	(revision 827d73f23124302d0257a467a1990e68bd7a15e7)
+++ kernel/generic/include/ipc/sysipc.h	(revision 672b22e998fe4b44c45775aa265ee54ebdcc43dc)
@@ -38,5 +38,5 @@
 #include <ipc/ipc.h>
 #include <ipc/irq.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 unative_t sys_ipc_call_sync_fast(unative_t phoneid, unative_t method,