Index: uspace/lib/net/il/arp_remote.c
===================================================================
--- uspace/lib/net/il/arp_remote.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
+++ uspace/lib/net/il/arp_remote.c	(revision f63a591d1085b2ef35cde0f9ec4cb50fa2d4050e)
@@ -36,4 +36,8 @@
  */
 
+#include <arp_interface.h>
+#include <arp_messages.h>
+#include <generic.h>
+
 #include <async.h>
 #include <errno.h>
@@ -41,10 +45,7 @@
 #include <ipc/services.h>
 
-#include <net_messages.h>
 #include <net/modules.h>
 #include <net/device.h>
-#include <arp_interface.h>
 #include <adt/measured_strings.h>
-#include <arp_messages.h>
 
 int arp_connect_module(services_t service){
Index: uspace/lib/net/il/ip_remote.c
===================================================================
--- uspace/lib/net/il/ip_remote.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
+++ uspace/lib/net/il/ip_remote.c	(revision f63a591d1085b2ef35cde0f9ec4cb50fa2d4050e)
@@ -40,15 +40,16 @@
  */
 
+#include <ip_remote.h>
+#include <ip_interface.h>
+#include <ip_messages.h>
+#include <il_messages.h>
+#include <packet_client.h>
+#include <generic.h>
+
 #include <ipc/services.h>
 
-#include <net_messages.h>
 #include <net/modules.h>
 #include <net/device.h>
 #include <net/inet.h>
-#include <ip_interface.h>
-#include <packet_client.h>
-#include <il_messages.h>
-#include <ip_messages.h>
-#include <ip_remote.h>
 
 /** Add a route to the device routing table.