diff --git a/front_end/BUILD.gn b/front_end/BUILD.gn
index db2392f861..a7c874f29d 100644
--- a/front_end/BUILD.gn
+++ b/front_end/BUILD.gn
@@ -16,8 +16,6 @@ group("front_end") {
     ":legacy_css",
     ":legacy_entrypoints",
     "Images",
-    "Images:generate_css_vars",
-    "emulated_devices/optimized:optimized_emulated_devices",
     "entrypoints/devtools_app",
     "entrypoints/formatter_worker:worker_entrypoint",
     "entrypoints/heap_snapshot_worker:worker_entrypoint",
@@ -31,7 +29,6 @@ group("front_end") {
     "entrypoints/wasmparser_worker:worker_entrypoint",
     "entrypoints/worker_app",
     "legacy_test_runner",
-    "models/issues_manager:descriptions",
   ]
 }
 
diff --git a/front_end/models/issues_manager/BUILD.gn b/front_end/models/issues_manager/BUILD.gn
index 2bffa3e45c..cdbf5e5ef7 100644
--- a/front_end/models/issues_manager/BUILD.gn
+++ b/front_end/models/issues_manager/BUILD.gn
@@ -39,6 +39,8 @@ devtools_module("issues_manager") {
     "../../models/workspace:bundle",
     "../../third_party/marked:bundle",
   ]
+
+  public_deps = [ ":descriptions" ]
 }
 
 devtools_issue_description_files = [
diff --git a/front_end/panels/emulation/BUILD.gn b/front_end/panels/emulation/BUILD.gn
index 366b1e7ab4..4bd585a561 100644
--- a/front_end/panels/emulation/BUILD.gn
+++ b/front_end/panels/emulation/BUILD.gn
@@ -37,6 +37,9 @@ devtools_module("emulation") {
     "../../ui/legacy:bundle",
     "../../ui/legacy/components/utils:bundle",
   ]
+
+  public_deps =
+      [ "../../emulated_devices/optimized:optimized_emulated_devices" ]
 }
 
 copy_to_gen("legacy_css") {