diff --git a/.gitmodules b/.gitmodules
index 3c49fac0..fee489de 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -61,3 +61,9 @@
 [submodule "mcpelauncher-linux-bin"]
 	path = mcpelauncher-linux-bin
 	url = ../mcpelauncher-linux-bin.git
+[submodule "epoll-shim"]
+	path = epoll-shim
+	url = ../epoll-shim.git
+[submodule "osx-elf-header"]
+	path = osx-elf-header
+	url = ../osx-elf-header.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05ce4723..766c7bee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,8 @@ else()
     set(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu")
 endif(APPLE)
 
+option(BUILD_TESTING "Build tests for cll-telemetry (requires GTest)" OFF)
+
 option(ENABLE_DEV_PATHS "Enables lookup in source directories for misc files required by the launcher. This should be disabled for package builds." ON)
 if (ENABLE_DEV_PATHS)
     add_definitions(-DDEV_EXTRA_PATHS="${CMAKE_SOURCE_DIR}/mcpelauncher-linux-bin")
@@ -20,6 +22,11 @@ endif()
 include(ext/json.cmake)
 include(ext/glfw.cmake)
 
+if (APPLE)
+    add_subdirectory(osx-elf-header)
+    add_subdirectory(epoll-shim)
+endif()
+
 add_subdirectory(logger)
 add_subdirectory(base64)
 add_subdirectory(file-util)
@@ -31,10 +38,12 @@ add_subdirectory(daemon-utils/client)
 add_subdirectory(msa-daemon-client)
 
 add_subdirectory(libhybris)
-add_subdirectory(eglut)
-add_subdirectory(linux-gamepad)
-add_subdirectory(game-window)
 add_subdirectory(file-picker)
+add_subdirectory(game-window)
+if (GAMEWINDOW_SYSTEM STREQUAL "EGLUT")
+    add_subdirectory(eglut)
+    add_subdirectory(linux-gamepad)
+endif()
 
 add_subdirectory(cll-telemetry)
 
diff --git a/epoll-shim b/epoll-shim
new file mode 160000
index 00000000..d04a26ae
--- /dev/null
+++ b/epoll-shim
@@ -0,0 +1 @@
+Subproject commit d04a26ae3cdd335d230e7e1806d15452bc957a54
diff --git a/osx-elf-header b/osx-elf-header
new file mode 160000
index 00000000..3af774ab
--- /dev/null
+++ b/osx-elf-header
@@ -0,0 +1 @@
+Subproject commit 3af774abbd9bb006fcbf2636e6b3a61acfd5ff2a