Index: generic/include/ipc/ipc.h
===================================================================
--- generic/include/ipc/ipc.h	(revision 9f222130bdbe659719771a8bd4c6c15f3d4afd38)
+++ generic/include/ipc/ipc.h	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
@@ -40,8 +40,8 @@
 #define IPC_CALL_ANSWERED       (1<<0) /**< This is answer to a call */
 #define IPC_CALL_STATIC_ALLOC   (1<<1) /**< This call will not be freed on error */
-#define IPC_CALL_DISPATCHED     (1<<2) /**< Call is in dispatch queue */
-#define IPC_CALL_DISCARD_ANSWER (1<<3) /**< Answer will not be passed to
+#define IPC_CALL_DISCARD_ANSWER (1<<2) /**< Answer will not be passed to
 					* userspace, will be discarded */
-#define IPC_CALL_FORWARDED      (1<<4) /* Call was forwarded */
+#define IPC_CALL_FORWARDED      (1<<3) /* Call was forwarded */
+#define IPC_CALL_CONN_ME_TO     (1<<4) /* Identify connect_me_to */
 
 /* Flags for ipc_wait_for_call */
@@ -183,5 +183,7 @@
 	answerbox_t *callerbox;
 
-	ipc_data_t data;
+	__native private; /**< Private data to internal IPC */
+
+	ipc_data_t data;  /**< Data passed from/to userspace */
 }call_t;
 
@@ -199,8 +201,9 @@
 extern void task_print_list(void);
 extern int ipc_forward(call_t *call, phone_t *newphone, answerbox_t *oldbox);
-
-extern answerbox_t *ipc_phone_0;
 extern void ipc_cleanup(task_t *task);
 extern int ipc_phone_hangup(phone_t *phone);
+extern void ipc_backsend_err(phone_t *phone, call_t *call, __native err);
+
+extern answerbox_t *ipc_phone_0;
 
 #endif
Index: generic/include/ipc/sysipc.h
===================================================================
--- generic/include/ipc/sysipc.h	(revision 9f222130bdbe659719771a8bd4c6c15f3d4afd38)
+++ generic/include/ipc/sysipc.h	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
@@ -40,10 +40,5 @@
 			     __native arg1, __native arg2);
 __native sys_ipc_answer(__native callid, ipc_data_t *data);
-__native sys_ipc_connect_to_me(__native phoneid, __native arg1,
-			       __native arg2, task_id_t *taskid);
-__native sys_ipc_wait_for_call(ipc_data_t *calldata, task_id_t *taskid,
-			       __native flags);
-__native sys_ipc_connect_me_to(__native phoneid, __native arg1,
-			       __native arg2);
+__native sys_ipc_wait_for_call(ipc_data_t *calldata, __native flags);
 __native sys_ipc_forward_fast(__native callid, __native phoneid,
 			      __native method, __native arg1);