diff --git a/DEPS b/DEPS
index 5f96b781..d9231e13 100644
--- a/DEPS
+++ b/DEPS
@@ -23,7 +23,7 @@ deps = {
       '6fe4a3251488f7af86d64fc25cf442e817cf6133',
   'crashpad/third_party/gtest/gtest':
       Var('chromium_git') + '/external/github.com/google/googletest@' +
-      '145d05750b15324899473340c8dd5af50d125d33',
+      'c091b0469ab4c04ee9411ef770f32360945f4c53',
   'crashpad/third_party/gyp/gyp':
       Var('chromium_git') + '/external/gyp@' +
       '5e2b3ddde7cda5eb6bc09a5546a76b00e49d888f',
diff --git a/client/crashpad_client_fuchsia.cc b/client/crashpad_client_fuchsia.cc
index 0d4b8727..26781094 100644
--- a/client/crashpad_client_fuchsia.cc
+++ b/client/crashpad_client_fuchsia.cc
@@ -14,7 +14,7 @@
 
 #include "client/crashpad_client.h"
 
-#include <fdio/spawn.h>
+#include <lib/fdio/spawn.h>
 #include <zircon/process.h>
 #include <zircon/processargs.h>
 
diff --git a/test/multiprocess_exec_fuchsia.cc b/test/multiprocess_exec_fuchsia.cc
index 20f3ab65..95436b47 100644
--- a/test/multiprocess_exec_fuchsia.cc
+++ b/test/multiprocess_exec_fuchsia.cc
@@ -14,8 +14,8 @@
 
 #include "test/multiprocess_exec.h"
 
-#include <fdio/io.h>
-#include <fdio/spawn.h>
+#include <lib/fdio/io.h>
+#include <lib/fdio/spawn.h>
 #include <zircon/process.h>
 #include <zircon/processargs.h>
 #include <zircon/syscalls.h>
diff --git a/third_party/gtest/BUILD.gn b/third_party/gtest/BUILD.gn
index f9108281..db5f4a56 100644
--- a/third_party/gtest/BUILD.gn
+++ b/third_party/gtest/BUILD.gn
@@ -46,9 +46,6 @@ if (crashpad_is_in_chromium) {
     visibility = [ ":*" ]
     include_dirs = [ "gtest/googletest" ]
     defines = [ "GUNIT_NO_GOOGLE3=1" ]
-    if (crashpad_is_fuchsia) {
-      libs = [ "launchpad" ]
-    }
   }
 
   config("gtest_public_config") {
@@ -265,9 +262,6 @@ if (crashpad_is_in_chromium) {
   config("gmock_private_config") {
     visibility = [ ":*" ]
     include_dirs = [ "gtest/googlemock" ]
-    if (crashpad_is_fuchsia) {
-      libs = [ "launchpad" ]
-    }
   }
 
   config("gmock_public_config") {
diff --git a/tools/run_with_crashpad.cc b/tools/run_with_crashpad.cc
index f26dd2bc..5ef0edb6 100644
--- a/tools/run_with_crashpad.cc
+++ b/tools/run_with_crashpad.cc
@@ -32,7 +32,7 @@
 #include "util/string/split_string.h"
 
 #if defined(OS_FUCHSIA)
-#include <fdio/spawn.h>
+#include <lib/fdio/spawn.h>
 #include <zircon/process.h>
 #include <zircon/syscalls.h>