diff --git a/lib/clang/Makefile b/lib/clang/Makefile
index cd0bcdd1952e..88bc3b1f206f 100644
--- a/lib/clang/Makefile
+++ b/lib/clang/Makefile
@@ -62,7 +62,6 @@ SUBDIR=	libclanganalysis \
 	libllvmaarch64asmparser \
 	libllvmaarch64codegen \
 	libllvmaarch64desc \
-	libllvmaarch64disassembler \
 	libllvmaarch64info \
 	libllvmaarch64instprinter \
 	libllvmaarch64utils \
@@ -75,7 +74,6 @@ SUBDIR=	libclanganalysis \
 	libllvmmipsasmparser \
 	libllvmmipscodegen \
 	libllvmmipsdesc \
-	libllvmmipsdisassembler \
 	libllvmmipsinfo \
 	libllvmmipsinstprinter \
 	libllvmpowerpcasmparser \
@@ -87,13 +85,11 @@ SUBDIR=	libclanganalysis \
 	libllvmsparcasmparser \
 	libllvmsparccodegen \
 	libllvmsparcdesc \
-	libllvmsparcdisassembler \
 	libllvmsparcinfo \
 	libllvmsparcinstprinter \
 	libllvmx86asmparser \
 	libllvmx86codegen \
 	libllvmx86desc \
-	libllvmx86disassembler \
 	libllvmx86info \
 	libllvmx86instprinter \
 	libllvmx86utils
@@ -106,10 +102,14 @@ SUBDIR+=libllvmdebuginfodwarf \
 	libllvmpasses
 .endif # MK_CLANG_EXTRAS
 .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
-SUBDIR+=libllvmexecutionengine \
+SUBDIR+=libllvmaarch64disassembler \
+	libllvmexecutionengine \
 	libllvminterpreter \
 	libllvmmcjit \
-	libllvmruntimedyld
+	libllvmmipsdisassembler \
+	libllvmruntimedyld \
+	libllvmsparcdisassembler \
+	libllvmx86disassembler
 .endif # MK_CLANG_EXTRAS | LLDB
 
 .if ${MK_LLDB} != "no"
diff --git a/lib/clang/libclanganalysis/Makefile b/lib/clang/libclanganalysis/Makefile
index 6a34dcabf2ec..66e7248f23ad 100644
--- a/lib/clang/libclanganalysis/Makefile
+++ b/lib/clang/libclanganalysis/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 LIB=	clanganalysis
 
@@ -26,10 +26,13 @@ SRCS=	AnalysisDeclContext.cpp \
 	ScanfFormatString.cpp \
 	ThreadSafety.cpp \
 	ThreadSafetyCommon.cpp \
-	ThreadSafetyLogical.cpp \
 	ThreadSafetyTIL.cpp \
 	UninitializedValues.cpp
 
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	ThreadSafetyLogical.cpp
+.endif
+
 TGHDRS=	AttrList \
 	AttrVisitor \
 	Attrs \
diff --git a/lib/clang/libclangstaticanalyzercheckers/Makefile b/lib/clang/libclangstaticanalyzercheckers/Makefile
index 5fb10352c95c..ec4a76ff72c6 100644
--- a/lib/clang/libclangstaticanalyzercheckers/Makefile
+++ b/lib/clang/libclangstaticanalyzercheckers/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 LIB=	clangstaticanalyzercheckers
 
@@ -21,7 +21,6 @@ SRCS=	AllocationDiagnostics.cpp \
 	CheckObjCInstMethSignature.cpp \
 	CheckSecuritySyntaxOnly.cpp \
 	CheckSizeofPointer.cpp \
-	CheckerDocumentation.cpp \
 	ChrootChecker.cpp \
 	ClangCheckers.cpp \
 	DeadStoresChecker.cpp \
@@ -73,6 +72,10 @@ SRCS=	AllocationDiagnostics.cpp \
 	VLASizeChecker.cpp \
 	VirtualCallChecker.cpp
 
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	CheckerDocumentation.cpp
+.endif
+
 TGHDRS=	AttrList \
 	AttrVisitor \
 	Attrs \
diff --git a/lib/clang/libllvmanalysis/Makefile b/lib/clang/libllvmanalysis/Makefile
index 508705562da5..23d1f876c22d 100644
--- a/lib/clang/libllvmanalysis/Makefile
+++ b/lib/clang/libllvmanalysis/Makefile
@@ -10,7 +10,6 @@ SRCS=	AliasAnalysis.cpp \
 	AliasAnalysisEvaluator.cpp \
 	AliasDebugger.cpp \
 	AliasSetTracker.cpp \
-	Analysis.cpp \
 	AssumptionCache.cpp \
 	BasicAliasAnalysis.cpp \
 	BlockFrequencyInfo.cpp \
@@ -19,7 +18,6 @@ SRCS=	AliasAnalysis.cpp \
 	CFG.cpp \
 	CFGPrinter.cpp \
 	CFLAliasAnalysis.cpp \
-	CGSCCPassManager.cpp \
 	CaptureTracking.cpp \
 	CodeMetrics.cpp \
 	ConstantFolding.cpp \
@@ -65,11 +63,16 @@ SRCS=	AliasAnalysis.cpp \
 	SparsePropagation.cpp \
 	TargetLibraryInfo.cpp \
 	TargetTransformInfo.cpp \
-	Trace.cpp \
 	TypeBasedAliasAnalysis.cpp \
 	ValueTracking.cpp \
 	VectorUtils.cpp
 
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	Analysis.cpp \
+	CGSCCPassManager.cpp \
+	Trace.cpp
+.endif
+	
 TGHDRS=	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmbitwriter/Makefile b/lib/clang/libllvmbitwriter/Makefile
index a99d1aca836d..2e5fa2ac7ffd 100644
--- a/lib/clang/libllvmbitwriter/Makefile
+++ b/lib/clang/libllvmbitwriter/Makefile
@@ -1,13 +1,16 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 LIB=	llvmbitwriter
 
 SRCDIR=	lib/Bitcode/Writer
-SRCS=	BitWriter.cpp \
-	BitcodeWriter.cpp \
+SRCS=	BitcodeWriter.cpp \
 	BitcodeWriterPass.cpp \
 	ValueEnumerator.cpp
 
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	BitWriter.cpp
+.endif
+
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmcodegen/Makefile b/lib/clang/libllvmcodegen/Makefile
index 8c0ac7cd76d3..3205f6a1d4e9 100644
--- a/lib/clang/libllvmcodegen/Makefile
+++ b/lib/clang/libllvmcodegen/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 LIB=	llvmcodegen
 
@@ -28,9 +28,7 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	ExpandPostRAPseudos.cpp \
 	FaultMaps.cpp \
 	GCMetadata.cpp \
-	GCMetadataPrinter.cpp \
 	GCRootLowering.cpp \
-	GCStrategy.cpp \
 	GlobalMerge.cpp \
 	IfConversion.cpp \
 	ImplicitNullChecks.cpp \
@@ -131,6 +129,11 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	VirtRegMap.cpp \
 	WinEHPrepare.cpp
 
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	GCMetadataPrinter.cpp \
+	GCStrategy.cpp
+.endif
+
 TGHDRS=	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmcore/Makefile b/lib/clang/libllvmcore/Makefile
index 52cf1d0a79d5..1d57eccd7f82 100644
--- a/lib/clang/libllvmcore/Makefile
+++ b/lib/clang/libllvmcore/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 LIB=	llvmcore
 
@@ -42,7 +42,6 @@ SRCS=	AsmWriter.cpp \
 	Module.cpp \
 	Operator.cpp \
 	Pass.cpp \
-	PassManager.cpp \
 	PassRegistry.cpp \
 	Statepoint.cpp \
 	Type.cpp \
@@ -54,6 +53,10 @@ SRCS=	AsmWriter.cpp \
 	ValueTypes.cpp \
 	Verifier.cpp
 
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	PassManager.cpp
+.endif
+
 TGHDRS=	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvminstrumentation/Makefile b/lib/clang/libllvminstrumentation/Makefile
index b01b91aea65e..82730b00319a 100644
--- a/lib/clang/libllvminstrumentation/Makefile
+++ b/lib/clang/libllvminstrumentation/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 LIB=	llvminstrumentation
 
@@ -10,12 +10,15 @@ SRCS=	AddressSanitizer.cpp \
 	DataFlowSanitizer.cpp \
 	GCOVProfiling.cpp \
 	MemorySanitizer.cpp \
-	Instrumentation.cpp \
 	InstrProfiling.cpp \
 	SafeStack.cpp \
 	SanitizerCoverage.cpp \
 	ThreadSanitizer.cpp
 
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	Instrumentation.cpp
+.endif
+
 TGHDRS=	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmc/Makefile b/lib/clang/libllvmmc/Makefile
index a6cc474db5ba..5acd2cce5dc4 100644
--- a/lib/clang/libllvmmc/Makefile
+++ b/lib/clang/libllvmmc/Makefile
@@ -25,7 +25,6 @@ SRCS=	ConstantPools.cpp \
 	MCInstPrinter.cpp \
 	MCInstrAnalysis.cpp \
 	MCInstrDesc.cpp \
-	MCLabel.cpp \
 	MCLinkerOptimizationHint.cpp \
 	MCMachOStreamer.cpp \
 	MCMachObjectTargetWriter.cpp \
@@ -43,7 +42,6 @@ SRCS=	ConstantPools.cpp \
 	MCSubtargetInfo.cpp \
 	MCSymbol.cpp \
 	MCSymbolELF.cpp \
-	MCSymbolizer.cpp \
 	MCTargetOptions.cpp \
 	MCValue.cpp \
 	MCWin64EH.cpp \
@@ -52,7 +50,15 @@ SRCS=	ConstantPools.cpp \
 	StringTableBuilder.cpp \
 	SubtargetFeature.cpp \
 	WinCOFFObjectWriter.cpp \
-	WinCOFFStreamer.cpp \
+	WinCOFFStreamer.cpp
+
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	MCLabel.cpp \
 	YAML.cpp
+.endif
+
+.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
+SRCS+=	MCSymbolizer.cpp
+.endif
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmcdisassembler/Makefile b/lib/clang/libllvmmcdisassembler/Makefile
index 2f8a940adc2e..41a56212b9b8 100644
--- a/lib/clang/libllvmmcdisassembler/Makefile
+++ b/lib/clang/libllvmmcdisassembler/Makefile
@@ -1,13 +1,16 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 LIB=	llvmmcdisassembler
 
 SRCDIR=	lib/MC/MCDisassembler
 SRCS=	Disassembler.cpp \
-	MCDisassembler.cpp \
-	MCExternalSymbolizer.cpp \
 	MCRelocationInfo.cpp
 
+.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
+SRCS+=	MCDisassembler.cpp \
+	MCExternalSymbolizer.cpp
+.endif
+
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmirparser/Makefile b/lib/clang/libllvmmirparser/Makefile
index 325cf77c3b05..a3a64c69ab5c 100644
--- a/lib/clang/libllvmmirparser/Makefile
+++ b/lib/clang/libllvmmirparser/Makefile
@@ -1,12 +1,15 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 LIB=	llvmmirparser
 
 SRCDIR=	lib/CodeGen/MIRParser
-SRCS=	MILexer.cpp \
-	MIParser.cpp \
+SRCS=	MIParser.cpp \
 	MIRParser.cpp
 
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	MILexer.cpp
+.endif
+	
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmobject/Makefile b/lib/clang/libllvmobject/Makefile
index 948cebd6d6cb..c575ecd574d2 100644
--- a/lib/clang/libllvmobject/Makefile
+++ b/lib/clang/libllvmobject/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 LIB=	llvmobject
 
@@ -17,10 +17,13 @@ SRCS=	Archive.cpp \
 	IRObjectFile.cpp \
 	MachOObjectFile.cpp \
 	MachOUniversal.cpp \
-	Object.cpp \
 	ObjectFile.cpp \
 	RecordStreamer.cpp \
-	SymbolSize.cpp \
 	SymbolicFile.cpp
 
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	Object.cpp \
+	SymbolSize.cpp
+.endif
+	
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmprofiledata/Makefile b/lib/clang/libllvmprofiledata/Makefile
index 332bf1c73d5c..a38a1903fae2 100644
--- a/lib/clang/libllvmprofiledata/Makefile
+++ b/lib/clang/libllvmprofiledata/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 LIB=	llvmprofiledata
 
@@ -12,7 +12,10 @@ SRCS=	CoverageMapping.cpp \
 	InstrProfReader.cpp \
 	InstrProfWriter.cpp \
 	SampleProf.cpp \
-	SampleProfReader.cpp \
-	SampleProfWriter.cpp
+	SampleProfReader.cpp
+
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	SampleProfWriter.cpp
+.endif
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmsupport/Makefile b/lib/clang/libllvmsupport/Makefile
index db1139680b5a..860285b47263 100644
--- a/lib/clang/libllvmsupport/Makefile
+++ b/lib/clang/libllvmsupport/Makefile
@@ -9,12 +9,10 @@ SRCS=	APFloat.cpp \
 	APInt.cpp \
 	APSInt.cpp \
 	ARMBuildAttrs.cpp \
-	ARMWinEH.cpp \
 	Allocator.cpp \
 	Atomic.cpp \
 	BlockFrequency.cpp \
 	BranchProbability.cpp \
-	COM.cpp \
 	CommandLine.cpp \
 	Compression.cpp \
 	ConvertUTF.c \
@@ -28,7 +26,6 @@ SRCS=	APFloat.cpp \
 	DynamicLibrary.cpp \
 	Errno.cpp \
 	ErrorHandling.cpp \
-	FileOutputBuffer.cpp \
 	FoldingSet.cpp \
 	FormattedStream.cpp \
 	GraphWriter.cpp \
@@ -44,7 +41,6 @@ SRCS=	APFloat.cpp \
 	MD5.cpp \
 	ManagedStatic.cpp \
 	MathExtras.cpp \
-	Memory.cpp \
 	MemoryBuffer.cpp \
 	MemoryObject.cpp \
 	Mutex.cpp \
@@ -82,7 +78,6 @@ SRCS=	APFloat.cpp \
 	Twine.cpp \
 	Unicode.cpp \
 	Valgrind.cpp \
-	Watchdog.cpp \
 	YAMLParser.cpp \
 	YAMLTraits.cpp \
 	circular_raw_ostream.cpp \
@@ -95,9 +90,17 @@ SRCS=	APFloat.cpp \
 	regstrlcpy.c
 
 .if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	DataStream.cpp \
+SRCS+=	ARMWinEH.cpp \
+	COM.cpp \
+	DataStream.cpp \
+	FileOutputBuffer.cpp \
 	FileUtilities.cpp \
-	SystemUtils.cpp
+	SystemUtils.cpp \
+	Watchdog.cpp
+.endif
+
+.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
+SRCS+=	Memory.cpp
 .endif
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmtarget/Makefile b/lib/clang/libllvmtarget/Makefile
index 2935e3e2800f..82410e0f59af 100644
--- a/lib/clang/libllvmtarget/Makefile
+++ b/lib/clang/libllvmtarget/Makefile
@@ -1,18 +1,21 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 LIB=	llvmtarget
 
 SRCDIR=	lib/Target
 SRCS=	Target.cpp \
-	TargetIntrinsicInfo.cpp \
 	TargetLoweringObjectFile.cpp \
 	TargetMachine.cpp \
 	TargetMachineC.cpp \
 	TargetRecip.cpp \
 	TargetSubtargetInfo.cpp
 
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	TargetIntrinsicInfo.cpp
+.endif
+	
 TGHDRS=	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmvectorize/Makefile b/lib/clang/libllvmvectorize/Makefile
index 7a63c9e739c6..bfe1a1013916 100644
--- a/lib/clang/libllvmvectorize/Makefile
+++ b/lib/clang/libllvmvectorize/Makefile
@@ -1,14 +1,17 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 LIB=	llvmvectorize
 
 SRCDIR=	lib/Transforms/Vectorize
 SRCS=	BBVectorize.cpp \
 	LoopVectorize.cpp \
-	SLPVectorizer.cpp \
-	Vectorize.cpp
+	SLPVectorizer.cpp
+
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	Vectorize.cpp
+.endif
 
 TGHDRS=	Intrinsics
 
diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile
index 5178d347c37d..7ee3ad8ab725 100644
--- a/usr.bin/clang/clang/Makefile
+++ b/usr.bin/clang/clang/Makefile
@@ -68,7 +68,6 @@ LIBDEPS=clangfrontendtool \
 	llvmvectorize \
 	llvmbitwriter \
 	llvmasmparser \
-	llvmaarch64disassembler \
 	llvmaarch64codegen \
 	llvmaarch64asmparser \
 	llvmaarch64desc \
@@ -81,7 +80,6 @@ LIBDEPS=clangfrontendtool \
 	llvmarmdesc \
 	llvmarminfo \
 	llvmarminstprinter \
-	llvmmipsdisassembler \
 	llvmmipscodegen \
 	llvmmipsasmparser \
 	llvmmipsdesc \
@@ -93,13 +91,11 @@ LIBDEPS=clangfrontendtool \
 	llvmpowerpcdesc \
 	llvmpowerpcinfo \
 	llvmpowerpcinstprinter \
-	llvmsparcdisassembler \
 	llvmsparccodegen \
 	llvmsparcasmparser \
 	llvmsparcdesc \
 	llvmsparcinfo \
 	llvmsparcinstprinter \
-	llvmx86disassembler \
 	llvmx86asmparser \
 	llvmx86codegen \
 	llvmselectiondag \