Index: uspace/lib/net/generic/generic.c
===================================================================
--- uspace/lib/net/generic/generic.c	(revision 124c0612c8daeba21701095e42877933875fb33a)
+++ uspace/lib/net/generic/generic.c	(revision 5bcf1f9bc844ed807e0697b24feb36afeff99d8a)
@@ -36,9 +36,6 @@
 
 #include <generic.h>
-
 #include <async.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
-
 #include <net/device.h>
 #include <adt/measured_strings.h>
Index: uspace/lib/net/generic/packet_remote.c
===================================================================
--- uspace/lib/net/generic/packet_remote.c	(revision 124c0612c8daeba21701095e42877933875fb33a)
+++ uspace/lib/net/generic/packet_remote.c	(revision 5bcf1f9bc844ed807e0697b24feb36afeff99d8a)
@@ -38,5 +38,4 @@
 #include <async.h>
 #include <errno.h>
-#include <ipc/ipc.h>
 #include <ipc/packet.h>
 #include <sys/mman.h>
Index: uspace/lib/net/il/arp_remote.c
===================================================================
--- uspace/lib/net/il/arp_remote.c	(revision 124c0612c8daeba21701095e42877933875fb33a)
+++ uspace/lib/net/il/arp_remote.c	(revision 5bcf1f9bc844ed807e0697b24feb36afeff99d8a)
@@ -41,5 +41,4 @@
 #include <async.h>
 #include <errno.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/arp.h>
Index: uspace/lib/net/il/il_skel.c
===================================================================
--- uspace/lib/net/il/il_skel.c	(revision 124c0612c8daeba21701095e42877933875fb33a)
+++ uspace/lib/net/il/il_skel.c	(revision 5bcf1f9bc844ed807e0697b24feb36afeff99d8a)
@@ -54,5 +54,5 @@
 	 * the initial IPC_M_CONNECT_ME_TO call.
 	 */
-	ipc_answer_0(iid, EOK);
+	async_answer_0(iid, EOK);
 	
 	while (true) {
@@ -115,5 +115,5 @@
 		goto out;
 	
-	rc = ipc_connect_to_me(PHONE_NS, service, 0, 0, NULL, NULL);
+	rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL);
 	if (rc != EOK)
 		goto out;
Index: uspace/lib/net/include/generic.h
===================================================================
--- uspace/lib/net/include/generic.h	(revision 124c0612c8daeba21701095e42877933875fb33a)
+++ uspace/lib/net/include/generic.h	(revision 5bcf1f9bc844ed807e0697b24feb36afeff99d8a)
@@ -39,5 +39,4 @@
 
 #include <async.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 
Index: uspace/lib/net/include/il_skel.h
===================================================================
--- uspace/lib/net/include/il_skel.h	(revision 124c0612c8daeba21701095e42877933875fb33a)
+++ uspace/lib/net/include/il_skel.h	(revision 5bcf1f9bc844ed807e0697b24feb36afeff99d8a)
@@ -41,5 +41,4 @@
 #include <async.h>
 #include <fibril_synch.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 
Index: uspace/lib/net/include/netif_skel.h
===================================================================
--- uspace/lib/net/include/netif_skel.h	(revision 124c0612c8daeba21701095e42877933875fb33a)
+++ uspace/lib/net/include/netif_skel.h	(revision 5bcf1f9bc844ed807e0697b24feb36afeff99d8a)
@@ -41,5 +41,4 @@
 #include <async.h>
 #include <fibril_synch.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 
Index: uspace/lib/net/include/nil_skel.h
===================================================================
--- uspace/lib/net/include/nil_skel.h	(revision 124c0612c8daeba21701095e42877933875fb33a)
+++ uspace/lib/net/include/nil_skel.h	(revision 5bcf1f9bc844ed807e0697b24feb36afeff99d8a)
@@ -41,5 +41,4 @@
 #include <async.h>
 #include <fibril_synch.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 
Index: uspace/lib/net/include/tl_skel.h
===================================================================
--- uspace/lib/net/include/tl_skel.h	(revision 124c0612c8daeba21701095e42877933875fb33a)
+++ uspace/lib/net/include/tl_skel.h	(revision 5bcf1f9bc844ed807e0697b24feb36afeff99d8a)
@@ -41,5 +41,4 @@
 #include <async.h>
 #include <fibril_synch.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 
Index: uspace/lib/net/netif/netif_skel.c
===================================================================
--- uspace/lib/net/netif/netif_skel.c	(revision 124c0612c8daeba21701095e42877933875fb33a)
+++ uspace/lib/net/netif/netif_skel.c	(revision 5bcf1f9bc844ed807e0697b24feb36afeff99d8a)
@@ -40,5 +40,4 @@
 #include <fibril_synch.h>
 #include <stdio.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/netif.h>
@@ -369,5 +368,5 @@
 	 * the initial IPC_M_CONNECT_ME_TO call.
 	 */
-	ipc_answer_0(iid, EOK);
+	async_answer_0(iid, EOK);
 	
 	while (true) {
Index: uspace/lib/net/nil/nil_skel.c
===================================================================
--- uspace/lib/net/nil/nil_skel.c	(revision 124c0612c8daeba21701095e42877933875fb33a)
+++ uspace/lib/net/nil/nil_skel.c	(revision 5bcf1f9bc844ed807e0697b24feb36afeff99d8a)
@@ -54,5 +54,5 @@
 	 * the initial IPC_M_CONNECT_ME_TO call.
 	 */
-	ipc_answer_0(iid, EOK);
+	async_answer_0(iid, EOK);
 	
 	while (true) {
@@ -115,5 +115,5 @@
 		goto out;
 	
-	rc = ipc_connect_to_me(PHONE_NS, service, 0, 0, NULL, NULL);
+	rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL);
 	if (rc != EOK)
 		goto out;
Index: uspace/lib/net/tl/icmp_remote.c
===================================================================
--- uspace/lib/net/tl/icmp_remote.c	(revision 124c0612c8daeba21701095e42877933875fb33a)
+++ uspace/lib/net/tl/icmp_remote.c	(revision 5bcf1f9bc844ed807e0697b24feb36afeff99d8a)
@@ -42,5 +42,4 @@
 #include <async.h>
 #include <errno.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/icmp.h>
Index: uspace/lib/net/tl/tl_skel.c
===================================================================
--- uspace/lib/net/tl/tl_skel.c	(revision 124c0612c8daeba21701095e42877933875fb33a)
+++ uspace/lib/net/tl/tl_skel.c	(revision 5bcf1f9bc844ed807e0697b24feb36afeff99d8a)
@@ -54,5 +54,5 @@
 	 * the initial IPC_M_CONNECT_ME_TO call.
 	 */
-	ipc_answer_0(iid, EOK);
+	async_answer_0(iid, EOK);
 	
 	/* Per-connection initialization */
@@ -117,5 +117,5 @@
 		goto out;
 	
-	rc = ipc_connect_to_me(PHONE_NS, service, 0, 0, NULL, NULL);
+	rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL);
 	if (rc != EOK)
 		goto out;