diff --git a/bin/simple_browser/BUILD.gn b/bin/simple_browser/BUILD.gn
index a03be3e..d3fefa4 100644
--- a/bin/simple_browser/BUILD.gn
+++ b/bin/simple_browser/BUILD.gn
@@ -28,9 +28,26 @@
   manifest = "pubspec.yaml"
 
   sources = [
+    "app.dart",
+    "create_web_context.dart",
     "main.dart",
     "src/blocs/tabs_bloc.dart",
+    "src/blocs/webpage_bloc.dart",
+    "src/models/app_model.dart",
     "src/models/tabs_action.dart",
+    "src/models/webpage_action.dart",
+    "src/services/simple_browser_navigation_event_listener.dart",
+    "src/services/simple_browser_web_service.dart",
+    "src/utils/browser_shortcuts.dart",
+    "src/utils/sanitize_url.dart",
+    "src/utils/tld_checker.dart",
+    "src/utils/tlds_provider.dart",
+    "src/utils/valid_tlds.dart",
+    "src/widgets/error_page.dart",
+    "src/widgets/history_buttons.dart",
+    "src/widgets/navigation_bar.dart",
+    "src/widgets/navigation_field.dart",
+    "src/widgets/tabs_widget.dart",
   ]
 
   deps = [
diff --git a/bin/terminal_settings/BUILD.gn b/bin/terminal_settings/BUILD.gn
index 2ef473d..35a987d 100644
--- a/bin/terminal_settings/BUILD.gn
+++ b/bin/terminal_settings/BUILD.gn
@@ -9,6 +9,7 @@
   main_dart = "lib/main.dart"
 
   sources = [
+    "main.dart",
     "src/widgets/settings_container.dart",
     "src/widgets/settings_pane.dart",
   ]
@@ -31,9 +32,7 @@
 }
 
 flutter_test("terminal_settings_unittests") {
-  sources = [
-    "settings_container_test.dart",
-  ]
+  sources = [ "settings_container_test.dart" ]
 
   deps = [
     ":terminal_settings_dart_library",
diff --git a/settings/bin/BUILD.gn b/settings/bin/BUILD.gn
index 23c238a..71da4a6 100644
--- a/settings/bin/BUILD.gn
+++ b/settings/bin/BUILD.gn
@@ -9,6 +9,20 @@
 
 settings_app("settings") {
   config = "settings.config"
+
+  additional_sources = [
+    "main.dart",
+    "src/models/embedded_module.dart",
+    "src/models/settings_status.dart",
+    "src/setting_entry_parser.dart",
+  ]
+
+  additional_deps = [
+    "//sdk/fidl/fuchsia.sys",
+    "//sdk/fidl/fuchsia.ui.app",
+    "//third_party/dart-pkg/pub/yaml",
+    "//topaz/public/dart/zircon",
+  ]
 }
 
 flutter_test("settings_tests") {
@@ -28,7 +42,5 @@
 group("tests") {
   testonly = true
 
-  deps = [
-    ":settings_tests",
-  ]
+  deps = [ ":settings_tests" ]
 }
diff --git a/settings/bluetooth/BUILD.gn b/settings/bluetooth/BUILD.gn
index 752c090..4afb0b3 100644
--- a/settings/bluetooth/BUILD.gn
+++ b/settings/bluetooth/BUILD.gn
@@ -5,12 +5,12 @@
 import("//topaz/runtime/flutter_runner/flutter_app.gni")
 
 flutter_app("bluetooth_settings") {
-
   main_dart = "lib/main.dart"
 
   manifest = "pubspec.yaml"
 
   sources = [
+    "main.dart",
     "src/bluetooth_model.dart",
     "src/bluetooth_settings.dart",
   ]
@@ -23,12 +23,12 @@
   ]
 
   deps = [
-    "//src/experiences/settings/lib/settings",
-    "//src/experiences/settings/lib/widgets",
     "//sdk/fidl/fuchsia.bluetooth",
     "//sdk/fidl/fuchsia.bluetooth.control",
     "//sdk/fidl/fuchsia.bluetooth.gatt",
     "//sdk/fidl/fuchsia.bluetooth.le",
+    "//src/experiences/settings/lib/settings",
+    "//src/experiences/settings/lib/widgets",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/dart/fuchsia_logger",
     "//topaz/public/dart/fuchsia_services",
diff --git a/settings/build/settings_app.gni b/settings/build/settings_app.gni
index 53d2c3a..c0155fe 100644
--- a/settings/build/settings_app.gni
+++ b/settings/build/settings_app.gni
@@ -13,6 +13,10 @@
     "src/widgets/all_settings.dart",
   ]
 
+  if (defined(invoker.additional_sources)) {
+    base_sources += invoker.additional_sources
+  }
+
   base_resources = [
     {
       path = rebase_path(config)
@@ -21,11 +25,11 @@
   ]
 
   base_deps = [
-    "//src/experiences/settings/lib/settings",
-    "//src/experiences/settings/lib/widgets",
     "//sdk/fidl/fuchsia.deprecatedtimezone",
     "//sdk/fidl/fuchsia.ui.views",
     "//sdk/fidl/fuchsia.wlan.service",
+    "//src/experiences/settings/lib/settings",
+    "//src/experiences/settings/lib/widgets",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//third_party/dart-pkg/git/flutter/packages/flutter_test",
     "//third_party/dart-pkg/pub/meta",
@@ -34,12 +38,16 @@
     "//topaz/public/dart/fuchsia_services",
   ]
 
+  if (defined(invoker.additional_deps)) {
+    base_deps += invoker.additional_deps
+  }
+
   base_meta = [
-      {
-        path = "//src/experiences/settings/bin/meta/settings.cmx"
-        dest = "settings.cmx"
-      },
-    ]
+    {
+      path = "//src/experiences/settings/bin/meta/settings.cmx"
+      dest = "settings.cmx"
+    },
+  ]
 
   # We cannot define the flutter app as a component for the base/canonical
   # target as tests target the dart library, which is only generated correctly
diff --git a/settings/datetime/BUILD.gn b/settings/datetime/BUILD.gn
index d7e92c4..928827f 100644
--- a/settings/datetime/BUILD.gn
+++ b/settings/datetime/BUILD.gn
@@ -9,8 +9,7 @@
 
   manifest = "pubspec.yaml"
 
-  sources = [
-  ]
+  sources = [ "main.dart" ]
 
   meta = [
     {
@@ -20,9 +19,9 @@
   ]
 
   deps = [
+    "//sdk/fidl/fuchsia.deprecatedtimezone",
     "//src/experiences/settings/lib/settings",
     "//src/experiences/settings/lib/widgets",
-    "//sdk/fidl/fuchsia.deprecatedtimezone",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/dart/fuchsia_logger",
     "//topaz/public/dart/fuchsia_services",
diff --git a/settings/wifi/BUILD.gn b/settings/wifi/BUILD.gn
index 4c07d6f..3d71761 100644
--- a/settings/wifi/BUILD.gn
+++ b/settings/wifi/BUILD.gn
@@ -5,12 +5,12 @@
 import("//topaz/runtime/flutter_runner/flutter_app.gni")
 
 flutter_app("wifi_settings") {
-
   main_dart = "lib/main.dart"
 
   manifest = "pubspec.yaml"
 
   sources = [
+    "main.dart",
     "src/fuchsia/access_point.dart",
     "src/fuchsia/wifi_settings_model.dart",
     "src/wlan_manager.dart",
@@ -24,10 +24,10 @@
   ]
 
   deps = [
-    "//src/experiences/settings/lib/settings",
-    "//src/experiences/settings/lib/widgets",
     "//sdk/fidl/fuchsia.netstack",
     "//sdk/fidl/fuchsia.wlan.service",
+    "//src/experiences/settings/lib/settings",
+    "//src/experiences/settings/lib/widgets",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/dart/fuchsia_logger",
     "//topaz/public/dart/fuchsia_services",