diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
index 846415b5b..925e26a2d 100644
--- a/renderdoc/CMakeLists.txt
+++ b/renderdoc/CMakeLists.txt
@@ -365,7 +365,7 @@ if(NOT ANDROID)
         3rdparty/compressonator/BC5_Encode_kernel.cpp
         3rdparty/compressonator/BC6_Encode_kernel.cpp
         3rdparty/compressonator/BC7_Encode_Kernel.cpp
-        PROPERTIES COMPILE_FLAGS "-D_LINUX -Wno-newline-eof -Wno-missing-braces -Wno-char-subscripts -Wno-sign-compare -Wno-unused-value -Wno-strict-aliasing -Wno-shift-negative-value")
+        PROPERTIES COMPILE_FLAGS "-D_LINUX -Wno-newline-eof -Wno-missing-braces -Wno-char-subscripts -Wno-sign-compare -Wno-unused-value -Wno-strict-aliasing -Wno-shift-negative-value -Wno-implicit-fallthrough")
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/renderdoc/driver/shaders/spirv/CMakeLists.txt b/renderdoc/driver/shaders/spirv/CMakeLists.txt
index e5f2f4113..915d43289 100644
--- a/renderdoc/driver/shaders/spirv/CMakeLists.txt
+++ b/renderdoc/driver/shaders/spirv/CMakeLists.txt
@@ -117,12 +117,9 @@ add_definitions(-DNV_EXTENSIONS)
 set_property(SOURCE ${glslang_sources}
     PROPERTY COMPILE_FLAGS "-Wno-ignored-qualifiers -Wno-strict-aliasing -Wno-unreachable-code-break")
 
-# GCC 7.0 and above needs -Wno-implicit-fallthrough on these files
+# GCC 7.0 and above needs -Wno-implicit-fallthrough
 if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.9)
-    set_property(SOURCE
-        ${glslang_dir}/glslang/MachineIndependent/reflection.cpp
-        ${glslang_dir}/glslang/MachineIndependent/Intermediate.cpp
-        ${glslang_dir}/glslang/MachineIndependent/ParseHelper.cpp
+    set_property(SOURCE ${glslang_sources}
         APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-implicit-fallthrough")
 endif()