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 @@ -177,6 +177,7 @@ if (Opts->Targets.empty()) Opts->Targets = {deduceDepTarget(Compiler.getFrontendOpts().OutputFile, Compiler.getFrontendOpts().Inputs)}; + Opts->IncludeSystemHeaders = true; switch (Format) { case ScanningOutputFormat::Make: diff --git a/clang/tools/clang-scan-deps/ClangScanDeps.cpp b/clang/tools/clang-scan-deps/ClangScanDeps.cpp --- a/clang/tools/clang-scan-deps/ClangScanDeps.cpp +++ b/clang/tools/clang-scan-deps/ClangScanDeps.cpp @@ -502,8 +502,6 @@ AdjustedArgs.push_back("/clang:-o"); AdjustedArgs.push_back("/clang:" + LastO); } - AdjustedArgs.push_back("-Xclang"); - AdjustedArgs.push_back("-sys-header-deps"); if (!HasResourceDir) { StringRef ResourceDir =