diff --git a/src/kits/network/Jamfile b/src/kits/network/Jamfile
index e220c88dc1..1174d24a59 100644
--- a/src/kits/network/Jamfile
+++ b/src/kits/network/Jamfile
@@ -4,10 +4,7 @@ Package haiku-networkingkit-cvs :
 	README.html install.sh 
 ;
 
-SubInclude HAIKU_TOP src kits network libbind ;
-SubInclude HAIKU_TOP src kits network libnet ;
-SubInclude HAIKU_TOP src kits network libnetapi ;
-SubInclude HAIKU_TOP src kits network libsocket ;
-
-
-
+# TODO: remove R5 target support
+# if ( $(TARGET_PLATFORM) != r5 ) {
+	SubInclude HAIKU_TOP src kits network compat ;
+# }
diff --git a/src/kits/network/libbind/DEVNOTES b/src/kits/network/compat/libbind/DEVNOTES
similarity index 100%
rename from src/kits/network/libbind/DEVNOTES
rename to src/kits/network/compat/libbind/DEVNOTES
diff --git a/src/kits/network/libbind/Jamfile b/src/kits/network/compat/libbind/Jamfile
similarity index 97%
rename from src/kits/network/libbind/Jamfile
rename to src/kits/network/compat/libbind/Jamfile
index 5d5ced0b7d..39af0e7499 100644
--- a/src/kits/network/libbind/Jamfile
+++ b/src/kits/network/compat/libbind/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src kits network libbind ;
+SubDir HAIKU_TOP src kits network compat libbind ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
@@ -6,7 +6,7 @@ UsePrivateHeaders net ;
 UseHeaders [ FDirName $(SUBDIR) headers ] : true ;
 SubDirSysHdrs $(SUBDIR) ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ( $(TARGET_PLATFORM) != haiku ) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
 		# We need the public network headers also when not compiling for Haiku.
 		# Unfortunately we get more than we want, namely all POSIX headers.
diff --git a/src/kits/network/libbind/config.h b/src/kits/network/compat/libbind/config.h
similarity index 100%
rename from src/kits/network/libbind/config.h
rename to src/kits/network/compat/libbind/config.h
diff --git a/src/kits/network/libbind/dst/dst_api.c b/src/kits/network/compat/libbind/dst/dst_api.c
similarity index 100%
rename from src/kits/network/libbind/dst/dst_api.c
rename to src/kits/network/compat/libbind/dst/dst_api.c
diff --git a/src/kits/network/libbind/dst/dst_internal.h b/src/kits/network/compat/libbind/dst/dst_internal.h
similarity index 100%
rename from src/kits/network/libbind/dst/dst_internal.h
rename to src/kits/network/compat/libbind/dst/dst_internal.h
diff --git a/src/kits/network/libbind/dst/hmac_link.c b/src/kits/network/compat/libbind/dst/hmac_link.c
similarity index 100%
rename from src/kits/network/libbind/dst/hmac_link.c
rename to src/kits/network/compat/libbind/dst/hmac_link.c
diff --git a/src/kits/network/libbind/dst/md5.h b/src/kits/network/compat/libbind/dst/md5.h
similarity index 100%
rename from src/kits/network/libbind/dst/md5.h
rename to src/kits/network/compat/libbind/dst/md5.h
diff --git a/src/kits/network/libbind/dst/md5_dgst.c b/src/kits/network/compat/libbind/dst/md5_dgst.c
similarity index 100%
rename from src/kits/network/libbind/dst/md5_dgst.c
rename to src/kits/network/compat/libbind/dst/md5_dgst.c
diff --git a/src/kits/network/libbind/dst/md5_locl.h b/src/kits/network/compat/libbind/dst/md5_locl.h
similarity index 100%
rename from src/kits/network/libbind/dst/md5_locl.h
rename to src/kits/network/compat/libbind/dst/md5_locl.h
diff --git a/src/kits/network/libbind/dst/support.c b/src/kits/network/compat/libbind/dst/support.c
similarity index 100%
rename from src/kits/network/libbind/dst/support.c
rename to src/kits/network/compat/libbind/dst/support.c
diff --git a/src/kits/network/libbind/headers/pthread_emu.h b/src/kits/network/compat/libbind/headers/pthread_emu.h
similarity index 100%
rename from src/kits/network/libbind/headers/pthread_emu.h
rename to src/kits/network/compat/libbind/headers/pthread_emu.h
diff --git a/src/kits/network/libbind/headers/sys/un.h b/src/kits/network/compat/libbind/headers/sys/un.h
similarity index 100%
rename from src/kits/network/libbind/headers/sys/un.h
rename to src/kits/network/compat/libbind/headers/sys/un.h
diff --git a/src/kits/network/libbind/headers/utmp.h b/src/kits/network/compat/libbind/headers/utmp.h
similarity index 100%
rename from src/kits/network/libbind/headers/utmp.h
rename to src/kits/network/compat/libbind/headers/utmp.h
diff --git a/src/kits/network/libbind/inet/inet_addr.c b/src/kits/network/compat/libbind/inet/inet_addr.c
similarity index 100%
rename from src/kits/network/libbind/inet/inet_addr.c
rename to src/kits/network/compat/libbind/inet/inet_addr.c
diff --git a/src/kits/network/libbind/inet/inet_cidr_ntop.c b/src/kits/network/compat/libbind/inet/inet_cidr_ntop.c
similarity index 100%
rename from src/kits/network/libbind/inet/inet_cidr_ntop.c
rename to src/kits/network/compat/libbind/inet/inet_cidr_ntop.c
diff --git a/src/kits/network/libbind/inet/inet_cidr_pton.c b/src/kits/network/compat/libbind/inet/inet_cidr_pton.c
similarity index 100%
rename from src/kits/network/libbind/inet/inet_cidr_pton.c
rename to src/kits/network/compat/libbind/inet/inet_cidr_pton.c
diff --git a/src/kits/network/libbind/inet/inet_data.c b/src/kits/network/compat/libbind/inet/inet_data.c
similarity index 100%
rename from src/kits/network/libbind/inet/inet_data.c
rename to src/kits/network/compat/libbind/inet/inet_data.c
diff --git a/src/kits/network/libbind/inet/inet_lnaof.c b/src/kits/network/compat/libbind/inet/inet_lnaof.c
similarity index 100%
rename from src/kits/network/libbind/inet/inet_lnaof.c
rename to src/kits/network/compat/libbind/inet/inet_lnaof.c
diff --git a/src/kits/network/libbind/inet/inet_makeaddr.c b/src/kits/network/compat/libbind/inet/inet_makeaddr.c
similarity index 100%
rename from src/kits/network/libbind/inet/inet_makeaddr.c
rename to src/kits/network/compat/libbind/inet/inet_makeaddr.c
diff --git a/src/kits/network/libbind/inet/inet_net_ntop.c b/src/kits/network/compat/libbind/inet/inet_net_ntop.c
similarity index 100%
rename from src/kits/network/libbind/inet/inet_net_ntop.c
rename to src/kits/network/compat/libbind/inet/inet_net_ntop.c
diff --git a/src/kits/network/libbind/inet/inet_net_pton.c b/src/kits/network/compat/libbind/inet/inet_net_pton.c
similarity index 100%
rename from src/kits/network/libbind/inet/inet_net_pton.c
rename to src/kits/network/compat/libbind/inet/inet_net_pton.c
diff --git a/src/kits/network/libbind/inet/inet_neta.c b/src/kits/network/compat/libbind/inet/inet_neta.c
similarity index 100%
rename from src/kits/network/libbind/inet/inet_neta.c
rename to src/kits/network/compat/libbind/inet/inet_neta.c
diff --git a/src/kits/network/libbind/inet/inet_netof.c b/src/kits/network/compat/libbind/inet/inet_netof.c
similarity index 100%
rename from src/kits/network/libbind/inet/inet_netof.c
rename to src/kits/network/compat/libbind/inet/inet_netof.c
diff --git a/src/kits/network/libbind/inet/inet_network.c b/src/kits/network/compat/libbind/inet/inet_network.c
similarity index 100%
rename from src/kits/network/libbind/inet/inet_network.c
rename to src/kits/network/compat/libbind/inet/inet_network.c
diff --git a/src/kits/network/libbind/inet/inet_ntoa.c b/src/kits/network/compat/libbind/inet/inet_ntoa.c
similarity index 100%
rename from src/kits/network/libbind/inet/inet_ntoa.c
rename to src/kits/network/compat/libbind/inet/inet_ntoa.c
diff --git a/src/kits/network/libbind/inet/inet_ntop.c b/src/kits/network/compat/libbind/inet/inet_ntop.c
similarity index 100%
rename from src/kits/network/libbind/inet/inet_ntop.c
rename to src/kits/network/compat/libbind/inet/inet_ntop.c
diff --git a/src/kits/network/libbind/inet/inet_pton.c b/src/kits/network/compat/libbind/inet/inet_pton.c
similarity index 100%
rename from src/kits/network/libbind/inet/inet_pton.c
rename to src/kits/network/compat/libbind/inet/inet_pton.c
diff --git a/src/kits/network/libbind/inet/nsap_addr.c b/src/kits/network/compat/libbind/inet/nsap_addr.c
similarity index 100%
rename from src/kits/network/libbind/inet/nsap_addr.c
rename to src/kits/network/compat/libbind/inet/nsap_addr.c
diff --git a/src/kits/network/libbind/irs/dns.c b/src/kits/network/compat/libbind/irs/dns.c
similarity index 100%
rename from src/kits/network/libbind/irs/dns.c
rename to src/kits/network/compat/libbind/irs/dns.c
diff --git a/src/kits/network/libbind/irs/dns_gr.c b/src/kits/network/compat/libbind/irs/dns_gr.c
similarity index 100%
rename from src/kits/network/libbind/irs/dns_gr.c
rename to src/kits/network/compat/libbind/irs/dns_gr.c
diff --git a/src/kits/network/libbind/irs/dns_ho.c b/src/kits/network/compat/libbind/irs/dns_ho.c
similarity index 100%
rename from src/kits/network/libbind/irs/dns_ho.c
rename to src/kits/network/compat/libbind/irs/dns_ho.c
diff --git a/src/kits/network/libbind/irs/dns_nw.c b/src/kits/network/compat/libbind/irs/dns_nw.c
similarity index 100%
rename from src/kits/network/libbind/irs/dns_nw.c
rename to src/kits/network/compat/libbind/irs/dns_nw.c
diff --git a/src/kits/network/libbind/irs/dns_p.h b/src/kits/network/compat/libbind/irs/dns_p.h
similarity index 100%
rename from src/kits/network/libbind/irs/dns_p.h
rename to src/kits/network/compat/libbind/irs/dns_p.h
diff --git a/src/kits/network/libbind/irs/dns_pr.c b/src/kits/network/compat/libbind/irs/dns_pr.c
similarity index 100%
rename from src/kits/network/libbind/irs/dns_pr.c
rename to src/kits/network/compat/libbind/irs/dns_pr.c
diff --git a/src/kits/network/libbind/irs/dns_pw.c b/src/kits/network/compat/libbind/irs/dns_pw.c
similarity index 100%
rename from src/kits/network/libbind/irs/dns_pw.c
rename to src/kits/network/compat/libbind/irs/dns_pw.c
diff --git a/src/kits/network/libbind/irs/dns_sv.c b/src/kits/network/compat/libbind/irs/dns_sv.c
similarity index 100%
rename from src/kits/network/libbind/irs/dns_sv.c
rename to src/kits/network/compat/libbind/irs/dns_sv.c
diff --git a/src/kits/network/libbind/irs/gai_strerror.c b/src/kits/network/compat/libbind/irs/gai_strerror.c
similarity index 100%
rename from src/kits/network/libbind/irs/gai_strerror.c
rename to src/kits/network/compat/libbind/irs/gai_strerror.c
diff --git a/src/kits/network/libbind/irs/gen.c b/src/kits/network/compat/libbind/irs/gen.c
similarity index 100%
rename from src/kits/network/libbind/irs/gen.c
rename to src/kits/network/compat/libbind/irs/gen.c
diff --git a/src/kits/network/libbind/irs/gen_gr.c b/src/kits/network/compat/libbind/irs/gen_gr.c
similarity index 100%
rename from src/kits/network/libbind/irs/gen_gr.c
rename to src/kits/network/compat/libbind/irs/gen_gr.c
diff --git a/src/kits/network/libbind/irs/gen_ho.c b/src/kits/network/compat/libbind/irs/gen_ho.c
similarity index 100%
rename from src/kits/network/libbind/irs/gen_ho.c
rename to src/kits/network/compat/libbind/irs/gen_ho.c
diff --git a/src/kits/network/libbind/irs/gen_ng.c b/src/kits/network/compat/libbind/irs/gen_ng.c
similarity index 100%
rename from src/kits/network/libbind/irs/gen_ng.c
rename to src/kits/network/compat/libbind/irs/gen_ng.c
diff --git a/src/kits/network/libbind/irs/gen_nw.c b/src/kits/network/compat/libbind/irs/gen_nw.c
similarity index 100%
rename from src/kits/network/libbind/irs/gen_nw.c
rename to src/kits/network/compat/libbind/irs/gen_nw.c
diff --git a/src/kits/network/libbind/irs/gen_p.h b/src/kits/network/compat/libbind/irs/gen_p.h
similarity index 100%
rename from src/kits/network/libbind/irs/gen_p.h
rename to src/kits/network/compat/libbind/irs/gen_p.h
diff --git a/src/kits/network/libbind/irs/gen_pr.c b/src/kits/network/compat/libbind/irs/gen_pr.c
similarity index 100%
rename from src/kits/network/libbind/irs/gen_pr.c
rename to src/kits/network/compat/libbind/irs/gen_pr.c
diff --git a/src/kits/network/libbind/irs/gen_pw.c b/src/kits/network/compat/libbind/irs/gen_pw.c
similarity index 100%
rename from src/kits/network/libbind/irs/gen_pw.c
rename to src/kits/network/compat/libbind/irs/gen_pw.c
diff --git a/src/kits/network/libbind/irs/gen_sv.c b/src/kits/network/compat/libbind/irs/gen_sv.c
similarity index 100%
rename from src/kits/network/libbind/irs/gen_sv.c
rename to src/kits/network/compat/libbind/irs/gen_sv.c
diff --git a/src/kits/network/libbind/irs/getaddrinfo.c b/src/kits/network/compat/libbind/irs/getaddrinfo.c
similarity index 100%
rename from src/kits/network/libbind/irs/getaddrinfo.c
rename to src/kits/network/compat/libbind/irs/getaddrinfo.c
diff --git a/src/kits/network/libbind/irs/getgrent.c b/src/kits/network/compat/libbind/irs/getgrent.c
similarity index 100%
rename from src/kits/network/libbind/irs/getgrent.c
rename to src/kits/network/compat/libbind/irs/getgrent.c
diff --git a/src/kits/network/libbind/irs/getgrent_r.c b/src/kits/network/compat/libbind/irs/getgrent_r.c
similarity index 100%
rename from src/kits/network/libbind/irs/getgrent_r.c
rename to src/kits/network/compat/libbind/irs/getgrent_r.c
diff --git a/src/kits/network/libbind/irs/gethostent.c b/src/kits/network/compat/libbind/irs/gethostent.c
similarity index 100%
rename from src/kits/network/libbind/irs/gethostent.c
rename to src/kits/network/compat/libbind/irs/gethostent.c
diff --git a/src/kits/network/libbind/irs/gethostent_r.c b/src/kits/network/compat/libbind/irs/gethostent_r.c
similarity index 100%
rename from src/kits/network/libbind/irs/gethostent_r.c
rename to src/kits/network/compat/libbind/irs/gethostent_r.c
diff --git a/src/kits/network/libbind/irs/getnameinfo.c b/src/kits/network/compat/libbind/irs/getnameinfo.c
similarity index 100%
rename from src/kits/network/libbind/irs/getnameinfo.c
rename to src/kits/network/compat/libbind/irs/getnameinfo.c
diff --git a/src/kits/network/libbind/irs/getnetent.c b/src/kits/network/compat/libbind/irs/getnetent.c
similarity index 100%
rename from src/kits/network/libbind/irs/getnetent.c
rename to src/kits/network/compat/libbind/irs/getnetent.c
diff --git a/src/kits/network/libbind/irs/getnetent_r.c b/src/kits/network/compat/libbind/irs/getnetent_r.c
similarity index 100%
rename from src/kits/network/libbind/irs/getnetent_r.c
rename to src/kits/network/compat/libbind/irs/getnetent_r.c
diff --git a/src/kits/network/libbind/irs/getnetgrent.c b/src/kits/network/compat/libbind/irs/getnetgrent.c
similarity index 100%
rename from src/kits/network/libbind/irs/getnetgrent.c
rename to src/kits/network/compat/libbind/irs/getnetgrent.c
diff --git a/src/kits/network/libbind/irs/getnetgrent_r.c b/src/kits/network/compat/libbind/irs/getnetgrent_r.c
similarity index 100%
rename from src/kits/network/libbind/irs/getnetgrent_r.c
rename to src/kits/network/compat/libbind/irs/getnetgrent_r.c
diff --git a/src/kits/network/libbind/irs/getprotoent.c b/src/kits/network/compat/libbind/irs/getprotoent.c
similarity index 100%
rename from src/kits/network/libbind/irs/getprotoent.c
rename to src/kits/network/compat/libbind/irs/getprotoent.c
diff --git a/src/kits/network/libbind/irs/getprotoent_r.c b/src/kits/network/compat/libbind/irs/getprotoent_r.c
similarity index 100%
rename from src/kits/network/libbind/irs/getprotoent_r.c
rename to src/kits/network/compat/libbind/irs/getprotoent_r.c
diff --git a/src/kits/network/libbind/irs/getpwent.c b/src/kits/network/compat/libbind/irs/getpwent.c
similarity index 100%
rename from src/kits/network/libbind/irs/getpwent.c
rename to src/kits/network/compat/libbind/irs/getpwent.c
diff --git a/src/kits/network/libbind/irs/getpwent_r.c b/src/kits/network/compat/libbind/irs/getpwent_r.c
similarity index 100%
rename from src/kits/network/libbind/irs/getpwent_r.c
rename to src/kits/network/compat/libbind/irs/getpwent_r.c
diff --git a/src/kits/network/libbind/irs/getservent.c b/src/kits/network/compat/libbind/irs/getservent.c
similarity index 100%
rename from src/kits/network/libbind/irs/getservent.c
rename to src/kits/network/compat/libbind/irs/getservent.c
diff --git a/src/kits/network/libbind/irs/getservent_r.c b/src/kits/network/compat/libbind/irs/getservent_r.c
similarity index 100%
rename from src/kits/network/libbind/irs/getservent_r.c
rename to src/kits/network/compat/libbind/irs/getservent_r.c
diff --git a/src/kits/network/libbind/irs/hesiod.c b/src/kits/network/compat/libbind/irs/hesiod.c
similarity index 100%
rename from src/kits/network/libbind/irs/hesiod.c
rename to src/kits/network/compat/libbind/irs/hesiod.c
diff --git a/src/kits/network/libbind/irs/hesiod_p.h b/src/kits/network/compat/libbind/irs/hesiod_p.h
similarity index 100%
rename from src/kits/network/libbind/irs/hesiod_p.h
rename to src/kits/network/compat/libbind/irs/hesiod_p.h
diff --git a/src/kits/network/libbind/irs/irp.c b/src/kits/network/compat/libbind/irs/irp.c
similarity index 100%
rename from src/kits/network/libbind/irs/irp.c
rename to src/kits/network/compat/libbind/irs/irp.c
diff --git a/src/kits/network/libbind/irs/irp_gr.c b/src/kits/network/compat/libbind/irs/irp_gr.c
similarity index 100%
rename from src/kits/network/libbind/irs/irp_gr.c
rename to src/kits/network/compat/libbind/irs/irp_gr.c
diff --git a/src/kits/network/libbind/irs/irp_ho.c b/src/kits/network/compat/libbind/irs/irp_ho.c
similarity index 100%
rename from src/kits/network/libbind/irs/irp_ho.c
rename to src/kits/network/compat/libbind/irs/irp_ho.c
diff --git a/src/kits/network/libbind/irs/irp_ng.c b/src/kits/network/compat/libbind/irs/irp_ng.c
similarity index 100%
rename from src/kits/network/libbind/irs/irp_ng.c
rename to src/kits/network/compat/libbind/irs/irp_ng.c
diff --git a/src/kits/network/libbind/irs/irp_nw.c b/src/kits/network/compat/libbind/irs/irp_nw.c
similarity index 100%
rename from src/kits/network/libbind/irs/irp_nw.c
rename to src/kits/network/compat/libbind/irs/irp_nw.c
diff --git a/src/kits/network/libbind/irs/irp_p.h b/src/kits/network/compat/libbind/irs/irp_p.h
similarity index 100%
rename from src/kits/network/libbind/irs/irp_p.h
rename to src/kits/network/compat/libbind/irs/irp_p.h
diff --git a/src/kits/network/libbind/irs/irp_pr.c b/src/kits/network/compat/libbind/irs/irp_pr.c
similarity index 100%
rename from src/kits/network/libbind/irs/irp_pr.c
rename to src/kits/network/compat/libbind/irs/irp_pr.c
diff --git a/src/kits/network/libbind/irs/irp_pw.c b/src/kits/network/compat/libbind/irs/irp_pw.c
similarity index 100%
rename from src/kits/network/libbind/irs/irp_pw.c
rename to src/kits/network/compat/libbind/irs/irp_pw.c
diff --git a/src/kits/network/libbind/irs/irp_sv.c b/src/kits/network/compat/libbind/irs/irp_sv.c
similarity index 100%
rename from src/kits/network/libbind/irs/irp_sv.c
rename to src/kits/network/compat/libbind/irs/irp_sv.c
diff --git a/src/kits/network/libbind/irs/irpmarshall.c b/src/kits/network/compat/libbind/irs/irpmarshall.c
similarity index 100%
rename from src/kits/network/libbind/irs/irpmarshall.c
rename to src/kits/network/compat/libbind/irs/irpmarshall.c
diff --git a/src/kits/network/libbind/irs/irs_data.c b/src/kits/network/compat/libbind/irs/irs_data.c
similarity index 100%
rename from src/kits/network/libbind/irs/irs_data.c
rename to src/kits/network/compat/libbind/irs/irs_data.c
diff --git a/src/kits/network/libbind/irs/irs_data.h b/src/kits/network/compat/libbind/irs/irs_data.h
similarity index 100%
rename from src/kits/network/libbind/irs/irs_data.h
rename to src/kits/network/compat/libbind/irs/irs_data.h
diff --git a/src/kits/network/libbind/irs/irs_p.h b/src/kits/network/compat/libbind/irs/irs_p.h
similarity index 100%
rename from src/kits/network/libbind/irs/irs_p.h
rename to src/kits/network/compat/libbind/irs/irs_p.h
diff --git a/src/kits/network/libbind/irs/lcl.c b/src/kits/network/compat/libbind/irs/lcl.c
similarity index 100%
rename from src/kits/network/libbind/irs/lcl.c
rename to src/kits/network/compat/libbind/irs/lcl.c
diff --git a/src/kits/network/libbind/irs/lcl_gr.c b/src/kits/network/compat/libbind/irs/lcl_gr.c
similarity index 100%
rename from src/kits/network/libbind/irs/lcl_gr.c
rename to src/kits/network/compat/libbind/irs/lcl_gr.c
diff --git a/src/kits/network/libbind/irs/lcl_ho.c b/src/kits/network/compat/libbind/irs/lcl_ho.c
similarity index 100%
rename from src/kits/network/libbind/irs/lcl_ho.c
rename to src/kits/network/compat/libbind/irs/lcl_ho.c
diff --git a/src/kits/network/libbind/irs/lcl_ng.c b/src/kits/network/compat/libbind/irs/lcl_ng.c
similarity index 100%
rename from src/kits/network/libbind/irs/lcl_ng.c
rename to src/kits/network/compat/libbind/irs/lcl_ng.c
diff --git a/src/kits/network/libbind/irs/lcl_nw.c b/src/kits/network/compat/libbind/irs/lcl_nw.c
similarity index 100%
rename from src/kits/network/libbind/irs/lcl_nw.c
rename to src/kits/network/compat/libbind/irs/lcl_nw.c
diff --git a/src/kits/network/libbind/irs/lcl_p.h b/src/kits/network/compat/libbind/irs/lcl_p.h
similarity index 100%
rename from src/kits/network/libbind/irs/lcl_p.h
rename to src/kits/network/compat/libbind/irs/lcl_p.h
diff --git a/src/kits/network/libbind/irs/lcl_pr.c b/src/kits/network/compat/libbind/irs/lcl_pr.c
similarity index 100%
rename from src/kits/network/libbind/irs/lcl_pr.c
rename to src/kits/network/compat/libbind/irs/lcl_pr.c
diff --git a/src/kits/network/libbind/irs/lcl_pw.c b/src/kits/network/compat/libbind/irs/lcl_pw.c
similarity index 100%
rename from src/kits/network/libbind/irs/lcl_pw.c
rename to src/kits/network/compat/libbind/irs/lcl_pw.c
diff --git a/src/kits/network/libbind/irs/lcl_sv.c b/src/kits/network/compat/libbind/irs/lcl_sv.c
similarity index 100%
rename from src/kits/network/libbind/irs/lcl_sv.c
rename to src/kits/network/compat/libbind/irs/lcl_sv.c
diff --git a/src/kits/network/libbind/irs/nis.c b/src/kits/network/compat/libbind/irs/nis.c
similarity index 100%
rename from src/kits/network/libbind/irs/nis.c
rename to src/kits/network/compat/libbind/irs/nis.c
diff --git a/src/kits/network/libbind/irs/nis_gr.c b/src/kits/network/compat/libbind/irs/nis_gr.c
similarity index 100%
rename from src/kits/network/libbind/irs/nis_gr.c
rename to src/kits/network/compat/libbind/irs/nis_gr.c
diff --git a/src/kits/network/libbind/irs/nis_ho.c b/src/kits/network/compat/libbind/irs/nis_ho.c
similarity index 100%
rename from src/kits/network/libbind/irs/nis_ho.c
rename to src/kits/network/compat/libbind/irs/nis_ho.c
diff --git a/src/kits/network/libbind/irs/nis_ng.c b/src/kits/network/compat/libbind/irs/nis_ng.c
similarity index 100%
rename from src/kits/network/libbind/irs/nis_ng.c
rename to src/kits/network/compat/libbind/irs/nis_ng.c
diff --git a/src/kits/network/libbind/irs/nis_nw.c b/src/kits/network/compat/libbind/irs/nis_nw.c
similarity index 100%
rename from src/kits/network/libbind/irs/nis_nw.c
rename to src/kits/network/compat/libbind/irs/nis_nw.c
diff --git a/src/kits/network/libbind/irs/nis_p.h b/src/kits/network/compat/libbind/irs/nis_p.h
similarity index 100%
rename from src/kits/network/libbind/irs/nis_p.h
rename to src/kits/network/compat/libbind/irs/nis_p.h
diff --git a/src/kits/network/libbind/irs/nis_pr.c b/src/kits/network/compat/libbind/irs/nis_pr.c
similarity index 100%
rename from src/kits/network/libbind/irs/nis_pr.c
rename to src/kits/network/compat/libbind/irs/nis_pr.c
diff --git a/src/kits/network/libbind/irs/nis_pw.c b/src/kits/network/compat/libbind/irs/nis_pw.c
similarity index 100%
rename from src/kits/network/libbind/irs/nis_pw.c
rename to src/kits/network/compat/libbind/irs/nis_pw.c
diff --git a/src/kits/network/libbind/irs/nis_sv.c b/src/kits/network/compat/libbind/irs/nis_sv.c
similarity index 100%
rename from src/kits/network/libbind/irs/nis_sv.c
rename to src/kits/network/compat/libbind/irs/nis_sv.c
diff --git a/src/kits/network/libbind/irs/nul_ng.c b/src/kits/network/compat/libbind/irs/nul_ng.c
similarity index 100%
rename from src/kits/network/libbind/irs/nul_ng.c
rename to src/kits/network/compat/libbind/irs/nul_ng.c
diff --git a/src/kits/network/libbind/irs/pathnames.h b/src/kits/network/compat/libbind/irs/pathnames.h
similarity index 100%
rename from src/kits/network/libbind/irs/pathnames.h
rename to src/kits/network/compat/libbind/irs/pathnames.h
diff --git a/src/kits/network/libbind/irs/util.c b/src/kits/network/compat/libbind/irs/util.c
similarity index 100%
rename from src/kits/network/libbind/irs/util.c
rename to src/kits/network/compat/libbind/irs/util.c
diff --git a/src/kits/network/libbind/isc/assertions.c b/src/kits/network/compat/libbind/isc/assertions.c
similarity index 100%
rename from src/kits/network/libbind/isc/assertions.c
rename to src/kits/network/compat/libbind/isc/assertions.c
diff --git a/src/kits/network/libbind/isc/base64.c b/src/kits/network/compat/libbind/isc/base64.c
similarity index 100%
rename from src/kits/network/libbind/isc/base64.c
rename to src/kits/network/compat/libbind/isc/base64.c
diff --git a/src/kits/network/libbind/isc/bitncmp.c b/src/kits/network/compat/libbind/isc/bitncmp.c
similarity index 100%
rename from src/kits/network/libbind/isc/bitncmp.c
rename to src/kits/network/compat/libbind/isc/bitncmp.c
diff --git a/src/kits/network/libbind/isc/ctl_clnt.c b/src/kits/network/compat/libbind/isc/ctl_clnt.c
similarity index 100%
rename from src/kits/network/libbind/isc/ctl_clnt.c
rename to src/kits/network/compat/libbind/isc/ctl_clnt.c
diff --git a/src/kits/network/libbind/isc/ctl_p.c b/src/kits/network/compat/libbind/isc/ctl_p.c
similarity index 100%
rename from src/kits/network/libbind/isc/ctl_p.c
rename to src/kits/network/compat/libbind/isc/ctl_p.c
diff --git a/src/kits/network/libbind/isc/ctl_p.h b/src/kits/network/compat/libbind/isc/ctl_p.h
similarity index 100%
rename from src/kits/network/libbind/isc/ctl_p.h
rename to src/kits/network/compat/libbind/isc/ctl_p.h
diff --git a/src/kits/network/libbind/isc/ctl_srvr.c b/src/kits/network/compat/libbind/isc/ctl_srvr.c
similarity index 100%
rename from src/kits/network/libbind/isc/ctl_srvr.c
rename to src/kits/network/compat/libbind/isc/ctl_srvr.c
diff --git a/src/kits/network/libbind/isc/ev_connects.c b/src/kits/network/compat/libbind/isc/ev_connects.c
similarity index 100%
rename from src/kits/network/libbind/isc/ev_connects.c
rename to src/kits/network/compat/libbind/isc/ev_connects.c
diff --git a/src/kits/network/libbind/isc/ev_files.c b/src/kits/network/compat/libbind/isc/ev_files.c
similarity index 100%
rename from src/kits/network/libbind/isc/ev_files.c
rename to src/kits/network/compat/libbind/isc/ev_files.c
diff --git a/src/kits/network/libbind/isc/ev_streams.c b/src/kits/network/compat/libbind/isc/ev_streams.c
similarity index 100%
rename from src/kits/network/libbind/isc/ev_streams.c
rename to src/kits/network/compat/libbind/isc/ev_streams.c
diff --git a/src/kits/network/libbind/isc/ev_timers.c b/src/kits/network/compat/libbind/isc/ev_timers.c
similarity index 100%
rename from src/kits/network/libbind/isc/ev_timers.c
rename to src/kits/network/compat/libbind/isc/ev_timers.c
diff --git a/src/kits/network/libbind/isc/ev_waits.c b/src/kits/network/compat/libbind/isc/ev_waits.c
similarity index 100%
rename from src/kits/network/libbind/isc/ev_waits.c
rename to src/kits/network/compat/libbind/isc/ev_waits.c
diff --git a/src/kits/network/libbind/isc/eventlib.c b/src/kits/network/compat/libbind/isc/eventlib.c
similarity index 100%
rename from src/kits/network/libbind/isc/eventlib.c
rename to src/kits/network/compat/libbind/isc/eventlib.c
diff --git a/src/kits/network/libbind/isc/eventlib_p.h b/src/kits/network/compat/libbind/isc/eventlib_p.h
similarity index 100%
rename from src/kits/network/libbind/isc/eventlib_p.h
rename to src/kits/network/compat/libbind/isc/eventlib_p.h
diff --git a/src/kits/network/libbind/isc/heap.c b/src/kits/network/compat/libbind/isc/heap.c
similarity index 100%
rename from src/kits/network/libbind/isc/heap.c
rename to src/kits/network/compat/libbind/isc/heap.c
diff --git a/src/kits/network/libbind/isc/hex.c b/src/kits/network/compat/libbind/isc/hex.c
similarity index 100%
rename from src/kits/network/libbind/isc/hex.c
rename to src/kits/network/compat/libbind/isc/hex.c
diff --git a/src/kits/network/libbind/isc/logging.c b/src/kits/network/compat/libbind/isc/logging.c
similarity index 100%
rename from src/kits/network/libbind/isc/logging.c
rename to src/kits/network/compat/libbind/isc/logging.c
diff --git a/src/kits/network/libbind/isc/logging_p.h b/src/kits/network/compat/libbind/isc/logging_p.h
similarity index 100%
rename from src/kits/network/libbind/isc/logging_p.h
rename to src/kits/network/compat/libbind/isc/logging_p.h
diff --git a/src/kits/network/libbind/isc/memcluster.c b/src/kits/network/compat/libbind/isc/memcluster.c
similarity index 100%
rename from src/kits/network/libbind/isc/memcluster.c
rename to src/kits/network/compat/libbind/isc/memcluster.c
diff --git a/src/kits/network/libbind/isc/movefile.c b/src/kits/network/compat/libbind/isc/movefile.c
similarity index 100%
rename from src/kits/network/libbind/isc/movefile.c
rename to src/kits/network/compat/libbind/isc/movefile.c
diff --git a/src/kits/network/libbind/isc/tree.c b/src/kits/network/compat/libbind/isc/tree.c
similarity index 100%
rename from src/kits/network/libbind/isc/tree.c
rename to src/kits/network/compat/libbind/isc/tree.c
diff --git a/src/kits/network/libbind/nameser/ns_date.c b/src/kits/network/compat/libbind/nameser/ns_date.c
similarity index 100%
rename from src/kits/network/libbind/nameser/ns_date.c
rename to src/kits/network/compat/libbind/nameser/ns_date.c
diff --git a/src/kits/network/libbind/nameser/ns_name.c b/src/kits/network/compat/libbind/nameser/ns_name.c
similarity index 100%
rename from src/kits/network/libbind/nameser/ns_name.c
rename to src/kits/network/compat/libbind/nameser/ns_name.c
diff --git a/src/kits/network/libbind/nameser/ns_netint.c b/src/kits/network/compat/libbind/nameser/ns_netint.c
similarity index 100%
rename from src/kits/network/libbind/nameser/ns_netint.c
rename to src/kits/network/compat/libbind/nameser/ns_netint.c
diff --git a/src/kits/network/libbind/nameser/ns_parse.c b/src/kits/network/compat/libbind/nameser/ns_parse.c
similarity index 100%
rename from src/kits/network/libbind/nameser/ns_parse.c
rename to src/kits/network/compat/libbind/nameser/ns_parse.c
diff --git a/src/kits/network/libbind/nameser/ns_print.c b/src/kits/network/compat/libbind/nameser/ns_print.c
similarity index 100%
rename from src/kits/network/libbind/nameser/ns_print.c
rename to src/kits/network/compat/libbind/nameser/ns_print.c
diff --git a/src/kits/network/libbind/nameser/ns_samedomain.c b/src/kits/network/compat/libbind/nameser/ns_samedomain.c
similarity index 100%
rename from src/kits/network/libbind/nameser/ns_samedomain.c
rename to src/kits/network/compat/libbind/nameser/ns_samedomain.c
diff --git a/src/kits/network/libbind/nameser/ns_sign.c b/src/kits/network/compat/libbind/nameser/ns_sign.c
similarity index 100%
rename from src/kits/network/libbind/nameser/ns_sign.c
rename to src/kits/network/compat/libbind/nameser/ns_sign.c
diff --git a/src/kits/network/libbind/nameser/ns_ttl.c b/src/kits/network/compat/libbind/nameser/ns_ttl.c
similarity index 100%
rename from src/kits/network/libbind/nameser/ns_ttl.c
rename to src/kits/network/compat/libbind/nameser/ns_ttl.c
diff --git a/src/kits/network/libbind/nameser/ns_verify.c b/src/kits/network/compat/libbind/nameser/ns_verify.c
similarity index 100%
rename from src/kits/network/libbind/nameser/ns_verify.c
rename to src/kits/network/compat/libbind/nameser/ns_verify.c
diff --git a/src/kits/network/libbind/port_after.h b/src/kits/network/compat/libbind/port_after.h
similarity index 100%
rename from src/kits/network/libbind/port_after.h
rename to src/kits/network/compat/libbind/port_after.h
diff --git a/src/kits/network/libbind/port_before.h b/src/kits/network/compat/libbind/port_before.h
similarity index 100%
rename from src/kits/network/libbind/port_before.h
rename to src/kits/network/compat/libbind/port_before.h
diff --git a/src/kits/network/libbind/resolv/herror.c b/src/kits/network/compat/libbind/resolv/herror.c
similarity index 100%
rename from src/kits/network/libbind/resolv/herror.c
rename to src/kits/network/compat/libbind/resolv/herror.c
diff --git a/src/kits/network/libbind/resolv/res_comp.c b/src/kits/network/compat/libbind/resolv/res_comp.c
similarity index 100%
rename from src/kits/network/libbind/resolv/res_comp.c
rename to src/kits/network/compat/libbind/resolv/res_comp.c
diff --git a/src/kits/network/libbind/resolv/res_data.c b/src/kits/network/compat/libbind/resolv/res_data.c
similarity index 100%
rename from src/kits/network/libbind/resolv/res_data.c
rename to src/kits/network/compat/libbind/resolv/res_data.c
diff --git a/src/kits/network/libbind/resolv/res_debug.c b/src/kits/network/compat/libbind/resolv/res_debug.c
similarity index 100%
rename from src/kits/network/libbind/resolv/res_debug.c
rename to src/kits/network/compat/libbind/resolv/res_debug.c
diff --git a/src/kits/network/libbind/resolv/res_debug.h b/src/kits/network/compat/libbind/resolv/res_debug.h
similarity index 100%
rename from src/kits/network/libbind/resolv/res_debug.h
rename to src/kits/network/compat/libbind/resolv/res_debug.h
diff --git a/src/kits/network/libbind/resolv/res_findzonecut.c b/src/kits/network/compat/libbind/resolv/res_findzonecut.c
similarity index 100%
rename from src/kits/network/libbind/resolv/res_findzonecut.c
rename to src/kits/network/compat/libbind/resolv/res_findzonecut.c
diff --git a/src/kits/network/libbind/resolv/res_init.c b/src/kits/network/compat/libbind/resolv/res_init.c
similarity index 100%
rename from src/kits/network/libbind/resolv/res_init.c
rename to src/kits/network/compat/libbind/resolv/res_init.c
diff --git a/src/kits/network/libbind/resolv/res_mkquery.c b/src/kits/network/compat/libbind/resolv/res_mkquery.c
similarity index 100%
rename from src/kits/network/libbind/resolv/res_mkquery.c
rename to src/kits/network/compat/libbind/resolv/res_mkquery.c
diff --git a/src/kits/network/libbind/resolv/res_mkupdate.c b/src/kits/network/compat/libbind/resolv/res_mkupdate.c
similarity index 100%
rename from src/kits/network/libbind/resolv/res_mkupdate.c
rename to src/kits/network/compat/libbind/resolv/res_mkupdate.c
diff --git a/src/kits/network/libbind/resolv/res_mkupdate.h b/src/kits/network/compat/libbind/resolv/res_mkupdate.h
similarity index 100%
rename from src/kits/network/libbind/resolv/res_mkupdate.h
rename to src/kits/network/compat/libbind/resolv/res_mkupdate.h
diff --git a/src/kits/network/libbind/resolv/res_private.h b/src/kits/network/compat/libbind/resolv/res_private.h
similarity index 100%
rename from src/kits/network/libbind/resolv/res_private.h
rename to src/kits/network/compat/libbind/resolv/res_private.h
diff --git a/src/kits/network/libbind/resolv/res_query.c b/src/kits/network/compat/libbind/resolv/res_query.c
similarity index 100%
rename from src/kits/network/libbind/resolv/res_query.c
rename to src/kits/network/compat/libbind/resolv/res_query.c
diff --git a/src/kits/network/libbind/resolv/res_send.c b/src/kits/network/compat/libbind/resolv/res_send.c
similarity index 100%
rename from src/kits/network/libbind/resolv/res_send.c
rename to src/kits/network/compat/libbind/resolv/res_send.c
diff --git a/src/kits/network/libbind/resolv/res_sendsigned.c b/src/kits/network/compat/libbind/resolv/res_sendsigned.c
similarity index 100%
rename from src/kits/network/libbind/resolv/res_sendsigned.c
rename to src/kits/network/compat/libbind/resolv/res_sendsigned.c
diff --git a/src/kits/network/libbind/resolv/res_update.c b/src/kits/network/compat/libbind/resolv/res_update.c
similarity index 100%
rename from src/kits/network/libbind/resolv/res_update.c
rename to src/kits/network/compat/libbind/resolv/res_update.c
diff --git a/src/kits/network/libbind/src/arc4random.c b/src/kits/network/compat/libbind/src/arc4random.c
similarity index 100%
rename from src/kits/network/libbind/src/arc4random.c
rename to src/kits/network/compat/libbind/src/arc4random.c
diff --git a/src/kits/network/libbind/src/ethers.c b/src/kits/network/compat/libbind/src/ethers.c
similarity index 100%
rename from src/kits/network/libbind/src/ethers.c
rename to src/kits/network/compat/libbind/src/ethers.c
diff --git a/src/kits/network/libbind/src/linkaddr.c b/src/kits/network/compat/libbind/src/linkaddr.c
similarity index 100%
rename from src/kits/network/libbind/src/linkaddr.c
rename to src/kits/network/compat/libbind/src/linkaddr.c
diff --git a/src/kits/network/libbind/src/pthread_emu.c b/src/kits/network/compat/libbind/src/pthread_emu.c
similarity index 100%
rename from src/kits/network/libbind/src/pthread_emu.c
rename to src/kits/network/compat/libbind/src/pthread_emu.c
diff --git a/src/kits/network/libbind/src/res_resultcodes.c b/src/kits/network/compat/libbind/src/res_resultcodes.c
similarity index 100%
rename from src/kits/network/libbind/src/res_resultcodes.c
rename to src/kits/network/compat/libbind/src/res_resultcodes.c
diff --git a/src/kits/network/libbind/src/strsep.c b/src/kits/network/compat/libbind/src/strsep.c
similarity index 100%
rename from src/kits/network/libbind/src/strsep.c
rename to src/kits/network/compat/libbind/src/strsep.c
diff --git a/src/kits/network/libnet/Jamfile b/src/kits/network/compat/libnet/Jamfile
similarity index 96%
rename from src/kits/network/libnet/Jamfile
rename to src/kits/network/compat/libnet/Jamfile
index dee69ff41d..2d41019eae 100644
--- a/src/kits/network/libnet/Jamfile
+++ b/src/kits/network/compat/libnet/Jamfile
@@ -1,11 +1,11 @@
-SubDir HAIKU_TOP src kits network libnet ;
+SubDir HAIKU_TOP src kits network compat libnet ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
 UseHeaders [ FDirName $(SUBDIR) headers ] : true ;
 UsePrivateHeaders net ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ( $(TARGET_PLATFORM) != haiku ) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
 		# We need the public network headers also when not compiling for Haiku.
 		# Unfortunately we get more than we want, namely all POSIX headers.
diff --git a/src/kits/network/libnet/arc4random.c b/src/kits/network/compat/libnet/arc4random.c
similarity index 100%
rename from src/kits/network/libnet/arc4random.c
rename to src/kits/network/compat/libnet/arc4random.c
diff --git a/src/kits/network/libnet/base64.c b/src/kits/network/compat/libnet/base64.c
similarity index 100%
rename from src/kits/network/libnet/base64.c
rename to src/kits/network/compat/libnet/base64.c
diff --git a/src/kits/network/libnet/compat.c b/src/kits/network/compat/libnet/compat.c
similarity index 100%
rename from src/kits/network/libnet/compat.c
rename to src/kits/network/compat/libnet/compat.c
diff --git a/src/kits/network/libnet/ethers.c b/src/kits/network/compat/libnet/ethers.c
similarity index 100%
rename from src/kits/network/libnet/ethers.c
rename to src/kits/network/compat/libnet/ethers.c
diff --git a/src/kits/network/libnet/freeaddrinfo.c b/src/kits/network/compat/libnet/freeaddrinfo.c
similarity index 100%
rename from src/kits/network/libnet/freeaddrinfo.c
rename to src/kits/network/compat/libnet/freeaddrinfo.c
diff --git a/src/kits/network/libnet/getaddrinfo.c b/src/kits/network/compat/libnet/getaddrinfo.c
similarity index 100%
rename from src/kits/network/libnet/getaddrinfo.c
rename to src/kits/network/compat/libnet/getaddrinfo.c
diff --git a/src/kits/network/libnet/gethostnamadr.c b/src/kits/network/compat/libnet/gethostnamadr.c
similarity index 100%
rename from src/kits/network/libnet/gethostnamadr.c
rename to src/kits/network/compat/libnet/gethostnamadr.c
diff --git a/src/kits/network/libnet/getnameinfo.c b/src/kits/network/compat/libnet/getnameinfo.c
similarity index 100%
rename from src/kits/network/libnet/getnameinfo.c
rename to src/kits/network/compat/libnet/getnameinfo.c
diff --git a/src/kits/network/libnet/getnetbyaddr.c b/src/kits/network/compat/libnet/getnetbyaddr.c
similarity index 100%
rename from src/kits/network/libnet/getnetbyaddr.c
rename to src/kits/network/compat/libnet/getnetbyaddr.c
diff --git a/src/kits/network/libnet/getnetbyname.c b/src/kits/network/compat/libnet/getnetbyname.c
similarity index 100%
rename from src/kits/network/libnet/getnetbyname.c
rename to src/kits/network/compat/libnet/getnetbyname.c
diff --git a/src/kits/network/libnet/getnetent.c b/src/kits/network/compat/libnet/getnetent.c
similarity index 100%
rename from src/kits/network/libnet/getnetent.c
rename to src/kits/network/compat/libnet/getnetent.c
diff --git a/src/kits/network/libnet/getnetnamadr.c b/src/kits/network/compat/libnet/getnetnamadr.c
similarity index 100%
rename from src/kits/network/libnet/getnetnamadr.c
rename to src/kits/network/compat/libnet/getnetnamadr.c
diff --git a/src/kits/network/libnet/getproto.c b/src/kits/network/compat/libnet/getproto.c
similarity index 100%
rename from src/kits/network/libnet/getproto.c
rename to src/kits/network/compat/libnet/getproto.c
diff --git a/src/kits/network/libnet/getprotoent.c b/src/kits/network/compat/libnet/getprotoent.c
similarity index 100%
rename from src/kits/network/libnet/getprotoent.c
rename to src/kits/network/compat/libnet/getprotoent.c
diff --git a/src/kits/network/libnet/getprotoname.c b/src/kits/network/compat/libnet/getprotoname.c
similarity index 100%
rename from src/kits/network/libnet/getprotoname.c
rename to src/kits/network/compat/libnet/getprotoname.c
diff --git a/src/kits/network/libnet/getservbyname.c b/src/kits/network/compat/libnet/getservbyname.c
similarity index 100%
rename from src/kits/network/libnet/getservbyname.c
rename to src/kits/network/compat/libnet/getservbyname.c
diff --git a/src/kits/network/libnet/getservbyport.c b/src/kits/network/compat/libnet/getservbyport.c
similarity index 100%
rename from src/kits/network/libnet/getservbyport.c
rename to src/kits/network/compat/libnet/getservbyport.c
diff --git a/src/kits/network/libnet/getservent.c b/src/kits/network/compat/libnet/getservent.c
similarity index 100%
rename from src/kits/network/libnet/getservent.c
rename to src/kits/network/compat/libnet/getservent.c
diff --git a/src/kits/network/libnet/headers/arpa/inet.h b/src/kits/network/compat/libnet/headers/arpa/inet.h
similarity index 100%
rename from src/kits/network/libnet/headers/arpa/inet.h
rename to src/kits/network/compat/libnet/headers/arpa/inet.h
diff --git a/src/kits/network/libnet/headers/arpa/nameser.h b/src/kits/network/compat/libnet/headers/arpa/nameser.h
similarity index 100%
rename from src/kits/network/libnet/headers/arpa/nameser.h
rename to src/kits/network/compat/libnet/headers/arpa/nameser.h
diff --git a/src/kits/network/libnet/headers/netdb.h b/src/kits/network/compat/libnet/headers/netdb.h
similarity index 100%
rename from src/kits/network/libnet/headers/netdb.h
rename to src/kits/network/compat/libnet/headers/netdb.h
diff --git a/src/kits/network/libnet/headers/resolv.h b/src/kits/network/compat/libnet/headers/resolv.h
similarity index 100%
rename from src/kits/network/libnet/headers/resolv.h
rename to src/kits/network/compat/libnet/headers/resolv.h
diff --git a/src/kits/network/libnet/inet_addr.c b/src/kits/network/compat/libnet/inet_addr.c
similarity index 100%
rename from src/kits/network/libnet/inet_addr.c
rename to src/kits/network/compat/libnet/inet_addr.c
diff --git a/src/kits/network/libnet/inet_lnaof.c b/src/kits/network/compat/libnet/inet_lnaof.c
similarity index 100%
rename from src/kits/network/libnet/inet_lnaof.c
rename to src/kits/network/compat/libnet/inet_lnaof.c
diff --git a/src/kits/network/libnet/inet_neta.c b/src/kits/network/compat/libnet/inet_neta.c
similarity index 100%
rename from src/kits/network/libnet/inet_neta.c
rename to src/kits/network/compat/libnet/inet_neta.c
diff --git a/src/kits/network/libnet/inet_netof.c b/src/kits/network/compat/libnet/inet_netof.c
similarity index 100%
rename from src/kits/network/libnet/inet_netof.c
rename to src/kits/network/compat/libnet/inet_netof.c
diff --git a/src/kits/network/libnet/inet_network.c b/src/kits/network/compat/libnet/inet_network.c
similarity index 100%
rename from src/kits/network/libnet/inet_network.c
rename to src/kits/network/compat/libnet/inet_network.c
diff --git a/src/kits/network/libnet/inet_ntoa.c b/src/kits/network/compat/libnet/inet_ntoa.c
similarity index 100%
rename from src/kits/network/libnet/inet_ntoa.c
rename to src/kits/network/compat/libnet/inet_ntoa.c
diff --git a/src/kits/network/libnet/inet_ntop.c b/src/kits/network/compat/libnet/inet_ntop.c
similarity index 100%
rename from src/kits/network/libnet/inet_ntop.c
rename to src/kits/network/compat/libnet/inet_ntop.c
diff --git a/src/kits/network/libnet/inet_pton.c b/src/kits/network/compat/libnet/inet_pton.c
similarity index 100%
rename from src/kits/network/libnet/inet_pton.c
rename to src/kits/network/compat/libnet/inet_pton.c
diff --git a/src/kits/network/libnet/linkaddr.c b/src/kits/network/compat/libnet/linkaddr.c
similarity index 100%
rename from src/kits/network/libnet/linkaddr.c
rename to src/kits/network/compat/libnet/linkaddr.c
diff --git a/src/kits/network/libnet/netconfig.c b/src/kits/network/compat/libnet/netconfig.c
similarity index 100%
rename from src/kits/network/libnet/netconfig.c
rename to src/kits/network/compat/libnet/netconfig.c
diff --git a/src/kits/network/libnet/netdebug.c b/src/kits/network/compat/libnet/netdebug.c
similarity index 100%
rename from src/kits/network/libnet/netdebug.c
rename to src/kits/network/compat/libnet/netdebug.c
diff --git a/src/kits/network/libnet/networks b/src/kits/network/compat/libnet/networks
similarity index 100%
rename from src/kits/network/libnet/networks
rename to src/kits/network/compat/libnet/networks
diff --git a/src/kits/network/libnet/poll.c b/src/kits/network/compat/libnet/poll.c
similarity index 100%
rename from src/kits/network/libnet/poll.c
rename to src/kits/network/compat/libnet/poll.c
diff --git a/src/kits/network/libnet/protocols b/src/kits/network/compat/libnet/protocols
similarity index 100%
rename from src/kits/network/libnet/protocols
rename to src/kits/network/compat/libnet/protocols
diff --git a/src/kits/network/libnet/res_comp.c b/src/kits/network/compat/libnet/res_comp.c
similarity index 100%
rename from src/kits/network/libnet/res_comp.c
rename to src/kits/network/compat/libnet/res_comp.c
diff --git a/src/kits/network/libnet/res_data.c b/src/kits/network/compat/libnet/res_data.c
similarity index 100%
rename from src/kits/network/libnet/res_data.c
rename to src/kits/network/compat/libnet/res_data.c
diff --git a/src/kits/network/libnet/res_debug.c b/src/kits/network/compat/libnet/res_debug.c
similarity index 100%
rename from src/kits/network/libnet/res_debug.c
rename to src/kits/network/compat/libnet/res_debug.c
diff --git a/src/kits/network/libnet/res_init.c b/src/kits/network/compat/libnet/res_init.c
similarity index 100%
rename from src/kits/network/libnet/res_init.c
rename to src/kits/network/compat/libnet/res_init.c
diff --git a/src/kits/network/libnet/res_mkquery.c b/src/kits/network/compat/libnet/res_mkquery.c
similarity index 100%
rename from src/kits/network/libnet/res_mkquery.c
rename to src/kits/network/compat/libnet/res_mkquery.c
diff --git a/src/kits/network/libnet/res_query.c b/src/kits/network/compat/libnet/res_query.c
similarity index 100%
rename from src/kits/network/libnet/res_query.c
rename to src/kits/network/compat/libnet/res_query.c
diff --git a/src/kits/network/libnet/res_random.c b/src/kits/network/compat/libnet/res_random.c
similarity index 100%
rename from src/kits/network/libnet/res_random.c
rename to src/kits/network/compat/libnet/res_random.c
diff --git a/src/kits/network/libnet/res_send.c b/src/kits/network/compat/libnet/res_send.c
similarity index 100%
rename from src/kits/network/libnet/res_send.c
rename to src/kits/network/compat/libnet/res_send.c
diff --git a/src/kits/network/libnet/resolv.conf b/src/kits/network/compat/libnet/resolv.conf
similarity index 100%
rename from src/kits/network/libnet/resolv.conf
rename to src/kits/network/compat/libnet/resolv.conf
diff --git a/src/kits/network/libnet/select.c b/src/kits/network/compat/libnet/select.c
similarity index 100%
rename from src/kits/network/libnet/select.c
rename to src/kits/network/compat/libnet/select.c
diff --git a/src/kits/network/libnet/services b/src/kits/network/compat/libnet/services
similarity index 100%
rename from src/kits/network/libnet/services
rename to src/kits/network/compat/libnet/services
diff --git a/src/kits/network/libnet/sethostent.c b/src/kits/network/compat/libnet/sethostent.c
similarity index 100%
rename from src/kits/network/libnet/sethostent.c
rename to src/kits/network/compat/libnet/sethostent.c
diff --git a/src/kits/network/libnet/socket.c b/src/kits/network/compat/libnet/socket.c
similarity index 100%
rename from src/kits/network/libnet/socket.c
rename to src/kits/network/compat/libnet/socket.c
diff --git a/src/kits/network/libnetapi/Jamfile b/src/kits/network/compat/libnetapi/Jamfile
similarity index 92%
rename from src/kits/network/libnetapi/Jamfile
rename to src/kits/network/compat/libnetapi/Jamfile
index b6fbbe02ea..bcf782b775 100644
--- a/src/kits/network/libnetapi/Jamfile
+++ b/src/kits/network/compat/libnetapi/Jamfile
@@ -1,8 +1,8 @@
-SubDir HAIKU_TOP src kits network libnetapi ;
+SubDir HAIKU_TOP src kits network compat libnetapi ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ( $(TARGET_PLATFORM) != haiku ) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
 		# We need the public network headers also when not compiling for Haiku.
 		# Unfortunately we get more than we want, namely all POSIX headers.
diff --git a/src/kits/network/libnetapi/NetAddress.cpp b/src/kits/network/compat/libnetapi/NetAddress.cpp
similarity index 100%
rename from src/kits/network/libnetapi/NetAddress.cpp
rename to src/kits/network/compat/libnetapi/NetAddress.cpp
diff --git a/src/kits/network/libnetapi/NetBuffer.cpp b/src/kits/network/compat/libnetapi/NetBuffer.cpp
similarity index 100%
rename from src/kits/network/libnetapi/NetBuffer.cpp
rename to src/kits/network/compat/libnetapi/NetBuffer.cpp
diff --git a/src/kits/network/libnetapi/NetDebug.cpp b/src/kits/network/compat/libnetapi/NetDebug.cpp
similarity index 100%
rename from src/kits/network/libnetapi/NetDebug.cpp
rename to src/kits/network/compat/libnetapi/NetDebug.cpp
diff --git a/src/kits/network/libnetapi/NetEndpoint.cpp b/src/kits/network/compat/libnetapi/NetEndpoint.cpp
similarity index 100%
rename from src/kits/network/libnetapi/NetEndpoint.cpp
rename to src/kits/network/compat/libnetapi/NetEndpoint.cpp
diff --git a/src/kits/network/libsocket/Jamfile b/src/kits/network/compat/libsocket/Jamfile
similarity index 93%
rename from src/kits/network/libsocket/Jamfile
rename to src/kits/network/compat/libsocket/Jamfile
index 3844a78ddf..01b6dec9be 100644
--- a/src/kits/network/libsocket/Jamfile
+++ b/src/kits/network/compat/libsocket/Jamfile
@@ -1,8 +1,8 @@
-SubDir HAIKU_TOP src kits network libsocket ;
+SubDir HAIKU_TOP src kits network compat libsocket ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ( $(TARGET_PLATFORM) != haiku ) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
 		# We need the public network headers also when not compiling for Haiku.
 		# Unfortunately we get more than we want, namely all POSIX headers.
diff --git a/src/kits/network/libsocket/select.c b/src/kits/network/compat/libsocket/select.c
similarity index 100%
rename from src/kits/network/libsocket/select.c
rename to src/kits/network/compat/libsocket/select.c
diff --git a/src/kits/network/libsocket/socket.c b/src/kits/network/compat/libsocket/socket.c
similarity index 100%
rename from src/kits/network/libsocket/socket.c
rename to src/kits/network/compat/libsocket/socket.c