Index: kernel/generic/include/ipc/ipc.h
===================================================================
--- kernel/generic/include/ipc/ipc.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/ipc/ipc.h	(revision 167616c1515dbd62bb4b8129641fdcba5f967ad5)
@@ -69,4 +69,6 @@
 	ipc_phone_state_t state;
 	atomic_t active_calls;
+	/** User-defined label */
+	sysarg_t label;
 	kobject_t *kobject;
 } phone_t;
@@ -101,21 +103,4 @@
 	list_t irq_notifs;
 } answerbox_t;
-
-typedef struct {
-	sysarg_t args[IPC_CALL_LEN];
-	/**
-	 * Task which made or forwarded the call with IPC_FF_ROUTE_FROM_ME,
-	 * or the task which answered the call.
-	 */
-	task_id_t task_id;
-	/** Phone which made or last masqueraded this call. */
-	phone_t *phone;
-	/** Flags */
-	unsigned flags;
-	/** User-defined label */
-	sysarg_t label;
-	/** Capability handle */
-	cap_call_handle_t cap_handle;
-} ipc_data_t;
 
 typedef struct call {