diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index c7c29a91721c0..6929395d192a6 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -96,6 +96,7 @@
 #include <vector>
 
 using namespace clang;
+using namespace driver;
 using namespace options;
 using namespace llvm::opt;
 
diff --git a/utils/bazel/llvm-project-overlay/clang/BUILD.bazel b/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
index 020b2aa68a357..8d8d367cb490a 100644
--- a/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
@@ -1371,7 +1371,6 @@ cc_library(
         ":analysis",
         ":ast",
         ":basic",
-        ":driver",
         ":frontend",
         ":index",
         "//llvm:Option",
@@ -1519,11 +1518,9 @@ cc_library(
     includes = ["include"],
     deps = [
         ":basic",
-        ":config",
         ":driver_options_inc_gen",
         ":static_analyzer_checkers_gen",
         "//llvm:Option",
-        "//llvm:Support",
     ],
 )
 
@@ -1563,11 +1560,9 @@ cc_library(
         ":basic",
         ":config",
         ":driver_options_inc_gen",
-        ":frontend",
         ":lex",
         ":options",
         ":parse",
-        ":serialization",
         ":static_analyzer_checkers_gen",
         "//llvm:BinaryFormat",
         "//llvm:FrontendDebug",
@@ -1719,6 +1714,7 @@ cc_library(
         ":ast",
         ":basic",
         ":config",
+        ":driver",
         ":driver_options_inc_gen",
         ":edit",
         ":lex",
@@ -2051,7 +2047,6 @@ cc_library(
         ":frontend",
         ":index",
         ":lex",
-        ":options",
         ":rewrite",
         ":sema",
         ":tooling",
@@ -2084,7 +2079,6 @@ cc_plugin_library(
         ":frontend",
         ":index",
         ":lex",
-        ":options",
         ":rewrite",
         ":sema",
         ":tooling",
@@ -2126,7 +2120,6 @@ cc_binary(
         ":basic",
         ":codegen",
         ":config",
-        ":driver",
         ":frontend",
         ":index",
         ":lex",
@@ -2243,7 +2236,6 @@ cc_binary(
     deps = [
         ":basic",
         ":diagnostic_defs_gen",
-        ":driver",
         ":frontend",
         ":lex",
         ":sema",
diff --git a/utils/bazel/llvm-project-overlay/clang/unittests/BUILD.bazel b/utils/bazel/llvm-project-overlay/clang/unittests/BUILD.bazel
index bf5bb7568c531..a862ac43e0fa1 100644
--- a/utils/bazel/llvm-project-overlay/clang/unittests/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/clang/unittests/BUILD.bazel
@@ -267,7 +267,6 @@ cc_test(
         "//clang:ast",
         "//clang:basic",
         "//clang:codegen",
-        "//clang:driver",
         "//clang:driver_options_inc_gen",
         "//clang:frontend",
         "//clang:frontend_tool",
@@ -339,7 +338,6 @@ cc_test(
         "//clang:ast",
         "//clang:ast_matchers",
         "//clang:basic",
-        "//clang:driver",
         "//clang:frontend",
         "//clang:lex",
         "//clang:parse",
@@ -518,7 +516,6 @@ cc_test(
     deps = [
         "//clang:ast",
         "//clang:basic",
-        "//clang:driver",
         "//clang:frontend",
         "//clang:lex",
         "//clang:testing",
@@ -723,7 +720,6 @@ cc_test(
     deps = [
         "//clang:ast_matchers",
         "//clang:basic",
-        "//clang:driver",
         "//clang:frontend",
         "//clang:lex",
         "//clang:parse",
diff --git a/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel b/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel
index 852921c392429..b69dddba261a9 100644
--- a/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel
@@ -441,7 +441,6 @@ cc_library(
         ":Utility",
         ":Version",
         "//clang:codegen",
-        "//clang:driver",
         "//clang:frontend",
         "//clang:serialization",
         "//llvm:Support",
diff --git a/utils/bazel/llvm-project-overlay/lldb/source/Plugins/BUILD.bazel b/utils/bazel/llvm-project-overlay/lldb/source/Plugins/BUILD.bazel
index 45ab113931aaf..3ded8bdf89514 100644
--- a/utils/bazel/llvm-project-overlay/lldb/source/Plugins/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/lldb/source/Plugins/BUILD.bazel
@@ -193,7 +193,6 @@ cc_library(
         "//clang:frontend",
         "//clang:frontend_rewrite",
         "//clang:lex",
-        "//clang:options",
         "//clang:parse",
         "//clang:rewrite",
         "//clang:sema",