diff --git a/app/dashboard/BUILD.gn b/app/dashboard/BUILD.gn
index b4d9224..abe5285 100644
--- a/app/dashboard/BUILD.gn
+++ b/app/dashboard/BUILD.gn
@@ -30,8 +30,8 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.testing.runner",
-    "//peridot/public/fidl/fuchsia.modular",
+    "$garnet_sdk_fidl/fuchsia.testing.runner",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//third_party/dart-pkg/pub/buildbucket",
     "//third_party/dart-pkg/pub/html",
diff --git a/app/latin-ime/BUILD.gn b/app/latin-ime/BUILD.gn
index 8248ae3..b2fda43 100644
--- a/app/latin-ime/BUILD.gn
+++ b/app/latin-ime/BUILD.gn
@@ -20,8 +20,8 @@
   sources = []
 
   deps = [
-    "//garnet/public/fidl/fuchsia.sys",
-    "//garnet/public/fidl/fuchsia.ui.policy",
+    "$garnet_sdk_fidl/fuchsia.sys",
+    "$garnet_sdk_fidl/fuchsia.ui.policy",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
diff --git a/app/maxwell/agents/module_suggester_dart/BUILD.gn b/app/maxwell/agents/module_suggester_dart/BUILD.gn
index 48b291a..3f98566 100644
--- a/app/maxwell/agents/module_suggester_dart/BUILD.gn
+++ b/app/maxwell/agents/module_suggester_dart/BUILD.gn
@@ -19,7 +19,7 @@
   sources = []
 
   deps = [
-    "//peridot/public/fidl/fuchsia.modular",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//topaz/public/lib/app/dart",
     "//topaz/public/lib/module_resolver/dart",
     "//topaz/public/lib/proposal/dart",
diff --git a/app/maxwell/agents/usage_log/BUILD.gn b/app/maxwell/agents/usage_log/BUILD.gn
index 0f6eb0b..0b705c7 100644
--- a/app/maxwell/agents/usage_log/BUILD.gn
+++ b/app/maxwell/agents/usage_log/BUILD.gn
@@ -25,7 +25,7 @@
   non_dart_deps = [ ":module_usage_tracking_metrics_registry" ]
 
   deps = [
-    "//peridot/public/fidl/fuchsia.modular",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
     "//topaz/public/lib/context/dart",
diff --git a/app/term/BUILD.gn b/app/term/BUILD.gn
index 963869d..3833f0d 100644
--- a/app/term/BUILD.gn
+++ b/app/term/BUILD.gn
@@ -24,11 +24,11 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.fonts",
-    "//garnet/public/fidl/fuchsia.math",
-    "//garnet/public/fidl/fuchsia.ui.input",
-    "//garnet/public/fidl/fuchsia.ui.scenic",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1",
+    "$garnet_sdk_fidl/fuchsia.fonts",
+    "$garnet_sdk_fidl/fuchsia.math",
+    "$garnet_sdk_fidl/fuchsia.ui.input",
+    "$garnet_sdk_fidl/fuchsia.ui.scenic",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
     "//garnet/public/lib/component/cpp",
     "//garnet/public/lib/fidl/cpp",
     "//garnet/public/lib/fsl",
diff --git a/auth_providers/google/BUILD.gn b/auth_providers/google/BUILD.gn
index fa1296e..8cee730 100644
--- a/auth_providers/google/BUILD.gn
+++ b/auth_providers/google/BUILD.gn
@@ -17,7 +17,7 @@
 
   deps = [
     ":lib",
-    "//garnet/public/fidl/fuchsia.auth",
+    "$garnet_sdk_fidl/fuchsia.auth",
     "//garnet/public/lib/component/cpp",
     "//garnet/public/lib/fidl/cpp",
     "//garnet/public/lib/fsl",
@@ -39,15 +39,15 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.net.oldhttp",
+    "$garnet_sdk_fidl/fuchsia.net.oldhttp",
     "//garnet/public/lib/svc/cpp",
     "//peridot/lib/rapidjson",
     "//topaz/auth_providers/oauth",
   ]
 
   public_deps = [
-    "//garnet/public/fidl/fuchsia.auth",
-    "//garnet/public/fidl/fuchsia.ui.app",
+    "$garnet_sdk_fidl/fuchsia.auth",
+    "$garnet_sdk_fidl/fuchsia.ui.app",
     "//garnet/public/lib/callback",
     "//garnet/public/lib/component/cpp",
     "//garnet/public/lib/fidl/cpp",
@@ -71,7 +71,7 @@
 
   deps = [
     ":lib",
-    "//garnet/public/fidl/fuchsia.auth",
+    "$garnet_sdk_fidl/fuchsia.auth",
     "//garnet/public/lib/fidl/cpp",
     "//garnet/public/lib/fxl:fxl_printers",
     "//garnet/public/lib/gtest:gtest",
diff --git a/auth_providers/oauth/BUILD.gn b/auth_providers/oauth/BUILD.gn
index 1f6cc8c..b720118 100644
--- a/auth_providers/oauth/BUILD.gn
+++ b/auth_providers/oauth/BUILD.gn
@@ -13,7 +13,7 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.auth",
+    "$garnet_sdk_fidl/fuchsia.auth",
     "//garnet/public/lib/fsl",
     "//garnet/public/lib/fxl",
     "//garnet/public/lib/network_wrapper",
diff --git a/auth_providers/spotify/BUILD.gn b/auth_providers/spotify/BUILD.gn
index e4b637c..1175b63 100644
--- a/auth_providers/spotify/BUILD.gn
+++ b/auth_providers/spotify/BUILD.gn
@@ -17,7 +17,7 @@
 
   deps = [
     ":lib",
-    "//garnet/public/fidl/fuchsia.auth",
+    "$garnet_sdk_fidl/fuchsia.auth",
     "//garnet/public/lib/component/cpp",
     "//garnet/public/lib/fidl/cpp",
     "//garnet/public/lib/fsl",
@@ -38,7 +38,7 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.net.oldhttp",
+    "$garnet_sdk_fidl/fuchsia.net.oldhttp",
     "//garnet/public/lib/svc/cpp",
     "//peridot/lib/rapidjson",
     "//third_party/rapidjson",
@@ -46,8 +46,8 @@
   ]
 
   public_deps = [
-    "//garnet/public/fidl/fuchsia.auth",
-    "//garnet/public/fidl/fuchsia.ui.app",
+    "$garnet_sdk_fidl/fuchsia.auth",
+    "$garnet_sdk_fidl/fuchsia.ui.app",
     "//garnet/public/lib/callback",
     "//garnet/public/lib/component/cpp",
     "//garnet/public/lib/fidl/cpp",
@@ -68,7 +68,7 @@
 
   deps = [
     ":lib",
-    "//garnet/public/fidl/fuchsia.auth",
+    "$garnet_sdk_fidl/fuchsia.auth",
     "//garnet/public/lib/fidl/cpp",
     "//garnet/public/lib/fxl:fxl_printers",
     "//garnet/public/lib/gtest:gtest",
diff --git a/bin/bluetooth_settings/BUILD.gn b/bin/bluetooth_settings/BUILD.gn
index 445c3cd..8086468 100644
--- a/bin/bluetooth_settings/BUILD.gn
+++ b/bin/bluetooth_settings/BUILD.gn
@@ -23,10 +23,10 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.bluetooth",
-    "//garnet/public/fidl/fuchsia.bluetooth.control",
-    "//garnet/public/fidl/fuchsia.bluetooth.gatt",
-    "//garnet/public/fidl/fuchsia.bluetooth.le",
+    "$garnet_sdk_fidl/fuchsia.bluetooth",
+    "$garnet_sdk_fidl/fuchsia.bluetooth.control",
+    "$garnet_sdk_fidl/fuchsia.bluetooth.gatt",
+    "$garnet_sdk_fidl/fuchsia.bluetooth.le",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/lib/settings:lib.settings",
     "//topaz/public/dart/widgets:lib.widgets",
diff --git a/bin/dart_fidl_json/dart_fidl_json.gni b/bin/dart_fidl_json/dart_fidl_json.gni
index 4d26a4d..e404144 100644
--- a/bin/dart_fidl_json/dart_fidl_json.gni
+++ b/bin/dart_fidl_json/dart_fidl_json.gni
@@ -13,7 +13,7 @@
 #
 #   fidl_target (required)
 #     Specifies the fidl target from which to read fidl json. For example,
-#     "//garnet/public/fidl/fuchsia.setui" for fuchsia.setui.
+#     "$garnet_sdk_fidl/fuchsia.setui" for fuchsia.setui.
 #
 #   template_path (optional)
 #     Specifies the template to use to generate the formatting code. Default
diff --git a/bin/device_settings/BUILD.gn b/bin/device_settings/BUILD.gn
index b2d3633..798fe8e 100644
--- a/bin/device_settings/BUILD.gn
+++ b/bin/device_settings/BUILD.gn
@@ -23,7 +23,7 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.amber",
+    "$garnet_sdk_fidl/fuchsia.amber",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/lib/settings:lib.settings",
     "//topaz/public/dart/widgets:lib.widgets",
diff --git a/bin/display_settings/BUILD.gn b/bin/display_settings/BUILD.gn
index 154e2fb..b74cdfe 100644
--- a/bin/display_settings/BUILD.gn
+++ b/bin/display_settings/BUILD.gn
@@ -21,7 +21,7 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.amber",
+    "$garnet_sdk_fidl/fuchsia.amber",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/lib/settings:lib.settings",
     "//topaz/public/dart/widgets:lib.widgets",
diff --git a/bin/ermine_ctl/BUILD.gn b/bin/ermine_ctl/BUILD.gn
index c1ffb14..56fd29e 100644
--- a/bin/ermine_ctl/BUILD.gn
+++ b/bin/ermine_ctl/BUILD.gn
@@ -9,7 +9,7 @@
   name = "ermine_ctl"
   edition = "2018"
   deps = [
-    "//garnet/public/fidl/fuchsia.developer.tiles:fuchsia.developer.tiles-rustc",
+    "$garnet_sdk_fidl/fuchsia.developer.tiles:fuchsia.developer.tiles-rustc",
     "//garnet/public/lib/fidl/rust/fidl",
     "//garnet/public/rust/fuchsia-app",
     "//garnet/public/rust/fuchsia-async",
diff --git a/bin/flutter_screencap_test/BUILD.gn b/bin/flutter_screencap_test/BUILD.gn
index 8e2e11d..ddf8997 100644
--- a/bin/flutter_screencap_test/BUILD.gn
+++ b/bin/flutter_screencap_test/BUILD.gn
@@ -18,8 +18,8 @@
   sources = []
 
   deps = [
-    "//garnet/public/fidl/fuchsia.sys",
-    "//garnet/public/fidl/fuchsia.testing.runner",
+    "$garnet_sdk_fidl/fuchsia.sys",
+    "$garnet_sdk_fidl/fuchsia.testing.runner",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/lib/app/dart",
   ]
diff --git a/bin/session_shell/ermine_session_shell/BUILD.gn b/bin/session_shell/ermine_session_shell/BUILD.gn
index 7162617..c335ff4 100644
--- a/bin/session_shell/ermine_session_shell/BUILD.gn
+++ b/bin/session_shell/ermine_session_shell/BUILD.gn
@@ -10,21 +10,21 @@
   edition = "2018"
 
   deps = [
-    "//garnet/public/fidl/fuchsia.developer.tiles:fuchsia.developer.tiles-rustc",
-    "//garnet/public/fidl/fuchsia.math:fuchsia.math-rustc",
-    "//garnet/public/fidl/fuchsia.sys:fuchsia.sys-rustc",
-    "//garnet/public/fidl/fuchsia.ui.gfx:fuchsia.ui.gfx-rustc",
-    "//garnet/public/fidl/fuchsia.ui.input:fuchsia.ui.input-rustc",
-    "//garnet/public/fidl/fuchsia.ui.policy:fuchsia.ui.policy-rustc",
-    "//garnet/public/fidl/fuchsia.ui.scenic:fuchsia.ui.scenic-rustc",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1:fuchsia.ui.viewsv1-rustc",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1token:fuchsia.ui.viewsv1token-rustc",
+    "$garnet_sdk_fidl/fuchsia.developer.tiles:fuchsia.developer.tiles-rustc",
+    "$garnet_sdk_fidl/fuchsia.math:fuchsia.math-rustc",
+    "$garnet_sdk_fidl/fuchsia.sys:fuchsia.sys-rustc",
+    "$garnet_sdk_fidl/fuchsia.ui.gfx:fuchsia.ui.gfx-rustc",
+    "$garnet_sdk_fidl/fuchsia.ui.input:fuchsia.ui.input-rustc",
+    "$garnet_sdk_fidl/fuchsia.ui.policy:fuchsia.ui.policy-rustc",
+    "$garnet_sdk_fidl/fuchsia.ui.scenic:fuchsia.ui.scenic-rustc",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1:fuchsia.ui.viewsv1-rustc",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1token:fuchsia.ui.viewsv1token-rustc",
     "//garnet/public/lib/fidl/rust/fidl",
     "//garnet/public/rust/fuchsia-app",
     "//garnet/public/rust/fuchsia-async",
     "//garnet/public/rust/fuchsia-scenic",
     "//garnet/public/rust/fuchsia-zircon",
-    "//peridot/public/fidl/fuchsia.modular:fuchsia.modular-rustc",
+    "$peridot_sdk_fidl/fuchsia.modular:fuchsia.modular-rustc",
     "//third_party/rust-crates/rustc_deps:failure",
     "//third_party/rust-crates/rustc_deps:futures-preview",
     "//third_party/rust-crates/rustc_deps:itertools",
diff --git a/bin/session_shell/ermine_session_shell/README.md b/bin/session_shell/ermine_session_shell/README.md
index cb5b0a2..a874256 100644
--- a/bin/session_shell/ermine_session_shell/README.md
+++ b/bin/session_shell/ermine_session_shell/README.md
@@ -9,7 +9,7 @@
 This initial version implements the same approach for view hosting,
 layout and control as ``//garnet/bin/developer/[tiles|tiles_ctl]``. For
 simplicity it re-uses
-``//garnet/public/fidl/fuchsia.developer.tiles/tiles.fidl``.
+``$garnet_sdk_fidl/fuchsia.developer.tiles/tiles.fidl``.
 
 There is an `ermine_ctl` program you can use to list and remove stories from Ermine. This
 program will be removed as soon as sessionctl supports "list" and "remove".
diff --git a/bin/system_dashboard/BUILD.gn b/bin/system_dashboard/BUILD.gn
index 23f8caa..2df6051 100644
--- a/bin/system_dashboard/BUILD.gn
+++ b/bin/system_dashboard/BUILD.gn
@@ -19,7 +19,7 @@
 
   sources = []
   deps = [
-    "//garnet/public/fidl/fuchsia.scpi",
+    "$garnet_sdk_fidl/fuchsia.scpi",
     "//third_party/dart-pkg/pub/flutter_staggered_grid_view",
     "//topaz/public/dart/widgets:lib.widgets",
     "//topaz/public/lib/app/dart",
diff --git a/bin/ui/skottie_viewer/BUILD.gn b/bin/ui/skottie_viewer/BUILD.gn
index a1e1a27..c041bd3 100644
--- a/bin/ui/skottie_viewer/BUILD.gn
+++ b/bin/ui/skottie_viewer/BUILD.gn
@@ -29,8 +29,8 @@
 
   deps = [
     ":skottie_loader",
-    "//garnet/public/fidl/fuchsia.ui.app",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1",
+    "$garnet_sdk_fidl/fuchsia.ui.app",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
     "//garnet/public/lib/component/cpp",
     "//garnet/public/lib/fidl/cpp",
 
diff --git a/bin/userpicker_base_shell/BUILD.gn b/bin/userpicker_base_shell/BUILD.gn
index 1776ed2..8be4e9c 100644
--- a/bin/userpicker_base_shell/BUILD.gn
+++ b/bin/userpicker_base_shell/BUILD.gn
@@ -49,11 +49,11 @@
   non_dart_deps = [ ":sysui_metrics_config" ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.timezone",
-    "//garnet/public/fidl/fuchsia.ui.input",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1",
-    "//peridot/public/fidl/fuchsia.modular",
-    "//peridot/public/fidl/fuchsia.modular.auth",
+    "$garnet_sdk_fidl/fuchsia.timezone",
+    "$garnet_sdk_fidl/fuchsia.ui.input",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+    "$peridot_sdk_fidl/fuchsia.modular",
+    "$peridot_sdk_fidl/fuchsia.modular.auth",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//third_party/dart-pkg/pub/http",
     "//topaz/lib/base_shell:lib.base_shell",
diff --git a/bin/voila/BUILD.gn b/bin/voila/BUILD.gn
index 4792d2a..b3d099e 100644
--- a/bin/voila/BUILD.gn
+++ b/bin/voila/BUILD.gn
@@ -9,19 +9,19 @@
   name = "voila"
   edition = "2018"
   deps = [
-    "//garnet/public/fidl/fuchsia.auth:fuchsia.auth-rustc",
-    "//garnet/public/fidl/fuchsia.math:fuchsia.math-rustc",
-    "//garnet/public/fidl/fuchsia.ui.gfx:fuchsia.ui.gfx-rustc",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1:fuchsia.ui.viewsv1-rustc",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1token:fuchsia.ui.viewsv1token-rustc",
+    "$garnet_sdk_fidl/fuchsia.auth:fuchsia.auth-rustc",
+    "$garnet_sdk_fidl/fuchsia.math:fuchsia.math-rustc",
+    "$garnet_sdk_fidl/fuchsia.ui.gfx:fuchsia.ui.gfx-rustc",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1:fuchsia.ui.viewsv1-rustc",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1token:fuchsia.ui.viewsv1token-rustc",
     "//garnet/public/lib/fidl/rust/fidl",
     "//garnet/public/rust/carnelian",
     "//garnet/public/rust/fuchsia-app",
     "//garnet/public/rust/fuchsia-async",
     "//garnet/public/rust/fuchsia-scenic",
-    "//peridot/public/fidl/fuchsia.modular:fuchsia.modular-rustc",
-    "//peridot/public/fidl/fuchsia.modular.auth:fuchsia.modular.auth-rustc",
-    "//peridot/public/fidl/fuchsia.modular.internal:fuchsia.modular.internal-rustc",
+    "$peridot_sdk_fidl/fuchsia.modular:fuchsia.modular-rustc",
+    "$peridot_sdk_fidl/fuchsia.modular.auth:fuchsia.modular.auth-rustc",
+    "$peridot_sdk_fidl/fuchsia.modular.internal:fuchsia.modular.internal-rustc",
     "//third_party/rust-crates/rustc_deps:failure",
     "//third_party/rust-crates/rustc_deps:futures-preview",
     "//third_party/rust-crates/rustc_deps:log",
diff --git a/bin/wifi_settings/BUILD.gn b/bin/wifi_settings/BUILD.gn
index 8f5ded3..4c2e85e 100644
--- a/bin/wifi_settings/BUILD.gn
+++ b/bin/wifi_settings/BUILD.gn
@@ -24,8 +24,8 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.netstack",
-    "//garnet/public/fidl/fuchsia.wlan.service",
+    "$garnet_sdk_fidl/fuchsia.netstack",
+    "$garnet_sdk_fidl/fuchsia.wlan.service",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/lib/settings:lib.settings",
     "//topaz/public/dart/widgets:lib.widgets",
diff --git a/bin/xi/xi_mod/BUILD.gn b/bin/xi/xi_mod/BUILD.gn
index db4db52..ec89f77 100644
--- a/bin/xi/xi_mod/BUILD.gn
+++ b/bin/xi/xi_mod/BUILD.gn
@@ -17,9 +17,9 @@
 
   sources = []
   deps = [
-    "//garnet/public/fidl/fuchsia.ui.viewsv1",
-    "//garnet/public/fidl/fuchsia.xi",
-    "//peridot/public/fidl/fuchsia.modular",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+    "$garnet_sdk_fidl/fuchsia.xi",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/lib/xi/fuchsia_client:xi_fuchsia_client",
     "//topaz/lib/xi/widgets:xi_widgets",
diff --git a/bin/xi/xi_session_agent/BUILD.gn b/bin/xi/xi_session_agent/BUILD.gn
index 1cba83d..d25807d 100644
--- a/bin/xi/xi_session_agent/BUILD.gn
+++ b/bin/xi/xi_session_agent/BUILD.gn
@@ -24,7 +24,7 @@
 
   deps = [
     ":xi_session_services",
-    "//garnet/public/fidl/fuchsia.auth",
+    "$garnet_sdk_fidl/fuchsia.auth",
     "//topaz/lib/xi/fuchsia_client:xi_fuchsia_client",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/agent/dart",
diff --git a/examples/eddystone_agent/BUILD.gn b/examples/eddystone_agent/BUILD.gn
index 3056ef9..c674723 100644
--- a/examples/eddystone_agent/BUILD.gn
+++ b/examples/eddystone_agent/BUILD.gn
@@ -11,9 +11,9 @@
 
   sources = []
   deps = [
-    "//garnet/public/fidl/fuchsia.bluetooth",
-    "//garnet/public/fidl/fuchsia.bluetooth.le",
-    "//peridot/public/fidl/fuchsia.modular",
+    "$garnet_sdk_fidl/fuchsia.bluetooth",
+    "$garnet_sdk_fidl/fuchsia.bluetooth.le",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/widgets:lib.widgets",
     "//topaz/public/lib/app/dart",
diff --git a/examples/fidl/BUILD.gn b/examples/fidl/BUILD.gn
index 865f89a..9f8d25a 100644
--- a/examples/fidl/BUILD.gn
+++ b/examples/fidl/BUILD.gn
@@ -14,7 +14,7 @@
       sources = []
       deps = [
         "//garnet/examples/fidl/services:echo2",
-        "//garnet/public/fidl/fuchsia.sys",
+        "$garnet_sdk_fidl/fuchsia.sys",
         "//topaz/public/dart/fidl",
         "//topaz/public/lib/app/dart",
       ]
diff --git a/examples/fidl/echo_client_async_dart/BUILD.gn b/examples/fidl/echo_client_async_dart/BUILD.gn
index 9c0d51a..fd1e9c6 100644
--- a/examples/fidl/echo_client_async_dart/BUILD.gn
+++ b/examples/fidl/echo_client_async_dart/BUILD.gn
@@ -18,7 +18,7 @@
   sources = []
   deps = [
     "//garnet/examples/fidl/services:echo2",
-    "//garnet/public/fidl/fuchsia.sys",
+    "$garnet_sdk_fidl/fuchsia.sys",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia_services",
   ]
diff --git a/examples/fidl/fidl_bindings_performance/BUILD.gn b/examples/fidl/fidl_bindings_performance/BUILD.gn
index fc259f4..1247d84 100644
--- a/examples/fidl/fidl_bindings_performance/BUILD.gn
+++ b/examples/fidl/fidl_bindings_performance/BUILD.gn
@@ -18,7 +18,7 @@
   sources = []
   deps = [
     "//garnet/examples/fidl/services:echo2",
-    "//garnet/public/fidl/fuchsia.sys",
+    "$garnet_sdk_fidl/fuchsia.sys",
     "//third_party/dart-pkg/pub/args",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
diff --git a/examples/ledger/todo_list/BUILD.gn b/examples/ledger/todo_list/BUILD.gn
index ecc3a26..55c90a1 100644
--- a/examples/ledger/todo_list/BUILD.gn
+++ b/examples/ledger/todo_list/BUILD.gn
@@ -22,7 +22,7 @@
   ]
 
   deps = [
-    "//peridot/public/fidl/fuchsia.ledger",
+    "$peridot_sdk_fidl/fuchsia.ledger",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/lib/app/dart",
     "//topaz/public/lib/app_driver/dart",
diff --git a/examples/media/vu_meter/BUILD.gn b/examples/media/vu_meter/BUILD.gn
index 7b05b26..8b2f9dc 100644
--- a/examples/media/vu_meter/BUILD.gn
+++ b/examples/media/vu_meter/BUILD.gn
@@ -12,7 +12,7 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.media",
+    "$garnet_sdk_fidl/fuchsia.media",
     "//garnet/public/lib/media/audio",
     "//garnet/public/lib/ui/base_view/cpp",
     "//third_party/skia",
diff --git a/examples/mediaplayer/mediaplayer_flutter/BUILD.gn b/examples/mediaplayer/mediaplayer_flutter/BUILD.gn
index dca0175..b8e85a8 100644
--- a/examples/mediaplayer/mediaplayer_flutter/BUILD.gn
+++ b/examples/mediaplayer/mediaplayer_flutter/BUILD.gn
@@ -16,8 +16,8 @@
         "config.dart",
       ]
       deps = [
-        "//garnet/public/fidl/fuchsia.ui.viewsv1",
-        "//peridot/public/fidl/fuchsia.modular",
+        "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+        "$peridot_sdk_fidl/fuchsia.modular",
         "//third_party/dart-pkg/git/flutter/packages/flutter",
         "//topaz/public/dart/fidl",
         "//topaz/public/dart/fuchsia",
diff --git a/examples/mediaplayer/mediaplayer_skia/BUILD.gn b/examples/mediaplayer/mediaplayer_skia/BUILD.gn
index 2af506e..bbefba5 100644
--- a/examples/mediaplayer/mediaplayer_skia/BUILD.gn
+++ b/examples/mediaplayer/mediaplayer_skia/BUILD.gn
@@ -16,8 +16,8 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.media",
-    "//garnet/public/fidl/fuchsia.mediaplayer",
+    "$garnet_sdk_fidl/fuchsia.media",
+    "$garnet_sdk_fidl/fuchsia.mediaplayer",
     "//garnet/public/lib/fsl",
     "//garnet/public/lib/media/timeline",
     "//garnet/public/lib/ui/base_view/cpp",
diff --git a/examples/modular/slider_mod/BUILD.gn b/examples/modular/slider_mod/BUILD.gn
index 10df513..5146f51 100644
--- a/examples/modular/slider_mod/BUILD.gn
+++ b/examples/modular/slider_mod/BUILD.gn
@@ -27,7 +27,7 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.testing.runner",
+    "$garnet_sdk_fidl/fuchsia.testing.runner",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/examples/modular/fidl:fibonacci_service",
     "//topaz/examples/modular/models",
diff --git a/examples/tictactoe/bin/tictactoe/game_tracker_agent/BUILD.gn b/examples/tictactoe/bin/tictactoe/game_tracker_agent/BUILD.gn
index 3ea2a3f..ed6d233 100644
--- a/examples/tictactoe/bin/tictactoe/game_tracker_agent/BUILD.gn
+++ b/examples/tictactoe/bin/tictactoe/game_tracker_agent/BUILD.gn
@@ -21,8 +21,8 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.auth",
-    "//peridot/public/fidl/fuchsia.modular",
+    "$garnet_sdk_fidl/fuchsia.auth",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//topaz/examples/tictactoe/lib/tictactoe/common",
     "//topaz/examples/tictactoe/public/fidl/tictactoe:game_tracker_service",
     "//topaz/public/dart/fidl",
diff --git a/examples/ui/jank/BUILD.gn b/examples/ui/jank/BUILD.gn
index 6db146d..bf363c3 100644
--- a/examples/ui/jank/BUILD.gn
+++ b/examples/ui/jank/BUILD.gn
@@ -14,9 +14,9 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.ui.app",
-    "//garnet/public/fidl/fuchsia.ui.scenic",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1",
+    "$garnet_sdk_fidl/fuchsia.ui.app",
+    "$garnet_sdk_fidl/fuchsia.ui.scenic",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
     "//garnet/public/lib/fidl/cpp",
     "//garnet/public/lib/fxl",
     "//garnet/public/lib/ui/base_view/cpp",
diff --git a/examples/ui/lib/BUILD.gn b/examples/ui/lib/BUILD.gn
index 38771a1..0719293 100644
--- a/examples/ui/lib/BUILD.gn
+++ b/examples/ui/lib/BUILD.gn
@@ -46,7 +46,7 @@
   deps = [
     ":skia_type_converters",
     ":skia_vmo",
-    "//garnet/public/fidl/fuchsia.fonts",
+    "$garnet_sdk_fidl/fuchsia.fonts",
     "//garnet/public/lib/fxl",
     "//third_party/skia",
   ]
@@ -61,7 +61,7 @@
   ]
 
   public_deps = [
-    "//garnet/public/fidl/fuchsia.math",
+    "$garnet_sdk_fidl/fuchsia.math",
     "//garnet/public/lib/fsl",
     "//third_party/skia",
   ]
diff --git a/examples/ui/localized_mod/BUILD.gn b/examples/ui/localized_mod/BUILD.gn
index 53cb097..37a8d4e 100644
--- a/examples/ui/localized_mod/BUILD.gn
+++ b/examples/ui/localized_mod/BUILD.gn
@@ -11,9 +11,9 @@
   sources = []
 
   deps = [
-    "//garnet/public/fidl/fuchsia.ui.gfx",
-    "//garnet/public/fidl/fuchsia.ui.scenic",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1",
+    "$garnet_sdk_fidl/fuchsia.ui.gfx",
+    "$garnet_sdk_fidl/fuchsia.ui.scenic",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//third_party/dart-pkg/git/flutter/packages/flutter_localizations",
     "//third_party/dart/third_party/pkg/intl",
diff --git a/examples/ui/noodles/BUILD.gn b/examples/ui/noodles/BUILD.gn
index 8301265..b1685c5 100644
--- a/examples/ui/noodles/BUILD.gn
+++ b/examples/ui/noodles/BUILD.gn
@@ -14,9 +14,9 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.ui.app",
-    "//garnet/public/fidl/fuchsia.ui.scenic",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1",
+    "$garnet_sdk_fidl/fuchsia.ui.app",
+    "$garnet_sdk_fidl/fuchsia.ui.scenic",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
     "//garnet/public/lib/fidl/cpp",
     "//garnet/public/lib/fsl",
     "//garnet/public/lib/fxl",
diff --git a/examples/ui/paint/BUILD.gn b/examples/ui/paint/BUILD.gn
index 10a0609..6cbe2cd 100644
--- a/examples/ui/paint/BUILD.gn
+++ b/examples/ui/paint/BUILD.gn
@@ -14,9 +14,9 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.ui.app",
-    "//garnet/public/fidl/fuchsia.ui.scenic",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1",
+    "$garnet_sdk_fidl/fuchsia.ui.app",
+    "$garnet_sdk_fidl/fuchsia.ui.scenic",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
     "//garnet/public/lib/fidl/cpp",
     "//garnet/public/lib/fsl",
     "//garnet/public/lib/fxl",
diff --git a/examples/ui/simple_flutter/BUILD.gn b/examples/ui/simple_flutter/BUILD.gn
index ac291d8..ed4eb84 100644
--- a/examples/ui/simple_flutter/BUILD.gn
+++ b/examples/ui/simple_flutter/BUILD.gn
@@ -13,9 +13,9 @@
       main_dart = "lib/main.dart"
       sources = []
       deps = [
-        "//garnet/public/fidl/fuchsia.ui.gfx",
-        "//garnet/public/fidl/fuchsia.ui.scenic",
-        "//garnet/public/fidl/fuchsia.ui.viewsv1",
+        "$garnet_sdk_fidl/fuchsia.ui.gfx",
+        "$garnet_sdk_fidl/fuchsia.ui.scenic",
+        "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
         "//third_party/dart-pkg/git/flutter/packages/flutter",
         "//topaz/public/dart/widgets:lib.widgets",
         "//topaz/public/lib/ui/flutter",
diff --git a/examples/ui/sketchy_flutter/BUILD.gn b/examples/ui/sketchy_flutter/BUILD.gn
index 8decfd9..07ca9cd 100644
--- a/examples/ui/sketchy_flutter/BUILD.gn
+++ b/examples/ui/sketchy_flutter/BUILD.gn
@@ -20,9 +20,9 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.ui.gfx",
-    "//garnet/public/fidl/fuchsia.ui.scenic",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1",
+    "$garnet_sdk_fidl/fuchsia.ui.gfx",
+    "$garnet_sdk_fidl/fuchsia.ui.scenic",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/lib/ui/flutter",
     "//topaz/public/lib/ui/scenic/dart",
diff --git a/examples/ui/text_flutter/BUILD.gn b/examples/ui/text_flutter/BUILD.gn
index b5c8c50..a0bb192 100644
--- a/examples/ui/text_flutter/BUILD.gn
+++ b/examples/ui/text_flutter/BUILD.gn
@@ -10,9 +10,9 @@
   sources = []
 
   deps = [
-    "//garnet/public/fidl/fuchsia.ui.gfx",
-    "//garnet/public/fidl/fuchsia.ui.scenic",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1",
+    "$garnet_sdk_fidl/fuchsia.ui.gfx",
+    "$garnet_sdk_fidl/fuchsia.ui.scenic",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/dart/widgets:lib.widgets",
     "//topaz/public/lib/app_driver/dart",
diff --git a/lib/base_shell/BUILD.gn b/lib/base_shell/BUILD.gn
index cbcaeba..a57f655 100644
--- a/lib/base_shell/BUILD.gn
+++ b/lib/base_shell/BUILD.gn
@@ -15,12 +15,12 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.netstack",
-    "//garnet/public/fidl/fuchsia.timezone",
-    "//garnet/public/fidl/fuchsia.ui.input",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1",
-    "//peridot/public/fidl/fuchsia.modular",
-    "//peridot/public/fidl/fuchsia.modular.auth",
+    "$garnet_sdk_fidl/fuchsia.netstack",
+    "$garnet_sdk_fidl/fuchsia.timezone",
+    "$garnet_sdk_fidl/fuchsia.ui.input",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+    "$peridot_sdk_fidl/fuchsia.modular",
+    "$peridot_sdk_fidl/fuchsia.modular.auth",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/widgets:lib.widgets",
diff --git a/lib/keyboard/dart/BUILD.gn b/lib/keyboard/dart/BUILD.gn
index 6dfd7ea..f75812d 100644
--- a/lib/keyboard/dart/BUILD.gn
+++ b/lib/keyboard/dart/BUILD.gn
@@ -12,7 +12,7 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.ui.input",
+    "$garnet_sdk_fidl/fuchsia.ui.input",
     "//topaz/lib/shell",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia_logger",
diff --git a/lib/keyboard/flutter/test/BUILD.gn b/lib/keyboard/flutter/test/BUILD.gn
index 4c2c99c..11aa809 100644
--- a/lib/keyboard/flutter/test/BUILD.gn
+++ b/lib/keyboard/flutter/test/BUILD.gn
@@ -15,7 +15,7 @@
   source_dir = "dart"
 
   deps = [
-    "//garnet/public/fidl/fuchsia.ui.input",
+    "$garnet_sdk_fidl/fuchsia.ui.input",
     "//topaz/lib/shell",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/widgets:lib.widgets",
diff --git a/lib/keyboard_deprecated/dart/BUILD.gn b/lib/keyboard_deprecated/dart/BUILD.gn
index 6dfd7ea..f75812d 100644
--- a/lib/keyboard_deprecated/dart/BUILD.gn
+++ b/lib/keyboard_deprecated/dart/BUILD.gn
@@ -12,7 +12,7 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.ui.input",
+    "$garnet_sdk_fidl/fuchsia.ui.input",
     "//topaz/lib/shell",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia_logger",
diff --git a/lib/keyboard_deprecated/flutter/test/BUILD.gn b/lib/keyboard_deprecated/flutter/test/BUILD.gn
index 4c2c99c..11aa809 100644
--- a/lib/keyboard_deprecated/flutter/test/BUILD.gn
+++ b/lib/keyboard_deprecated/flutter/test/BUILD.gn
@@ -15,7 +15,7 @@
   source_dir = "dart"
 
   deps = [
-    "//garnet/public/fidl/fuchsia.ui.input",
+    "$garnet_sdk_fidl/fuchsia.ui.input",
     "//topaz/lib/shell",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/widgets:lib.widgets",
diff --git a/lib/settings/BUILD.gn b/lib/settings/BUILD.gn
index f3a1628..c3cfeab 100644
--- a/lib/settings/BUILD.gn
+++ b/lib/settings/BUILD.gn
@@ -14,7 +14,7 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.devicesettings",
+    "$garnet_sdk_fidl/fuchsia.devicesettings",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/dart/widgets:lib.widgets",
   ]
diff --git a/lib/setui/settings/client/BUILD.gn b/lib/setui/settings/client/BUILD.gn
index 41732ae..3a3d20f 100644
--- a/lib/setui/settings/client/BUILD.gn
+++ b/lib/setui/settings/client/BUILD.gn
@@ -14,7 +14,7 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.setui",
+    "$garnet_sdk_fidl/fuchsia.setui",
     "//topaz/lib/setui/common:common",
     "//topaz/lib/setui/flutter:flutter",
     "//topaz/lib/setui/settings/common:common",
@@ -30,7 +30,7 @@
 
   deps = [
     ":client",
-    "//garnet/public/fidl/fuchsia.setui",
+    "$garnet_sdk_fidl/fuchsia.setui",
     "//third_party/dart-pkg/git/flutter/packages/flutter_test",
     "//third_party/dart-pkg/pub/mockito",
     "//third_party/dart-pkg/pub/test",
diff --git a/lib/setui/settings/common/BUILD.gn b/lib/setui/settings/common/BUILD.gn
index c7af0d0..96af10d 100644
--- a/lib/setui/settings/common/BUILD.gn
+++ b/lib/setui/settings/common/BUILD.gn
@@ -16,7 +16,7 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.setui",
+    "$garnet_sdk_fidl/fuchsia.setui",
     "//topaz/lib/setui/common:common",
     "//topaz/lib/setui/flutter:flutter",
     "//topaz/lib/setui/settings/json:fuchsia.setui.json",
@@ -31,7 +31,7 @@
 
   deps = [
     ":common",
-    "//garnet/public/fidl/fuchsia.setui",
+    "$garnet_sdk_fidl/fuchsia.setui",
     "//third_party/dart-pkg/git/flutter/packages/flutter_test",
     "//third_party/dart-pkg/pub/mockito",
     "//third_party/dart-pkg/pub/test",
diff --git a/lib/setui/settings/json/BUILD.gn b/lib/setui/settings/json/BUILD.gn
index e861007..b5bf4ac 100644
--- a/lib/setui/settings/json/BUILD.gn
+++ b/lib/setui/settings/json/BUILD.gn
@@ -6,9 +6,9 @@
 import("//topaz/runtime/dart/dart_test.gni")
 
 json_fidl("fuchsia.setui.json") {
-  fidl_target = "//garnet/public/fidl/fuchsia.setui"
+  fidl_target = "$garnet_sdk_fidl/fuchsia.setui"
 
   deps = [
-    "//garnet/public/fidl/fuchsia.setui",
+    "$garnet_sdk_fidl/fuchsia.setui",
   ]
 }
diff --git a/lib/setui/settings/service/BUILD.gn b/lib/setui/settings/service/BUILD.gn
index 827b683..bd1bc87 100644
--- a/lib/setui/settings/service/BUILD.gn
+++ b/lib/setui/settings/service/BUILD.gn
@@ -13,10 +13,10 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.netstack",
-    "//garnet/public/fidl/fuchsia.setui",
-    "//garnet/public/fidl/fuchsia.timezone",
-    "//garnet/public/fidl/fuchsia.wlan.service",
+    "$garnet_sdk_fidl/fuchsia.netstack",
+    "$garnet_sdk_fidl/fuchsia.setui",
+    "$garnet_sdk_fidl/fuchsia.timezone",
+    "$garnet_sdk_fidl/fuchsia.wlan.service",
     "//topaz/lib/settings:lib.settings",
     "//topaz/lib/setui/settings/common:common",
     "//topaz/public/dart/fidl",
diff --git a/lib/setui/settings/testing/BUILD.gn b/lib/setui/settings/testing/BUILD.gn
index 56d0ba3..6360710 100644
--- a/lib/setui/settings/testing/BUILD.gn
+++ b/lib/setui/settings/testing/BUILD.gn
@@ -13,7 +13,7 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.setui",
+    "$garnet_sdk_fidl/fuchsia.setui",
     "//topaz/lib/setui/settings/client:client",
     "//topaz/lib/setui/settings/common:common",
   ]
@@ -26,7 +26,7 @@
 
   deps = [
     ":testing",
-    "//garnet/public/fidl/fuchsia.setui",
+    "$garnet_sdk_fidl/fuchsia.setui",
     "//third_party/dart-pkg/git/flutter/packages/flutter_test",
     "//third_party/dart-pkg/pub/test",
     "//topaz/lib/setui/settings/common:common",
diff --git a/lib/story_shell/BUILD.gn b/lib/story_shell/BUILD.gn
index 48387be..79e922f 100644
--- a/lib/story_shell/BUILD.gn
+++ b/lib/story_shell/BUILD.gn
@@ -13,7 +13,7 @@
   ]
 
   deps = [
-    "//peridot/public/fidl/fuchsia.modular",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia",
     "//topaz/public/dart/widgets:lib.widgets",
diff --git a/lib/story_shell/examples/example_manual_relationships/BUILD.gn b/lib/story_shell/examples/example_manual_relationships/BUILD.gn
index eabcb62..47bdd25 100644
--- a/lib/story_shell/examples/example_manual_relationships/BUILD.gn
+++ b/lib/story_shell/examples/example_manual_relationships/BUILD.gn
@@ -23,8 +23,8 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.ui.viewsv1",
-    "//peridot/public/fidl/fuchsia.modular",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia",
diff --git a/lib/story_shell/examples/story_shell_test/BUILD.gn b/lib/story_shell/examples/story_shell_test/BUILD.gn
index 93279df..eae3d88 100644
--- a/lib/story_shell/examples/story_shell_test/BUILD.gn
+++ b/lib/story_shell/examples/story_shell_test/BUILD.gn
@@ -16,7 +16,7 @@
   package_only = true
 
   deps = [
-    "//peridot/public/fidl/fuchsia.modular",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//third_party/dart-pkg/pub/mockito",
     "//third_party/dart-pkg/pub/test",
     "//topaz/lib/story_shell:lib.story_shell",
diff --git a/lib/xi/fuchsia_client/BUILD.gn b/lib/xi/fuchsia_client/BUILD.gn
index f88376b..55d5b92 100644
--- a/lib/xi/fuchsia_client/BUILD.gn
+++ b/lib/xi/fuchsia_client/BUILD.gn
@@ -14,8 +14,8 @@
 
   deps = [
     "../client:xi_client",
-    "//garnet/public/fidl/fuchsia.xi",
-    "//peridot/public/fidl/fuchsia.modular",
+    "$garnet_sdk_fidl/fuchsia.xi",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia",
     "//topaz/public/lib/app/dart",
diff --git a/lib/xi/widgets/lib/src/key_info.dart b/lib/xi/widgets/lib/src/key_info.dart
index 5ab7929..bb763c2 100644
--- a/lib/xi/widgets/lib/src/key_info.dart
+++ b/lib/xi/widgets/lib/src/key_info.dart
@@ -56,7 +56,7 @@
   static const int _metaCtrlRightOn = 0x4000;
 
   // Fuchsia modifier values. See:
-  // //garnet/public/fidl/fuchsia.ui.input/input_event_constants.fidl
+  // $garnet_sdk_fidl/fuchsia.ui.input/input_event_constants.fidl
   static const int _modifierShiftLeft = 2;
   static const int _modifierShiftRight = 4;
   static const int _modifierShiftMask = 6;
diff --git a/public/dart-pkg/fuchsia/BUILD.gn b/public/dart-pkg/fuchsia/BUILD.gn
index 7a15d47..8cd8f30 100644
--- a/public/dart-pkg/fuchsia/BUILD.gn
+++ b/public/dart-pkg/fuchsia/BUILD.gn
@@ -26,7 +26,7 @@
   ]
 
   public_deps = [
-    "//garnet/public/fidl/fuchsia.sys",
+    "$garnet_sdk_fidl/fuchsia.sys",
     "//third_party/tonic",
     "//topaz/public/dart-pkg/zircon",
   ]
diff --git a/public/dart/fuchsia_media/BUILD.gn b/public/dart/fuchsia_media/BUILD.gn
index 320ab25..8993ff5 100644
--- a/public/dart/fuchsia_media/BUILD.gn
+++ b/public/dart/fuchsia_media/BUILD.gn
@@ -18,6 +18,6 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.media",
+    "$garnet_sdk_fidl/fuchsia.media",
   ]
 }
diff --git a/public/dart/fuchsia_modular/BUILD.gn b/public/dart/fuchsia_modular/BUILD.gn
index 2e32a73..d0bd70c 100644
--- a/public/dart/fuchsia_modular/BUILD.gn
+++ b/public/dart/fuchsia_modular/BUILD.gn
@@ -50,10 +50,10 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.auth",
-    "//garnet/public/fidl/fuchsia.sys",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1token",
-    "//peridot/public/fidl/fuchsia.modular",
+    "$garnet_sdk_fidl/fuchsia.auth",
+    "$garnet_sdk_fidl/fuchsia.sys",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1token",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//third_party/dart-pkg/pub/async",
     "//third_party/dart-pkg/pub/meta",
     "//topaz/public/dart/fidl",
diff --git a/public/dart/fuchsia_scenic/BUILD.gn b/public/dart/fuchsia_scenic/BUILD.gn
index ad448db..be37d2f 100644
--- a/public/dart/fuchsia_scenic/BUILD.gn
+++ b/public/dart/fuchsia_scenic/BUILD.gn
@@ -18,8 +18,8 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.ui.gfx",
-    "//garnet/public/fidl/fuchsia.ui.scenic",
+    "$garnet_sdk_fidl/fuchsia.ui.gfx",
+    "$garnet_sdk_fidl/fuchsia.ui.scenic",
     "//topaz/public/dart/zircon",
   ]
 }
diff --git a/public/dart/fuchsia_scenic_flutter/BUILD.gn b/public/dart/fuchsia_scenic_flutter/BUILD.gn
index 0d5ba6e..502dbfb 100644
--- a/public/dart/fuchsia_scenic_flutter/BUILD.gn
+++ b/public/dart/fuchsia_scenic_flutter/BUILD.gn
@@ -24,10 +24,10 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.math",
-    "//garnet/public/fidl/fuchsia.sys",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1token",
+    "$garnet_sdk_fidl/fuchsia.math",
+    "$garnet_sdk_fidl/fuchsia.sys",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1token",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//third_party/dart-pkg/pub/meta",
     "//topaz/public/dart/fidl",
diff --git a/public/dart/fuchsia_services/BUILD.gn b/public/dart/fuchsia_services/BUILD.gn
index 3209447..63b38ac 100644
--- a/public/dart/fuchsia_services/BUILD.gn
+++ b/public/dart/fuchsia_services/BUILD.gn
@@ -22,7 +22,7 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.sys",
+    "$garnet_sdk_fidl/fuchsia.sys",
     "//third_party/dart-pkg/pub/meta",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia",
diff --git a/public/dart/sledge/BUILD.gn b/public/dart/sledge/BUILD.gn
index c6babfb..d5e3f3a 100644
--- a/public/dart/sledge/BUILD.gn
+++ b/public/dart/sledge/BUILD.gn
@@ -51,7 +51,7 @@
   ]
 
   deps = [
-    "//peridot/public/fidl/fuchsia.ledger",
+    "$peridot_sdk_fidl/fuchsia.ledger",
     "//third_party/dart-pkg/pub/collection",
     "//third_party/dart-pkg/pub/crypto",
     "//topaz/public/lib/module/dart",
diff --git a/public/dart/widgets/BUILD.gn b/public/dart/widgets/BUILD.gn
index 1845fd4..84ee57f 100644
--- a/public/dart/widgets/BUILD.gn
+++ b/public/dart/widgets/BUILD.gn
@@ -30,9 +30,9 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.ui.policy",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1",
-    "//peridot/public/fidl/fuchsia.modular",
+    "$garnet_sdk_fidl/fuchsia.ui.policy",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//third_party/dart-pkg/pub/flutter_image",
     "//topaz/bin/ui/skottie_viewer:skottie_loader",
diff --git a/public/lib/agent/dart/BUILD.gn b/public/lib/agent/dart/BUILD.gn
index 498b67f..32ece27 100644
--- a/public/lib/agent/dart/BUILD.gn
+++ b/public/lib/agent/dart/BUILD.gn
@@ -13,8 +13,8 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.auth",
-    "//peridot/public/fidl/fuchsia.modular",
+    "$garnet_sdk_fidl/fuchsia.auth",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
   ]
diff --git a/public/lib/app/dart/BUILD.gn b/public/lib/app/dart/BUILD.gn
index 0a96720..74f78fd 100644
--- a/public/lib/app/dart/BUILD.gn
+++ b/public/lib/app/dart/BUILD.gn
@@ -23,7 +23,7 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.sys",
+    "$garnet_sdk_fidl/fuchsia.sys",
     "//third_party/dart-pkg/pub/logging",
     "//third_party/dart-pkg/pub/stack_trace",
     "//topaz/public/dart/fidl",
diff --git a/public/lib/app_driver/dart/BUILD.gn b/public/lib/app_driver/dart/BUILD.gn
index d4de31c..faf2d93 100644
--- a/public/lib/app_driver/dart/BUILD.gn
+++ b/public/lib/app_driver/dart/BUILD.gn
@@ -29,7 +29,7 @@
 
   deps = [
     ":modules_metrics_registry_dartlib",
-    "//peridot/public/fidl/fuchsia.modular",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//topaz/public/lib/app/dart",
     "//topaz/public/lib/component/dart",
     "//topaz/public/lib/entity/dart",
diff --git a/public/lib/component/dart/BUILD.gn b/public/lib/component/dart/BUILD.gn
index f25e2de..7e4eda2 100644
--- a/public/lib/component/dart/BUILD.gn
+++ b/public/lib/component/dart/BUILD.gn
@@ -15,7 +15,7 @@
   ]
 
   deps = [
-    "//peridot/public/fidl/fuchsia.modular",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/zircon",
     "//topaz/public/lib/app/dart",
diff --git a/public/lib/context/dart/BUILD.gn b/public/lib/context/dart/BUILD.gn
index 61586b3..f889b30 100644
--- a/public/lib/context/dart/BUILD.gn
+++ b/public/lib/context/dart/BUILD.gn
@@ -14,7 +14,7 @@
   ]
 
   deps = [
-    "//peridot/public/fidl/fuchsia.modular",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//topaz/public/lib/app/dart",
   ]
 }
diff --git a/public/lib/device/dart/BUILD.gn b/public/lib/device/dart/BUILD.gn
index 100a9b0..e6ece0c 100644
--- a/public/lib/device/dart/BUILD.gn
+++ b/public/lib/device/dart/BUILD.gn
@@ -15,8 +15,8 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.auth",
-    "//peridot/public/fidl/fuchsia.modular",
+    "$garnet_sdk_fidl/fuchsia.auth",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
   ]
diff --git a/public/lib/display/dart/BUILD.gn b/public/lib/display/dart/BUILD.gn
index 4dbdf92..cc69612 100644
--- a/public/lib/display/dart/BUILD.gn
+++ b/public/lib/display/dart/BUILD.gn
@@ -12,8 +12,8 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.device.display",
-    "//garnet/public/fidl/fuchsia.devicesettings",
+    "$garnet_sdk_fidl/fuchsia.device.display",
+    "$garnet_sdk_fidl/fuchsia.devicesettings",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
   ]
diff --git a/public/lib/entity/dart/BUILD.gn b/public/lib/entity/dart/BUILD.gn
index 6346458..6114cec 100644
--- a/public/lib/entity/dart/BUILD.gn
+++ b/public/lib/entity/dart/BUILD.gn
@@ -16,7 +16,7 @@
   ]
 
   deps = [
-    "//peridot/public/fidl/fuchsia.modular",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//third_party/dart-pkg/pub/json_schema",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
diff --git a/public/lib/intent_handler/dart/BUILD.gn b/public/lib/intent_handler/dart/BUILD.gn
index d7528a6..fa21f8d 100644
--- a/public/lib/intent_handler/dart/BUILD.gn
+++ b/public/lib/intent_handler/dart/BUILD.gn
@@ -15,7 +15,7 @@
   ]
 
   deps = [
-    "//peridot/public/fidl/fuchsia.modular",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
   ]
diff --git a/public/lib/lifecycle/dart/BUILD.gn b/public/lib/lifecycle/dart/BUILD.gn
index 49abbdf..ee10c25 100644
--- a/public/lib/lifecycle/dart/BUILD.gn
+++ b/public/lib/lifecycle/dart/BUILD.gn
@@ -16,7 +16,7 @@
   ]
 
   deps = [
-    "//peridot/public/fidl/fuchsia.modular",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
   ]
diff --git a/public/lib/media/dart/BUILD.gn b/public/lib/media/dart/BUILD.gn
index 2dc40b4..da359c2 100644
--- a/public/lib/media/dart/BUILD.gn
+++ b/public/lib/media/dart/BUILD.gn
@@ -15,7 +15,7 @@
   source_dir = "."
 
   deps = [
-    "//garnet/public/fidl/fuchsia.media",
+    "$garnet_sdk_fidl/fuchsia.media",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia_logger",
     "//topaz/public/dart/fuchsia_services",
diff --git a/public/lib/mediaplayer/dart/BUILD.gn b/public/lib/mediaplayer/dart/BUILD.gn
index 93e686c..73dd101 100644
--- a/public/lib/mediaplayer/dart/BUILD.gn
+++ b/public/lib/mediaplayer/dart/BUILD.gn
@@ -15,11 +15,11 @@
   source_dir = "."
 
   deps = [
-    "//garnet/public/fidl/fuchsia.device.display",
-    "//garnet/public/fidl/fuchsia.math",
-    "//garnet/public/fidl/fuchsia.media",
-    "//garnet/public/fidl/fuchsia.mediaplayer",
-    "//garnet/public/fidl/fuchsia.net.oldhttp",
+    "$garnet_sdk_fidl/fuchsia.device.display",
+    "$garnet_sdk_fidl/fuchsia.math",
+    "$garnet_sdk_fidl/fuchsia.media",
+    "$garnet_sdk_fidl/fuchsia.mediaplayer",
+    "$garnet_sdk_fidl/fuchsia.net.oldhttp",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
     "//topaz/public/lib/settings:settings_protos",
diff --git a/public/lib/mediaplayer/flutter/BUILD.gn b/public/lib/mediaplayer/flutter/BUILD.gn
index 461fc88..0a2ba03 100644
--- a/public/lib/mediaplayer/flutter/BUILD.gn
+++ b/public/lib/mediaplayer/flutter/BUILD.gn
@@ -16,8 +16,8 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.media",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1",
+    "$garnet_sdk_fidl/fuchsia.media",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
diff --git a/public/lib/module/dart/BUILD.gn b/public/lib/module/dart/BUILD.gn
index 27a7a6a..d42e60c 100644
--- a/public/lib/module/dart/BUILD.gn
+++ b/public/lib/module/dart/BUILD.gn
@@ -16,8 +16,8 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.ui.viewsv1",
-    "//peridot/public/fidl/fuchsia.modular",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia",
     "//topaz/public/lib/app/dart",
diff --git a/public/lib/module_resolver/dart/BUILD.gn b/public/lib/module_resolver/dart/BUILD.gn
index eb1cf6c..b374db1 100644
--- a/public/lib/module_resolver/dart/BUILD.gn
+++ b/public/lib/module_resolver/dart/BUILD.gn
@@ -16,7 +16,7 @@
   ]
 
   deps = [
-    "//peridot/public/fidl/fuchsia.modular",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//topaz/public/lib/app/dart",
   ]
 }
diff --git a/public/lib/proposal/dart/BUILD.gn b/public/lib/proposal/dart/BUILD.gn
index b7b596f..ce71450 100644
--- a/public/lib/proposal/dart/BUILD.gn
+++ b/public/lib/proposal/dart/BUILD.gn
@@ -14,7 +14,7 @@
   ]
 
   deps = [
-    "//peridot/public/fidl/fuchsia.modular",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//third_party/dart-pkg/pub/http",
     "//topaz/public/dart/zircon",
     "//topaz/public/lib/app/dart",
diff --git a/public/lib/settings/BUILD.gn b/public/lib/settings/BUILD.gn
index 2fbf81e..42ced87 100644
--- a/public/lib/settings/BUILD.gn
+++ b/public/lib/settings/BUILD.gn
@@ -20,7 +20,7 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.devicesettings",
+    "$garnet_sdk_fidl/fuchsia.devicesettings",
     "//third_party/dart-pkg/pub/protobuf",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia_services",
diff --git a/public/lib/story/dart/BUILD.gn b/public/lib/story/dart/BUILD.gn
index 553146e..9e6e2ed 100644
--- a/public/lib/story/dart/BUILD.gn
+++ b/public/lib/story/dart/BUILD.gn
@@ -17,7 +17,7 @@
   ]
 
   deps = [
-    "//peridot/public/fidl/fuchsia.modular",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//topaz/public/lib/app/dart",
   ]
 }
diff --git a/public/lib/ui/flutter/BUILD.gn b/public/lib/ui/flutter/BUILD.gn
index 34f3e6f..6b972c0 100644
--- a/public/lib/ui/flutter/BUILD.gn
+++ b/public/lib/ui/flutter/BUILD.gn
@@ -17,9 +17,9 @@
   source_dir = "."
 
   deps = [
-    "//garnet/public/fidl/fuchsia.math",
-    "//garnet/public/fidl/fuchsia.ui.app",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1",
+    "$garnet_sdk_fidl/fuchsia.math",
+    "$garnet_sdk_fidl/fuchsia.ui.app",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//third_party/dart-pkg/pub/meta",
     "//topaz/public/lib/app/dart",
diff --git a/public/lib/ui/flutter/sdk_ext/BUILD.gn b/public/lib/ui/flutter/sdk_ext/BUILD.gn
index 8b0a7fb..68af3a4 100644
--- a/public/lib/ui/flutter/sdk_ext/BUILD.gn
+++ b/public/lib/ui/flutter/sdk_ext/BUILD.gn
@@ -9,7 +9,7 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.ui.viewsv1",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
     "//garnet/public/lib/fxl",
     "//third_party/dart/runtime:dart_api",
     "//third_party/tonic",
diff --git a/public/lib/ui/scenic/dart/BUILD.gn b/public/lib/ui/scenic/dart/BUILD.gn
index aa3ed18..41137a8 100644
--- a/public/lib/ui/scenic/dart/BUILD.gn
+++ b/public/lib/ui/scenic/dart/BUILD.gn
@@ -16,8 +16,8 @@
   source_dir = "."
 
   deps = [
-    "//garnet/public/fidl/fuchsia.ui.gfx",
-    "//garnet/public/fidl/fuchsia.ui.scenic",
+    "$garnet_sdk_fidl/fuchsia.ui.gfx",
+    "$garnet_sdk_fidl/fuchsia.ui.scenic",
     "//topaz/public/lib/app/dart",
   ]
 }
diff --git a/public/lib/user/dart/BUILD.gn b/public/lib/user/dart/BUILD.gn
index 99908f8..ab9928c 100644
--- a/public/lib/user/dart/BUILD.gn
+++ b/public/lib/user/dart/BUILD.gn
@@ -16,7 +16,7 @@
   ]
 
   deps = [
-    "//peridot/public/fidl/fuchsia.modular",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia",
     "//topaz/public/lib/app/dart",
diff --git a/runtime/chromium/BUILD.gn b/runtime/chromium/BUILD.gn
index bcfe328..0f713ba 100644
--- a/runtime/chromium/BUILD.gn
+++ b/runtime/chromium/BUILD.gn
@@ -11,8 +11,8 @@
   sources = chromium_web_sources
 
   deps = [
-    "//garnet/public/fidl/fuchsia.sys",
-    "//garnet/public/fidl/fuchsia.ui.viewsv1token",
+    "$garnet_sdk_fidl/fuchsia.sys",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1token",
   ]
 }
 
diff --git a/runtime/dart/dart_component.gni b/runtime/dart/dart_component.gni
index 0aae230..52639d2 100644
--- a/runtime/dart/dart_component.gni
+++ b/runtime/dart/dart_component.gni
@@ -413,8 +413,8 @@
 
       if (flutter_driver_extendable) {
         deps += [
-          "//garnet/public/fidl/fuchsia.testing.runner",
-          "//peridot/public/fidl/fuchsia.modular",
+          "$garnet_sdk_fidl/fuchsia.testing.runner",
+          "$peridot_sdk_fidl/fuchsia.modular",
           "//third_party/dart-pkg/git/flutter/packages/flutter_driver",
           "//topaz/public/lib/app/dart",
           "//topaz/public/lib/module/dart",
diff --git a/runtime/dart_runner/embedder/script_runner_snapshot.dart b/runtime/dart_runner/embedder/script_runner_snapshot.dart
index b019de9..c7aa96c 100644
--- a/runtime/dart_runner/embedder/script_runner_snapshot.dart
+++ b/runtime/dart_runner/embedder/script_runner_snapshot.dart
@@ -27,5 +27,5 @@
 import 'package:lib.app.dart/app.dart';
 import 'package:fidl/fidl.dart';
 
-// From //peridot/public/fidl/fuchsia.modular
+// From $peridot_sdk_fidl/fuchsia.modular
 import 'package:fidl_fuchsia_modular/fidl.dart';
diff --git a/runtime/flutter_runner/BUILD.gn b/runtime/flutter_runner/BUILD.gn
index 9eb7d99..0ef9854 100644
--- a/runtime/flutter_runner/BUILD.gn
+++ b/runtime/flutter_runner/BUILD.gn
@@ -124,11 +124,11 @@
     ]
 
     deps = [
-             "//garnet/public/fidl/fuchsia.accessibility",
-             "//garnet/public/fidl/fuchsia.fonts",
-             "//garnet/public/fidl/fuchsia.ui.app",
-             "//garnet/public/fidl/fuchsia.ui.input",
-             "//garnet/public/fidl/fuchsia.ui.viewsv1",
+             "$garnet_sdk_fidl/fuchsia.accessibility",
+             "$garnet_sdk_fidl/fuchsia.fonts",
+             "$garnet_sdk_fidl/fuchsia.ui.app",
+             "$garnet_sdk_fidl/fuchsia.ui.input",
+             "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
              "//garnet/public/lib/component/cpp",
              "//garnet/public/lib/fsl",
              "//garnet/public/lib/fxl",
@@ -137,7 +137,7 @@
              "//garnet/public/lib/ui/gfx/cpp",
              "//garnet/public/lib/ui/scenic/cpp",
              "//garnet/public/lib/vulkan",
-             "//peridot/public/fidl/fuchsia.modular",
+             "$peridot_sdk_fidl/fuchsia.modular",
              "//third_party/dart/runtime/bin:libdart_builtin${product_suffix}",
              "//third_party/rapidjson",
              "//third_party/skia",
@@ -354,7 +354,7 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.fonts",
+    "$garnet_sdk_fidl/fuchsia.fonts",
     "//garnet/public/lib/component/cpp",
     "//garnet/public/lib/component/cpp/testing",
     "//garnet/public/lib/fsl",
diff --git a/shell/mondrian_story_shell/BUILD.gn b/shell/mondrian_story_shell/BUILD.gn
index fca9318..b61ae66 100644
--- a/shell/mondrian_story_shell/BUILD.gn
+++ b/shell/mondrian_story_shell/BUILD.gn
@@ -45,8 +45,8 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.ui.viewsv1",
-    "//peridot/public/fidl/fuchsia.modular",
+    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//third_party/dart-pkg/pub/meta",
     "//third_party/dart-pkg/pub/quiver",
@@ -72,7 +72,7 @@
 
   deps = [
     ":mondrian_dart_library",
-    "//peridot/public/fidl/fuchsia.modular",
+    "$peridot_sdk_fidl/fuchsia.modular",
     "//third_party/dart-pkg/git/flutter/packages/flutter_test",
     "//third_party/dart-pkg/pub/mockito",
     "//third_party/dart-pkg/pub/test",
diff --git a/tests/dart_app_service_tests/BUILD.gn b/tests/dart_app_service_tests/BUILD.gn
index 723bd41..224b21c 100644
--- a/tests/dart_app_service_tests/BUILD.gn
+++ b/tests/dart_app_service_tests/BUILD.gn
@@ -18,7 +18,7 @@
 
   deps = [
     "//garnet/examples/fidl/services:echo2",
-    "//garnet/public/fidl/fuchsia.sys",
+    "$garnet_sdk_fidl/fuchsia.sys",
     "//third_party/dart-pkg/pub/test",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
diff --git a/tests/web_runner_smoke_tests/BUILD.gn b/tests/web_runner_smoke_tests/BUILD.gn
index 485176d..3ae8930 100644
--- a/tests/web_runner_smoke_tests/BUILD.gn
+++ b/tests/web_runner_smoke_tests/BUILD.gn
@@ -16,7 +16,7 @@
   ]
 
   deps = [
-    "//garnet/public/fidl/fuchsia.sys",
+    "$garnet_sdk_fidl/fuchsia.sys",
     "//garnet/public/lib/component/cpp/testing",
     "//garnet/public/lib/fxl",
     "//third_party/googletest:gtest_main",