diff --git a/media-layer/core/gles/CMakeLists.txt b/media-layer/core/gles/CMakeLists.txt
index 5919b08..87adf79 100644
--- a/media-layer/core/gles/CMakeLists.txt
+++ b/media-layer/core/gles/CMakeLists.txt
@@ -1,5 +1,8 @@
 project(media-layer-gles)
 
+# Dependencies
+add_subdirectory(dependencies)
+
 # Build
 if(MCPI_HEADLESS_MODE)
     # Stubs For Headless Mode
@@ -7,9 +10,6 @@ if(MCPI_HEADLESS_MODE)
     target_link_libraries(GLESv1_CM PRIVATE media-layer-headers)
 elseif(MCPI_USE_GLES1_COMPATIBILITY_LAYER)
     # GLESv1_CM Compatibility Layer
-    set(GLES_COMPATIBILITY_LAYER_USE_SDL FALSE CACHE BOOL "" FORCE)
-    set(GLES_COMPATIBILITY_LAYER_DEPENDENCY glfw CACHE STRING "" FORCE)
-    add_subdirectory(dependencies/gles-compatibility-layer)
     add_library(GLESv1_CM INTERFACE)
     target_link_libraries(GLESv1_CM INTERFACE gles-compatibility-layer)
 else()
diff --git a/media-layer/core/gles/dependencies/CMakeLists.txt b/media-layer/core/gles/dependencies/CMakeLists.txt
new file mode 100644
index 0000000..9f8be98
--- /dev/null
+++ b/media-layer/core/gles/dependencies/CMakeLists.txt
@@ -0,0 +1,10 @@
+project(media-layer-core-gles-dependencies)
+
+# GLES Compatibility Layer
+if(NOT MCPI_HEADLESS_MODE AND MCPI_USE_GLES1_COMPATIBILITY_LAYER)
+    set(GLES_COMPATIBILITY_LAYER_USE_DEFAULT_INCLUDE_PATH FALSE CACHE BOOL "" FORCE)
+    set(GLES_COMPATIBILITY_LAYER_USE_SDL FALSE CACHE BOOL "" FORCE)
+    set(GLES_COMPATIBILITY_LAYER_DEPENDENCY glfw CACHE STRING "" FORCE)
+    add_subdirectory(gles-compatibility-layer)
+    target_link_libraries(gles-compatibility-layer media-layer-headers)
+endif()
diff --git a/media-layer/core/gles/dependencies/gles-compatibility-layer b/media-layer/core/gles/dependencies/gles-compatibility-layer
index c6f1947..3078b26 160000
--- a/media-layer/core/gles/dependencies/gles-compatibility-layer
+++ b/media-layer/core/gles/dependencies/gles-compatibility-layer
@@ -1 +1 @@
-Subproject commit c6f1947c1b0df71128bfb702ff1a949be5846ac0
+Subproject commit 3078b267561053af3b590407ef60f8b4beae18bd