diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7605ff03..0d499a24 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,4 @@ build:
     before_script:
         - "git submodule update --init --recursive"
     script:
-        - "cd libglez;mkdir build;cd build;cmake ..;make;make install;cd ..;cd .."
-        - "cd libxoverlay;mkdir build;cd build;cmake ..;make;make install;cd ..;cd .."
-        - "cd simple-ipc;mkdir build;cd build;cmake ..;make;make install;cd ..;cd .."
         - "mkdir build; cd build; cmake ..; make; cd .."
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9672f56f..ea03b02b 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,8 @@
-# UNFINISHED - DO NOT USE.
+# Current dependencies:
+#   Git
+#   OpenSSL (maybe should be removed, only used by backpack.tf esp)
+#   SDL2
+#   GLEW
 
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build type")
@@ -15,7 +19,6 @@ set(Game "tf2" CACHE STRING "Target game")
 set(GameValues "tf2;hl2dm;dab;tf2c;css;dynamic" CACHE INTERNAL "List of supported game types")
 set_property(CACHE Game PROPERTY STRINGS ${GameValues})
 
-
 set(EnableVisuals 1 CACHE BOOL "Enable Visuals")
 set(LagbotMode 0 CACHE BOOL "Build light cathook made for lagbots")
 set(ExternalDrawing 0 CACHE BOOL "External Visuals")
@@ -54,27 +57,20 @@ find_library(ValveLibraryTier0   NAMES tier0 PATHS "${PROJECT_SOURCE_DIR}/lib" N
 find_library(ValveLibraryVStdLib NAMES vstdlib PATHS "${PROJECT_SOURCE_DIR}/lib" NO_DEFAULT_PATH)
 
 if(EnableIPC)
-    find_package(SimpleIPC REQUIRED)
-    get_target_property(SimpleIPC_INCLUDE_DIRS SimpleIPC INTERFACE_INCLUDE_DIRECTORIES)
-    target_include_directories(cathook PRIVATE "${SimpleIPC_INCLUDE_DIRS}")
+    add_subdirectory(simple-ipc)
+    target_link_libraries(cathook SimpleIPC)
 endif()
 
 if(EnableVisuals)
-    find_package(glez REQUIRED)
-    get_target_property(glez_INCLUDE_DIRS glez INTERFACE_INCLUDE_DIRECTORIES)
+    add_subdirectory(libglez)
     find_package(SDL2 REQUIRED)
     find_package(GLEW REQUIRED)
     if(ExternalDrawing)
-        find_package(xoverlay REQUIRED)
-        get_target_property(xoverlay_INCLUDE_DIRS xoverlay INTERFACE_INCLUDE_DIRECTORIES)
-        target_include_directories(cathook PRIVATE
-                "${xoverlay_INCLUDE_DIRS}")
+        add_subdirectory(libxoverlay)
         target_link_libraries(cathook xoverlay)
     endif()
-    target_include_directories(cathook PRIVATE
-            "${SDL2_INCLUDE_DIRS}"
-            "${glez_INCLUDE_DIRS}")
-    target_link_libraries(cathook ${ValveLibrarySDL2} glez ${GLEW_LIBRARIES})
+    target_include_directories(cathook PRIVATE "${SDL2_INCLUDE_DIRS}")
+    target_link_libraries(cathook glez ${ValveLibrarySDL2} ${GLEW_LIBRARIES})
 endif()
 
 configure_file(include/config.h.in ${CMAKE_SOURCE_DIR}/include/config.h @ONLY)
diff --git a/include/ipc.hpp b/include/ipc.hpp
index d6b18b14..dccc6414 100755
--- a/include/ipc.hpp
+++ b/include/ipc.hpp
@@ -11,7 +11,7 @@
 
 #if ENABLE_IPC
 
-#include "ipcb.hpp"
+#include <SimpleIPC/ipcb.hpp>
 #include "pthread.h"
 #include <time.h>
 
diff --git a/libglez b/libglez
index aa37e735..06bd9fce 160000
--- a/libglez
+++ b/libglez
@@ -1 +1 @@
-Subproject commit aa37e735a7dbc86e64a9849fbeef0194685d2169
+Subproject commit 06bd9fceaff516e6fcb86f86c4a1fc5512685745
diff --git a/libxoverlay b/libxoverlay
index de4e4bb2..b7e2c85f 160000
--- a/libxoverlay
+++ b/libxoverlay
@@ -1 +1 @@
-Subproject commit de4e4bb2787a5c586bd54834f9b09b703b35e59e
+Subproject commit b7e2c85f47522ea6d59c925d395eb2badcd4d23b
diff --git a/simple-ipc b/simple-ipc
index 60f43c1c..f983bd9f 160000
--- a/simple-ipc
+++ b/simple-ipc
@@ -1 +1 @@
-Subproject commit 60f43c1c8ebe794345f8ab2ba465984ec445a9c6
+Subproject commit f983bd9fd8e50f5ef944f4c5952cbb791446e72d