Index: projects/clangbsd/usr.bin/clang/clang/Makefile
===================================================================
--- projects/clangbsd/usr.bin/clang/clang/Makefile	(revision 209044)
+++ projects/clangbsd/usr.bin/clang/clang/Makefile	(revision 209045)
@@ -1,28 +1,28 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 PROG_CXX=clang
 
 SRCDIR=	tools/clang/tools/driver
 SRCS=	cc1_main.cpp cc1as_main.cpp driver.cpp
 MAN=
 
 LINKS=	${BINDIR}/clang ${BINDIR}/clang++
 
-TGHDRS=	DiagnosticCommonKinds DiagnosticDriverKinds \
-	DiagnosticFrontendKinds DiagnosticLexKinds DiagnosticSemaKinds \
-	CC1Options CC1AsOptions Options
+TGHDRS=	CC1AsOptions CC1Options DiagnosticCommonKinds \
+	DiagnosticDriverKinds DiagnosticFrontendKinds \
+	DiagnosticLexKinds DiagnosticSemaKinds Options
 LIBDEPS=clangfrontend clangdriver clangcodegen clangsema clangchecker \
 	clanganalysis clangrewrite clangast clangparse clanglex clangbasic \
 	\
 	llvminstcombine llvmipo llvmbitwriter llvmbitreader \
 	llvmpowerpccodegen llvmpowerpcasmprinter llvmpowerpcinfo \
 	llvmx86asmparser llvmx86asmprinter llvmx86codegen llvmx86info \
 	llvmmipsasmprinter llvmmipscodegen llvmmipsinfo \
 	llvmarmasmparser llvmarmasmprinter llvmarmcodegen \
 	llvmselectiondag llvmasmprinter llvmcodegen llvmscalaropts \
 	llvmtransformutils llvmmc llvmmcparser llvmipa llvmanalysis \
 	llvmtarget llvmmc llvmcore llvmarminfo llvmsupport llvmsystem
 
 .include "../clang.prog.mk"
Index: projects/clangbsd/usr.bin/clang/tblgen/Makefile
===================================================================
--- projects/clangbsd/usr.bin/clang/tblgen/Makefile	(revision 209044)
+++ projects/clangbsd/usr.bin/clang/tblgen/Makefile	(revision 209045)
@@ -1,24 +1,24 @@
 # $FreeBSD$
 
 PROG_CXX=tblgen
 
 SRCDIR=	utils/TableGen
 SRCS=	ARMDecoderEmitter.cpp AsmMatcherEmitter.cpp \
 	AsmWriterEmitter.cpp AsmWriterInst.cpp CallingConvEmitter.cpp \
 	ClangASTNodesEmitter.cpp ClangDiagnosticsEmitter.cpp \
-	CodeEmitterGen.cpp CodeGenDAGPatterns.cpp CodeGenInstruction.cpp \
-	CodeGenTarget.cpp DAGISelEmitter.cpp DAGISelMatcher.cpp \
-	DAGISelMatcherEmitter.cpp DAGISelMatcherGen.cpp \
-	DAGISelMatcherOpt.cpp DisassemblerEmitter.cpp EDEmitter.cpp \
-	FastISelEmitter.cpp InstrEnumEmitter.cpp InstrInfoEmitter.cpp \
-	IntrinsicEmitter.cpp LLVMCConfigurationEmitter.cpp \
-	OptParserEmitter.cpp Record.cpp RegisterInfoEmitter.cpp \
-	SubtargetEmitter.cpp TGLexer.cpp TGParser.cpp TGValueTypes.cpp \
-	TableGen.cpp TableGenBackend.cpp X86DisassemblerTables.cpp \
-	X86RecognizableInstr.cpp
+	CodeEmitterGen.cpp CodeGenDAGPatterns.cpp \
+	CodeGenInstruction.cpp CodeGenTarget.cpp DAGISelEmitter.cpp \
+	DAGISelMatcher.cpp DAGISelMatcherEmitter.cpp \
+	DAGISelMatcherGen.cpp DAGISelMatcherOpt.cpp \
+	DisassemblerEmitter.cpp EDEmitter.cpp FastISelEmitter.cpp \
+	InstrEnumEmitter.cpp InstrInfoEmitter.cpp IntrinsicEmitter.cpp \
+	LLVMCConfigurationEmitter.cpp OptParserEmitter.cpp Record.cpp \
+	RegisterInfoEmitter.cpp SubtargetEmitter.cpp TGLexer.cpp \
+	TGParser.cpp TGValueTypes.cpp TableGen.cpp TableGenBackend.cpp \
+	X86DisassemblerTables.cpp X86RecognizableInstr.cpp
 MAN=
 REQUIRES_EH=
 
 LIBDEPS=llvmsupport llvmsystem
 
 .include "../clang.prog.mk"