diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad989ba8386..c8b3ebf056c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,6 +57,7 @@ target_compile_options(
         $<$<CXX_COMPILER_ID:GNU>:-Wno-error=maybe-uninitialized>
         $<$<CXX_COMPILER_ID:GNU>:-Wno-error=return-type>
         $<$<CXX_COMPILER_ID:GNU>:-Wno-error=unknown-pragmas>
+        $<$<CXX_COMPILER_ID:GNU>:-Wno-error=type-limits>
         $<$<CXX_COMPILER_ID:AppleClang>:-Wno-error=deprecated-declarations>
         $<$<CXX_COMPILER_ID:AppleClang>:-Wno-error=unused-parameter>
         $<$<CXX_COMPILER_ID:AppleClang>:-Wno-error=unused-property-ivar>
@@ -972,6 +973,8 @@ include(${PROJECT_SOURCE_DIR}/vendor/unique_resource.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/vector-tile.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/wagyu.cmake)
 
+find_package(Threads REQUIRED)
+
 target_link_libraries(
     mbgl-core
     PRIVATE
@@ -991,6 +994,7 @@ target_link_libraries(
         mbgl-vendor-unique_resource
         mbgl-vendor-vector-tile
         mbgl-vendor-wagyu
+        Threads::Threads
     PUBLIC
         Mapbox::Base
         Mapbox::Base::Extras::expected-lite
diff --git a/include/mbgl/util/string.hpp b/include/mbgl/util/string.hpp
index 27c3943c5f0..66ad7cfda77 100644
--- a/include/mbgl/util/string.hpp
+++ b/include/mbgl/util/string.hpp
@@ -3,6 +3,7 @@
 #include <string>
 #include <cstdlib>
 #include <type_traits>
+#include <exception>
 
 // Polyfill needed by Qt when building for Android with GCC
 #if defined(__ANDROID__) && defined(__GLIBCXX__)
diff --git a/scripts/license.cmake b/scripts/license.cmake
index e3a7d2aaa48..8c03fb205c5 100644
--- a/scripts/license.cmake
+++ b/scripts/license.cmake
@@ -2,7 +2,7 @@
 
 function(mbgl_generate_license param)
     # Fake targets or non relevant.
-    set(BLACKLIST "mbgl-compiler-options")
+    set(BLACKLIST "mbgl-compiler-options" "Threads::Threads")
 
     get_target_property(LIBRARIES ${param} LINK_LIBRARIES)
     list(INSERT LIBRARIES 0 ${param})
diff --git a/vendor/benchmark b/vendor/benchmark
index 090faecb454..c05843a9f62 160000
--- a/vendor/benchmark
+++ b/vendor/benchmark
@@ -1 +1 @@
-Subproject commit 090faecb454fbd6e6e17a75ef8146acb037118d4
+Subproject commit c05843a9f622db08ad59804c190f98879b76beba