6 files changed, 11 insertions, 11 deletions
diff --git a/clang/tools/clang-cc/Analyses.def b/clang/include/clang/Frontend/Analyses.def
index 3492d09c10a..3492d09c10a 100644
--- a/clang/tools/clang-cc/Analyses.def
+++ b/clang/include/clang/Frontend/Analyses.def
diff --git a/clang/tools/clang-cc/AnalysisConsumer.h b/clang/include/clang/Frontend/AnalysisConsumer.h
index ce878833846..c6452869d2b 100644
--- a/clang/tools/clang-cc/AnalysisConsumer.h
+++ b/clang/include/clang/Frontend/AnalysisConsumer.h
@@ -25,21 +25,21 @@ class LangOptions;
 /// Analysis - Set of available source code analyses.
 enum Analyses {
 #define ANALYSIS(NAME, CMDFLAG, DESC, SCOPE) NAME,
-#include "Analyses.def"
+#include "clang/Frontend/Analyses.def"
 NumAnalyses
 };
 
 /// AnalysisStores - Set of available analysis store models.
 enum AnalysisStores {
 #define ANALYSIS_STORE(NAME, CMDFLAG, DESC, CREATFN) NAME##Model,
-#include "Analyses.def"
+#include "clang/Frontend/Analyses.def"
 NumStores
 };
 
 /// AnalysisConstraints - Set of available constraint models.
 enum AnalysisConstraints {
 #define ANALYSIS_CONSTRAINTS(NAME, CMDFLAG, DESC, CREATFN) NAME##Model,
-#include "Analyses.def"
+#include "clang/Frontend/Analyses.def"
 NumConstraints
 };
 
@@ -47,7 +47,7 @@ NumConstraints
 ///  analysis results.
 enum AnalysisDiagClients {
 #define ANALYSIS_DIAGNOSTICS(NAME, CMDFLAG, DESC, CREATFN, AUTOCREAT) PD_##NAME,
-#include "Analyses.def"
+#include "clang/Frontend/Analyses.def"
 NUM_ANALYSIS_DIAG_CLIENTS
 };
 
diff --git a/clang/tools/clang-cc/AnalysisConsumer.cpp b/clang/lib/Frontend/AnalysisConsumer.cpp
index ce65776c5a0..02a8710b16f 100644
--- a/clang/tools/clang-cc/AnalysisConsumer.cpp
+++ b/clang/lib/Frontend/AnalysisConsumer.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "AnalysisConsumer.h"
+#include "clang/Frontend/AnalysisConsumer.h"
 #include "clang/Frontend/PathDiagnosticClients.h"
 #include "clang/Frontend/ManagerRegistry.h"
 #include "clang/AST/ASTConsumer.h"
diff --git a/clang/lib/Frontend/CMakeLists.txt b/clang/lib/Frontend/CMakeLists.txt
index 02e02f3fc89..241cf5cc8f1 100644
--- a/clang/lib/Frontend/CMakeLists.txt
+++ b/clang/lib/Frontend/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(LLVM_NO_RTTI 1)
 
 add_clang_library(clangFrontend
+  AnalysisConsumer.cpp
   ASTConsumers.cpp
   Backend.cpp
   CacheTokens.cpp
diff --git a/clang/tools/clang-cc/CMakeLists.txt b/clang/tools/clang-cc/CMakeLists.txt
index a20691dfed5..ec2ea3d6290 100644
--- a/clang/tools/clang-cc/CMakeLists.txt
+++ b/clang/tools/clang-cc/CMakeLists.txt
@@ -22,6 +22,5 @@ set( LLVM_LINK_COMPONENTS
   )
 
 add_clang_executable(clang-cc
-  AnalysisConsumer.cpp
   clang-cc.cpp
   )
diff --git a/clang/tools/clang-cc/clang-cc.cpp b/clang/tools/clang-cc/clang-cc.cpp
index e4888f88c80..95a704b4f69 100644
--- a/clang/tools/clang-cc/clang-cc.cpp
+++ b/clang/tools/clang-cc/clang-cc.cpp
@@ -22,7 +22,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "AnalysisConsumer.h"
+#include "clang/Frontend/AnalysisConsumer.h"
 #include "clang/Frontend/ASTConsumers.h"
 #include "clang/Frontend/CompileOptions.h"
 #include "clang/Frontend/FixItRewriter.h"
@@ -1525,7 +1525,7 @@ AnalysisList(llvm::cl::desc("Source Code Analysis - Checks and Analyses"),
 llvm::cl::values(
 #define ANALYSIS(NAME, CMDFLAG, DESC, SCOPE)\
 clEnumValN(NAME, CMDFLAG, DESC),
-#include "Analyses.def"
+#include "clang/Frontend/Analyses.def"
 clEnumValEnd));
 
 static llvm::cl::opt<AnalysisStores> 
@@ -1535,7 +1535,7 @@ AnalysisStoreOpt("analyzer-store",
   llvm::cl::values(
 #define ANALYSIS_STORE(NAME, CMDFLAG, DESC, CREATFN)\
 clEnumValN(NAME##Model, CMDFLAG, DESC),
-#include "Analyses.def"
+#include "clang/Frontend/Analyses.def"
 clEnumValEnd));
 
 static llvm::cl::opt<AnalysisConstraints> 
@@ -1545,7 +1545,7 @@ AnalysisConstraintsOpt("analyzer-constraints",
   llvm::cl::values(
 #define ANALYSIS_CONSTRAINTS(NAME, CMDFLAG, DESC, CREATFN)\
 clEnumValN(NAME##Model, CMDFLAG, DESC),
-#include "Analyses.def"
+#include "clang/Frontend/Analyses.def"
 clEnumValEnd));
 
 static llvm::cl::opt<AnalysisDiagClients>
@@ -1555,7 +1555,7 @@ AnalysisDiagOpt("analyzer-output",
                 llvm::cl::values(
 #define ANALYSIS_DIAGNOSTICS(NAME, CMDFLAG, DESC, CREATFN, AUTOCREATE)\
 clEnumValN(PD_##NAME, CMDFLAG, DESC),
-#include "Analyses.def"
+#include "clang/Frontend/Analyses.def"
 clEnumValEnd));
 
 static llvm::cl::opt<bool>