diff --git a/.gitmodules b/.gitmodules
index fd50aa8d8..50bd3bcc1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -162,3 +162,6 @@
 [submodule "src/external/ruby"]
 	path = src/external/ruby
 	url = ../darling-ruby.git
+[submodule "src/external/commoncrypto"]
+	path = src/external/commoncrypto
+	url = ../darling-commoncrypto.git
diff --git a/platform-include/dispatch b/platform-include/dispatch
new file mode 120000
index 000000000..001ec721f
--- /dev/null
+++ b/platform-include/dispatch
@@ -0,0 +1 @@
+../src/external/libdispatch/dispatch
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 90aef60e9..2df7fba63 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -100,7 +100,7 @@ add_subdirectory(external/libauto)
 add_subdirectory(external/libarchive/libarchive)
 add_subdirectory(external/apr)
 add_subdirectory(external/corecrypto)
-#add_subdirectory(external/security) # work in progress
+add_subdirectory(external/security) # work in progress
 add_subdirectory(sandbox)
 add_subdirectory(Cocoa)
 add_subdirectory(external/file/file)
diff --git a/src/DiskArbitration/DASession.h b/src/DiskArbitration/DASession.h
index 97c53f634..1b256aa57 100644
--- a/src/DiskArbitration/DASession.h
+++ b/src/DiskArbitration/DASession.h
@@ -8,7 +8,7 @@ extern "C" {
 
 typedef struct _DASession * DASessionRef;
 
-typedef void* dispatch_queue_t; // hack
+//typedef void* dispatch_queue_t; // hack
 
 CFTypeID DASessionGetTypeID(void);
 DASessionRef DASessionCreate(CFAllocatorRef allocator);
diff --git a/src/external/commoncrypto b/src/external/commoncrypto
new file mode 160000
index 000000000..02d797e7f
--- /dev/null
+++ b/src/external/commoncrypto
@@ -0,0 +1 @@
+Subproject commit 02d797e7f6b6c42ffe6aea286a68e7b2d03560fb
diff --git a/src/external/corefoundation b/src/external/corefoundation
index 5eb9d274d..8b9ea719b 160000
--- a/src/external/corefoundation
+++ b/src/external/corefoundation
@@ -1 +1 @@
-Subproject commit 5eb9d274df064cb4d55df596d952dd61d6d3a55e
+Subproject commit 8b9ea719b46599f70c53df9700572d09e90a9094
diff --git a/src/external/security b/src/external/security
index 9b7bb1f5f..040820fa7 160000
--- a/src/external/security
+++ b/src/external/security
@@ -1 +1 @@
-Subproject commit 9b7bb1f5f97a77ac92c5766b8cfeb5c091554a0f
+Subproject commit 040820fa745c9f5f92961ff30f3db3239072c4ed