diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile
index 4653fb2e4762..dd4f98488c0e 100644
--- a/lib/clang/libclang/Makefile
+++ b/lib/clang/libclang/Makefile
@@ -129,7 +129,6 @@ SRCS_MIN+=	Analysis/ReachableCode.cpp
 SRCS_MIN+=	Analysis/ScanfFormatString.cpp
 SRCS_MIN+=	Analysis/ThreadSafety.cpp
 SRCS_MIN+=	Analysis/ThreadSafetyCommon.cpp
-SRCS_MIN+=	Analysis/ThreadSafetyLogical.cpp
 SRCS_MIN+=	Analysis/ThreadSafetyTIL.cpp
 SRCS_MIN+=	Analysis/UninitializedValues.cpp
 SRCS_MIN+=	Basic/Attributes.cpp
@@ -311,8 +310,6 @@ SRCS_MIN+=	Frontend/Rewrite/FrontendActions.cpp
 SRCS_MIN+=	Frontend/Rewrite/HTMLPrint.cpp
 SRCS_MIN+=	Frontend/Rewrite/InclusionRewriter.cpp
 SRCS_MIN+=	Frontend/Rewrite/RewriteMacros.cpp
-SRCS_MIN+=	Frontend/Rewrite/RewriteModernObjC.cpp
-SRCS_MIN+=	Frontend/Rewrite/RewriteObjC.cpp
 SRCS_MIN+=	Frontend/Rewrite/RewriteTest.cpp
 SRCS_MIN+=	Frontend/SerializedDiagnosticPrinter.cpp
 SRCS_MIN+=	Frontend/SerializedDiagnosticReader.cpp
@@ -451,7 +448,6 @@ SRCS_FUL+=	StaticAnalyzer/Checkers/CheckObjCDealloc.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/CheckObjCInstMethSignature.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/CheckSecuritySyntaxOnly.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/CheckSizeofPointer.cpp
-SRCS_FUL+=	StaticAnalyzer/Checkers/CheckerDocumentation.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ChrootChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ClangCheckers.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/CloneChecker.cpp
diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile
index e933a646aa0a..d456c6622b56 100644
--- a/lib/clang/liblldb/Makefile
+++ b/lib/clang/liblldb/Makefile
@@ -31,7 +31,6 @@ SRCS+=		API/SBEvent.cpp
 SRCS+=		API/SBExecutionContext.cpp
 SRCS+=		API/SBExpressionOptions.cpp
 SRCS+=		API/SBFileSpec.cpp
-SRCS+=		API/SBFileSpecList.cpp
 SRCS+=		API/SBFrame.cpp
 SRCS+=		API/SBFunction.cpp
 SRCS+=		API/SBHostOS.cpp
@@ -42,7 +41,6 @@ SRCS+=		API/SBLaunchInfo.cpp
 SRCS+=		API/SBLineEntry.cpp
 SRCS+=		API/SBListener.cpp
 SRCS+=		API/SBMemoryRegionInfo.cpp
-SRCS+=		API/SBMemoryRegionInfoList.cpp
 SRCS+=		API/SBModule.cpp
 SRCS+=		API/SBModuleSpec.cpp
 SRCS+=		API/SBPlatform.cpp
@@ -71,7 +69,6 @@ SRCS+=		API/SBTypeSummary.cpp
 SRCS+=		API/SBUnixSignals.cpp
 SRCS+=		API/SBValue.cpp
 SRCS+=		API/SBValueList.cpp
-SRCS+=		API/SBVariablesOptions.cpp
 SRCS+=		API/SBWatchpoint.cpp
 SRCS+=		API/SystemInitializerFull.cpp
 SRCS+=		Breakpoint/Breakpoint.cpp
diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile
index 7200027240e5..2f4ea3d6a80b 100644
--- a/usr.bin/clang/lld/Makefile
+++ b/usr.bin/clang/lld/Makefile
@@ -43,7 +43,6 @@ SRCS+=		ELF/Target.cpp
 SRCS+=		ELF/Thunks.cpp
 SRCS+=		ELF/Writer.cpp
 SRCS+=		lib/Config/Version.cpp
-SRCS+=		lib/Core/DefinedAtom.cpp
 SRCS+=		lib/Core/Error.cpp
 SRCS+=		lib/Core/File.cpp
 SRCS+=		lib/Core/LinkingContext.cpp
@@ -52,7 +51,6 @@ SRCS+=		lib/Core/Reproduce.cpp
 SRCS+=		lib/Core/Resolver.cpp
 SRCS+=		lib/Core/SymbolTable.cpp
 SRCS+=		lib/Core/TargetOptionsCommandFlags.cpp
-SRCS+=		lib/Core/Writer.cpp
 SRCS+=		tools/lld/lld.cpp
 
 .include "${SRCTOP}/lib/clang/llvm.build.mk"