diff -rupN apitrace-0f541f460bba86a69c8c714076db5a7607cc8d16/cli/CMakeLists.txt apitrace-0f541f460bba86a69c8c714076db5a7607cc8d16-new/cli/CMakeLists.txt
--- apitrace-0f541f460bba86a69c8c714076db5a7607cc8d16/cli/CMakeLists.txt	2019-07-03 14:46:05.000000000 +0200
+++ apitrace-0f541f460bba86a69c8c714076db5a7607cc8d16-new/cli/CMakeLists.txt	2019-07-22 15:52:23.244239215 +0200
@@ -39,7 +39,7 @@ add_executable (apitrace
 
 target_link_libraries (apitrace
     common
-    brotli_dec brotli_enc brotli_common
+    brotlidec brotlienc brotlicommon
     ${ZLIB_LIBRARIES}
     ${SNAPPY_LIBRARIES}
     ${GETOPT_LIBRARIES}
diff -rupN apitrace-0f541f460bba86a69c8c714076db5a7607cc8d16/CMakeLists.txt apitrace-0f541f460bba86a69c8c714076db5a7607cc8d16-new/CMakeLists.txt
--- apitrace-0f541f460bba86a69c8c714076db5a7607cc8d16/CMakeLists.txt	2019-07-03 14:46:05.000000000 +0200
+++ apitrace-0f541f460bba86a69c8c714076db5a7607cc8d16-new/CMakeLists.txt	2019-07-22 15:52:23.244239215 +0200
@@ -483,9 +483,6 @@ if (ENABLE_STATIC_SNAPPY OR NOT SNAPPY_F
 endif ()
 include_directories (${SNAPPY_INCLUDE_DIRS})
 
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/brotli/c/include)
-add_subdirectory (thirdparty/brotli)
-
 if (NOT WIN32 AND NOT ENABLE_STATIC_EXE)
     # zlib 1.2.4-1.2.5 made it impossible to read the last block of incomplete
     # gzip traces (e.g., apitrace-tests/traces/zlib-no-eof.trace).
@@ -547,17 +544,10 @@ set (MD5_LIBRARIES md5_bundled)
 # also avoids missing/inconsistent declarations in system headers.
 include_directories (BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/khronos)
 
-# We use non-standard C++ flags, so we can't just use GTest's CMakeLists.txt
-add_definitions (-DGTEST_HAS_TR1_TUPLE=0)
-include_directories (BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gtest/include)
-add_library (gtest ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gtest/src/gtest-all.cc)
-set_property (TARGET gtest APPEND PROPERTY INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gtest)
-target_link_libraries (gtest ${CMAKE_THREAD_LIBS_INIT})
-
 # Convenience macro for adding unit tests
 macro (add_gtest)
     add_executable (${ARGV})
-    target_link_libraries (${ARGV0} gtest)
+    target_link_libraries (${ARGV0} gtest pthread)
     add_dependencies (check ${ARGV0})
     add_test (NAME ${ARGV0} COMMAND $<TARGET_FILE:${ARGV0}>)
 endmacro ()
diff -rupN apitrace-0f541f460bba86a69c8c714076db5a7607cc8d16/lib/trace/CMakeLists.txt apitrace-0f541f460bba86a69c8c714076db5a7607cc8d16-new/lib/trace/CMakeLists.txt
--- apitrace-0f541f460bba86a69c8c714076db5a7607cc8d16/lib/trace/CMakeLists.txt	2019-07-03 14:46:05.000000000 +0200
+++ apitrace-0f541f460bba86a69c8c714076db5a7607cc8d16-new/lib/trace/CMakeLists.txt	2019-07-22 15:52:23.245239215 +0200
@@ -31,7 +31,7 @@ target_link_libraries (common
     guids
     highlight
     os
-    brotli_dec brotli_common
+    brotlidec brotlicommon
 )
 
 add_gtest (trace_parser_flags_test trace_parser_flags_test.cpp)