Index: uspace/lib/c/include/ipc/il.h
===================================================================
--- uspace/lib/c/include/ipc/il.h	(revision 522253c17f2a73e3e130364e26c885169c0e3527)
+++ uspace/lib/c/include/ipc/il.h	(revision 522253c17f2a73e3e130364e26c885169c0e3527)
@@ -0,0 +1,91 @@
+/*
+ * 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 libc
+ * @{
+ */
+
+/** @file
+ * Internetwork layer modules messages.
+ * @see il_interface.h
+ * @see ip_interface.h
+ */
+
+#ifndef LIBC_IL_MESSAGES_H_
+#define LIBC_IL_MESSAGES_H_
+
+#include <ipc/ipc.h>
+#include <ipc/net.h>
+
+/** Internet layer modules messages. */
+typedef enum {
+	/** New device message.
+	 * @see ip_device_req()
+	 */
+	NET_IL_DEVICE = NET_IL_FIRST,
+	/** Device state changed message.
+	 * @see il_device_state_msg()
+	 */
+	NET_IL_DEVICE_STATE,
+	/** Device MTU changed message.
+	 * @see il_mtu_changed_msg()
+	 */
+	NET_IL_MTU_CHANGED,
+	/** Packet size message.
+	 * @see il_packet_size_req()
+	 */
+	NET_IL_PACKET_SPACE,
+	/** Packet received message.
+	 * @see il_received_msg()
+	 */
+	NET_IL_RECEIVED,
+	/** Packet send message.
+	 * @see il_send_msg()
+	 */
+	NET_IL_SEND
+} il_messages;
+
+/** @name Internetwork layer specific message parameters definitions */
+/*@{*/
+
+/** Return the protocol number message parameter.
+ * @param[in] call The message call structure.
+ */
+#define IL_GET_PROTO(call)	(int) IPC_GET_ARG1(*call)
+
+/** Return the registering service message parameter.
+ * @param[in] call The message call structure.
+ */
+#define IL_GET_SERVICE(call)	(services_t) IPC_GET_ARG2(*call)
+
+/*@}*/
+
+#endif
+
+/** @}
+ */
Index: uspace/lib/net/il/ip_remote.c
===================================================================
--- uspace/lib/net/il/ip_remote.c	(revision f87ec5354628ec7c365ede59fcdee8ccfb427631)
+++ uspace/lib/net/il/ip_remote.c	(revision 522253c17f2a73e3e130364e26c885169c0e3527)
@@ -43,9 +43,9 @@
 #include <ip_interface.h>
 #include <ip_messages.h>
-#include <il_messages.h>
 #include <packet_client.h>
 #include <generic.h>
 
 #include <ipc/services.h>
+#include <ipc/il.h>
 
 #include <net/modules.h>
Index: uspace/lib/net/include/il_interface.h
===================================================================
--- uspace/lib/net/include/il_interface.h	(revision f87ec5354628ec7c365ede59fcdee8ccfb427631)
+++ uspace/lib/net/include/il_interface.h	(revision 522253c17f2a73e3e130364e26c885169c0e3527)
@@ -42,8 +42,8 @@
 
 #include <ipc/services.h>
+#include <ipc/il.h>
 
 #include <net/device.h>
 #include <net/packet.h>
-#include <il_messages.h>
 
 #include <packet_client.h>
Index: pace/lib/net/include/il_messages.h
===================================================================
--- uspace/lib/net/include/il_messages.h	(revision f87ec5354628ec7c365ede59fcdee8ccfb427631)
+++ 	(revision )
@@ -1,96 +1,0 @@
-/*
- * 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_il
- * @{
- */
-
-/** @file
- * Internetwork layer modules messages.
- * @see il_interface.h
- * @see ip_interface.h
- */
-
-#ifndef __NET_IL_MESSAGES_H__
-#define __NET_IL_MESSAGES_H__
-
-#include <ipc/ipc.h>
-#include <ipc/net.h>
-
-/** Internet layer modules messages.
- */
-typedef enum {
-	/** New device message.
-	 *  @see ip_device_req()
-	 */
-	NET_IL_DEVICE = NET_IL_FIRST,
-	/** Device state changed message.
-	 *  @see il_device_state_msg()
-	 */
-	NET_IL_DEVICE_STATE,
-	/** Device MTU changed message.
-	 *  @see il_mtu_changed_msg()
-	 */
-	NET_IL_MTU_CHANGED,
-	/** Packet size message.
-	 *  @see il_packet_size_req()
-	 */
-	NET_IL_PACKET_SPACE,
-	/** Packet received message.
-	 *  @see il_received_msg()
-	 */
-	NET_IL_RECEIVED,
-	/** Packet send message.
-	 *  @see il_send_msg()
-	 */
-	NET_IL_SEND
-} il_messages;
-
-/** @name Internetwork layer specific message parameters definitions
- *
- */
-/*@{*/
-
-/** Return the protocol number message parameter.
- * @param[in] call The message call structure.
- *
- */
-#define IL_GET_PROTO(call)  (int) IPC_GET_ARG1(*call)
-
-/** Return the registering service message parameter.
- * @param[in] call The message call structure.
- *
- */
-#define IL_GET_SERVICE(call)  (services_t) IPC_GET_ARG2(*call)
-
-/*@}*/
-
-#endif
-
-/** @}
- */
Index: uspace/srv/net/il/arp/arp.c
===================================================================
--- uspace/srv/net/il/arp/arp.c	(revision f87ec5354628ec7c365ede59fcdee8ccfb427631)
+++ uspace/srv/net/il/arp/arp.c	(revision 522253c17f2a73e3e130364e26c885169c0e3527)
@@ -47,4 +47,5 @@
 #include <ipc/net.h>
 #include <ipc/arp.h>
+#include <ipc/il.h>
 #include <byteorder.h>
 #include <err.h>
@@ -59,5 +60,4 @@
 #include <packet_client.h>
 #include <packet_remote.h>
-#include <il_messages.h>
 #include <il_interface.h>
 #include <il_local.h>
Index: uspace/srv/net/il/ip/ip.c
===================================================================
--- uspace/srv/net/il/ip/ip.c	(revision f87ec5354628ec7c365ede59fcdee8ccfb427631)
+++ uspace/srv/net/il/ip/ip.c	(revision 522253c17f2a73e3e130364e26c885169c0e3527)
@@ -45,4 +45,5 @@
 #include <ipc/services.h>
 #include <ipc/net.h>
+#include <ipc/il.h>
 #include <sys/types.h>
 #include <byteorder.h>
@@ -72,5 +73,4 @@
 #include <packet_remote.h>
 #include <nil_messages.h>
-#include <il_messages.h>
 #include <il_local.h>
 #include <ip_local.h>
Index: uspace/srv/net/net/net.c
===================================================================
--- uspace/srv/net/net/net.c	(revision f87ec5354628ec7c365ede59fcdee8ccfb427631)
+++ uspace/srv/net/net/net.c	(revision 522253c17f2a73e3e130364e26c885169c0e3527)
@@ -46,6 +46,7 @@
 
 #include <ipc/ipc.h>
+#include <ipc/services.h>
 #include <ipc/net.h>
-#include <ipc/services.h>
+#include <ipc/il.h>
 
 #include <net/modules.h>
@@ -55,5 +56,4 @@
 #include <adt/module_map.h>
 #include <net/packet.h>
-#include <il_messages.h>
 #include <netif_remote.h>
 #include <net/device.h>