diff --git a/utils/TableGen/TGSourceMgr.h b/include/llvm/Support/SourceMgr.h
similarity index 92%
rename from utils/TableGen/TGSourceMgr.h
rename to include/llvm/Support/SourceMgr.h
index 69fb74ca20c..60bf7801f4e 100644
--- a/utils/TableGen/TGSourceMgr.h
+++ b/include/llvm/Support/SourceMgr.h
@@ -1,4 +1,4 @@
-//===- TGSourceMgr.h - Manager for Source Buffers & Diagnostics -*- C++ -*-===//
+//===- SourceMgr.h - Manager for Source Buffers & Diagnostics ---*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,7 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This file declares the TGSourceMgr class.
+// This file declares the SourceMgr class.  This class is used as a simple
+// substrate for diagnostics, #include handling, and other low level things for
+// simple parsers.
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/utils/TableGen/TGSourceMgr.cpp b/lib/Support/SourceMgr.cpp
similarity index 92%
rename from utils/TableGen/TGSourceMgr.cpp
rename to lib/Support/SourceMgr.cpp
index 42bc75246c9..e745207cff5 100644
--- a/utils/TableGen/TGSourceMgr.cpp
+++ b/lib/Support/SourceMgr.cpp
@@ -1,4 +1,4 @@
-//===- TGSourceMgr.cpp - Manager for Source Buffers & Diagnostics ---------===//
+//===- SourceMgr.cpp - Manager for Simple Source Buffers & Diagnostics ----===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,11 +7,13 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This file implements the TGSourceMgr class.
+// This file implements the SourceMgr class.  This class is used as a simple
+// substrate for diagnostics, #include handling, and other low level things for
+// simple parsers.
 //
 //===----------------------------------------------------------------------===//
 
-#include "TGSourceMgr.h"
+#include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/raw_ostream.h"
 using namespace llvm;
diff --git a/utils/TableGen/Record.h b/utils/TableGen/Record.h
index ac06cae809d..18b10eabdc0 100644
--- a/utils/TableGen/Record.h
+++ b/utils/TableGen/Record.h
@@ -15,7 +15,7 @@
 #ifndef RECORD_H
 #define RECORD_H
 
-#include "TGSourceMgr.h"
+#include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/DataTypes.h"
 #include <map>
 #include <ostream>
diff --git a/utils/TableGen/TGLexer.cpp b/utils/TableGen/TGLexer.cpp
index 758d499a8b5..1941a599e8b 100644
--- a/utils/TableGen/TGLexer.cpp
+++ b/utils/TableGen/TGLexer.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "TGLexer.h"
-#include "TGSourceMgr.h"
+#include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/Streams.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include <ostream>
diff --git a/utils/TableGen/TGParser.h b/utils/TableGen/TGParser.h
index 3af467d16ab..c618708ee97 100644
--- a/utils/TableGen/TGParser.h
+++ b/utils/TableGen/TGParser.h
@@ -15,7 +15,7 @@
 #define TGPARSER_H
 
 #include "TGLexer.h"
-#include "TGSourceMgr.h"
+#include "llvm/Support/SourceMgr.h"
 #include <map>
 
 namespace llvm {