Index: uspace/lib/net/include/arp_interface.h
===================================================================
--- uspace/lib/net/include/arp_interface.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
+++ uspace/lib/net/include/arp_interface.h	(revision 514ee46735ae99a559924fd69a01def4b9b49fff)
@@ -35,5 +35,10 @@
 
 #include <adt/measured_strings.h>
+#include <task.h>
+
+#include <ipc/services.h>
+
 #include <net/device.h>
+#include <net/socket.h>
 
 /** @name ARP module interface
Index: uspace/lib/net/include/generic.h
===================================================================
--- uspace/lib/net/include/generic.h	(revision 514ee46735ae99a559924fd69a01def4b9b49fff)
+++ uspace/lib/net/include/generic.h	(revision 514ee46735ae99a559924fd69a01def4b9b49fff)
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2009 Lukas Mejdrech
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup net
+ * @{
+ */
+
+/** @file
+ * Generic communication interfaces for networking.
+ */
+
+#ifndef NET_GENERIC_H_
+#define NET_GENERIC_H_
+
+#include <async.h>
+#include <ipc/ipc.h>
+#include <ipc/services.h>
+
+#include <net/device.h>
+#include <adt/measured_strings.h>
+#include <net/packet.h>
+
+extern int generic_device_state_msg_remote(int, int, device_id_t, int,
+    services_t);
+extern int generic_device_req_remote(int, int, device_id_t, int, services_t);
+extern int generic_get_addr_req(int, int, device_id_t, measured_string_ref *,
+    char **);
+extern int generic_packet_size_req_remote(int, int, device_id_t,
+    packet_dimension_ref);
+extern int generic_received_msg_remote(int, int, device_id_t, packet_id_t,
+    services_t, services_t);
+extern int generic_send_msg_remote(int, int, device_id_t, packet_id_t,
+    services_t, services_t);
+extern int generic_translate_req(int, int, device_id_t, services_t,
+    measured_string_ref, size_t, measured_string_ref *, char **);
+
+#endif
+
+/** @}
+ */
Index: uspace/lib/net/include/il_interface.h
===================================================================
--- uspace/lib/net/include/il_interface.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
+++ uspace/lib/net/include/il_interface.h	(revision 514ee46735ae99a559924fd69a01def4b9b49fff)
@@ -39,13 +39,13 @@
 #define __NET_IL_INTERFACE_H__
 
-#include <async.h>
+#include <generic.h>
 
 #include <ipc/services.h>
 
-#include <net_messages.h>
 #include <net/device.h>
 #include <net/packet.h>
+#include <il_messages.h>
+
 #include <packet_client.h>
-#include <il_messages.h>
 
 /** @name Internetwork layer module interface
Index: uspace/lib/net/include/ip_remote.h
===================================================================
--- uspace/lib/net/include/ip_remote.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
+++ uspace/lib/net/include/ip_remote.h	(revision 514ee46735ae99a559924fd69a01def4b9b49fff)
@@ -34,5 +34,4 @@
 #define __NET_IP_REMOTE_H__
 
-#include <async.h>
 #include <ipc/services.h>
 
@@ -40,4 +39,7 @@
 #include <net/inet.h>
 #include <net/in.h>
+#include <net/packet.h>
+#include <net/device.h>
+#include <net/socket.h>
 
 extern int ip_set_gateway_req_remote(int, device_id_t, in_addr_t);
Index: uspace/lib/net/include/netif_remote.h
===================================================================
--- uspace/lib/net/include/netif_remote.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
+++ uspace/lib/net/include/netif_remote.h	(revision 514ee46735ae99a559924fd69a01def4b9b49fff)
@@ -34,7 +34,7 @@
 #define __NET_NETIF_REMOTE_H__
 
-#include <async.h>
-#include <fibril_synch.h>
-#include <ipc/ipc.h>
+#include <ipc/services.h>
+#include <adt/measured_strings.h>
+#include <net/device.h>
 
 extern int netif_get_addr_req_remote(int, device_id_t, measured_string_ref *,
Index: uspace/lib/net/include/nil_interface.h
===================================================================
--- uspace/lib/net/include/nil_interface.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
+++ uspace/lib/net/include/nil_interface.h	(revision 514ee46735ae99a559924fd69a01def4b9b49fff)
@@ -39,9 +39,7 @@
 #include <ipc/ipc.h>
 
-#include <net_messages.h>
-#include <adt/measured_strings.h>
-#include <net/packet.h>
+#include <generic.h>
 #include <nil_messages.h>
-#include <net/device.h>
+#include <nil_remote.h>
 
 #define nil_bind_service(service, device_id, me, receiver) \
@@ -67,8 +65,4 @@
 	    netif_service)
 
-
-#include <nil_remote.h>
-#include <packet/packet_server.h>
-
 #define nil_device_state_msg  nil_device_state_msg_remote
 #define nil_received_msg      nil_received_msg_remote
Index: uspace/lib/net/include/nil_remote.h
===================================================================
--- uspace/lib/net/include/nil_remote.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
+++ uspace/lib/net/include/nil_remote.h	(revision 514ee46735ae99a559924fd69a01def4b9b49fff)
@@ -34,7 +34,7 @@
 #define __NET_NIL_REMOTE_H__
 
-#include <async.h>
-#include <fibril_synch.h>
-#include <ipc/ipc.h>
+#include <ipc/services.h>
+#include <net/device.h>
+#include <net/packet.h>
 
 extern int nil_device_state_msg_remote(int, device_id_t, int);
Index: uspace/lib/net/include/tl_interface.h
===================================================================
--- uspace/lib/net/include/tl_interface.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
+++ uspace/lib/net/include/tl_interface.h	(revision 514ee46735ae99a559924fd69a01def4b9b49fff)
@@ -41,5 +41,5 @@
 #include <ipc/services.h>
 
-#include <net_messages.h>
+#include <generic.h>
 #include <net/device.h>
 #include <net/packet.h>