Index: uspace/srv/hw/netif/dp8390/dp8390_module.c
===================================================================
--- uspace/srv/hw/netif/dp8390/dp8390_module.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
+++ uspace/srv/hw/netif/dp8390/dp8390_module.c	(revision 514ee46735ae99a559924fd69a01def4b9b49fff)
@@ -44,5 +44,4 @@
 #include <ipc/services.h>
 
-#include <net_messages.h>
 #include <net/modules.h>
 #include <packet_client.h>
Index: uspace/srv/net/il/arp/arp.c
===================================================================
--- uspace/srv/net/il/arp/arp.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
+++ uspace/srv/net/il/arp/arp.c	(revision 514ee46735ae99a559924fd69a01def4b9b49fff)
@@ -45,8 +45,8 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/net.h>
 #include <byteorder.h>
 #include <err.h>
 
-#include <net_messages.h>
 #include <net/modules.h>
 #include <net/device.h>
Index: uspace/srv/net/il/ip/ip.c
===================================================================
--- uspace/srv/net/il/ip/ip.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
+++ uspace/srv/net/il/ip/ip.c	(revision 514ee46735ae99a559924fd69a01def4b9b49fff)
@@ -44,4 +44,5 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/net.h>
 #include <sys/types.h>
 #include <byteorder.h>
@@ -52,11 +53,11 @@
 #include <net/inet.h>
 #include <net/modules.h>
-
-#include <net_messages.h>
+#include <net/device.h>
+#include <net/packet.h>
+#include <net/icmp_codes.h>
+
 #include <arp_interface.h>
 #include <net_checksum.h>
-#include <net/device.h>
 #include <icmp_client.h>
-#include <net/icmp_codes.h>
 #include <icmp_interface.h>
 #include <il_interface.h>
Index: uspace/srv/net/net/net.c
===================================================================
--- uspace/srv/net/net/net.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
+++ uspace/srv/net/net/net.c	(revision 514ee46735ae99a559924fd69a01def4b9b49fff)
@@ -46,7 +46,7 @@
 
 #include <ipc/ipc.h>
+#include <ipc/net.h>
 #include <ipc/services.h>
 
-#include <net_messages.h>
 #include <net/modules.h>
 #include <adt/char_map.h>
Index: uspace/srv/net/netif/lo/lo.c
===================================================================
--- uspace/srv/net/netif/lo/lo.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
+++ uspace/srv/net/netif/lo/lo.c	(revision 514ee46735ae99a559924fd69a01def4b9b49fff)
@@ -44,5 +44,4 @@
 #include <ipc/services.h>
 
-#include <net_messages.h>
 #include <net/modules.h>
 #include <adt/measured_strings.h>
Index: uspace/srv/net/nil/eth/eth.c
===================================================================
--- uspace/srv/net/nil/eth/eth.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
+++ uspace/srv/net/nil/eth/eth.c	(revision 514ee46735ae99a559924fd69a01def4b9b49fff)
@@ -45,7 +45,7 @@
 
 #include <ipc/ipc.h>
+#include <ipc/net.h>
 #include <ipc/services.h>
 
-#include <net_messages.h>
 #include <net/modules.h>
 #include <net_checksum.h>
Index: uspace/srv/net/nil/nildummy/nildummy.c
===================================================================
--- uspace/srv/net/nil/nildummy/nildummy.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
+++ uspace/srv/net/nil/nildummy/nildummy.c	(revision 514ee46735ae99a559924fd69a01def4b9b49fff)
@@ -43,7 +43,7 @@
 #include <err.h>
 #include <ipc/ipc.h>
+#include <ipc/net.h>
 #include <ipc/services.h>
 
-#include <net_messages.h>
 #include <net/modules.h>
 #include <net/device.h>
Index: uspace/srv/net/tl/icmp/icmp.c
===================================================================
--- uspace/srv/net/tl/icmp/icmp.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
+++ uspace/srv/net/tl/icmp/icmp.c	(revision 514ee46735ae99a559924fd69a01def4b9b49fff)
@@ -44,4 +44,5 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/net.h>
 #include <ipc/icmp.h>
 #include <sys/time.h>
@@ -55,5 +56,4 @@
 #include <net/inet.h>
 
-#include <net_messages.h>
 #include <net/modules.h>
 #include <packet_client.h>
Index: uspace/srv/net/tl/tcp/tcp.c
===================================================================
--- uspace/srv/net/tl/tcp/tcp.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
+++ uspace/srv/net/tl/tcp/tcp.c	(revision 514ee46735ae99a559924fd69a01def4b9b49fff)
@@ -47,4 +47,5 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/net.h>
 #include <ipc/socket.h>
 
@@ -56,5 +57,4 @@
 #include <net/modules.h>
 
-#include <net_messages.h>
 #include <adt/dynamic_fifo.h>
 #include <packet_client.h>
Index: uspace/srv/net/tl/udp/udp.c
===================================================================
--- uspace/srv/net/tl/udp/udp.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
+++ uspace/srv/net/tl/udp/udp.c	(revision 514ee46735ae99a559924fd69a01def4b9b49fff)
@@ -42,4 +42,5 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/net.h>
 #include <ipc/socket.h>
 #include <errno.h>
@@ -53,5 +54,4 @@
 #include <net/modules.h>
 
-#include <net_messages.h>
 #include <adt/dynamic_fifo.h>
 #include <packet_client.h>