Index: kernel/generic/include/ipc/ipc.h
===================================================================
--- kernel/generic/include/ipc/ipc.h	(revision 79872cd42e49e046628c77564cd57e01dec61da6)
+++ kernel/generic/include/ipc/ipc.h	(revision 211b0c132c099449ef7376d8f483e96f3388351f)
@@ -261,4 +261,26 @@
 	unative_t args[IPC_CALL_LEN];
 	phone_t *phone;
+} ipc_data_t;
+
+typedef struct {
+	link_t link;
+
+	int flags;
+
+	/** Identification of the caller. */
+	struct task *sender;
+	/** The caller box is different from sender->answerbox for synchronous
+	 *  calls. */
+	answerbox_t *callerbox;
+
+	/** Private data to internal IPC. */
+	unative_t priv;
+
+	/** Data passed from/to userspace. */
+	ipc_data_t data;
+
+	/** Buffer for IPC_M_DATA_WRITE and IPC_M_DATA_READ. */
+	uint8_t *buffer;
+
 	/*
 	 * The forward operation can masquerade the caller phone. For those
@@ -267,25 +289,4 @@
 	 */
 	phone_t *caller_phone;
-} ipc_data_t;
-
-typedef struct {
-	link_t link;
-
-	int flags;
-
-	/** Identification of the caller. */
-	struct task *sender;
-	/** The caller box is different from sender->answerbox for synchronous
-	 *  calls. */
-	answerbox_t *callerbox;
-
-	/** Private data to internal IPC. */
-	unative_t priv;
-
-	/** Data passed from/to userspace. */
-	ipc_data_t data;
-
-	/** Buffer for IPC_M_DATA_WRITE and IPC_M_DATA_READ. */
-	uint8_t *buffer;
 } call_t;