diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5d47c13a9..3a1d56791 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -171,8 +171,8 @@ add_subdirectory(external/installer)
 add_subdirectory(external/gnutar/gnutar)
 add_subdirectory(external/gpatch)
 add_subdirectory(external/gnudiff)
-#add_subdirectory(launchd/src)
-#add_subdirectory(launchd/support)
+add_subdirectory(launchd/src)
+add_subdirectory(launchd/support)
 add_subdirectory(external/openssh)
 #add_subdirectory(external/top)
 add_subdirectory(external/perl)
diff --git a/src/external/libxpc b/src/external/libxpc
index 7e15e911a..f72de1d0e 160000
--- a/src/external/libxpc
+++ b/src/external/libxpc
@@ -1 +1 @@
-Subproject commit 7e15e911a784e0609bd293b370b16990fdee8093
+Subproject commit f72de1d0e6f4a14b93972df871a8f7158d61517c
diff --git a/src/launchd/src/CMakeLists.txt b/src/launchd/src/CMakeLists.txt
index 20d96efaa..4a6097e01 100644
--- a/src/launchd/src/CMakeLists.txt
+++ b/src/launchd/src/CMakeLists.txt
@@ -56,7 +56,6 @@ set(launchd_sources
 	launchd.c
 	log.c
 	runtime.c
-	../stub.c
 	${CMAKE_CURRENT_BINARY_DIR}/jobServer.c
 	${CMAKE_CURRENT_BINARY_DIR}/helperUser.c
 	${CMAKE_CURRENT_BINARY_DIR}/internalServer.c
diff --git a/src/launchd/stub.c b/src/launchd/stub.c
deleted file mode 100644
index 3749cd216..000000000
--- a/src/launchd/stub.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <unistd.h>
-void audit_token_to_au32(void* atoken, uid_t *auidp, uid_t *euidp, gid_t *egidp, ...)
-{
-	*euidp = getuid();
-	*egidp = getgid();
-}
-
diff --git a/src/launchd/support/CMakeLists.txt b/src/launchd/support/CMakeLists.txt
index 989f677f1..c191e6362 100644
--- a/src/launchd/support/CMakeLists.txt
+++ b/src/launchd/support/CMakeLists.txt
@@ -24,6 +24,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src/libedit/src)
 include_directories(${CMAKE_SOURCE_DIR}/src/libinfo/lookup.subproj)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/src/external/corefoundation)
+include_directories(${CMAKE_SOURCE_DIR}/src/external/libclosure)
 include_directories(${CMAKE_SOURCE_DIR}/src/external/foundation/include)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -fblocks -nostdinc -include ${CMAKE_SOURCE_DIR}/kernel-include/sys/fileport.h")