diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
index b1f2f315..b6a66a0d 100644
--- a/android/CMakeLists.txt
+++ b/android/CMakeLists.txt
@@ -150,12 +150,7 @@ set_target_properties(SPIRV-Tools-opt PROPERTIES
   IMPORTED_LOCATION ${platform_spec_path}/glslang/libSPIRV-Tools-opt.a
 )
 
-add_library(SPVRemapper STATIC IMPORTED GLOBAL)
-set_target_properties(SPVRemapper PROPERTIES
-  IMPORTED_LOCATION ${platform_spec_path}/glslang/libSPVRemapper.a
-)
-
-set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools SPVRemapper GenericCodeGen)
+set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools GenericCodeGen)
 
 ############################# TBB #############################
 
diff --git a/android/arm64-v8a/glslang/libSPIRV.a b/android/arm64-v8a/glslang/libSPIRV.a
index b864d1df..a5e9c830 100644
Binary files a/android/arm64-v8a/glslang/libSPIRV.a and b/android/arm64-v8a/glslang/libSPIRV.a differ
diff --git a/android/arm64-v8a/glslang/libSPVRemapper.a b/android/arm64-v8a/glslang/libSPVRemapper.a
deleted file mode 100644
index 284b291e..00000000
Binary files a/android/arm64-v8a/glslang/libSPVRemapper.a and /dev/null differ
diff --git a/android/armeabi-v7a/glslang/libSPIRV.a b/android/armeabi-v7a/glslang/libSPIRV.a
index 18bf1722..86c3955b 100644
Binary files a/android/armeabi-v7a/glslang/libSPIRV.a and b/android/armeabi-v7a/glslang/libSPIRV.a differ
diff --git a/android/armeabi-v7a/glslang/libSPVRemapper.a b/android/armeabi-v7a/glslang/libSPVRemapper.a
deleted file mode 100644
index fb9d5822..00000000
Binary files a/android/armeabi-v7a/glslang/libSPVRemapper.a and /dev/null differ
diff --git a/android/x86/glslang/libSPIRV.a b/android/x86/glslang/libSPIRV.a
index 445ebf25..2b1bbf91 100644
Binary files a/android/x86/glslang/libSPIRV.a and b/android/x86/glslang/libSPIRV.a differ
diff --git a/android/x86/glslang/libSPVRemapper.a b/android/x86/glslang/libSPVRemapper.a
deleted file mode 100644
index 51cd36d9..00000000
Binary files a/android/x86/glslang/libSPVRemapper.a and /dev/null differ
diff --git a/android/x86_64/glslang/libSPIRV.a b/android/x86_64/glslang/libSPIRV.a
index 51e27742..8bc2ce03 100644
Binary files a/android/x86_64/glslang/libSPIRV.a and b/android/x86_64/glslang/libSPIRV.a differ
diff --git a/android/x86_64/glslang/libSPVRemapper.a b/android/x86_64/glslang/libSPVRemapper.a
deleted file mode 100644
index 4adb663a..00000000
Binary files a/android/x86_64/glslang/libSPVRemapper.a and /dev/null differ
diff --git a/ios/CMakeLists.txt b/ios/CMakeLists.txt
index f3e75d9d..b5ac4e61 100644
--- a/ios/CMakeLists.txt
+++ b/ios/CMakeLists.txt
@@ -96,57 +96,13 @@ endif()
 
 ############################# glslang #############################
 
-add_library(GenericCodeGen STATIC IMPORTED GLOBAL)
-set_target_properties(GenericCodeGen PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libGenericCodeGen.a
-)
-
-add_library(glslang STATIC IMPORTED GLOBAL)
-set_target_properties(glslang PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libglslang.a
-)
-
-add_library(glslang-default-resource-limits STATIC IMPORTED GLOBAL)
-set_target_properties(glslang-default-resource-limits PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libglslang-default-resource-limits.a
-)
-
-add_library(MachineIndependent STATIC IMPORTED GLOBAL)
-set_target_properties(MachineIndependent PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libMachineIndependent.a
-)
-
-add_library(OGLCompiler STATIC IMPORTED GLOBAL)
-set_target_properties(OGLCompiler PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libOGLCompiler.a
-)
-
-add_library(OSDependent STATIC IMPORTED GLOBAL)
-set_target_properties(OSDependent PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libOSDependent.a
-)
-
-add_library(SPIRV STATIC IMPORTED GLOBAL)
-set_target_properties(SPIRV PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libSPIRV.a
-)
-
-add_library(SPIRV-Tools STATIC IMPORTED GLOBAL)
-set_target_properties(SPIRV-Tools PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libSPIRV-Tools.a
-)
-
-add_library(SPIRV-Tools-opt STATIC IMPORTED GLOBAL)
-set_target_properties(SPIRV-Tools-opt PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libSPIRV-Tools-opt.a
-)
-
-add_library(SPVRemapper STATIC IMPORTED GLOBAL)
-set_target_properties(SPVRemapper PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libSPVRemapper.a
-)
-
-set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools SPVRemapper GenericCodeGen)
+set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt GenericCodeGen)
+foreach(gl IN LISTS glslang_libs_name)
+  add_library(${gl} STATIC IMPORTED GLOBAL)
+  set_target_properties(${gl} PROPERTIES
+    IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/lib${gl}.a
+  )
+endforeach()
 
 ############################# SPIRV-Cross #############################
 
diff --git a/ios/libs/glslang/libSPIRV.a b/ios/libs/glslang/libSPIRV.a
index 191a6ab5..2b25d0af 100644
Binary files a/ios/libs/glslang/libSPIRV.a and b/ios/libs/glslang/libSPIRV.a differ
diff --git a/ios/libs/glslang/libSPVRemapper.a b/ios/libs/glslang/libSPVRemapper.a
deleted file mode 100644
index 11852349..00000000
Binary files a/ios/libs/glslang/libSPVRemapper.a and /dev/null differ
diff --git a/mac/CMakeLists.txt b/mac/CMakeLists.txt
index 5db52a27..5832af3a 100644
--- a/mac/CMakeLists.txt
+++ b/mac/CMakeLists.txt
@@ -143,12 +143,8 @@ set_target_properties(SPIRV-Tools-opt PROPERTIES
   IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libSPIRV-Tools-opt.a
 )
 
-add_library(SPVRemapper STATIC IMPORTED GLOBAL)
-set_target_properties(SPVRemapper PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libSPVRemapper.a
-)
 
-set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt SPVRemapper GenericCodeGen)
+set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt GenericCodeGen)
 
 ############################# SPIRV-Cross #############################
 
diff --git a/mac/libs/glslang/libSPIRV.a b/mac/libs/glslang/libSPIRV.a
index 4a7624c5..02eb5d1b 100644
Binary files a/mac/libs/glslang/libSPIRV.a and b/mac/libs/glslang/libSPIRV.a differ
diff --git a/mac/libs/glslang/libSPVRemapper.a b/mac/libs/glslang/libSPVRemapper.a
deleted file mode 100644
index c40e1b8e..00000000
Binary files a/mac/libs/glslang/libSPVRemapper.a and /dev/null differ
diff --git a/win32/CMakeLists.txt b/win32/CMakeLists.txt
index c2d89aba..880db456 100644
--- a/win32/CMakeLists.txt
+++ b/win32/CMakeLists.txt
@@ -195,7 +195,7 @@ endif()
 
 ############################# glslang #############################
 
-set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt SPVRemapper GenericCodeGen)
+set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt GenericCodeGen)
 foreach(gl IN LISTS glslang_libs_name)
   add_library(${gl} STATIC IMPORTED GLOBAL)
   set_target_properties(${gl} PROPERTIES
diff --git a/win32/libs/glslang/SPIRV.lib b/win32/libs/glslang/SPIRV.lib
index 91c0799f..ad0f3afe 100644
Binary files a/win32/libs/glslang/SPIRV.lib and b/win32/libs/glslang/SPIRV.lib differ
diff --git a/win32/libs/glslang/SPIRVd.lib b/win32/libs/glslang/SPIRVd.lib
index dc2cb5f4..6b209d6e 100644
Binary files a/win32/libs/glslang/SPIRVd.lib and b/win32/libs/glslang/SPIRVd.lib differ
diff --git a/win32/libs/glslang/SPVRemapper.lib b/win32/libs/glslang/SPVRemapper.lib
deleted file mode 100644
index 85e9d650..00000000
Binary files a/win32/libs/glslang/SPVRemapper.lib and /dev/null differ
diff --git a/win32/libs/glslang/SPVRemapperd.lib b/win32/libs/glslang/SPVRemapperd.lib
deleted file mode 100644
index 1fb6ca72..00000000
Binary files a/win32/libs/glslang/SPVRemapperd.lib and /dev/null differ
diff --git a/win32/libs/glslang/glslang-default-resource-limits.lib b/win32/libs/glslang/glslang-default-resource-limits.lib
index a1c53e91..47db9536 100644
Binary files a/win32/libs/glslang/glslang-default-resource-limits.lib and b/win32/libs/glslang/glslang-default-resource-limits.lib differ
diff --git a/win32/libs/glslang/glslang-default-resource-limitsd.lib b/win32/libs/glslang/glslang-default-resource-limitsd.lib
index 8c8f7ad6..82a398c0 100644
Binary files a/win32/libs/glslang/glslang-default-resource-limitsd.lib and b/win32/libs/glslang/glslang-default-resource-limitsd.lib differ
diff --git a/win64/CMakeLists.txt b/win64/CMakeLists.txt
index dccf1273..bf1619f1 100644
--- a/win64/CMakeLists.txt
+++ b/win64/CMakeLists.txt
@@ -195,7 +195,7 @@ endif()
 
 ############################# glslang #############################
 
-set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt SPVRemapper GenericCodeGen)
+set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt GenericCodeGen)
 foreach(gl IN LISTS glslang_libs_name)
   add_library(${gl} STATIC IMPORTED GLOBAL)
   set_target_properties(${gl} PROPERTIES
diff --git a/win64/libs/glslang/SPIRV.lib b/win64/libs/glslang/SPIRV.lib
index c7feb20c..88151b7e 100644
Binary files a/win64/libs/glslang/SPIRV.lib and b/win64/libs/glslang/SPIRV.lib differ
diff --git a/win64/libs/glslang/SPIRVd.lib b/win64/libs/glslang/SPIRVd.lib
index 1c03e300..f4499f2d 100644
Binary files a/win64/libs/glslang/SPIRVd.lib and b/win64/libs/glslang/SPIRVd.lib differ
diff --git a/win64/libs/glslang/SPVRemapper.lib b/win64/libs/glslang/SPVRemapper.lib
deleted file mode 100644
index cc5487a8..00000000
Binary files a/win64/libs/glslang/SPVRemapper.lib and /dev/null differ
diff --git a/win64/libs/glslang/SPVRemapperd.lib b/win64/libs/glslang/SPVRemapperd.lib
deleted file mode 100644
index 9f13446e..00000000
Binary files a/win64/libs/glslang/SPVRemapperd.lib and /dev/null differ
diff --git a/win64/libs/glslang/glslang-default-resource-limits.lib b/win64/libs/glslang/glslang-default-resource-limits.lib
index 78f7fcf5..a106b900 100644
Binary files a/win64/libs/glslang/glslang-default-resource-limits.lib and b/win64/libs/glslang/glslang-default-resource-limits.lib differ
diff --git a/win64/libs/glslang/glslang-default-resource-limitsd.lib b/win64/libs/glslang/glslang-default-resource-limitsd.lib
index d8edd4af..cd331a90 100644
Binary files a/win64/libs/glslang/glslang-default-resource-limitsd.lib and b/win64/libs/glslang/glslang-default-resource-limitsd.lib differ