diff --git a/compat/BUILD.gn b/compat/BUILD.gn
index 0903e795..a03653cf 100644
--- a/compat/BUILD.gn
+++ b/compat/BUILD.gn
@@ -74,9 +74,9 @@ static_library("compat") {
   deps = []
 
   if (is_mac) {
-    deps += [ "//third_party/crashpad/crashpad/third_party/apple_cctools" ]
+    deps += [ "../third_party/apple_cctools" ]
   }
   if (is_win) {
-    deps += [ "//third_party/crashpad/crashpad/third_party/getopt" ]
+    deps += [ "../third_party/getopt" ]
   }
 }
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 441393b8..3dcf2f22 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -47,8 +47,6 @@ static_library("test") {
   ]
 
   if (is_mac) {
-    libs = [ "bsm" ]
-    deps += [ "//third_party/crashpad/crashpad/handler" ]
     sources += [
       "mac/dyld.cc",
       "mac/dyld.h",
@@ -89,6 +87,11 @@ static_library("test") {
     "//base",
     "//testing/gtest",
   ]
+
+  if (is_mac) {
+    libs = [ "bsm" ]
+    deps += [ "../handler" ]
+  }
 }
 
 source_set("test_test") {
diff --git a/util/BUILD.gn b/util/BUILD.gn
index 7f8e7ecc..c744ddc8 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -297,7 +297,7 @@ static_library("util") {
 
   public_configs = [ "..:crashpad_config" ]
 
-  # Include files from here and generated files starting with "util".
+  # Include generated files starting with "util".
   include_dirs = [ "$root_gen_dir/third_party/crashpad/crashpad" ]
 
   public_deps = [