2 files changed, 19 insertions, 16 deletions
diff --git a/include/clang/Frontend/SerializedDiagnosticPrinter.h b/include/clang/Frontend/SerializedDiagnosticPrinter.h
index b092b86ee5..7338b7003f 100644
--- a/include/clang/Frontend/SerializedDiagnosticPrinter.h
+++ b/include/clang/Frontend/SerializedDiagnosticPrinter.h
@@ -10,6 +10,8 @@
 #ifndef LLVM_CLANG_FRONTEND_SERIALIZE_DIAGNOSTIC_PRINTER_H_
 #define LLVM_CLANG_FRONTEND_SERIALIZE_DIAGNOSTIC_PRINTER_H_
 
+#include "llvm/Bitcode/BitstreamWriter.h"
+
 namespace llvm {
 class raw_ostream;
 }
@@ -19,6 +21,22 @@ class DiagnosticConsumer;
 class DiagnosticsEngine;
 
 namespace serialized_diags {
+  
+enum BlockIDs {
+  /// \brief The DIAG block, which acts as a container around a diagnostic.
+  BLOCK_DIAG = llvm::bitc::FIRST_APPLICATION_BLOCKID,
+  /// \brief The STRINGS block, which contains strings 
+  /// from multiple diagnostics.
+  BLOCK_STRINGS
+};
+
+enum RecordIDs {
+  RECORD_DIAG = 1,
+  RECORD_DIAG_FLAG,
+  RECORD_CATEGORY,
+  RECORD_FILENAME
+};
+
 /// \brief Returns a DiagnosticConsumer that serializes diagnostics to
 ///  a bitcode file.
 ///
diff --git a/lib/Frontend/SerializedDiagnosticPrinter.cpp b/lib/Frontend/SerializedDiagnosticPrinter.cpp
index 3516ad2e7b..3f42c5fe74 100644
--- a/lib/Frontend/SerializedDiagnosticPrinter.cpp
+++ b/lib/Frontend/SerializedDiagnosticPrinter.cpp
@@ -8,7 +8,6 @@
 //===----------------------------------------------------------------------===//
 
 #include <vector>
-#include "llvm/Bitcode/BitstreamWriter.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/SmallString.h"
@@ -20,6 +19,7 @@
 #include "clang/Frontend/SerializedDiagnosticPrinter.h"
 
 using namespace clang;
+using namespace clang::serialized_diags;
 
 namespace {
 
@@ -130,21 +130,6 @@ private:
   /// \brief Flag indicating whether or not we are in the process of
   /// emitting a non-note diagnostic.
   bool inNonNoteDiagnostic;
-
-  enum BlockIDs {
-    /// \brief The DIAG block, which acts as a container around a diagnostic.
-    BLOCK_DIAG = llvm::bitc::FIRST_APPLICATION_BLOCKID,
-    /// \brief The STRINGS block, which contains strings 
-    /// from multiple diagnostics.
-    BLOCK_STRINGS
-  };
-  
-  enum RecordIDs {
-    RECORD_DIAG = 1,
-    RECORD_DIAG_FLAG,
-    RECORD_CATEGORY,
-    RECORD_FILENAME
-  };
 };
 } // end anonymous namespace