diff --git a/nx/Makefile b/nx/Makefile
index 5e1822ff..1bb0c9d3 100644
--- a/nx/Makefile
+++ b/nx/Makefile
@@ -26,7 +26,7 @@ TARGET		:=	nx
 #BUILD		:=	build
 SOURCES		:=	source/arm source/runtime source/kernel source/runtime/devices source/services source/gfx source/gfx/ioctl source/runtime/util/utf
 DATA		:=	data
-INCLUDES	:=	include
+INCLUDES	:=	include external/bsd/include
 
 #---------------------------------------------------------------------------------
 # options for code generation
@@ -94,10 +94,10 @@ export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
 all: lib/libnx.a lib/libnxd.a
 
 dist-bin: all
-	@tar --exclude=*~ -cjf libnx-$(VERSION).tar.bz2 include lib default_icon.jpg switch_rules switch.ld switch.specs
+	@tar --exclude=*~ -cjf libnx-$(VERSION).tar.bz2 include lib default_icon.jpg switch_rules switch.ld switch.specs -C external/bsd include 
 
 dist-src:
-	@tar --exclude=*~ -cjf libnx-src-$(VERSION).tar.bz2 include source data Makefile default_icon.jpg switch_rules switch.ld switch.specs
+	@tar --exclude=*~ -cjf libnx-src-$(VERSION).tar.bz2 include source data external Makefile default_icon.jpg switch_rules switch.ld switch.specs
 
 dist: dist-src dist-bin
 
diff --git a/nx/include/arpa/inet.h b/nx/external/bsd/include/arpa/inet.h
similarity index 100%
rename from nx/include/arpa/inet.h
rename to nx/external/bsd/include/arpa/inet.h
diff --git a/nx/include/net/bpf.h b/nx/external/bsd/include/net/bpf.h
similarity index 100%
rename from nx/include/net/bpf.h
rename to nx/external/bsd/include/net/bpf.h
diff --git a/nx/include/net/dlt.h b/nx/external/bsd/include/net/dlt.h
similarity index 100%
rename from nx/include/net/dlt.h
rename to nx/external/bsd/include/net/dlt.h
diff --git a/nx/include/net/if.h b/nx/external/bsd/include/net/if.h
similarity index 100%
rename from nx/include/net/if.h
rename to nx/external/bsd/include/net/if.h
diff --git a/nx/include/net/if_arp.h b/nx/external/bsd/include/net/if_arp.h
similarity index 100%
rename from nx/include/net/if_arp.h
rename to nx/external/bsd/include/net/if_arp.h
diff --git a/nx/include/net/if_dl.h b/nx/external/bsd/include/net/if_dl.h
similarity index 100%
rename from nx/include/net/if_dl.h
rename to nx/external/bsd/include/net/if_dl.h
diff --git a/nx/include/net/if_media.h b/nx/external/bsd/include/net/if_media.h
similarity index 100%
rename from nx/include/net/if_media.h
rename to nx/external/bsd/include/net/if_media.h
diff --git a/nx/include/net/route.h b/nx/external/bsd/include/net/route.h
similarity index 100%
rename from nx/include/net/route.h
rename to nx/external/bsd/include/net/route.h
diff --git a/nx/include/netdb.h b/nx/external/bsd/include/netdb.h
similarity index 100%
rename from nx/include/netdb.h
rename to nx/external/bsd/include/netdb.h
diff --git a/nx/include/netinet/in.h b/nx/external/bsd/include/netinet/in.h
similarity index 100%
rename from nx/include/netinet/in.h
rename to nx/external/bsd/include/netinet/in.h
diff --git a/nx/include/netinet/tcp.h b/nx/external/bsd/include/netinet/tcp.h
similarity index 100%
rename from nx/include/netinet/tcp.h
rename to nx/external/bsd/include/netinet/tcp.h
diff --git a/nx/include/netinet/udp.h b/nx/external/bsd/include/netinet/udp.h
similarity index 100%
rename from nx/include/netinet/udp.h
rename to nx/external/bsd/include/netinet/udp.h
diff --git a/nx/include/poll.h b/nx/external/bsd/include/poll.h
similarity index 100%
rename from nx/include/poll.h
rename to nx/external/bsd/include/poll.h
diff --git a/nx/include/sys/_iovec.h b/nx/external/bsd/include/sys/_iovec.h
similarity index 100%
rename from nx/include/sys/_iovec.h
rename to nx/external/bsd/include/sys/_iovec.h
diff --git a/nx/include/sys/_sockaddr_storage.h b/nx/external/bsd/include/sys/_sockaddr_storage.h
similarity index 100%
rename from nx/include/sys/_sockaddr_storage.h
rename to nx/external/bsd/include/sys/_sockaddr_storage.h
diff --git a/nx/include/sys/filio.h b/nx/external/bsd/include/sys/filio.h
similarity index 100%
rename from nx/include/sys/filio.h
rename to nx/external/bsd/include/sys/filio.h
diff --git a/nx/include/sys/ioccom.h b/nx/external/bsd/include/sys/ioccom.h
similarity index 100%
rename from nx/include/sys/ioccom.h
rename to nx/external/bsd/include/sys/ioccom.h
diff --git a/nx/include/sys/ioctl.h b/nx/external/bsd/include/sys/ioctl.h
similarity index 100%
rename from nx/include/sys/ioctl.h
rename to nx/external/bsd/include/sys/ioctl.h
diff --git a/nx/include/sys/socket.h b/nx/external/bsd/include/sys/socket.h
similarity index 100%
rename from nx/include/sys/socket.h
rename to nx/external/bsd/include/sys/socket.h
diff --git a/nx/include/sys/sockio.h b/nx/external/bsd/include/sys/sockio.h
similarity index 100%
rename from nx/include/sys/sockio.h
rename to nx/external/bsd/include/sys/sockio.h
diff --git a/nx/include/sys/sysctl.h b/nx/external/bsd/include/sys/sysctl.h
similarity index 100%
rename from nx/include/sys/sysctl.h
rename to nx/external/bsd/include/sys/sysctl.h