diff --git a/single_include/kompute/Kompute.hpp b/single_include/kompute/Kompute.hpp
index 0093eddc1..d55e3233f 100755
--- a/single_include/kompute/Kompute.hpp
+++ b/single_include/kompute/Kompute.hpp
@@ -729,7 +729,12 @@ extern py::object kp_debug, kp_info, kp_warning, kp_error;
 #include <iostream>
 #include <vector>
 
+#if USE_EXTERNAL_SHADER
 #include <SPIRV/GlslangToSpv.h>
+#else 
+#include <glslang/SPIRV/GlslangToSpv.h>
+#endif
+
 #include <glslang/Include/ResourceLimits.h>
 #include <glslang/Public/ShaderLang.h>
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c1ab2d3eb..2d0282389 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -145,6 +145,11 @@ endif()
 #################### GLSLANG #######################
 #####################################################
 
+# If glslag was cloned, then SPIRV/GlslangToSpv.h will be used instead of glslang/SPIRV/GlslangToSpv.h
+if(KOMPUTE_OPT_REPO_SUBMODULE_BUILD)
+        set(USE_EXTERNAL_SHADER 1)
+endif()
+
 if(NOT KOMPUTE_OPT_DISABLE_SHADER_UTILS)
     if(KOMPUTE_OPT_REPO_SUBMODULE_BUILD)
         add_subdirectory(${PROJECT_SOURCE_DIR}/external/glslang
diff --git a/src/include/kompute/Shader.hpp b/src/include/kompute/Shader.hpp
index 2cd240424..1e14091ac 100644
--- a/src/include/kompute/Shader.hpp
+++ b/src/include/kompute/Shader.hpp
@@ -4,7 +4,12 @@
 #include <iostream>
 #include <vector>
 
+#if USE_EXTERNAL_SHADER
 #include <SPIRV/GlslangToSpv.h>
+#else 
+#include <glslang/SPIRV/GlslangToSpv.h>
+#endif
+
 #include <glslang/Include/ResourceLimits.h>
 #include <glslang/Public/ShaderLang.h>