diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66eacce8..db6f01ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,8 +16,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -msse3 -nostdinc -nostdinc+
 add_definitions(
 	-D__APPLE_CPP__
 	-D__DARWIN_UNIX03
-	-DOBJC2RUNTIME=1
+	-Dnil=NULL
 	-DTARGET_HAS_KEYSTORE=0
+	-DTARGET_OS_OSX=1
 )
 
 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
@@ -42,6 +43,7 @@ include_directories(
 	${CMAKE_SOURCE_DIR}/src/external/libcxx/include
 	${CMAKE_SOURCE_DIR}/src/external/libdispatch
 	${CMAKE_SOURCE_DIR}/src/external/openpam/include
+	${CMAKE_SOURCE_DIR}/src/external/syslog/libsystem_asl.tproj/include
 	${CMAKE_SOURCE_DIR}/src/CommonCrypto
 	${CMAKE_SOURCE_DIR}/src/external/commoncrypto/include
 	${CMAKE_SOURCE_DIR}/src/external/corecrypto/include
@@ -63,6 +65,9 @@ include_directories(
 	${CMAKE_SOURCE_DIR}/src/libinfo/include
 	${CMAKE_SOURCE_DIR}/src/quarantine
 	${CMAKE_SOURCE_DIR}/src/LocalAuthentication
+	${CMAKE_SOURCE_DIR}/src/kernel/libsyscall/wrappers/libproc
+	${CMAKE_SOURCE_DIR}/src/libmalloc/include
+	${CMAKE_SOURCE_DIR}/src/external/objc4/runtime
 )
 
 add_subdirectory(OSX)
diff --git a/OSX/CMakeLists.txt b/OSX/CMakeLists.txt
index f47d736f..32f21bb3 100644
--- a/OSX/CMakeLists.txt
+++ b/OSX/CMakeLists.txt
@@ -73,7 +73,7 @@ add_framework(Security
 	$<TARGET_OBJECTS:security_cms>
 	$<TARGET_OBJECTS:security_comcryption>
 	$<TARGET_OBJECTS:security_codesigning>
-	$<TARGET_OBJECTS:secutityd_client>
+	$<TARGET_OBJECTS:securityd_client>
 	$<TARGET_OBJECTS:sec_item_shim>
 
 	ExtraConstants.c
@@ -84,4 +84,8 @@ add_framework(Security
 		sqlite3
 		xpc
 		pam.2
+		cxx
+		xpc
+		xar
+		CommonCrypto
 )
diff --git a/OSX/libsecurity_codesigning/CMakeLists.txt b/OSX/libsecurity_codesigning/CMakeLists.txt
index 32550f50..1b32b197 100644
--- a/OSX/libsecurity_codesigning/CMakeLists.txt
+++ b/OSX/libsecurity_codesigning/CMakeLists.txt
@@ -6,12 +6,12 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/antlr2
 	${CMAKE_CURRENT_SOURCE_DIR}/../libsecurityd
 	${CMAKE_CURRENT_SOURCE_DIR}/../sec
+	${CMAKE_CURRENT_BINARY_DIR}/../libsecurityd
 )
 
 add_definitions(
 	-Wno-unused-value
 	-Wno-format
-	-DCS_ENTITLEMENTS_VALIDATED=0
 )
 
 add_library(security_codesigning OBJECT
@@ -101,3 +101,4 @@ add_library(security_codesigning OBJECT
 	#lib/SecCodeHostLib.c			FIXME: Multiple definitions of SecHostSetHostingPort
 )
 
+add_dependencies(security_codesigning securityd_client)
diff --git a/OSX/libsecurity_smime/lib/cmsdecode.c b/OSX/libsecurity_smime/lib/cmsdecode.c
index 765a1685..72a874f1 100644
--- a/OSX/libsecurity_smime/lib/cmsdecode.c
+++ b/OSX/libsecurity_smime/lib/cmsdecode.c
@@ -39,6 +39,7 @@
 #include <Security/SecCmsContentInfo.h>
 #include <Security/SecCmsDigestContext.h>
 #include <Security/SecCmsMessage.h>
+#include <MacTypes.h>
 
 #include "cmslocal.h"
 
diff --git a/OSX/libsecurity_smime/lib/cmssigdata.c b/OSX/libsecurity_smime/lib/cmssigdata.c
index e5d8b6cf..6a3b998a 100644
--- a/OSX/libsecurity_smime/lib/cmssigdata.c
+++ b/OSX/libsecurity_smime/lib/cmssigdata.c
@@ -56,6 +56,7 @@
 #include <Security/SecPolicyPriv.h>
 #include <utilities/SecCFWrappers.h>
 #include <syslog.h>
+#include <MacTypes.h>
 
 #ifndef NDEBUG
 #define SIGDATA_DEBUG	1
diff --git a/OSX/libsecurity_ssl/lib/sslContext.c b/OSX/libsecurity_ssl/lib/sslContext.c
index 653cbe32..c2508548 100644
--- a/OSX/libsecurity_ssl/lib/sslContext.c
+++ b/OSX/libsecurity_ssl/lib/sslContext.c
@@ -49,6 +49,7 @@
 #include <Security/SecTrust.h>
 #include <Security/SecTrustSettingsPriv.h>
 #include <Security/oidsalg.h>
+#include <MacTypes.h>
 #include "utilities/SecCFRelease.h"
 #include "utilities/SecCFWrappers.h"
 #include <pthread.h>
diff --git a/OSX/libsecurity_ssl/lib/sslCrypto.c b/OSX/libsecurity_ssl/lib/sslCrypto.c
index df6d9707..1916aedc 100644
--- a/OSX/libsecurity_ssl/lib/sslCrypto.c
+++ b/OSX/libsecurity_ssl/lib/sslCrypto.c
@@ -38,6 +38,7 @@
 #include <Security/SecTrustPriv.h>
 #include <Security/SecPolicy.h>
 #include <Security/SecCertificate.h>
+#include <MacTypes.h>
 
 #include <AssertMacros.h>
 #include "utilities/SecCFRelease.h"
diff --git a/OSX/libsecurityd/CMakeLists.txt b/OSX/libsecurityd/CMakeLists.txt
index b6866bc2..5421ef47 100644
--- a/OSX/libsecurityd/CMakeLists.txt
+++ b/OSX/libsecurityd/CMakeLists.txt
@@ -41,7 +41,7 @@ mig(mig/ucspNotify.defs)
 
 #add_library(securityd STATIC ${security_libsecurityd_sources})
 
-add_library(secutityd_client OBJECT
+add_library(securityd_client OBJECT
 	lib/SharedMemoryClient.cpp
 	lib/eventlistener.cpp
 	securityd_client/ucspNotifySender.cpp
@@ -61,4 +61,6 @@ add_library(secutityd_client OBJECT
 	lib/sec_xdr_sizeof.c
 	${CMAKE_CURRENT_BINARY_DIR}/mig/cshostingServer.cpp
 	${CMAKE_CURRENT_BINARY_DIR}/mig/cshostingUser.cpp
+	${CMAKE_CURRENT_BINARY_DIR}/mig/ucspUser.cpp
+	${CMAKE_CURRENT_BINARY_DIR}/mig/ucspNotifyUser.cpp
 )