diff --git a/llvm/support/tools/TableGen/CodeEmitterGen.cpp b/llvm/support/tools/TableGen/CodeEmitterGen.cpp
index 25bbe5bdbf35b217980f5f22d04ab1084824102a..87f3b87dbdf91b50deb3fe95ceb8806d6c767925 100644
--- a/llvm/support/tools/TableGen/CodeEmitterGen.cpp
+++ b/llvm/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/llvm/support/tools/TableGen/CodeEmitterGen.h b/llvm/support/tools/TableGen/CodeEmitterGen.h
index 60f11de1da30996bee8165551be3ea09d70ddf98..16420340243d6dc9b642bdd13fa60d76b74931bf 100644
--- a/llvm/support/tools/TableGen/CodeEmitterGen.h
+++ b/llvm/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;