Index: kernel/generic/include/cap/cap.h
===================================================================
--- kernel/generic/include/cap/cap.h	(revision 3422fb6a2a8e483c3294e3bfbd50bd1dc755217c)
+++ kernel/generic/include/cap/cap.h	(revision fa32c9fed494a266a88de2f081478dff9fe4f31f)
@@ -38,5 +38,4 @@
 #include <typedefs.h>
 #include <ipc/ipc.h>
-#include <ddi/irq.h>
 
 #define MAX_CAPS  64
@@ -64,8 +63,5 @@
 
 	/* The underlying kernel object. */
-	union {
-		phone_t phone;
-		irq_t irq;
-	};
+	void *kobject;
 } cap_t;