diff --git a/CMakeLists.txt b/CMakeLists.txt

index 0232f9b..dab2d4f 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -139,12 +139,6 @@ if(${SHADERC_ENABLE_EXAMPLES})

     add_subdirectory(examples)

 endif()

-add_custom_target(build-version

-  ${PYTHON_EXECUTABLE}

-  ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py

-  ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc

-  COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")

-

 function(define_pkg_config_file NAME LIBS)

   add_custom_target(${NAME}-pkg-config ALL

     COMMAND ${CMAKE_COMMAND}

diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt

index c8fa6d5..15722f9 100644

--- a/glslc/CMakeLists.txt

+++ b/glslc/CMakeLists.txt

@@ -30,7 +30,6 @@ add_library(glslc STATIC

 )

 shaderc_default_compile_options(glslc)

-target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})

 if (SHADERC_ENABLE_WGSL_OUTPUT)

   if (IS_DIRECTORY "${tint_SOURCE_DIR}/include")

@@ -43,7 +42,7 @@ if (SHADERC_ENABLE_WGSL_OUTPUT)

 endif(SHADERC_ENABLE_WGSL_OUTPUT)

 target_link_libraries(glslc PRIVATE

-  glslang OSDependent OGLCompiler HLSL glslang SPIRV    # Glslang libraries

+  -lglslang -lHLSL -lSPIRV    # Glslang libraries

   $<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint>      # Tint libraries, optional

   shaderc_util shaderc                                  # internal Shaderc libraries

   ${CMAKE_THREAD_LIBS_INIT})

@@ -53,7 +52,6 @@ shaderc_default_compile_options(glslc_exe)

 target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include)

 set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc)

 target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc)

-add_dependencies(glslc_exe build-version)

 shaderc_add_tests(

   TEST_PREFIX glslc

diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt

index 2cced9e..a1ef549 100644

--- a/libshaderc/CMakeLists.txt

+++ b/libshaderc/CMakeLists.txt

@@ -28,15 +28,14 @@ add_library(shaderc STATIC ${SHADERC_SOURCES})

 shaderc_default_compile_options(shaderc)

 target_include_directories(shaderc

     PUBLIC include

-    PRIVATE ${glslang_SOURCE_DIR}

-            ${SPIRV-Headers_SOURCE_DIR}/include)

+    PUBLIC /usr/include/spirv-headers)

 add_library(shaderc_shared SHARED ${SHADERC_SOURCES})

 shaderc_default_compile_options(shaderc_shared)

 target_include_directories(shaderc_shared

     PUBLIC include

-    PRIVATE ${glslang_SOURCE_DIR}

-            ${SPIRV-Headers_SOURCE_DIR}/include)

+    PUBLIC /usr/include/spirv-headers)

+

 target_compile_definitions(shaderc_shared

     PRIVATE SHADERC_IMPLEMENTATION

     PUBLIC SHADERC_SHAREDLIB

@@ -63,10 +62,10 @@ endif(SHADERC_ENABLE_INSTALL)

 find_package(Threads)

 set(SHADERC_LIBS

-  glslang OSDependent OGLCompiler glslang ${CMAKE_THREAD_LIBS_INIT}

+  -lglslang ${CMAKE_THREAD_LIBS_INIT}

   shaderc_util

-  SPIRV # from glslang

-  SPIRV-Tools

+  -lSPIRV # from glslang

+  -lSPIRV-Tools

 )

 target_link_libraries(shaderc PRIVATE ${SHADERC_LIBS})

diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt

index 99ce3c4..af71d3b 100644

--- a/libshaderc_util/CMakeLists.txt

+++ b/libshaderc_util/CMakeLists.txt

@@ -46,8 +46,8 @@ add_definitions(-DENABLE_HLSL)

 find_package(Threads)

 target_link_libraries(shaderc_util PRIVATE

-  glslang OSDependent OGLCompiler HLSL glslang SPIRV

-  SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})

+  -lHLSL -lglslang -lSPIRV

+  -lSPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})

 shaderc_add_tests(

   TEST_PREFIX shaderc_util

diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt

index 7bd9617..16c778c 100644

--- a/third_party/CMakeLists.txt

+++ b/third_party/CMakeLists.txt

@@ -38,45 +38,6 @@ check_cxx_compiler_flag(-fPIC COMPILER_SUPPORTS_PIC)

 if (IS_DIRECTORY ${SHADERC_SPIRV_HEADERS_DIR})

   set(SPIRV_HEADERS_SKIP_EXAMPLES ON)

-  add_subdirectory(${SHADERC_SPIRV_HEADERS_DIR} spirv-headers)

-endif()

-

-if (NOT TARGET SPIRV-Tools)

-  # Check SPIRV-Tools before glslang so that it is linked into glslang.

-  # we control optimizations via glslang API calls directly.

-  if (IS_DIRECTORY ${SHADERC_SPIRV_TOOLS_DIR})

-    if ("${SHADERC_SKIP_TESTS}")

-      # Also skip building tests in SPIRV-Tools.

-      set(SPIRV_SKIP_TESTS ON CACHE BOOL "Skip building SPIRV-Tools tests")

-    elseif(NOT "${SPIRV_SKIP_TESTS}")

-      # SPIRV-Tools requires effcee and re2 to build tests.

-      # re2 tests take a long time and do not add much value, since re2 is a

-      # dependency of a dependency, so not running them.

-      set(RE2_BUILD_TESTING OFF CACHE STRING "Run RE2 Tests")

-      add_subdirectory(${SHADERC_RE2_DIR} re2)

-      add_subdirectory(${SHADERC_EFFCEE_DIR} effcee)

-    endif()

-    add_subdirectory(${SHADERC_SPIRV_TOOLS_DIR} spirv-tools)

-  endif()

-  if (NOT TARGET SPIRV-Tools)

-    message(FATAL_ERROR "SPIRV-Tools was not found - required for compilation")

-  endif()

-endif()

-

-if (NOT TARGET glslang)

-  if (IS_DIRECTORY ${SHADERC_GLSLANG_DIR})

-    add_subdirectory(${SHADERC_GLSLANG_DIR} glslang)

-  endif()

-  if (NOT TARGET glslang)

-    message(FATAL_ERROR "glslang was not found - required for compilation")

-  endif()

-  if(WIN32)

-      # This is unfortunate but glslang forces our

-      # platform toolset to be v110, which we may not even have

-      # installed, undo anything glslang has done to it.

-      set(CMAKE_GENERATOR_TOOLSET "${OLD_PLATFORM_TOOLSET}" CACHE STRING

-        "Platform Toolset" FORCE)

-  endif()

 endif()

 if (SHADERC_ENABLE_WGSL_OUTPUT)