diff --git a/.gitmodules b/.gitmodules
index 85c66b2c..f0a1e923 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,5 +19,5 @@
 	url = https://gitlab.com/qemu-project/qemu.git
 	ignore = dirty
 [submodule "media-layer/core/gles/dependencies/gles-compatibility-layer"]
-	path = media-layer/core/gles/dependencies/gles-compatibility-layer
+	path = media-layer/core/gles/dependencies/gles-compatibility-layer/src
 	url = https://gitea.thebrokenrail.com/minecraft-pi-reborn/gles-compatibility-layer.git
diff --git a/dependencies/LIEF/src b/dependencies/LIEF/src
index 966a66c7..2d9855fc 160000
--- a/dependencies/LIEF/src
+++ b/dependencies/LIEF/src
@@ -1 +1 @@
-Subproject commit 966a66c78a498ed694f28a25b350853852612c4d
+Subproject commit 2d9855fc7f9d4ce6325245f8b75c98eb7663db60
diff --git a/dependencies/libpng/zlib/src b/dependencies/libpng/zlib/src
index 04f42cec..09155eaa 160000
--- a/dependencies/libpng/zlib/src
+++ b/dependencies/libpng/zlib/src
@@ -1 +1 @@
-Subproject commit 04f42ceca40f73e2978b50e93806c2a18c1281fc
+Subproject commit 09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851
diff --git a/dependencies/qemu/src b/dependencies/qemu/src
index 621da778..78385bc7 160000
--- a/dependencies/qemu/src
+++ b/dependencies/qemu/src
@@ -1 +1 @@
-Subproject commit 621da7789083b80d6f1ff1c0fb499334007b4f51
+Subproject commit 78385bc738108a9b5b20e639520dc60425ca2a5a
diff --git a/media-layer/core/dependencies/glfw/src b/media-layer/core/dependencies/glfw/src
index 3fa23607..3eaf1255 160000
--- a/media-layer/core/dependencies/glfw/src
+++ b/media-layer/core/dependencies/glfw/src
@@ -1 +1 @@
-Subproject commit 3fa2360720eeba1964df3c0ecf4b5df8648a8e52
+Subproject commit 3eaf1255b29fdf5c2895856c7be7d7185ef2b241
diff --git a/media-layer/core/gles/dependencies/CMakeLists.txt b/media-layer/core/gles/dependencies/CMakeLists.txt
index 3e44310d..90cae9fb 100644
--- a/media-layer/core/gles/dependencies/CMakeLists.txt
+++ b/media-layer/core/gles/dependencies/CMakeLists.txt
@@ -2,10 +2,5 @@ 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_ES3 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
deleted file mode 160000
index 86dadd66..00000000
--- a/media-layer/core/gles/dependencies/gles-compatibility-layer
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 86dadd6644d454b1c5460d7110a89c54cbdd2507
diff --git a/media-layer/core/gles/dependencies/gles-compatibility-layer/CMakeLists.txt b/media-layer/core/gles/dependencies/gles-compatibility-layer/CMakeLists.txt
new file mode 100644
index 00000000..cc916635
--- /dev/null
+++ b/media-layer/core/gles/dependencies/gles-compatibility-layer/CMakeLists.txt
@@ -0,0 +1,9 @@
+project(media-layer-core-gles-dependencies-gles-compatibility-layer)
+
+# GLES Compatibility Layer
+set(GLES_COMPATIBILITY_LAYER_USE_DEFAULT_INCLUDE_PATH FALSE CACHE BOOL "" FORCE)
+set(GLES_COMPATIBILITY_LAYER_USE_ES3 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(src)
+target_link_libraries(gles-compatibility-layer media-layer-headers)
diff --git a/media-layer/core/gles/dependencies/gles-compatibility-layer/src b/media-layer/core/gles/dependencies/gles-compatibility-layer/src
new file mode 160000
index 00000000..5bf535a6
--- /dev/null
+++ b/media-layer/core/gles/dependencies/gles-compatibility-layer/src
@@ -0,0 +1 @@
+Subproject commit 5bf535a68fe1ca0381b4628859e642b40a166017
diff --git a/media-layer/include/GLES b/media-layer/include/GLES
index ecf8ecea..acbe0420 120000
--- a/media-layer/include/GLES
+++ b/media-layer/include/GLES
@@ -1 +1 @@
-../core/gles/dependencies/gles-compatibility-layer/include/GLES
\ No newline at end of file
+../core/gles/dependencies/gles-compatibility-layer/src/include/GLES
\ No newline at end of file