diff --git a/Makefile.common b/Makefile.common
index 5d5f528a99..d191fcdcfe 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1865,13 +1865,13 @@ ifeq ($(HAVE_BUILTINGLSLANG), 1)
       gfx/drivers_shader/glslang.cpp \
 		$(DEPS_DIR)/glslang/glslang/SPIRV/GlslangToSpv.cpp \
 		$(DEPS_DIR)/glslang/glslang/SPIRV/InReadableOrder.cpp \
+		$(DEPS_DIR)/glslang/glslang/SPIRV/Logger.cpp \
 		$(DEPS_DIR)/glslang/glslang/SPIRV/SpvBuilder.cpp \
+      $(wildcard $(DEPS_DIR)/glslang/glslang/glslang/GenericCodeGen/*.cpp) \
       $(wildcard $(DEPS_DIR)/glslang/glslang/OGLCompilersDLL/*.cpp) \
       $(wildcard $(DEPS_DIR)/glslang/glslang/glslang/MachineIndependent/*.cpp) \
-      $(wildcard $(DEPS_DIR)/glslang/glslang/glslang/MachineIndependent/preprocessor/*.cpp)
-   GLSLANG_SOURCES_C += \
-      $(DEPS_DIR)/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM)/ossource.c
-
+      $(wildcard $(DEPS_DIR)/glslang/glslang/glslang/MachineIndependent/preprocessor/*.cpp) \
+      $(DEPS_DIR)/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM)/ossource.cpp
    ifneq ($(findstring Win32,$(OS)),)
       DEFINES += -DENABLE_HLSL
       GLSLANG_SOURCES += $(wildcard $(DEPS_DIR)/glslang/glslang/hlsl/*.cpp)
diff --git a/griffin/griffin.c b/griffin/griffin.c
index d145740140..383055423d 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -1711,18 +1711,3 @@ ANDROID PLAY FEATURE DELIVERY
 #if defined(ANDROID)
 #include "../play_feature_delivery/play_feature_delivery.c"
 #endif
-
-/*============================================================
-GLSLANG
-============================================================ */
-#ifdef WANT_GLSLANG
-
-#if defined(__linux__) || defined(__APPLE__)
-#include "../deps/glslang/glslang/glslang/OSDependent/Unix/ossource.c"
-#endif
-
-#ifdef _WIN32
-#include "../deps/glslang/glslang/glslang/OSDependent/Windows/ossource.c"
-#endif
-
-#endif
diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp
index b485ec4d47..ece5cd6221 100644
--- a/griffin/griffin_cpp.cpp
+++ b/griffin/griffin_cpp.cpp
@@ -102,6 +102,16 @@ VIDEO DRIVER
 #endif
 #endif
 
+#ifdef WANT_GLSLANG
+#ifdef _WIN32
+#include "../deps/glslang/glslang/glslang/OSDependent/Windows/ossource.cpp"
+#endif
+
+#if defined(__linux__)
+#include "../deps/glslang/glslang/glslang/OSDependent/Unix/ossource.cpp"
+#endif
+#endif
+
 /*============================================================
 FONTS
 ============================================================ */
diff --git a/griffin/griffin_glslang.cpp b/griffin/griffin_glslang.cpp
index f94da7eed7..ddd9d7f5be 100644
--- a/griffin/griffin_glslang.cpp
+++ b/griffin/griffin_glslang.cpp
@@ -11,8 +11,12 @@
 #include "../gfx/drivers_shader/glslang.cpp"
 #include "../deps/glslang/glslang/SPIRV/GlslangToSpv.cpp"
 #include "../deps/glslang/glslang/SPIRV/InReadableOrder.cpp"
+#include "../deps/glslang/glslang/SPIRV/Logger.cpp"
 #include "../deps/glslang/glslang/SPIRV/SpvBuilder.cpp"
 
+#include "../deps/glslang/glslang/glslang/GenericCodeGen/CodeGen.cpp"
+#include "../deps/glslang/glslang/glslang/GenericCodeGen/Link.cpp"
+
 #include "../deps/glslang/glslang/OGLCompilersDLL/InitializeDll.cpp"
 
 #include "../deps/glslang/glslang/glslang/MachineIndependent/attribute.cpp"
@@ -23,6 +27,7 @@
 #include "../deps/glslang/glslang/glslang/MachineIndependent/Intermediate.cpp"
 #include "../deps/glslang/glslang/glslang/MachineIndependent/intermOut.cpp"
 #include "../deps/glslang/glslang/glslang/MachineIndependent/IntermTraverse.cpp"
+#include "../deps/glslang/glslang/glslang/MachineIndependent/iomapper.cpp"
 #include "../deps/glslang/glslang/glslang/MachineIndependent/limits.cpp"
 #include "../deps/glslang/glslang/glslang/MachineIndependent/linkValidate.cpp"
 #include "../deps/glslang/glslang/glslang/MachineIndependent/parseConst.cpp"
@@ -30,6 +35,8 @@
 #include "../deps/glslang/glslang/glslang/MachineIndependent/ParseHelper.cpp"
 #include "../deps/glslang/glslang/glslang/MachineIndependent/PoolAlloc.cpp"
 #include "../deps/glslang/glslang/glslang/MachineIndependent/propagateNoContraction.cpp"
+#include "../deps/glslang/glslang/glslang/MachineIndependent/reflection.cpp"
+#include "../deps/glslang/glslang/glslang/MachineIndependent/RemoveTree.cpp"
 #include "../deps/glslang/glslang/glslang/MachineIndependent/Scan.cpp"
 #include "../deps/glslang/glslang/glslang/MachineIndependent/ShaderLang.cpp"
 #include "../deps/glslang/glslang/glslang/MachineIndependent/SymbolTable.cpp"
@@ -41,6 +48,10 @@
 #include "../deps/glslang/glslang/glslang/MachineIndependent/preprocessor/PpScanner.cpp"
 #include "../deps/glslang/glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp"
 
+#ifdef __APPLE__
+#include "../deps/glslang/glslang/glslang/OSDependent/Unix/ossource.cpp"
+#endif
+
 #if defined(ENABLE_HLSL)
 #include "../deps/glslang/glslang/hlsl/hlslAttributes.cpp"
 #include "../deps/glslang/glslang/hlsl/hlslGrammar.cpp"