diff --git a/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp b/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
--- a/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
+++ b/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
@@ -36,8 +36,6 @@
       llvm::sys::path::remove_dots(CanonPath, /*remove_dot_dot=*/true);
       C.handleFileDependency(*Opts, CanonPath);
     }
-    for (const auto& ExtraDep : Opts->ExtraDeps)
-      C.handleFileDependency(*Opts, ExtraDep);
   }
 
 private:
diff --git a/clang/test/ClangScanDeps/Inputs/non-header-dependency.json b/clang/test/ClangScanDeps/Inputs/non-header-dependency.json
deleted file mode 100644
--- a/clang/test/ClangScanDeps/Inputs/non-header-dependency.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-    {
-      "directory": "DIR",
-      "command": "clang -E DIR/non-header-dependency_input.cpp -fsanitize=bounds -fsanitize-blacklist=DIR/Inputs/sanitize-blacklist.txt",
-      "file": "DIR/non-header-dependency_input.cpp"
-    }
-]
diff --git a/clang/test/ClangScanDeps/Inputs/sanitize-blacklist.txt b/clang/test/ClangScanDeps/Inputs/sanitize-blacklist.txt
deleted file mode 100644
--- a/clang/test/ClangScanDeps/Inputs/sanitize-blacklist.txt
+++ /dev/null
@@ -1 +0,0 @@
-fun:*
diff --git a/clang/test/ClangScanDeps/non-header-dependency.cpp b/clang/test/ClangScanDeps/non-header-dependency.cpp
deleted file mode 100644
--- a/clang/test/ClangScanDeps/non-header-dependency.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// RUN: rm -rf %t.dir
-// RUN: rm -rf %t.cdb
-// RUN: mkdir -p %t.dir
-// RUN: cp %s %t.dir/non-header-dependency_input.cpp
-// RUN: mkdir %t.dir/Inputs
-// RUN: cp %S/Inputs/sanitize-blacklist.txt %t.dir/Inputs/sanitize-blacklist.txt
-// RUN: sed -e "s|DIR|%/t.dir|g" %S/Inputs/non-header-dependency.json > %t.cdb
-//
-// RUN: clang-scan-deps -compilation-database %t.cdb -j 1 | FileCheck %s
-
-#define FOO "foo"
-
-// CHECK: Inputs{{/|\\}}sanitize-blacklist.txt
-// CHECK-NEXT: non-header-dependency_input.cpp