10 files changed, 13 insertions, 14 deletions
diff --git a/clang/tools/clang-cc/clang-cc.h b/clang/include/clang/Frontend/Utils.h
index 354d73b9ac5..41eb31a0fc3 100644
--- a/clang/tools/clang-cc/clang-cc.h
+++ b/clang/include/clang/Frontend/Utils.h
@@ -1,4 +1,4 @@
-//===--- clang-cc.h - C-Language Front-end --------------------------------===//
+//===--- Utils.h - Misc utilities for the front-end------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,12 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This is the header file that pulls together the top-level driver.
+//  This header contains miscellaneous utilities for various front-end actions.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_CLANG_CC_H
-#define LLVM_CLANG_CLANG_CC_H
+#ifndef LLVM_CLANG_FRONTEND_UTILS_H
+#define LLVM_CLANG_FRONTEND_UTILS_H
 
 #include <vector>
 #include <string>
diff --git a/clang/tools/clang-cc/CacheTokens.cpp b/clang/lib/Frontend/CacheTokens.cpp
index 53352360fbc..0065828c6de 100644
--- a/clang/tools/clang-cc/CacheTokens.cpp
+++ b/clang/lib/Frontend/CacheTokens.cpp
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang-cc.h"
+#include "clang/Frontend/Utils.h"
 #include "clang/Basic/FileManager.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/IdentifierTable.h"
diff --git a/clang/tools/clang-cc/DependencyFile.cpp b/clang/lib/Frontend/DependencyFile.cpp
index 3306f82aea7..4cee280ebf5 100644
--- a/clang/tools/clang-cc/DependencyFile.cpp
+++ b/clang/lib/Frontend/DependencyFile.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang-cc.h"
+#include "clang/Frontend/Utils.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/FileManager.h"
 #include "clang/Lex/Preprocessor.h"
diff --git a/clang/tools/clang-cc/DiagChecker.cpp b/clang/lib/Frontend/DiagChecker.cpp
index 5e964dcfb7a..2eaf2fe62f5 100644
--- a/clang/tools/clang-cc/DiagChecker.cpp
+++ b/clang/lib/Frontend/DiagChecker.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang-cc.h"
+#include "clang/Frontend/Utils.h"
 #include "clang/Frontend/TextDiagnosticBuffer.h"
 #include "clang/Sema/ParseAST.h"
 #include "clang/AST/ASTConsumer.h"
diff --git a/clang/tools/clang-cc/PrintParserCallbacks.cpp b/clang/lib/Frontend/PrintParserCallbacks.cpp
index e5b7d0455cf..e9aece968fd 100644
--- a/clang/tools/clang-cc/PrintParserCallbacks.cpp
+++ b/clang/lib/Frontend/PrintParserCallbacks.cpp
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang-cc.h"
+#include "clang/Frontend/Utils.h"
 #include "clang/Parse/Action.h"
 #include "clang/Parse/DeclSpec.h"
 #include "llvm/Support/raw_ostream.h"
diff --git a/clang/tools/clang-cc/PrintPreprocessedOutput.cpp b/clang/lib/Frontend/PrintPreprocessedOutput.cpp
index 429b8296490..6a7ad31b53e 100644
--- a/clang/tools/clang-cc/PrintPreprocessedOutput.cpp
+++ b/clang/lib/Frontend/PrintPreprocessedOutput.cpp
@@ -12,8 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Basic/SourceManager.h"
-#include "clang-cc.h"
+#include "clang/Frontend/Utils.h"
 #include "clang/Lex/MacroInfo.h"
 #include "clang/Lex/PPCallbacks.h"
 #include "clang/Lex/Preprocessor.h"
diff --git a/clang/tools/clang-cc/RewriteMacros.cpp b/clang/lib/Frontend/RewriteMacros.cpp
index c9c4444ad47..5ef4892e5bc 100644
--- a/clang/tools/clang-cc/RewriteMacros.cpp
+++ b/clang/lib/Frontend/RewriteMacros.cpp
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang-cc.h"
+#include "clang/Frontend/Utils.h"
 #include "clang/Rewrite/Rewriter.h"
 #include "clang/Lex/Preprocessor.h"
 #include "clang/Basic/SourceManager.h"
diff --git a/clang/tools/clang-cc/RewriteTest.cpp b/clang/lib/Frontend/RewriteTest.cpp
index c4b3a779565..f9eb58f8674 100644
--- a/clang/tools/clang-cc/RewriteTest.cpp
+++ b/clang/lib/Frontend/RewriteTest.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang-cc.h"
+#include "clang/Frontend/Utils.h"
 #include "clang/Lex/Preprocessor.h"
 #include "clang/Rewrite/TokenRewriter.h"
 #include "llvm/Support/raw_ostream.h"
diff --git a/clang/tools/clang-cc/Warnings.cpp b/clang/lib/Frontend/Warnings.cpp
index b3e21e10527..8d6ca68de9a 100644
--- a/clang/tools/clang-cc/Warnings.cpp
+++ b/clang/lib/Frontend/Warnings.cpp
@@ -20,7 +20,7 @@
 // Given a warning option 'foo', the following are valid:
 //    -Wfoo, -Wno-foo, -Werror=foo
 //
-#include "clang-cc.h"
+#include "clang/Frontend/Utils.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Sema/SemaDiagnostic.h"
 #include "clang/Lex/LexDiagnostic.h"
diff --git a/clang/tools/clang-cc/clang-cc.cpp b/clang/tools/clang-cc/clang-cc.cpp
index 40333d22d30..51b3ffda274 100644
--- a/clang/tools/clang-cc/clang-cc.cpp
+++ b/clang/tools/clang-cc/clang-cc.cpp
@@ -22,7 +22,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang-cc.h"
 #include "AnalysisConsumer.h"
 #include "clang/Frontend/ASTConsumers.h"
 #include "clang/Frontend/CompileOptions.h"
@@ -34,6 +33,7 @@
 #include "clang/Frontend/PCHReader.h"
 #include "clang/Frontend/TextDiagnosticBuffer.h"
 #include "clang/Frontend/TextDiagnosticPrinter.h"
+#include "clang/Frontend/Utils.h"
 #include "clang/Analysis/PathDiagnostic.h"
 #include "clang/CodeGen/ModuleBuilder.h"
 #include "clang/Sema/ParseAST.h"