9 files changed, 24 insertions, 24 deletions
diff --git a/include/clang/AST/ASTDiagnostic.h b/include/clang/AST/ASTDiagnostic.h
index f08cb33e37..7438b7a81b 100644
--- a/include/clang/AST/ASTDiagnostic.h
+++ b/include/clang/AST/ASTDiagnostic.h
@@ -17,7 +17,7 @@ namespace clang {
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
 #define ASTSTART
-#include "clang/Basic/DiagnosticASTKinds.def"
+#include "clang/Basic/DiagnosticASTKinds.inc"
 #undef DIAG
       NUM_BUILTIN_AST_DIAGNOSTICS
     };
diff --git a/include/clang/Analysis/AnalysisDiagnostic.h b/include/clang/Analysis/AnalysisDiagnostic.h
index f01170a925..e7f5ad84f8 100644
--- a/include/clang/Analysis/AnalysisDiagnostic.h
+++ b/include/clang/Analysis/AnalysisDiagnostic.h
@@ -17,7 +17,7 @@ namespace clang {
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
 #define ANALYSISSTART
-#include "clang/Basic/DiagnosticAnalysisKinds.def"
+#include "clang/Basic/DiagnosticAnalysisKinds.inc"
 #undef DIAG
       NUM_BUILTIN_ANALYSIS_DIAGNOSTICS
     };
diff --git a/include/clang/Basic/Diagnostic.h b/include/clang/Basic/Diagnostic.h
index bcec5d9334..005c0c73cf 100644
--- a/include/clang/Basic/Diagnostic.h
+++ b/include/clang/Basic/Diagnostic.h
@@ -50,7 +50,7 @@ namespace clang {
     // Get typedefs for common diagnostics.
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
-#include "clang/Basic/DiagnosticCommonKinds.def"
+#include "clang/Basic/DiagnosticCommonKinds.inc"
       NUM_BUILTIN_COMMON_DIAGNOSTICS
 #undef DIAG
     };
diff --git a/include/clang/Driver/DriverDiagnostic.h b/include/clang/Driver/DriverDiagnostic.h
index d68f964019..b1a8568a11 100644
--- a/include/clang/Driver/DriverDiagnostic.h
+++ b/include/clang/Driver/DriverDiagnostic.h
@@ -17,7 +17,7 @@ namespace clang {
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
 #define DRIVERSTART
-#include "clang/Basic/DiagnosticDriverKinds.def"
+#include "clang/Basic/DiagnosticDriverKinds.inc"
 #undef DIAG
       NUM_BUILTIN_DRIVER_DIAGNOSTICS
     };
diff --git a/include/clang/Frontend/FrontendDiagnostic.h b/include/clang/Frontend/FrontendDiagnostic.h
index 7c87598503..9b405d00cd 100644
--- a/include/clang/Frontend/FrontendDiagnostic.h
+++ b/include/clang/Frontend/FrontendDiagnostic.h
@@ -17,7 +17,7 @@ namespace clang {
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
 #define FRONTENDSTART
-#include "clang/Basic/DiagnosticFrontendKinds.def"
+#include "clang/Basic/DiagnosticFrontendKinds.inc"
 #undef DIAG
       NUM_BUILTIN_FRONTEND_DIAGNOSTICS
     };
diff --git a/include/clang/Lex/LexDiagnostic.h b/include/clang/Lex/LexDiagnostic.h
index 8e79e15f6d..c9f3534ca8 100644
--- a/include/clang/Lex/LexDiagnostic.h
+++ b/include/clang/Lex/LexDiagnostic.h
@@ -17,7 +17,7 @@ namespace clang {
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
 #define LEXSTART
-#include "clang/Basic/DiagnosticLexKinds.def"
+#include "clang/Basic/DiagnosticLexKinds.inc"
 #undef DIAG
       NUM_BUILTIN_LEX_DIAGNOSTICS
     };
diff --git a/include/clang/Parse/ParseDiagnostic.h b/include/clang/Parse/ParseDiagnostic.h
index 1856b0670b..df37df4c4f 100644
--- a/include/clang/Parse/ParseDiagnostic.h
+++ b/include/clang/Parse/ParseDiagnostic.h
@@ -17,7 +17,7 @@ namespace clang {
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
 #define PARSESTART
-#include "clang/Basic/DiagnosticParseKinds.def"
+#include "clang/Basic/DiagnosticParseKinds.inc"
 #undef DIAG
       NUM_BUILTIN_PARSE_DIAGNOSTICS
     };
diff --git a/include/clang/Sema/SemaDiagnostic.h b/include/clang/Sema/SemaDiagnostic.h
index 2819641ac9..0ca7a86379 100644
--- a/include/clang/Sema/SemaDiagnostic.h
+++ b/include/clang/Sema/SemaDiagnostic.h
@@ -17,7 +17,7 @@ namespace clang {
     enum {
 #define DIAG(ENUM,FLAGS,DESC) ENUM,
 #define SEMASTART
-#include "clang/Basic/DiagnosticSemaKinds.def"
+#include "clang/Basic/DiagnosticSemaKinds.inc"
 #undef DIAG
       NUM_BUILTIN_SEMA_DIAGNOSTICS
     };
diff --git a/lib/Basic/Diagnostic.cpp b/lib/Basic/Diagnostic.cpp
index 378b8f514d..97952a04f2 100644
--- a/lib/Basic/Diagnostic.cpp
+++ b/lib/Basic/Diagnostic.cpp
@@ -41,35 +41,35 @@ enum {
 /// diagnostic.
 #define DIAG(ENUM,FLAGS,DESC) FLAGS,
 static unsigned char DiagnosticFlagsCommon[] = {
-#include "clang/Basic/DiagnosticCommonKinds.def"
+#include "clang/Basic/DiagnosticCommonKinds.inc"
   0
 };
 static unsigned char DiagnosticFlagsDriver[] = {
-#include "clang/Basic/DiagnosticDriverKinds.def"
+#include "clang/Basic/DiagnosticDriverKinds.inc"
   0
 };
 static unsigned char DiagnosticFlagsFrontend[] = {
-#include "clang/Basic/DiagnosticFrontendKinds.def"
+#include "clang/Basic/DiagnosticFrontendKinds.inc"
   0
 };
 static unsigned char DiagnosticFlagsLex[] = {
-#include "clang/Basic/DiagnosticLexKinds.def"
+#include "clang/Basic/DiagnosticLexKinds.inc"
   0
 };
 static unsigned char DiagnosticFlagsParse[] = {
-#include "clang/Basic/DiagnosticParseKinds.def"
+#include "clang/Basic/DiagnosticParseKinds.inc"
   0
 };
 static unsigned char DiagnosticFlagsAST[] = {
-#include "clang/Basic/DiagnosticASTKinds.def"
+#include "clang/Basic/DiagnosticASTKinds.inc"
   0
 };
 static unsigned char DiagnosticFlagsSema[] = {
-#include "clang/Basic/DiagnosticSemaKinds.def"
+#include "clang/Basic/DiagnosticSemaKinds.inc"
   0
 };
 static unsigned char DiagnosticFlagsAnalysis[] = {
-#include "clang/Basic/DiagnosticAnalysisKinds.def"
+#include "clang/Basic/DiagnosticAnalysisKinds.inc"
   0
 };
 #undef DIAG
@@ -103,35 +103,35 @@ static unsigned getBuiltinDiagClass(unsigned DiagID) {
 /// should be localized.
 #define DIAG(ENUM,FLAGS,DESC) DESC,
 static const char * const DiagnosticTextCommon[] = {
-#include "clang/Basic/DiagnosticCommonKinds.def"
+#include "clang/Basic/DiagnosticCommonKinds.inc"
   0
 };
 static const char * const DiagnosticTextDriver[] = {
-#include "clang/Basic/DiagnosticDriverKinds.def"
+#include "clang/Basic/DiagnosticDriverKinds.inc"
   0
 };
 static const char * const DiagnosticTextFrontend[] = {
-#include "clang/Basic/DiagnosticFrontendKinds.def"
+#include "clang/Basic/DiagnosticFrontendKinds.inc"
   0
 };
 static const char * const DiagnosticTextLex[] = {
-#include "clang/Basic/DiagnosticLexKinds.def"
+#include "clang/Basic/DiagnosticLexKinds.inc"
   0
 };
 static const char * const DiagnosticTextParse[] = {
-#include "clang/Basic/DiagnosticParseKinds.def"
+#include "clang/Basic/DiagnosticParseKinds.inc"
   0
 };
 static const char * const DiagnosticTextAST[] = {
-#include "clang/Basic/DiagnosticASTKinds.def"
+#include "clang/Basic/DiagnosticASTKinds.inc"
   0
 };
 static const char * const DiagnosticTextSema[] = {
-#include "clang/Basic/DiagnosticSemaKinds.def"
+#include "clang/Basic/DiagnosticSemaKinds.inc"
   0
 };
 static const char * const DiagnosticTextAnalysis[] = {
-#include "clang/Basic/DiagnosticAnalysisKinds.def"
+#include "clang/Basic/DiagnosticAnalysisKinds.inc"
   0
 };
 #undef DIAG