Index: uspace/srv/net/dhcp/transport.h
===================================================================
--- uspace/srv/net/dhcp/transport.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/dhcp/transport.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -40,5 +40,5 @@
 #include <inet/udp.h>
 #include <ipc/loc.h>
-#include <sys/types.h>
+#include <stddef.h>
 
 struct dhcp_transport;
Index: uspace/srv/net/ethip/ethip.h
===================================================================
--- uspace/srv/net/ethip/ethip.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/ethip/ethip.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -43,5 +43,6 @@
 #include <inet/addr.h>
 #include <loc.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 typedef struct {
Index: uspace/srv/net/ethip/std.h
===================================================================
--- uspace/srv/net/ethip/std.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/ethip/std.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -38,5 +38,5 @@
 #define ETHIP_STD_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <inet/addr.h>
 
Index: uspace/srv/net/inetsrv/addrobj.h
===================================================================
--- uspace/srv/net/inetsrv/addrobj.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/inetsrv/addrobj.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -38,5 +38,6 @@
 #define INET_ADDROBJ_H_
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include "inetsrv.h"
 
Index: uspace/srv/net/inetsrv/icmp_std.h
===================================================================
--- uspace/srv/net/inetsrv/icmp_std.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/inetsrv/icmp_std.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -38,5 +38,5 @@
 #define ICMP_STD_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #define IP_PROTO_ICMP 1
Index: uspace/srv/net/inetsrv/icmpv6_std.h
===================================================================
--- uspace/srv/net/inetsrv/icmpv6_std.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/inetsrv/icmpv6_std.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -38,5 +38,5 @@
 #define ICMPV6_STD_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #define IP_PROTO_ICMPV6  58
Index: uspace/srv/net/inetsrv/inet_link.h
===================================================================
--- uspace/srv/net/inetsrv/inet_link.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/inetsrv/inet_link.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -38,5 +38,6 @@
 #define INET_LINK_H_
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include "inetsrv.h"
 
Index: uspace/srv/net/inetsrv/inet_std.h
===================================================================
--- uspace/srv/net/inetsrv/inet_std.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/inetsrv/inet_std.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -38,5 +38,5 @@
 #define INET_STD_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #define IP6_NEXT_FRAGMENT  44
Index: uspace/srv/net/inetsrv/inetcfg.c
===================================================================
--- uspace/srv/net/inetsrv/inetcfg.c	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/inetsrv/inetcfg.c	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -43,5 +43,5 @@
 #include <stdlib.h>
 #include <str.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <types/inetcfg.h>
 
Index: uspace/srv/net/inetsrv/inetping.c
===================================================================
--- uspace/srv/net/inetsrv/inetping.c	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/inetsrv/inetping.c	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -43,5 +43,6 @@
 #include <loc.h>
 #include <stdlib.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <types/inetping.h>
 #include "icmp.h"
Index: uspace/srv/net/inetsrv/inetsrv.c
===================================================================
--- uspace/srv/net/inetsrv/inetsrv.c	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/inetsrv/inetsrv.c	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -45,5 +45,6 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <task.h>
 #include "addrobj.h"
Index: uspace/srv/net/inetsrv/inetsrv.h
===================================================================
--- uspace/srv/net/inetsrv/inetsrv.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/inetsrv/inetsrv.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -43,5 +43,6 @@
 #include <inet/iplink.h>
 #include <ipc/loc.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <types/inet.h>
 #include <async.h>
Index: uspace/srv/net/inetsrv/ndp.h
===================================================================
--- uspace/srv/net/inetsrv/ndp.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/inetsrv/ndp.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -38,5 +38,4 @@
 #define NDP_H_
 
-#include <sys/types.h>
 #include <inet/addr.h>
 #include "inetsrv.h"
Index: uspace/srv/net/inetsrv/pdu.h
===================================================================
--- uspace/srv/net/inetsrv/pdu.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/inetsrv/pdu.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -39,5 +39,6 @@
 
 #include <loc.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include "inetsrv.h"
 #include "ndp.h"
Index: uspace/srv/net/inetsrv/reass.h
===================================================================
--- uspace/srv/net/inetsrv/reass.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/inetsrv/reass.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -38,5 +38,4 @@
 #define INET_REASS_H_
 
-#include <sys/types.h>
 #include "inetsrv.h"
 
Index: uspace/srv/net/inetsrv/sroute.h
===================================================================
--- uspace/srv/net/inetsrv/sroute.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/inetsrv/sroute.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -38,5 +38,6 @@
 #define INET_SROUTE_H_
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include "inetsrv.h"
 
Index: uspace/srv/net/nconfsrv/iplink.h
===================================================================
--- uspace/srv/net/nconfsrv/iplink.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/nconfsrv/iplink.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -38,5 +38,5 @@
 #define NCONFSRV_IPLINK_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 #include "nconfsrv.h"
 
Index: uspace/srv/net/nconfsrv/nconfsrv.c
===================================================================
--- uspace/srv/net/nconfsrv/nconfsrv.c	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/nconfsrv/nconfsrv.c	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -47,5 +47,4 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include <task.h>
 #include "iplink.h"
Index: uspace/srv/net/tcp/pdu.h
===================================================================
--- uspace/srv/net/tcp/pdu.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/tcp/pdu.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -37,5 +37,5 @@
 
 #include <inet/endpoint.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include "std.h"
 #include "tcp_type.h"
Index: uspace/srv/net/tcp/segment.h
===================================================================
--- uspace/srv/net/tcp/segment.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/tcp/segment.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -36,5 +36,6 @@
 #define SEGMENT_H
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include "tcp_type.h"
 
Index: uspace/srv/net/tcp/seq_no.c
===================================================================
--- uspace/srv/net/tcp/seq_no.c	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/tcp/seq_no.c	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -37,5 +37,5 @@
 #include <assert.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include "seq_no.h"
 #include "tcp_type.h"
Index: uspace/srv/net/tcp/seq_no.h
===================================================================
--- uspace/srv/net/tcp/seq_no.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/tcp/seq_no.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -36,5 +36,5 @@
 #define SEQ_NO_H
 
-#include <sys/types.h>
+#include <stdint.h>
 #include "tcp_type.h"
 
Index: uspace/srv/net/tcp/std.h
===================================================================
--- uspace/srv/net/tcp/std.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/tcp/std.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -38,5 +38,5 @@
 #define STD_H
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <inet/addr.h>
 
Index: uspace/srv/net/tcp/tcp_type.h
===================================================================
--- uspace/srv/net/tcp/tcp_type.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/tcp/tcp_type.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -41,5 +41,6 @@
 #include <fibril.h>
 #include <fibril_synch.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <inet/addr.h>
 #include <inet/endpoint.h>
Index: uspace/srv/net/tcp/ucall.h
===================================================================
--- uspace/srv/net/tcp/ucall.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/tcp/ucall.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -37,5 +37,5 @@
 
 #include <inet/endpoint.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include "tcp_type.h"
 
Index: uspace/srv/net/udp/assoc.h
===================================================================
--- uspace/srv/net/udp/assoc.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/udp/assoc.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -38,5 +38,4 @@
 #include <inet/endpoint.h>
 #include <ipc/loc.h>
-#include <sys/types.h>
 #include "udp_type.h"
 
Index: uspace/srv/net/udp/pdu.h
===================================================================
--- uspace/srv/net/udp/pdu.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/udp/pdu.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -37,5 +37,4 @@
 
 #include <inet/endpoint.h>
-#include <sys/types.h>
 #include "std.h"
 #include "udp_type.h"
Index: uspace/srv/net/udp/std.h
===================================================================
--- uspace/srv/net/udp/std.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/udp/std.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -38,5 +38,5 @@
 #define STD_H
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #define IP_PROTO_UDP  17
Index: uspace/srv/net/udp/udp_type.h
===================================================================
--- uspace/srv/net/udp/udp_type.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/srv/net/udp/udp_type.h	(revision 3ec2acc5fe46d047e352ebba9dfc534ee35a9ca4)
@@ -41,5 +41,5 @@
 #include <inet/endpoint.h>
 #include <ipc/loc.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <inet/addr.h>