Index: src/Common/utility.h
===================================================================
--- src/Common/utility.h	(revision ea6332d2c7319372654f557cb69ec651fdc92331)
+++ src/Common/utility.h	(revision be9288a525b285ac5a849a870863a162fd3d36c7)
@@ -27,4 +27,5 @@
 
 #include <cassert>
+
 template< typename T >
 static inline T * maybeClone( const T *orig ) {
Index: src/Concurrency/Keywords.cc
===================================================================
--- src/Concurrency/Keywords.cc	(revision ea6332d2c7319372654f557cb69ec651fdc92331)
+++ src/Concurrency/Keywords.cc	(revision be9288a525b285ac5a849a870863a162fd3d36c7)
@@ -23,4 +23,5 @@
 #include "InitTweak/InitTweak.h"   // for isConstructor
 #include "Parser/LinkageSpec.h"    // for Cforall
+#include "SymTab/AddVisit.h"       // for acceptAndAdd
 #include "SynTree/Constant.h"      // for Constant
 #include "SynTree/Declaration.h"   // for StructDecl, FunctionDecl, ObjectDecl
Index: src/ControlStruct/Mutate.cc
===================================================================
--- src/ControlStruct/Mutate.cc	(revision ea6332d2c7319372654f557cb69ec651fdc92331)
+++ src/ControlStruct/Mutate.cc	(revision be9288a525b285ac5a849a870863a162fd3d36c7)
@@ -17,9 +17,9 @@
 #include <list>                    // for list
 
+#include "Common/PassVisitor.h"    // for mutateAll
 #include "Common/SemanticError.h"  // for SemanticError
 #include "ForExprMutator.h"        // for ForExprMutator
 #include "LabelFixer.h"            // for LabelFixer
 #include "Mutate.h"
-#include "PassVisitor.h"           // for mutateAll
 #include "SynTree/Declaration.h"   // for Declaration
 #include "SynTree/Mutator.h"       // for mutateAll
Index: src/GenPoly/InstantiateGeneric.cc
===================================================================
--- src/GenPoly/InstantiateGeneric.cc	(revision ea6332d2c7319372654f557cb69ec651fdc92331)
+++ src/GenPoly/InstantiateGeneric.cc	(revision be9288a525b285ac5a849a870863a162fd3d36c7)
@@ -13,4 +13,5 @@
 // Update Count     : 1
 //
+#include "InstantiateGeneric.h"
 
 #include <cassert>                     // for assertf, assert
@@ -26,6 +27,4 @@
 #include "Common/utility.h"            // for deleteAll, cloneAll
 #include "GenPoly.h"                   // for isPolyType, typesPolyCompatible
-#include "InstantiateGeneric.h"
-#include "PassVisitor.h"               // for mutateAll
 #include "ScopedSet.h"                 // for ScopedSet, ScopedSet<>::iterator
 #include "ScrubTyVars.h"               // for ScrubTyVars
Index: src/InitTweak/FixInit.cc
===================================================================
--- src/InitTweak/FixInit.cc	(revision ea6332d2c7319372654f557cb69ec651fdc92331)
+++ src/InitTweak/FixInit.cc	(revision be9288a525b285ac5a849a870863a162fd3d36c7)
@@ -13,4 +13,5 @@
 // Update Count     : 74
 //
+#include "FixInit.h"
 
 #include <stddef.h>                    // for NULL
@@ -33,5 +34,4 @@
 #include "Common/utility.h"            // for CodeLocation, ValueGuard, toSt...
 #include "FixGlobalInit.h"             // for fixGlobalInit
-#include "FixInit.h"
 #include "GenInit.h"                   // for genCtorDtor
 #include "GenPoly/DeclMutator.h"       // for DeclMutator
@@ -40,5 +40,4 @@
 #include "InitTweak.h"                 // for getFunctionName, getCallArg
 #include "Parser/LinkageSpec.h"        // for C, Spec, Cforall, isBuiltin
-#include "PassVisitor.h"               // for mutateAll
 #include "ResolvExpr/Resolver.h"       // for findVoidExpression
 #include "ResolvExpr/typeops.h"        // for typesCompatible
Index: src/InitTweak/GenInit.cc
===================================================================
--- src/InitTweak/GenInit.cc	(revision ea6332d2c7319372654f557cb69ec651fdc92331)
+++ src/InitTweak/GenInit.cc	(revision be9288a525b285ac5a849a870863a162fd3d36c7)
@@ -13,4 +13,5 @@
 // Update Count     : 183
 //
+#include "GenInit.h"
 
 #include <stddef.h>                // for NULL
@@ -24,5 +25,4 @@
 #include "Common/UniqueName.h"     // for UniqueName
 #include "Common/utility.h"        // for ValueGuard, maybeClone
-#include "GenInit.h"
 #include "GenPoly/DeclMutator.h"   // for DeclMutator
 #include "GenPoly/GenPoly.h"       // for getFunctionType, isPolyType
@@ -30,5 +30,4 @@
 #include "InitTweak.h"             // for isConstExpr, InitExpander, checkIn...
 #include "Parser/LinkageSpec.h"    // for isOverridable, C
-#include "PassVisitor.h"           // for bool_ref, acceptAll, mutateAll
 #include "SymTab/Autogen.h"        // for genImplicitCall, SizeType
 #include "SymTab/Mangler.h"        // for Mangler
Index: src/InitTweak/InitTweak.h
===================================================================
--- src/InitTweak/InitTweak.h	(revision ea6332d2c7319372654f557cb69ec651fdc92331)
+++ src/InitTweak/InitTweak.h	(revision be9288a525b285ac5a849a870863a162fd3d36c7)
@@ -16,6 +16,6 @@
 #pragma once
 
-#include <bits/shared_ptr.h>  // for shared_ptr
 #include <list>               // for list
+#include <memory>             // for shared_ptr
 #include <string>             // for string, allocator
 
Index: src/Parser/ParseNode.h
===================================================================
--- src/Parser/ParseNode.h	(revision ea6332d2c7319372654f557cb69ec651fdc92331)
+++ src/Parser/ParseNode.h	(revision be9288a525b285ac5a849a870863a162fd3d36c7)
@@ -25,4 +25,5 @@
 
 #include "Common/SemanticError.h"  // for SemanticError
+#include "Common/UniqueName.h"     // for UniqueName
 #include "Common/utility.h"        // for maybeClone, CodeLocation, maybeBuild
 #include "Parser/LinkageSpec.h"    // for Spec
@@ -39,5 +40,4 @@
 class Initializer;
 class StatementNode;
-class UniqueName;
 
 //##############################################################################
Index: src/Parser/TypedefTable.h
===================================================================
--- src/Parser/TypedefTable.h	(revision ea6332d2c7319372654f557cb69ec651fdc92331)
+++ src/Parser/TypedefTable.h	(revision be9288a525b285ac5a849a870863a162fd3d36c7)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TypedefTable.h -- 
+// TypedefTable.h --
 //
 // Author           : Rodolfo G. Esteves
@@ -21,4 +21,5 @@
 #include <string>     // for string
 
+#include "ParserTypes.h"
 #include "parser.hh"  // for IDENTIFIER, TYPEDEFname, TYPEGENname
 
@@ -31,5 +32,5 @@
 		kind_t kind;
 	};
-	
+
 	struct DeferredEntry {
 		std::string identifier;
@@ -43,9 +44,9 @@
 	std::string currentTrait;
 	int contextScope;
-	
+
 	typedef std::list< DeferredEntry > deferListType;
 	std::stack< deferListType > deferListStack;
 	std::map< std::string, deferListType > contexts;
-	
+
 	std::stack< std::string > nextIdentifiers;
 
@@ -69,16 +70,16 @@
 	void addToEnclosingScope( const std::string &identifier, kind_t kind );
 	void addToEnclosingScope( kind_t kind );		// use nextIdentifiers.top()
-	
+
 	// "addToEnclosingScope2" adds the identifier/type pair to the scope that encloses the scope enclosing the the
 	// current one.  This is the right way to handle assertion names
 	void addToEnclosingScope2( const std::string &identifier, kind_t kind );
 	void addToEnclosingScope2( kind_t kind );		// use nextIdentifiers.top()
-	
+
 	// set the next identifier to be used by an "add" operation without an identifier parameter within the current scope
 	void setNextIdentifier( const std::string &identifier );
-	
+
 	// dump the definitions from a pre-defined context into the current scope
 	void openTrait( const std::string &contextName );
-	
+
 	void enterScope();
 	void leaveScope();
Index: src/SymTab/Autogen.cc
===================================================================
--- src/SymTab/Autogen.cc	(revision ea6332d2c7319372654f557cb69ec651fdc92331)
+++ src/SymTab/Autogen.cc	(revision be9288a525b285ac5a849a870863a162fd3d36c7)
@@ -15,6 +15,12 @@
 #include "Autogen.h"
 
-#include <cassert>                // for assert, assertf
-#include <cstddef>                // for NULL
+#include <cstddef>                 // for NULL
+#include <algorithm>               // for count_if
+#include <cassert>                 // for safe_dynamic_cast, assert, assertf
+#include <iterator>                // for back_insert_iterator, back_inserter
+#include <list>                    // for list, _List_iterator, list<>::iter...
+#include <set>                     // for set, _Rb_tree_const_iterator
+#include <utility>                 // for pair
+#include <vector>                  // for vector
 
 #include "AddVisit.h"             // for addVisit
@@ -23,4 +29,5 @@
 #include "GenPoly/ScopedSet.h"    // for ScopedSet
 #include "Parser/LinkageSpec.h"   // for AutoGen, Intrinsic, Spec
+#include "SymTab/Mangler.h"       // for mangleType
 #include "SynTree/Statement.h"    // for SwitchStmt (ptr only), CompoundStmt
 #include "SynTree/Type.h"         // for Type, ArrayType, Type::StorageClasses
Index: src/SymTab/Validate.cc
===================================================================
--- src/SymTab/Validate.cc	(revision ea6332d2c7319372654f557cb69ec651fdc92331)
+++ src/SymTab/Validate.cc	(revision be9288a525b285ac5a849a870863a162fd3d36c7)
@@ -46,8 +46,11 @@
 #include <utility>                     // for pair
 
+#include "CodeGen/CodeGenerator.h"     // for genName
 #include "Common/PassVisitor.h"        // for PassVisitor, WithDeclsToAdd
 #include "Common/ScopedMap.h"          // for ScopedMap
 #include "Common/SemanticError.h"      // for SemanticError
 #include "Common/UniqueName.h"         // for UniqueName
+#include "Common/utility.h"            // for operator+, cloneAll, deleteAll
+#include "Concurrency/Keywords.h"      // for applyKeywords
 #include "FixFunction.h"               // for FixFunction
 #include "Indexer.h"                   // for Indexer
@@ -55,4 +58,7 @@
 #include "Parser/LinkageSpec.h"        // for C
 #include "ResolvExpr/typeops.h"        // for typesCompatible
+#include "SymTab/AddVisit.h"           // for addVisit
+#include "SymTab/Autogen.h"            // for SizeType
+#include "SynTree/Attribute.h"         // for noAttributes, Attribute
 #include "SynTree/Constant.h"          // for Constant
 #include "SynTree/Declaration.h"       // for ObjectDecl, DeclarationWithType
@@ -68,4 +74,5 @@
 class ReturnStmt;
 class SwitchStmt;
+
 
 #define debugPrint( x ) if ( doDebug ) { std::cout << x; }
Index: src/SynTree/Type.cc
===================================================================
--- src/SynTree/Type.cc	(revision ea6332d2c7319372654f557cb69ec651fdc92331)
+++ src/SynTree/Type.cc	(revision be9288a525b285ac5a849a870863a162fd3d36c7)
@@ -13,4 +13,5 @@
 // Update Count     : 29
 //
+#include "Type.h"
 
 #include "Attribute.h"               // for Attribute
@@ -18,5 +19,5 @@
 #include "InitTweak/InitTweak.h"     // for getPointerBase
 #include "SynTree/BaseSyntaxNode.h"  // for BaseSyntaxNode
-#include "Type.h"
+#include "SynTree/Declaration.h"     // for TypeDecl
 
 using namespace std;
Index: src/Tuples/TupleExpansion.cc
===================================================================
--- src/Tuples/TupleExpansion.cc	(revision ea6332d2c7319372654f557cb69ec651fdc92331)
+++ src/Tuples/TupleExpansion.cc	(revision be9288a525b285ac5a849a870863a162fd3d36c7)
@@ -24,5 +24,4 @@
 #include "InitTweak/InitTweak.h"  // for getFunction
 #include "Parser/LinkageSpec.h"   // for Spec, C, Intrinsic
-#include "PassVisitor.h"               // for mutateAll
 #include "SynTree/Constant.h"     // for Constant
 #include "SynTree/Declaration.h"  // for StructDecl, DeclarationWithType
Index: src/main.cc
===================================================================
--- src/main.cc	(revision ea6332d2c7319372654f557cb69ec651fdc92331)
+++ src/main.cc	(revision be9288a525b285ac5a849a870863a162fd3d36c7)
@@ -23,4 +23,5 @@
 #include <cstdlib>                          // for exit, free, abort, EXIT_F...
 #include <cstring>                          // for index
+#include <fstream>                          // for ofstream
 #include <iostream>                         // for operator<<, basic_ostream
 #include <iterator>                         // for back_inserter