diff --git a/platform-include/dispatch b/platform-include/dispatch
deleted file mode 120000
index ab0d3d882..000000000
--- a/platform-include/dispatch
+++ /dev/null
@@ -1 +0,0 @@
-../src/external/libdispatch/include/dispatch/
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 57f292af3..31a8d228f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -68,6 +68,7 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/libc/include/NetBSD
 	${CMAKE_CURRENT_SOURCE_DIR}/libc/include/FreeBSD
 	${CMAKE_CURRENT_SOURCE_DIR}/kernel/libsyscall/wrappers
+	${CMAKE_CURRENT_SOURCE_DIR}/kernel/include
 	${CMAKE_SOURCE_DIR}/kernel-include
 	${CMAKE_CURRENT_SOURCE_DIR}/duct/include
 	${CMAKE_CURRENT_SOURCE_DIR}/libm/include
@@ -104,6 +105,15 @@ include_directories(AFTER
 	${CMAKE_CURRENT_SOURCE_DIR}/external/security/include
 	${CMAKE_CURRENT_SOURCE_DIR}/xcselect/include
 	${CMAKE_CURRENT_SOURCE_DIR}/libaks/include
+	${CMAKE_CURRENT_SOURCE_DIR}/external/icu/include
+	${CMAKE_CURRENT_SOURCE_DIR}/external/libpthread/include
+	${CMAKE_CURRENT_SOURCE_DIR}/libremovefile/include
+	${CMAKE_CURRENT_SOURCE_DIR}/external/libdispatch/include
+	${CMAKE_CURRENT_SOURCE_DIR}/external/libclosure/include
+	${CMAKE_CURRENT_SOURCE_DIR}/external/cfnetwork/include
+	${CMAKE_CURRENT_SOURCE_DIR}/external/cfnetwork/private_include
+	${CMAKE_CURRENT_SOURCE_DIR}/external/libxml2/include
+	${CMAKE_CURRENT_BINARY_DIR}/external/libxml2/include
 )
 
 add_subdirectory(external/libkqueue)
diff --git a/src/external/corefoundation b/src/external/corefoundation
index b9a9775b6..a822a73a4 160000
--- a/src/external/corefoundation
+++ b/src/external/corefoundation
@@ -1 +1 @@
-Subproject commit b9a9775b628ba3d8721e66904b82e6506e8d90df
+Subproject commit a822a73a48abc75b72ada6a1978b1828c403a2b6
diff --git a/src/external/foundation b/src/external/foundation
index e39a1f410..a26054486 160000
--- a/src/external/foundation
+++ b/src/external/foundation
@@ -1 +1 @@
-Subproject commit e39a1f410972cf7ca97c2ac294b67b94666cef4a
+Subproject commit a26054486e80bc4b4adf94b59211d2ba316dafba
diff --git a/src/external/icu b/src/external/icu
index 2d76072d8..92b16565c 160000
--- a/src/external/icu
+++ b/src/external/icu
@@ -1 +1 @@
-Subproject commit 2d76072d87416da7d7ad7ac584135d5405a6cc0a
+Subproject commit 92b16565c1e90f57c841e7afceebf53d87a8fb4c
diff --git a/src/external/libclosure b/src/external/libclosure
index 3f7acfe74..bcee40081 160000
--- a/src/external/libclosure
+++ b/src/external/libclosure
@@ -1 +1 @@
-Subproject commit 3f7acfe743f55738cf025ed2438a5800895b189e
+Subproject commit bcee40081328192fc0e032e9d39f4d49214ea5de
diff --git a/src/external/libdispatch b/src/external/libdispatch
index a4006fbab..e0c354adb 160000
--- a/src/external/libdispatch
+++ b/src/external/libdispatch
@@ -1 +1 @@
-Subproject commit a4006fbab58ba0e939331fbd25119fe3dde4147a
+Subproject commit e0c354adbaa4458da0a99d78d37f8b16861e116e
diff --git a/src/external/libpthread b/src/external/libpthread
index 8bef25f80..eb40eac73 160000
--- a/src/external/libpthread
+++ b/src/external/libpthread
@@ -1 +1 @@
-Subproject commit 8bef25f80ce588fcdbc9a942aa262f6ea6cd6b43
+Subproject commit eb40eac73c891aed8d6f6a6116adbd4bb43f7768
diff --git a/src/kernel/include/os/tsd.h b/src/kernel/include/os/tsd.h
new file mode 120000
index 000000000..eb33e3c76
--- /dev/null
+++ b/src/kernel/include/os/tsd.h
@@ -0,0 +1 @@
+../../libsyscall/os/tsd.h
\ No newline at end of file
diff --git a/src/libc/include/execinfo.h b/src/libc/include/execinfo.h
new file mode 120000
index 000000000..03a98d8f2
--- /dev/null
+++ b/src/libc/include/execinfo.h
@@ -0,0 +1 @@
+../gen/execinfo.h
\ No newline at end of file
diff --git a/src/libc/include/tzfile.h b/src/libc/include/tzfile.h
new file mode 120000
index 000000000..d16c7d1ca
--- /dev/null
+++ b/src/libc/include/tzfile.h
@@ -0,0 +1 @@
+../stdtime/FreeBSD/tzfile.h
\ No newline at end of file
diff --git a/src/libremovefile/include/checkint.h b/src/libremovefile/include/checkint.h
new file mode 120000
index 000000000..86efa901e
--- /dev/null
+++ b/src/libremovefile/include/checkint.h
@@ -0,0 +1 @@
+../checkint.h
\ No newline at end of file
diff --git a/src/libremovefile/include/removefile.h b/src/libremovefile/include/removefile.h
new file mode 120000
index 000000000..5ef206068
--- /dev/null
+++ b/src/libremovefile/include/removefile.h
@@ -0,0 +1 @@
+../removefile.h
\ No newline at end of file
diff --git a/src/libremovefile/include/removefile_priv.h b/src/libremovefile/include/removefile_priv.h
new file mode 120000
index 000000000..41f924ac6
--- /dev/null
+++ b/src/libremovefile/include/removefile_priv.h
@@ -0,0 +1 @@
+../removefile_priv.h
\ No newline at end of file