Index: src/CodeGen/CodeGenerator.cc
===================================================================
--- src/CodeGen/CodeGenerator.cc	(revision bf2438c144672ed3463924e84dfb66424384ec03)
+++ src/CodeGen/CodeGenerator.cc	(revision 30f90724b547940fbd8dcdd08214fcbbd3acafb4)
@@ -13,9 +13,9 @@
 // Update Count     : 485
 //
+#include "CodeGenerator.h"
 
 #include <cassert>                   // for assert, assertf
 #include <list>                      // for _List_iterator, list, list<>::it...
 
-#include "CodeGenerator.h"
 #include "Common/SemanticError.h"    // for SemanticError
 #include "Common/UniqueName.h"       // for UniqueName
Index: src/CodeGen/GenType.cc
===================================================================
--- src/CodeGen/GenType.cc	(revision bf2438c144672ed3463924e84dfb66424384ec03)
+++ src/CodeGen/GenType.cc	(revision 30f90724b547940fbd8dcdd08214fcbbd3acafb4)
@@ -13,4 +13,5 @@
 // Update Count     : 22
 //
+#include "GenType.h"
 
 #include <cassert>                // for assert, assertf
@@ -19,5 +20,4 @@
 
 #include "CodeGenerator.h"        // for CodeGenerator
-#include "GenType.h"
 #include "SynTree/Declaration.h"  // for DeclarationWithType
 #include "SynTree/Expression.h"   // for Expression
Index: src/CodeGen/Generate.cc
===================================================================
--- src/CodeGen/Generate.cc	(revision bf2438c144672ed3463924e84dfb66424384ec03)
+++ src/CodeGen/Generate.cc	(revision 30f90724b547940fbd8dcdd08214fcbbd3acafb4)
@@ -13,4 +13,5 @@
 // Update Count     : 6
 //
+#include "Generate.h"
 
 #include <iostream>                  // for ostream, endl, operator<<
@@ -20,5 +21,4 @@
 #include "CodeGenerator.h"           // for CodeGenerator, doSemicolon, oper...
 #include "GenType.h"                 // for genPrettyType
-#include "Generate.h"
 #include "Parser/LinkageSpec.h"      // for isBuiltin, isGeneratable
 #include "SynTree/BaseSyntaxNode.h"  // for BaseSyntaxNode