diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
index fe1d07bec..3663753e7 100644
--- a/SPIRV/CMakeLists.txt
+++ b/SPIRV/CMakeLists.txt
@@ -110,11 +110,11 @@ if(WIN32 AND BUILD_SHARED_LIBS)
 endif()
 
 if(ENABLE_OPT)
-    target_link_libraries(SPIRV PRIVATE MachineIndependent PUBLIC SPIRV-Tools-opt)
+    target_link_libraries(SPIRV PRIVATE glslang PUBLIC SPIRV-Tools-opt)
     target_include_directories(SPIRV PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>)
 else()
-    target_link_libraries(SPIRV PRIVATE MachineIndependent)
+    target_link_libraries(SPIRV PRIVATE glslang)
 endif()
 
 if(WIN32)
diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
index a9740232a..385d46971 100644
--- a/glslang/CMakeLists.txt
+++ b/glslang/CMakeLists.txt
@@ -136,6 +136,7 @@ endif()
 add_library(MachineIndependent STATIC stub.cpp)
 set_property(TARGET MachineIndependent PROPERTY POSITION_INDEPENDENT_CODE ON)
 set_property(TARGET MachineIndependent PROPERTY FOLDER glslang)
+target_link_libraries(MachineIndependent PRIVATE glslang)
 
 if (NOT MSVC)
     # -Wunused-but-set-variable is triggered in code generated by bison that we do not control. Turn this warning off, but only for the generated.