diff --git a/Makefile.common b/Makefile.common
index 2b33154614..d6694f5445 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1524,16 +1524,17 @@ ifeq ($(HAVE_BUILTINGLSLANG), 1)
       GLSLANG_PLATFORM := Unix
    endif
 
+   DEFINES += -DHAVE_BUILTINGLSLANG
+
    INCLUDE_DIRS += \
       -I$(DEPS_DIR)/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM) \
       -I$(DEPS_DIR)/glslang/glslang/OGLCompilersDLL \
-      -I$(DEPS_DIR)/glslang/glslang \
       -I$(DEPS_DIR)/glslang/glslang/glslang/MachineIndependent \
       -I$(DEPS_DIR)/glslang/glslang/glslang/Public \
       -I$(DEPS_DIR)/glslang/glslang/SPIRV
 
    GLSLANG_SOURCES := \
-      $(wildcard $(DEPS_DIR)/glslang/*.cpp) \
+      gfx/drivers_shader/glslang.cpp \
       $(wildcard $(DEPS_DIR)/glslang/glslang/SPIRV/*.cpp) \
       $(wildcard $(DEPS_DIR)/glslang/glslang/glslang/GenericCodeGen/*.cpp) \
       $(wildcard $(DEPS_DIR)/glslang/glslang/OGLCompilersDLL/*.cpp) \
@@ -1547,7 +1548,7 @@ ifeq ($(HAVE_BUILTINGLSLANG), 1)
    endif
 else ifeq ($(HAVE_GLSLANG),1)
    HAVE_GLSLANG_COMMON = 1
-   GLSLANG_SOURCES := $(DEPS_DIR)/glslang/glslang.cpp
+   GLSLANG_SOURCES := gfx/drivers_shader/glslang.cpp
 
    # The order of these libs are somewhat specific
    LIBS += $(GLSLANG_LIBS) \
@@ -1561,7 +1562,6 @@ endif
 
 ifeq ($(HAVE_GLSLANG_COMMON), 1)
    DEFINES += -DHAVE_GLSLANG
-   INCLUDE_DIRS += -I$(DEPS_DIR)/glslang
    OBJ += $(GLSLANG_SOURCES:.cpp=.o)
 endif
 
diff --git a/deps/glslang/glslang.cpp b/gfx/drivers_shader/glslang.cpp
similarity index 99%
rename from deps/glslang/glslang.cpp
rename to gfx/drivers_shader/glslang.cpp
index 0dd86a45b7..3765d86af8 100644
--- a/deps/glslang/glslang.cpp
+++ b/gfx/drivers_shader/glslang.cpp
@@ -16,8 +16,8 @@
 #include "glslang.hpp"
 
 #ifdef HAVE_BUILTINGLSLANG
-#include "glslang/glslang/Public/ShaderLang.h"
-#include "glslang/SPIRV/GlslangToSpv.h"
+#include "ShaderLang.h"
+#include "GlslangToSpv.h"
 #elif HAVE_GLSLANG
 #include <glslang/Public/ShaderLang.h>
 #include <glslang/SPIRV/GlslangToSpv.h>
diff --git a/deps/glslang/glslang.hpp b/gfx/drivers_shader/glslang.hpp
similarity index 100%
rename from deps/glslang/glslang.hpp
rename to gfx/drivers_shader/glslang.hpp
diff --git a/gfx/drivers_shader/glslang_util_cxx.cpp b/gfx/drivers_shader/glslang_util_cxx.cpp
index cb675294e3..a54b16dbd6 100644
--- a/gfx/drivers_shader/glslang_util_cxx.cpp
+++ b/gfx/drivers_shader/glslang_util_cxx.cpp
@@ -32,7 +32,7 @@
 #include "glslang_util.h"
 #include "glslang_util_cxx.h"
 #if defined(HAVE_GLSLANG)
-#include <glslang.hpp>
+#include "glslang.hpp"
 #endif
 #include "../../verbosity.h"
 
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index 090d833660..4b7429b01b 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -24,7 +24,7 @@
 
 #include "../../retroarch.h"
 #include "../../configuration.h"
-#include "../managers/core_option_manager.h"
+#include "../../managers/core_option_manager.h"
 
 #ifndef BIND_ACTION_GET_TITLE
 #define BIND_ACTION_GET_TITLE(cbs, name) \