diff --git a/src/kits/network/libnet/Jamfile b/src/kits/network/libnet/Jamfile
index 2ec4499aa7..b454437f30 100644
--- a/src/kits/network/libnet/Jamfile
+++ b/src/kits/network/libnet/Jamfile
@@ -1,6 +1,9 @@
 SubDir OBOS_TOP src kits net libnet ;
 
 UsePosixHeaders ;
+UsePrivateHeaders net ;
+SetupIncludes ;
+SubDirCcFlags -nostdinc ;
 
 SharedLibrary net :
 	socket.c
@@ -45,5 +48,4 @@ SharedLibrary net :
 ;
 
 LinkSharedOSLibs libnet.so :
-	root
 ;
diff --git a/src/kits/network/libnet/compat.c b/src/kits/network/libnet/compat.c
index f3088713f4..3040fe81fe 100644
--- a/src/kits/network/libnet/compat.c
+++ b/src/kits/network/libnet/compat.c
@@ -6,7 +6,7 @@
 
 #include <fcntl.h>
 #include <unistd.h>
-#include <kernel/OS.h>
+#include <OS.h>
 #include <iovec.h>
 #include <stdio.h>
 #include <string.h>
@@ -18,7 +18,7 @@ static int32 h_errno_tls;
 /* These should probably be moved to a seperate file as they
  * are unique to the library as a whole...
  */
-
+/*
 void _init()
 {
 	h_errno_tls = tls_allocate();
@@ -27,6 +27,15 @@ void _init()
 void _fini()
 {
 }
+*/
+void initialize_before()
+{
+	h_errno_tls = tls_allocate();
+}
+
+void terminate_after()
+{
+}
 
 struct net_settings {
 	int dummy;
diff --git a/src/kits/network/libnet/gethostnamadr.c b/src/kits/network/libnet/gethostnamadr.c
index 88dd3d0f48..ef8141b3de 100644
--- a/src/kits/network/libnet/gethostnamadr.c
+++ b/src/kits/network/libnet/gethostnamadr.c
@@ -52,12 +52,12 @@
  */
 
 #include <sys/param.h>
-#include "sys/socket.h"
-#include "netinet/in.h"
-#include "arpa/inet.h"
-#include "arpa/nameser.h"
-#include "netdb.h"
-#include "resolv.h"
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
+#include <netdb.h>
+#include <resolv.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
diff --git a/src/kits/network/libnet/getnetbyaddr.c b/src/kits/network/libnet/getnetbyaddr.c
index ebe5f711dd..6430206640 100644
--- a/src/kits/network/libnet/getnetbyaddr.c
+++ b/src/kits/network/libnet/getnetbyaddr.c
@@ -32,8 +32,8 @@
  */
 
 #include <kernel/OS.h>
-#include "netinet/in.h"
-#include "netdb.h"
+#include <netinet/in.h>
+#include <netdb.h>
 
 extern int _net_stayopen;
 
diff --git a/src/kits/network/libnet/getnetbyname.c b/src/kits/network/libnet/getnetbyname.c
index 4f6bf208a1..7cfd6c639c 100644
--- a/src/kits/network/libnet/getnetbyname.c
+++ b/src/kits/network/libnet/getnetbyname.c
@@ -31,9 +31,9 @@
  * SUCH DAMAGE.
  */
 
-#include <kernel/OS.h>
-#include "netinet/in.h"
-#include "netdb.h"
+#include <OS.h>
+#include <netinet/in.h>
+#include <netdb.h>
 #include <string.h>
 
 extern int _net_stayopen;
diff --git a/src/kits/network/libnet/getnetent.c b/src/kits/network/libnet/getnetent.c
index c4673e7e66..c43a4703ba 100644
--- a/src/kits/network/libnet/getnetent.c
+++ b/src/kits/network/libnet/getnetent.c
@@ -33,10 +33,10 @@
 
 #include <sys/types.h>
 #include <kernel/OS.h>
-#include "sys/socket.h"
-#include "netinet/in.h"
-#include "arpa/inet.h"
-#include "netdb.h"
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/src/kits/network/libnet/getproto.c b/src/kits/network/libnet/getproto.c
index ef1cfadd07..cdda598dc0 100644
--- a/src/kits/network/libnet/getproto.c
+++ b/src/kits/network/libnet/getproto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "netinet/in.h"
+#include <netinet/in.h>
 #include <netdb.h>
 
 extern int _proto_stayopen;
diff --git a/src/kits/network/libnet/getprotoent.c b/src/kits/network/libnet/getprotoent.c
index 9c3514a6eb..ede7f23622 100644
--- a/src/kits/network/libnet/getprotoent.c
+++ b/src/kits/network/libnet/getprotoent.c
@@ -33,7 +33,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include "netinet/in.h"
+#include <netinet/in.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/kits/network/libnet/getprotoname.c b/src/kits/network/libnet/getprotoname.c
index 077f43472d..cb1a68be09 100644
--- a/src/kits/network/libnet/getprotoname.c
+++ b/src/kits/network/libnet/getprotoname.c
@@ -31,8 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#include "netinet/in.h"
-#include "netdb.h"
+#include <netinet/in.h>
+#include <netdb.h>
 #include <string.h>
 
 extern int _proto_stayopen;
diff --git a/src/kits/network/libnet/getservbyname.c b/src/kits/network/libnet/getservbyname.c
index 6e11e54eb9..400263a4e3 100644
--- a/src/kits/network/libnet/getservbyname.c
+++ b/src/kits/network/libnet/getservbyname.c
@@ -32,7 +32,7 @@
  */
 
 
-#include "netinet/in.h"
+#include <netinet/in.h>
 #include <netdb.h>
 #include <string.h>
 
diff --git a/src/kits/network/libnet/getservbyport.c b/src/kits/network/libnet/getservbyport.c
index 4d21def625..e17dd77f82 100644
--- a/src/kits/network/libnet/getservbyport.c
+++ b/src/kits/network/libnet/getservbyport.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "netinet/in.h"
+#include <netinet/in.h>
 #include <netdb.h>
 #include <string.h>
 
diff --git a/src/kits/network/libnet/getservent.c b/src/kits/network/libnet/getservent.c
index c91b7c8817..088d47c767 100644
--- a/src/kits/network/libnet/getservent.c
+++ b/src/kits/network/libnet/getservent.c
@@ -31,9 +31,10 @@
  * SUCH DAMAGE.
  */
 
+#include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include "netinet/in.h"
+#include <netinet/in.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/kits/network/libnet/inet_network.c b/src/kits/network/libnet/inet_network.c
index 6a29c6a1cf..48834d827d 100644
--- a/src/kits/network/libnet/inet_network.c
+++ b/src/kits/network/libnet/inet_network.c
@@ -32,8 +32,8 @@
  */
 
 #include <sys/types.h>
-#include "netinet/in.h"
-#include "arpa/inet.h"
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #include <ctype.h>
 
 /*
diff --git a/src/kits/network/libnet/inet_ntop.c b/src/kits/network/libnet/inet_ntop.c
index c95d8b87e5..2547bfc67d 100644
--- a/src/kits/network/libnet/inet_ntop.c
+++ b/src/kits/network/libnet/inet_ntop.c
@@ -16,10 +16,10 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
-#include "sys/socket.h"
-#include "netinet/in.h"
-#include "arpa/inet.h"
-#include "arpa/nameser.h"
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/src/kits/network/libnet/inet_pton.c b/src/kits/network/libnet/inet_pton.c
index 884dd709be..8a6644499e 100644
--- a/src/kits/network/libnet/inet_pton.c
+++ b/src/kits/network/libnet/inet_pton.c
@@ -16,10 +16,10 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
-#include "sys/socket.h"
-#include "netinet/in.h"
-#include "arpa/inet.h"
-#include "arpa/nameser.h"
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
 #include <string.h>
 #include <errno.h>
 
diff --git a/src/kits/network/libnet/linkaddr.c b/src/kits/network/libnet/linkaddr.c
index 649faf9945..ade6c68cd6 100644
--- a/src/kits/network/libnet/linkaddr.c
+++ b/src/kits/network/libnet/linkaddr.c
@@ -33,8 +33,8 @@
 
 #include <sys/types.h>
 #include <kernel/OS.h>
-#include "sys/socket.h"
-#include "net/if_dl.h"
+#include <sys/socket.h>
+#include <net/if_dl.h>
 #include <string.h>
 
 /* States*/
diff --git a/src/kits/network/libnet/res_comp.c b/src/kits/network/libnet/res_comp.c
index 4813aa2baf..c442502a91 100644
--- a/src/kits/network/libnet/res_comp.c
+++ b/src/kits/network/libnet/res_comp.c
@@ -55,14 +55,13 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
-#include "netinet/in.h"
-#include "arpa/nameser.h"
-#include "netdb.h" /* for MAXHOSTNAMELEN */
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <netdb.h> /* for MAXHOSTNAMELEN */
+#include <resolv.h>
 
 #include <stdio.h>
-#include "resolv.h"
 #include <ctype.h>
-
 #include <unistd.h>
 #include <string.h>
 
diff --git a/src/kits/network/libnet/res_debug.c b/src/kits/network/libnet/res_debug.c
index aec30dc677..089bf90d2c 100644
--- a/src/kits/network/libnet/res_debug.c
+++ b/src/kits/network/libnet/res_debug.c
@@ -77,14 +77,14 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
-#include "sys/socket.h"
-#include "netinet/in.h"
-#include "arpa/inet.h"
-#include "arpa/nameser.h"
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
 
 #include <ctype.h>
-#include "netdb.h"
-#include "resolv.h"
+#include <netdb.h>
+#include <resolv.h>
 #include <stdio.h>
 #include <time.h>
 
diff --git a/src/kits/network/libnet/res_init.c b/src/kits/network/libnet/res_init.c
index cb497cebd3..011e816e98 100644
--- a/src/kits/network/libnet/res_init.c
+++ b/src/kits/network/libnet/res_init.c
@@ -55,19 +55,19 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
-#include "sys/socket.h"
+#include <sys/socket.h>
 #include <sys/time.h>
-#include "netinet/in.h"
-#include "arpa/inet.h"
-#include "arpa/nameser.h"
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
 
 #include <stdio.h>
 #include <ctype.h>
-#include "resolv.h"
+#include <resolv.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include "netdb.h"
+#include <netdb.h>
 
 /*-------------------------------------- info about "sortlist" --------------
  * Marc Majka		1994/04/16
diff --git a/src/kits/network/libnet/res_mkquery.c b/src/kits/network/libnet/res_mkquery.c
index 8aea5fe8f8..cc573842c7 100644
--- a/src/kits/network/libnet/res_mkquery.c
+++ b/src/kits/network/libnet/res_mkquery.c
@@ -53,6 +53,7 @@
  * --Copyright--
  */
 
+#include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <netinet/in.h>
diff --git a/src/kits/network/libnet/res_random.c b/src/kits/network/libnet/res_random.c
index 1271bb690c..73c73e49fe 100644
--- a/src/kits/network/libnet/res_random.c
+++ b/src/kits/network/libnet/res_random.c
@@ -58,9 +58,9 @@
  */
 
 #include <sys/types.h>
-#include "netinet/in.h"
+#include <netinet/in.h>
 #include <sys/time.h>
-#include "resolv.h"
+#include <resolv.h>
 
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/src/kits/network/libnet/res_send.c b/src/kits/network/libnet/res_send.c
index 63b8a08bbd..61674b4e33 100644
--- a/src/kits/network/libnet/res_send.c
+++ b/src/kits/network/libnet/res_send.c
@@ -67,17 +67,17 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
-#include "sys/socket.h"
+#include <sys/socket.h>
 #include <sys/uio.h>
-#include "netinet/in.h"
-#include "arpa/nameser.h"
-#include "arpa/inet.h"
-#include "sys/select.h"
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <arpa/inet.h>
+#include <sys/select.h>
 
 #include <stdio.h>
-#include "netdb.h"
+#include <netdb.h>
 #include <errno.h>
-#include "resolv.h"
+#include <resolv.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/src/kits/network/libnet/select.c b/src/kits/network/libnet/select.c
index 7930acaec9..2ff6c77fad 100644
--- a/src/kits/network/libnet/select.c
+++ b/src/kits/network/libnet/select.c
@@ -1,10 +1,10 @@
 #include <unistd.h>
-#include <kernel/image.h>
-#include <kernel/OS.h>
+#include <image.h>
+#include <OS.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/select.h>
-#include <posix/errno.h>
+#include <errno.h>
 
 #include "net_stack_driver.h"
 
diff --git a/src/kits/network/libnet/socket.c b/src/kits/network/libnet/socket.c
index 276e1acc89..0361146a41 100644
--- a/src/kits/network/libnet/socket.c
+++ b/src/kits/network/libnet/socket.c
@@ -10,9 +10,9 @@
 #include <iovec.h>
 #include <stdio.h>
 
-#include "sys/socket.h"
-#include "sys/sockio.h"
-#include "netinet/in.h"
+#include <sys/socket.h>
+#include <sys/sockio.h>
+#include <netinet/in.h>
 
 #include "net_stack_driver.h"