diff --git a/BUILD.gn b/BUILD.gn
index a973678698..270ae31f5a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -8,17 +8,17 @@ import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
 import("//build/config/zip.gni")
 import("//build/util/branding.gni")
+import("//build/util/process_version.gni")
+import("//extensions/features/features.gni")
+import("//printing/features/features.gni")
 import("//tools/grit/grit_rule.gni")
 import("//tools/grit/repack.gni")
 import("//ui/base/ui_features.gni")
 import("//v8/gni/v8.gni")
-import("//chrome/version.gni")
 import("//third_party/icu/config.gni")
 import("//media/cdm/ppapi/cdm_paths.gni")
 import("//electron/build/config.gni")
 
-enable_service_discovery = false
-
 group("electron") {
   testonly = false
 
diff --git a/app/BUILD.gn b/app/BUILD.gn
index 546e147357..27ea700bca 100644
--- a/app/BUILD.gn
+++ b/app/BUILD.gn
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
-import("//services/shell/public/service_manifest.gni")
 import("//tools/grit/grit_rule.gni")
 
 if (use_aura) {
diff --git a/app/linux/BUILD.gn b/app/linux/BUILD.gn
index f38e0bd369..e7f4e2cf1e 100644
--- a/app/linux/BUILD.gn
+++ b/app/linux/BUILD.gn
@@ -7,7 +7,6 @@ import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
 import("//ui/base/ui_features.gni")
 import("//v8/gni/v8.gni")
-import("//chrome/version.gni")
 import("//build/compiled_action.gni")
 import("//build/util/branding.gni")
 import("//build_overrides/v8.gni")
diff --git a/app/mac/BUILD.gn b/app/mac/BUILD.gn
index 68aa78c5d7..3a118ca5e8 100644
--- a/app/mac/BUILD.gn
+++ b/app/mac/BUILD.gn
@@ -7,7 +7,6 @@ import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
 import("//ui/base/ui_features.gni")
 import("//v8/gni/v8.gni")
-import("//chrome/version.gni")
 import("//build/compiled_action.gni")
 import("//build/config/mac/rules.gni")
 import("//build/config/mac/symbols.gni")
diff --git a/app/win/BUILD.gn b/app/win/BUILD.gn
index 04ff8fb8d5..364426f002 100644
--- a/app/win/BUILD.gn
+++ b/app/win/BUILD.gn
@@ -8,9 +8,9 @@ import("//build/config/ui.gni")
 import("//build/config/win/manifest.gni")
 import("//ui/base/ui_features.gni")
 import("//v8/gni/v8.gni")
-import("//chrome/version.gni")
 import("//build/compiled_action.gni")
 import("//build/util/branding.gni")
+import("//build/util/process_version.gni")
 import("//build_overrides/v8.gni")
 import("//media/cdm/ppapi/cdm_paths.gni")
 import("//electron/build/config.gni")
diff --git a/atom/app/BUILD.gn b/atom/app/BUILD.gn
index f796d71dcf..d45176bdc8 100644
--- a/atom/app/BUILD.gn
+++ b/atom/app/BUILD.gn
@@ -24,7 +24,7 @@ source_set("app") {
   }
 
   deps = [
-    "//third_party/widevine/cdm:version_h",
+    "//third_party/widevine/cdm:headers",
     "//third_party/kasko",
   ]
 }
diff --git a/atom/browser/BUILD.gn b/atom/browser/BUILD.gn
index 51864c0107..e7a88de6d5 100644
--- a/atom/browser/BUILD.gn
+++ b/atom/browser/BUILD.gn
@@ -1,5 +1,6 @@
 import("//build/config/ui.gni")
 import("//build/config/features.gni")
+import("//extensions/features/features.gni")
 
 source_set("browser") {
   public_configs = [
@@ -14,7 +15,8 @@ source_set("browser") {
   public_deps = [
     "//electron/vendor/brightray:browser",
     "//ui/events",
-    "//components/security_state",
+    "//components/security_state/content",
+    "//components/security_state/core",
     "//components/autofill/content/browser:browser",
     "//third_party/protobuf:protobuf_lite",
     "//third_party/WebKit/public:blink_headers",
diff --git a/atom/common/BUILD.gn b/atom/common/BUILD.gn
index 968a08ccbe..0d3f89a3e4 100644
--- a/atom/common/BUILD.gn
+++ b/atom/common/BUILD.gn
@@ -2,6 +2,8 @@ import("//build/buildflag_header.gni")
 import("//build/config/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/features.gni")
+import("//extensions/features/features.gni")
+import("//printing/features/features.gni")
 
 source_set("node") {
   public_configs = [
diff --git a/brave/browser/BUILD.gn b/brave/browser/BUILD.gn
index a5725f3b5a..161069919f 100644
--- a/brave/browser/BUILD.gn
+++ b/brave/browser/BUILD.gn
@@ -2,6 +2,9 @@ import("//build/buildflag_header.gni")
 import("//build/config/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/features.gni")
+import("//extensions/features/features.gni")
+import("//printing/features/features.gni")
+
 
 source_set("browser") {
   configs += [
@@ -46,12 +49,9 @@ source_set("browser") {
     "//components/autofill/content/browser:risk_proto",
     "//components/autofill/content/browser",
     "//components/autofill/core/browser",
-    "//components/devtools_discovery",
-    "//components/devtools_http_handler",
     "//components/resources",
     "//components/subresource_filter/content/browser",
     "//components/subresource_filter/core/browser",
-    "//components/syncable_prefs",
     "//device/usb/mojo",
     "//device/usb/public/interfaces",
     "//gpu/config",
diff --git a/brave/browser/component_updater/BUILD.gn b/brave/browser/component_updater/BUILD.gn
index e13d80c2c6..789c915432 100644
--- a/brave/browser/component_updater/BUILD.gn
+++ b/brave/browser/component_updater/BUILD.gn
@@ -16,7 +16,7 @@ source_set("component_updater") {
   ]
 
   deps = [
-    "//third_party/widevine/cdm:version_h",
+    "//third_party/widevine/cdm:headers",
     "//components/component_updater",
     "//components/update_client",
   ]
diff --git a/brave/common/extensions/api/BUILD.gn b/brave/common/extensions/api/BUILD.gn
index 785fccd0db..9a140b6c66 100644
--- a/brave/common/extensions/api/BUILD.gn
+++ b/brave/common/extensions/api/BUILD.gn
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/json_schema_api.gni")
 import("//tools/json_schema_compiler/json_features.gni")
+import("//tools/json_schema_compiler/json_schema_api.gni")
 import("schemas.gni")
 
 # assert(enable_extensions)
diff --git a/build/BUILD.gn b/build/BUILD.gn
index 20d89812a0..c1470408a6 100644
--- a/build/BUILD.gn
+++ b/build/BUILD.gn
@@ -1,7 +1,6 @@
 import("//build/config/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/util/branding.gni")
-import("//chrome/version.gni")
 
 if (is_linux) {
   import("//build/config/linux/pkg_config.gni")
diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn
index 22418b75d0..caa9d18e3c 100644
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -1,6 +1,8 @@
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
-import("///build/config/crypto.gni")
+import("//build/config/crypto.gni")
+import("//extensions/features/features.gni")
+import("//printing/features/features.gni")
 
 config("chromium_src_config") {
   include_dirs = [
@@ -100,7 +102,7 @@ source_set("renderer") {
 
   deps = [
     "//chrome/renderer",
-    "//components/content_settings/content/common",
+    "//components/content_settings/core/common",
     "//third_party/WebKit/public:blink_headers",
   ]
 }
diff --git a/lib/BUILD.gn b/lib/BUILD.gn
index 6ab7803ad8..5f32a64252 100644
--- a/lib/BUILD.gn
+++ b/lib/BUILD.gn
@@ -2,6 +2,7 @@ import("//build/buildflag_header.gni")
 import("//build/config/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/features.gni")
+import("//extensions/features/features.gni")
 
 action("lib") {
   script = "//electron/tools/js2asar.py"
diff --git a/vendor/brightray/BUILD.gn b/vendor/brightray/BUILD.gn
index f240098516..48a97f732e 100644
--- a/vendor/brightray/BUILD.gn
+++ b/vendor/brightray/BUILD.gn
@@ -161,8 +161,6 @@ source_set("browser") {
   ]
 
   deps = [
-    "//components/devtools_discovery",
-    "//components/devtools_http_handler",
     "//third_party/WebKit/public:blink_headers",
     "//content/shell:resources",
     ":common",