diff --git a/clang/lib/Frontend/CMakeLists.txt b/clang/lib/Frontend/CMakeLists.txt
index 047314649f7f..807b469b7514 100644
--- a/clang/lib/Frontend/CMakeLists.txt
+++ b/clang/lib/Frontend/CMakeLists.txt
@@ -1,8 +1,12 @@
 set(LLVM_NO_RTTI 1)
 
 add_clang_library(clangFrontend
+  ASTConsumers.cpp
+  Backend.cpp
   FixItRewriter.cpp
+  GeneratePCH.cpp
   HTMLDiagnostics.cpp
+  HTMLPrint.cpp
   InitHeaderSearch.cpp
   InitPreprocessor.cpp
   TextDiagnosticBuffer.cpp
@@ -14,5 +18,7 @@ add_clang_library(clangFrontend
   PCHWriterDecl.cpp
   PCHWriterStmt.cpp
   PlistDiagnostics.cpp
+  RewriteBlocks.cpp
+  RewriteObjC.cpp
   ManagerRegistry.cpp
   )
diff --git a/clang/tools/clang-cc/CMakeLists.txt b/clang/tools/clang-cc/CMakeLists.txt
index 4ebebb74f5af..9029c0a247b2 100644
--- a/clang/tools/clang-cc/CMakeLists.txt
+++ b/clang/tools/clang-cc/CMakeLists.txt
@@ -1,11 +1,11 @@
 set(LLVM_NO_RTTI 1)
 
 set( LLVM_USED_LIBS
+  clangFrontend
   clangCodeGen
   clangAnalysis
   clangRewrite
   clangSema
-  clangFrontend
   clangAST
   clangParse
   clangLex
@@ -23,19 +23,13 @@ set( LLVM_LINK_COMPONENTS
 
 add_clang_executable(clang-cc
   AnalysisConsumer.cpp
-  ASTConsumers.cpp
-  Backend.cpp
   CacheTokens.cpp
   clang-cc.cpp
   DependencyFile.cpp
   DiagChecker.cpp
-  GeneratePCH.cpp
-  HTMLPrint.cpp
   PrintParserCallbacks.cpp
   PrintPreprocessedOutput.cpp
-  RewriteBlocks.cpp
   RewriteMacros.cpp
-  RewriteObjC.cpp
   RewriteTest.cpp
   Warnings.cpp
   )