diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 89b182ae..1bc545a9 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -29,6 +29,7 @@
 #cmakedefine DBUS_PREFIX "@DBUS_PREFIX@"
 #cmakedefine DBUS_SYSTEM_CONFIG_FILE  "@DBUS_SYSTEM_CONFIG_FILE@"
 #cmakedefine DBUS_SESSION_CONFIG_FILE "@DBUS_SESSION_CONFIG_FILE@"
+#cmakedefine DBUS_SESSION_SOCKET_DIR "@DBUS_SESSION_SOCKET_DIR@"
 #cmakedefine DBUS_DAEMON_NAME "@DBUS_DAEMON_NAME@"
 #cmakedefine DBUS_SYSTEM_BUS_DEFAULT_ADDRESS  "@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@"
 #cmakedefine DBUS_SESSION_BUS_CONNECT_ADDRESS  "@DBUS_SESSION_BUS_CONNECT_ADDRESS@"
diff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt
index 2fedcba4..972e05c1 100644
--- a/dbus/CMakeLists.txt
+++ b/dbus/CMakeLists.txt
@@ -61,6 +61,7 @@ set(DBUS_LIB_SOURCES
 
 if(UNIX)
     set(DBUS_LIB_SOURCES ${DBUS_LIB_SOURCES}
+        dbus-uuidgen.c
         dbus-transport-unix.c
         dbus-server-unix.c
     )
@@ -95,6 +96,7 @@ set(DBUS_LIB_HEADERS
     dbus-threads-internal.h
     dbus-transport.h
     dbus-transport-protected.h
+    dbus-uuidgen.h
     dbus-watch.h
     ${CMAKE_BINARY_DIR}/config.h
 )
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 21efa98f..23f567b5 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -59,6 +59,16 @@ set(dbus_run_session_SOURCES
     dbus-run-session.c
 )
 
+set(dbus_uuidgen_SOURCES
+    dbus-uuidgen.c
+)
+
+if(NOT WIN32)
+    add_executable(dbus-cleanup-sockets ${dbus_cleanup_sockets_SOURCES})
+    target_link_libraries(dbus-cleanup-sockets ${DBUS_LIBRARIES})
+    install(TARGETS dbus-cleanup-sockets ${INSTALL_TARGETS_DEFAULT_ARGS})
+endif()
+
 if(WIN32)
     add_executable_version_info(dbus_send_SOURCES "dbus-send")
 endif()
@@ -112,6 +122,12 @@ add_executable(dbus-run-session ${dbus_run_session_SOURCES})
 target_link_libraries(dbus-run-session ${DBUS_INTERNAL_LIBRARIES})
 install(TARGETS dbus-run-session ${INSTALL_TARGETS_DEFAULT_ARGS})
 
+if(NOT WIN32)
+    add_executable(dbus-uuidgen ${dbus_uuidgen_SOURCES})
+    target_link_libraries(dbus-uuidgen ${DBUS_LIBRARIES})
+    install(TARGETS dbus-uuidgen ${INSTALL_TARGETS_DEFAULT_ARGS})
+endif()
+
 # create the /var/lib/dbus directory for dbus-uuidgen
 install(DIRECTORY DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR}/lib/dbus)