Index: uspace/app/dnsres/dnsres.c
===================================================================
--- uspace/app/dnsres/dnsres.c	(revision e948fde266f4f69dd0caf033d76df02d962da8f2)
+++ uspace/app/dnsres/dnsres.c	(revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4)
@@ -36,5 +36,4 @@
 #include <inet/addr.h>
 #include <inet/dnsr.h>
-#include <net/socket_codes.h>
 #include <stdio.h>
 #include <stdlib.h>
Index: uspace/app/ping/ping.c
===================================================================
--- uspace/app/ping/ping.c	(revision e948fde266f4f69dd0caf033d76df02d962da8f2)
+++ uspace/app/ping/ping.c	(revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4)
@@ -37,5 +37,4 @@
 #include <errno.h>
 #include <fibril_synch.h>
-#include <net/socket_codes.h>
 #include <inet/dnsr.h>
 #include <inet/addr.h>
Index: uspace/app/ping6/ping6.c
===================================================================
--- uspace/app/ping6/ping6.c	(revision e948fde266f4f69dd0caf033d76df02d962da8f2)
+++ uspace/app/ping6/ping6.c	(revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4)
@@ -37,5 +37,4 @@
 #include <errno.h>
 #include <fibril_synch.h>
-#include <net/socket_codes.h>
 #include <inet/dnsr.h>
 #include <inet/addr.h>
Index: uspace/lib/c/generic/inet.c
===================================================================
--- uspace/lib/c/generic/inet.c	(revision e948fde266f4f69dd0caf033d76df02d962da8f2)
+++ uspace/lib/c/generic/inet.c	(revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4)
@@ -30,5 +30,4 @@
 #include <assert.h>
 #include <errno.h>
-#include <net/socket_codes.h>
 #include <inet/inet.h>
 #include <ipc/inet.h>
Index: uspace/srv/net/dhcp/dhcp.c
===================================================================
--- uspace/srv/net/dhcp/dhcp.c	(revision e948fde266f4f69dd0caf033d76df02d962da8f2)
+++ uspace/srv/net/dhcp/dhcp.c	(revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4)
@@ -37,4 +37,5 @@
 #include <adt/list.h>
 #include <bitops.h>
+#include <errno.h>
 #include <fibril_synch.h>
 #include <inet/addr.h>
@@ -43,7 +44,4 @@
 #include <io/log.h>
 #include <loc.h>
-#include <net/in.h>
-#include <net/inet.h>
-#include <net/socket.h>
 #include <stdio.h>
 #include <stdlib.h>
Index: uspace/srv/net/dnsrsrv/query.c
===================================================================
--- uspace/srv/net/dnsrsrv/query.c	(revision e948fde266f4f69dd0caf033d76df02d962da8f2)
+++ uspace/srv/net/dnsrsrv/query.c	(revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4)
@@ -39,5 +39,4 @@
 #include <stdlib.h>
 #include <str.h>
-#include <net/socket_codes.h>
 #include "dns_msg.h"
 #include "dns_std.h"
Index: uspace/srv/net/ethip/arp.c
===================================================================
--- uspace/srv/net/ethip/arp.c	(revision e948fde266f4f69dd0caf033d76df02d962da8f2)
+++ uspace/srv/net/ethip/arp.c	(revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4)
@@ -40,5 +40,4 @@
 #include <inet/addr.h>
 #include <stdlib.h>
-#include <net/socket_codes.h>
 #include "arp.h"
 #include "atrans.h"
Index: uspace/srv/net/ethip/ethip.c
===================================================================
--- uspace/srv/net/ethip/ethip.c	(revision e948fde266f4f69dd0caf033d76df02d962da8f2)
+++ uspace/srv/net/ethip/ethip.c	(revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4)
@@ -42,7 +42,7 @@
 #include <io/log.h>
 #include <loc.h>
+#include <net/socket_codes.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <net/socket_codes.h>
 #include "arp.h"
 #include "ethip.h"
Index: uspace/srv/net/ethip/ethip_nic.c
===================================================================
--- uspace/srv/net/ethip/ethip_nic.c	(revision e948fde266f4f69dd0caf033d76df02d962da8f2)
+++ uspace/srv/net/ethip/ethip_nic.c	(revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4)
@@ -45,5 +45,4 @@
 #include <device/nic.h>
 #include <stdlib.h>
-#include <net/socket_codes.h>
 #include <mem.h>
 #include "ethip.h"
Index: uspace/srv/net/inetsrv/addrobj.c
===================================================================
--- uspace/srv/net/inetsrv/addrobj.c	(revision e948fde266f4f69dd0caf033d76df02d962da8f2)
+++ uspace/srv/net/inetsrv/addrobj.c	(revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4)
@@ -42,5 +42,4 @@
 #include <stdlib.h>
 #include <str.h>
-#include <net/socket_codes.h>
 #include "addrobj.h"
 #include "inetsrv.h"
Index: uspace/srv/net/inetsrv/icmp.c
===================================================================
--- uspace/srv/net/inetsrv/icmp.c	(revision e948fde266f4f69dd0caf033d76df02d962da8f2)
+++ uspace/srv/net/inetsrv/icmp.c	(revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4)
@@ -41,5 +41,4 @@
 #include <stdlib.h>
 #include <types/inetping.h>
-#include <net/socket_codes.h>
 #include "icmp.h"
 #include "icmp_std.h"
Index: uspace/srv/net/inetsrv/icmpv6.c
===================================================================
--- uspace/srv/net/inetsrv/icmpv6.c	(revision e948fde266f4f69dd0caf033d76df02d962da8f2)
+++ uspace/srv/net/inetsrv/icmpv6.c	(revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4)
@@ -40,5 +40,4 @@
 #include <mem.h>
 #include <stdlib.h>
-#include <net/socket_codes.h>
 #include <types/inetping6.h>
 #include "icmpv6.h"
Index: uspace/srv/net/inetsrv/inetping.c
===================================================================
--- uspace/srv/net/inetsrv/inetping.c	(revision e948fde266f4f69dd0caf033d76df02d962da8f2)
+++ uspace/srv/net/inetsrv/inetping.c	(revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4)
@@ -44,5 +44,4 @@
 #include <sys/types.h>
 #include <types/inetping.h>
-#include <net/socket_codes.h>
 #include "icmp.h"
 #include "icmp_std.h"
Index: uspace/srv/net/inetsrv/inetping6.c
===================================================================
--- uspace/srv/net/inetsrv/inetping6.c	(revision e948fde266f4f69dd0caf033d76df02d962da8f2)
+++ uspace/srv/net/inetsrv/inetping6.c	(revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4)
@@ -44,5 +44,4 @@
 #include <sys/types.h>
 #include <types/inetping6.h>
-#include <net/socket_codes.h>
 #include "icmpv6.h"
 #include "icmpv6_std.h"
Index: uspace/srv/net/inetsrv/inetsrv.c
===================================================================
--- uspace/srv/net/inetsrv/inetsrv.c	(revision e948fde266f4f69dd0caf033d76df02d962da8f2)
+++ uspace/srv/net/inetsrv/inetsrv.c	(revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4)
@@ -46,5 +46,4 @@
 #include <stdlib.h>
 #include <sys/types.h>
-#include <net/socket_codes.h>
 #include "addrobj.h"
 #include "icmp.h"
Index: uspace/srv/net/inetsrv/ndp.c
===================================================================
--- uspace/srv/net/inetsrv/ndp.c	(revision e948fde266f4f69dd0caf033d76df02d962da8f2)
+++ uspace/srv/net/inetsrv/ndp.c	(revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4)
@@ -39,5 +39,4 @@
 #include <malloc.h>
 #include <io/log.h>
-#include <net/socket_codes.h>
 #include "ntrans.h"
 #include "addrobj.h"
Index: uspace/srv/net/inetsrv/pdu.c
===================================================================
--- uspace/srv/net/inetsrv/pdu.c	(revision e948fde266f4f69dd0caf033d76df02d962da8f2)
+++ uspace/srv/net/inetsrv/pdu.c	(revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4)
@@ -44,5 +44,4 @@
 #include <mem.h>
 #include <stdlib.h>
-#include <net/socket_codes.h>
 #include "inetsrv.h"
 #include "inet_std.h"
Index: uspace/srv/net/nconfsrv/nconfsrv.c
===================================================================
--- uspace/srv/net/nconfsrv/nconfsrv.c	(revision e948fde266f4f69dd0caf033d76df02d962da8f2)
+++ uspace/srv/net/nconfsrv/nconfsrv.c	(revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4)
@@ -48,5 +48,4 @@
 #include <stdlib.h>
 #include <sys/types.h>
-#include <net/socket_codes.h>
 #include "iplink.h"
 #include "nconfsrv.h"
Index: uspace/srv/net/tcp/pdu.c
===================================================================
--- uspace/srv/net/tcp/pdu.c	(revision e948fde266f4f69dd0caf033d76df02d962da8f2)
+++ uspace/srv/net/tcp/pdu.c	(revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4)
@@ -40,5 +40,4 @@
 #include <mem.h>
 #include <stdlib.h>
-#include <net/socket_codes.h>
 #include "pdu.h"
 #include "segment.h"