diff --git a/3rdparty/googletest/include/gtest/internal/gtest-port.h b/3rdparty/googletest/include/gtest/internal/gtest-port.h
index dc4fe0c..c20561c 100644
--- a/3rdparty/googletest/include/gtest/internal/gtest-port.h
+++ b/3rdparty/googletest/include/gtest/internal/gtest-port.h
@@ -1387,7 +1387,7 @@ class MutexBase {
 // This allows initialization to work whether pthread_t is a scalar or struct.
 // The flag -Wmissing-field-initializers must not be specified for this to work.
 # define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
-    ::testing::internal::MutexBase mutex = { PTHREAD_MUTEX_INITIALIZER, false }
+    ::testing::internal::MutexBase mutex = { PTHREAD_MUTEX_INITIALIZER, false, 0 }
 
 // The Mutex class can only be used for mutexes created at runtime. It
 // shares its API with MutexBase otherwise.
diff --git a/3rdparty/googletest/src/gtest-all.cc b/3rdparty/googletest/src/gtest-all.cc
index 0a9cee5..97753e5 100644
--- a/3rdparty/googletest/src/gtest-all.cc
+++ b/3rdparty/googletest/src/gtest-all.cc
@@ -39,10 +39,10 @@
 #include "gtest/gtest.h"
 
 // The following lines pull in the real gtest *.cc files.
-#include "src/gtest.cc"
-#include "src/gtest-death-test.cc"
-#include "src/gtest-filepath.cc"
-#include "src/gtest-port.cc"
-#include "src/gtest-printers.cc"
-#include "src/gtest-test-part.cc"
-#include "src/gtest-typed-test.cc"
+#include "gtest.cc"
+#include "gtest-death-test.cc"
+#include "gtest-filepath.cc"
+#include "gtest-port.cc"
+#include "gtest-printers.cc"
+#include "gtest-test-part.cc"
+#include "gtest-typed-test.cc"
diff --git a/3rdparty/googletest/src/gtest-death-test.cc b/3rdparty/googletest/src/gtest-death-test.cc
index a6023fc..8a33e8c 100644
--- a/3rdparty/googletest/src/gtest-death-test.cc
+++ b/3rdparty/googletest/src/gtest-death-test.cc
@@ -72,7 +72,7 @@
 // prevent a user from accidentally including gtest-internal-inl.h in
 // his code.
 #define GTEST_IMPLEMENTATION_ 1
-#include "src/gtest-internal-inl.h"
+#include "gtest-internal-inl.h"
 #undef GTEST_IMPLEMENTATION_
 
 namespace testing {
diff --git a/3rdparty/googletest/src/gtest-port.cc b/3rdparty/googletest/src/gtest-port.cc
index 0c4df5f..2de9d4f 100644
--- a/3rdparty/googletest/src/gtest-port.cc
+++ b/3rdparty/googletest/src/gtest-port.cc
@@ -67,7 +67,7 @@
 // prevent a user from accidentally including gtest-internal-inl.h in
 // his code.
 #define GTEST_IMPLEMENTATION_ 1
-#include "src/gtest-internal-inl.h"
+#include "gtest-internal-inl.h"
 #undef GTEST_IMPLEMENTATION_
 
 namespace testing {
diff --git a/3rdparty/googletest/src/gtest-test-part.cc b/3rdparty/googletest/src/gtest-test-part.cc
index c60eef3..25c9064 100644
--- a/3rdparty/googletest/src/gtest-test-part.cc
+++ b/3rdparty/googletest/src/gtest-test-part.cc
@@ -39,7 +39,7 @@
 // prevent a user from accidentally including gtest-internal-inl.h in
 // his code.
 #define GTEST_IMPLEMENTATION_ 1
-#include "src/gtest-internal-inl.h"
+#include "gtest-internal-inl.h"
 #undef GTEST_IMPLEMENTATION_
 
 namespace testing {
diff --git a/3rdparty/googletest/src/gtest.cc b/3rdparty/googletest/src/gtest.cc
index d6552f2..0aa25be 100644
--- a/3rdparty/googletest/src/gtest.cc
+++ b/3rdparty/googletest/src/gtest.cc
@@ -132,7 +132,7 @@
 // prevent a user from accidentally including gtest-internal-inl.h in
 // his code.
 #define GTEST_IMPLEMENTATION_ 1
-#include "src/gtest-internal-inl.h"
+#include "gtest-internal-inl.h"
 #undef GTEST_IMPLEMENTATION_
 
 #if GTEST_OS_WINDOWS