diff --git a/llvm/utils/gn/secondary/clang/lib/Analysis/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Analysis/BUILD.gn
index 90da3924ae6818..49ec784224b122 100644
--- a/llvm/utils/gn/secondary/clang/lib/Analysis/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/Analysis/BUILD.gn
@@ -24,19 +24,14 @@ static_library("Analysis") {
     "Consumed.cpp",
     "Dominators.cpp",
     "ExprMutationAnalyzer.cpp",
-    "HTMLPathDiagnosticConsumer.cpp",
     "IssueHash.cpp",
     "LiveVariables.cpp",
     "ObjCNoReturn.cpp",
     "PathDiagnostic.cpp",
-    "PlistHTMLPathDiagnosticConsumer.cpp",
-    "PlistPathDiagnosticConsumer.cpp",
     "PostOrderCFGView.cpp",
     "ProgramPoint.cpp",
     "ReachableCode.cpp",
     "RetainSummaryManager.cpp",
-    "SarifPathDiagnosticConsumer.cpp",
-    "TextPathDiagnosticConsumer.cpp",
     "ThreadSafety.cpp",
     "ThreadSafetyCommon.cpp",
     "ThreadSafetyLogical.cpp",
diff --git a/llvm/utils/gn/secondary/clang/lib/StaticAnalyzer/Core/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/StaticAnalyzer/Core/BUILD.gn
index 44be3eee1310da..c16c37d47b2843 100644
--- a/llvm/utils/gn/secondary/clang/lib/StaticAnalyzer/Core/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/StaticAnalyzer/Core/BUILD.gn
@@ -39,9 +39,11 @@ static_library("Core") {
     "ExprEngineCallAndReturn.cpp",
     "ExprEngineObjC.cpp",
     "FunctionSummary.cpp",
+    "HTMLDiagnostics.cpp",
     "LoopUnrolling.cpp",
     "LoopWidening.cpp",
     "MemRegion.cpp",
+    "PlistDiagnostics.cpp",
     "ProgramState.cpp",
     "RangeConstraintManager.cpp",
     "RangedConstraintManager.cpp",
@@ -49,10 +51,12 @@ static_library("Core") {
     "SMTConstraintManager.cpp",
     "SValBuilder.cpp",
     "SVals.cpp",
+    "SarifDiagnostics.cpp",
     "SimpleConstraintManager.cpp",
     "SimpleSValBuilder.cpp",
     "Store.cpp",
     "SymbolManager.cpp",
+    "TextDiagnostics.cpp",
     "WorkList.cpp",
   ]
 }