4 files changed, 22 insertions, 6 deletions
diff --git a/support/tools/TableGen/CodeEmitterGen.cpp b/support/tools/TableGen/CodeEmitterGen.cpp
index 25bbe5bdbf..87f3b87dbd 100644
--- a/support/tools/TableGen/CodeEmitterGen.cpp
+++ b/support/tools/TableGen/CodeEmitterGen.cpp
@@ -1,6 +1,12 @@
-#include "Support/Statistic.h"
-#include "Record.h"
+//===- CodeEmitterGen.cpp - Code Emitter Generator ------------------------===//
+//
+// FIXME: Document.
+//
+//===----------------------------------------------------------------------===//
+
 #include "CodeEmitterGen.h"
+#include "Record.h"
+#include "Support/Statistic.h"
 
 bool CodeEmitterGen::run(std::ostream &o) {
   std::vector<Record*> Insts;
diff --git a/support/tools/TableGen/CodeEmitterGen.h b/support/tools/TableGen/CodeEmitterGen.h
index 60f11de1da..1642034024 100644
--- a/support/tools/TableGen/CodeEmitterGen.h
+++ b/support/tools/TableGen/CodeEmitterGen.h
@@ -7,7 +7,9 @@
 #ifndef CODEMITTERGEN_H
 #define CODEMITTERGEN_H
 
-#include "Record.h"
+#include <string>
+#include <iosfwd>
+class RecordKeeper;
 
 class CodeEmitterGen {
   RecordKeeper &Records;
diff --git a/utils/TableGen/CodeEmitterGen.cpp b/utils/TableGen/CodeEmitterGen.cpp
index 25bbe5bdbf..87f3b87dbd 100644
--- a/utils/TableGen/CodeEmitterGen.cpp
+++ b/utils/TableGen/CodeEmitterGen.cpp
@@ -1,6 +1,12 @@
-#include "Support/Statistic.h"
-#include "Record.h"
+//===- CodeEmitterGen.cpp - Code Emitter Generator ------------------------===//
+//
+// FIXME: Document.
+//
+//===----------------------------------------------------------------------===//
+
 #include "CodeEmitterGen.h"
+#include "Record.h"
+#include "Support/Statistic.h"
 
 bool CodeEmitterGen::run(std::ostream &o) {
   std::vector<Record*> Insts;
diff --git a/utils/TableGen/CodeEmitterGen.h b/utils/TableGen/CodeEmitterGen.h
index 60f11de1da..1642034024 100644
--- a/utils/TableGen/CodeEmitterGen.h
+++ b/utils/TableGen/CodeEmitterGen.h
@@ -7,7 +7,9 @@
 #ifndef CODEMITTERGEN_H
 #define CODEMITTERGEN_H
 
-#include "Record.h"
+#include <string>
+#include <iosfwd>
+class RecordKeeper;
 
 class CodeEmitterGen {
   RecordKeeper &Records;