Index: src/SynTree/AddStmtVisitor.cc
===================================================================
--- src/SynTree/AddStmtVisitor.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/AddStmtVisitor.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -15,8 +15,10 @@
 
 #include "AddStmtVisitor.h"
-#include "Statement.h"
-#include "Declaration.h"
-#include "Expression.h"
-#include "Common/utility.h"
+
+#include "Common/SemanticError.h"  // for SemanticError
+#include "Declaration.h"           // for Declaration
+#include "Expression.h"            // for Expression
+#include "Statement.h"             // for CompoundStmt, ForStmt, IfStmt, Sta...
+#include "SynTree/Label.h"         // for Label, noLabels
 
 void AddStmtVisitor::visitStatementList( std::list< Statement* > &statements ) {
Index: src/SynTree/AddStmtVisitor.h
===================================================================
--- src/SynTree/AddStmtVisitor.h	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/AddStmtVisitor.h	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -16,8 +16,8 @@
 #pragma once
 
-#include <list>
+#include <list>               // for list
 
-#include "SynTree/SynTree.h"
-#include "SynTree/Visitor.h"
+#include "SynTree/SynTree.h"  // for Visitor Nodes
+#include "SynTree/Visitor.h"  // for Visitor
 
 class AddStmtVisitor : public Visitor {
Index: src/SynTree/AddressExpr.cc
===================================================================
--- src/SynTree/AddressExpr.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/AddressExpr.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,7 +14,10 @@
 //
 
-#include "Expression.h"
-#include "Type.h"
-#include "Common/utility.h"
+#include <ostream>           // for ostream, operator<<, basic_ostream, endl
+#include <string>            // for operator<<, string
+
+#include "Common/utility.h"  // for maybeClone
+#include "Expression.h"      // for AddressExpr, Expression
+#include "Type.h"            // for PointerType, Type, Type::Qualifiers
 
 // Address expressions are typed based on the following inference rules:
Index: src/SynTree/AggregateDecl.cc
===================================================================
--- src/SynTree/AggregateDecl.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/AggregateDecl.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,8 +14,13 @@
 //
 
-#include "Declaration.h"
-#include "Attribute.h"
-#include "Type.h"
-#include "Common/utility.h"
+#include <list>                  // for list
+#include <ostream>               // for operator<<, basic_ostream, ostream
+#include <string>                // for operator<<, string, char_traits
+
+#include "Attribute.h"           // for Attribute
+#include "Common/utility.h"      // for printAll, cloneAll, deleteAll
+#include "Declaration.h"         // for AggregateDecl, TypeDecl, Declaration
+#include "Parser/LinkageSpec.h"  // for Spec, linkageName, Cforall
+#include "Type.h"                // for Type, Type::StorageClasses
 
 
Index: src/SynTree/ApplicationExpr.cc
===================================================================
--- src/SynTree/ApplicationExpr.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/ApplicationExpr.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,12 +14,17 @@
 //
 
-#include <cassert>
+#include <cassert>               // for safe_dynamic_cast, assert
+#include <list>                  // for list
+#include <map>                   // for _Rb_tree_const_iterator, map, map<>:...
+#include <memory>                // for unique_ptr
+#include <ostream>               // for operator<<, ostream, basic_ostream
+#include <string>                // for operator<<, string, char_traits
+#include <utility>               // for pair
 
-#include "Expression.h"
-#include "Declaration.h"
-#include "Type.h"
-#include "TypeSubstitution.h"
-#include "Common/utility.h"
-#include "ResolvExpr/typeops.h"
+#include "Common/utility.h"      // for maybeClone, cloneAll, deleteAll, pri...
+#include "Declaration.h"         // for Declaration
+#include "Expression.h"          // for ParamEntry, ApplicationExpr, Expression
+#include "ResolvExpr/typeops.h"  // for extractResultType
+#include "Type.h"                // for Type, PointerType, FunctionType
 
 ParamEntry::ParamEntry( const ParamEntry &other ) :
Index: src/SynTree/ArrayType.cc
===================================================================
--- src/SynTree/ArrayType.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/ArrayType.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,7 +14,12 @@
 //
 
-#include "Type.h"
-#include "Expression.h"
-#include "Common/utility.h"
+#include <list>              // for list
+#include <ostream>           // for operator<<, ostream
+
+#include "Common/utility.h"  // for maybeClone
+#include "Expression.h"      // for Expression
+#include "Type.h"            // for ArrayType, Type, Type::Qualifiers
+
+class Attribute;
 
 
Index: src/SynTree/AttrType.cc
===================================================================
--- src/SynTree/AttrType.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/AttrType.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,7 +14,13 @@
 //
 
-#include "Type.h"
-#include "Expression.h"
-#include "Common/utility.h"
+#include <list>              // for list
+#include <ostream>           // for operator<<, ostream, basic_ostream
+#include <string>            // for char_traits, operator<<, string
+
+#include "Common/utility.h"  // for maybeClone
+#include "Expression.h"      // for Expression
+#include "Type.h"            // for AttrType, Type, Type::Qualifiers
+
+class Attribute;
 
 
Index: src/SynTree/Attribute.cc
===================================================================
--- src/SynTree/Attribute.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/Attribute.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,9 +14,9 @@
 //
 
-#include <cassert>
+#include <ostream>           // for operator<<, ostream, basic_ostream, endl
 
-#include "Common/utility.h"
 #include "Attribute.h"
-#include "Expression.h"
+#include "Common/utility.h"  // for cloneAll, deleteAll, printAll
+#include "Expression.h"      // for Expression
 
 Attribute::Attribute( const Attribute &other ) : name( other.name ) {
Index: src/SynTree/Attribute.h
===================================================================
--- src/SynTree/Attribute.h	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/Attribute.h	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -16,5 +16,9 @@
 #pragma once
 
-#include "SynTree.h"
+#include <iosfwd>  // for ostream
+#include <list>    // for list
+#include <string>  // for string, operator==
+
+class Expression;
 
 // GCC attribute
Index: src/SynTree/BaseSyntaxNode.h
===================================================================
--- src/SynTree/BaseSyntaxNode.h	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/BaseSyntaxNode.h	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -9,13 +9,13 @@
 // Author           : Thierry Delisle
 // Created On       : Tue Feb 14 07:44:20 2017
-// Last Modified By :
-// Last Modified On :
-// Update Count     :
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Aug 17 13:44:00
+// Update Count     : 1
 //
 
 #pragma once
 
-#include "Common/utility.h"
-#include "Visitor.h"
+#include "Common/CodeLocation.h"
+class Visitor;
 
 class BaseSyntaxNode {
Index: src/SynTree/BasicType.cc
===================================================================
--- src/SynTree/BasicType.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/BasicType.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,6 +14,11 @@
 //
 
-#include <cassert>
-#include "Type.h"
+#include <cassert>  // for assert
+#include <list>     // for list
+#include <ostream>  // for operator<<, ostream
+
+#include "Type.h"   // for BasicType, Type, BasicType::Kind, BasicType::Kind...
+
+class Attribute;
 
 BasicType::BasicType( const Type::Qualifiers &tq, Kind bt, const std::list< Attribute * > & attributes ) : Type( tq, attributes ), kind( bt ) {}
Index: src/SynTree/CommaExpr.cc
===================================================================
--- src/SynTree/CommaExpr.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/CommaExpr.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,7 +14,10 @@
 //
 
-#include "Expression.h"
-#include "Type.h"
-#include "Common/utility.h"
+#include <ostream>           // for ostream, endl, operator<<, basic_ostream
+#include <string>            // for operator<<, string
+
+#include "Common/utility.h"  // for maybeClone
+#include "Expression.h"      // for CommaExpr, Expression
+#include "Type.h"            // for Type
 
 CommaExpr::CommaExpr( Expression *arg1, Expression *arg2, Expression *_aname )
Index: src/SynTree/CompoundStmt.cc
===================================================================
--- src/SynTree/CompoundStmt.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/CompoundStmt.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,11 +14,14 @@
 //
 
-#include "Statement.h"
-#include "Common/utility.h"
-#include <algorithm>
-#include <functional>
-#include "Expression.h"
-#include "Declaration.h"
-#include "SynTree/VarExprReplacer.h"
+#include <cassert>                    // for assert, safe_dynamic_cast
+#include <list>                       // for list, _List_const_iterator, lis...
+#include <ostream>                    // for operator<<, ostream, basic_ostream
+#include <string>                     // for operator==, string
+
+#include "Common/utility.h"           // for cloneAll, deleteAll, printAll
+#include "Declaration.h"              // for DeclarationWithType, Declaration
+#include "Statement.h"                // for CompoundStmt, Statement, DeclStmt
+#include "SynTree/Label.h"            // for Label
+#include "SynTree/VarExprReplacer.h"  // for VarExprReplacer, VarExprReplace...
 
 using std::string;
Index: src/SynTree/Constant.cc
===================================================================
--- src/SynTree/Constant.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/Constant.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,10 +14,10 @@
 //
 
-#include <iostream>
-#include <list>
-#include <string>
+#include <cassert>   // for safe_dynamic_cast, assertf
+#include <iostream>  // for operator<<, ostream, basic_ostream
+#include <string>    // for to_string, string, char_traits, operator<<
 
 #include "Constant.h"
-#include "Type.h"
+#include "Type.h"    // for BasicType, Type, Type::Qualifiers, PointerType
 
 Constant::Constant( Type * type, std::string rep, unsigned long long val ) : type( type ), rep( rep ), val( val ) {}
Index: src/SynTree/Constant.h
===================================================================
--- src/SynTree/Constant.h	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/Constant.h	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -16,7 +16,11 @@
 #pragma once
 
-#include "SynTree.h"
-#include "Visitor.h"
-#include "Mutator.h"
+#include <iosfwd>     // for ostream
+#include <string>     // for string
+
+#include "Mutator.h"  // for Mutator
+#include "Visitor.h"  // for Visitor
+
+class Type;
 
 class Constant {
Index: src/SynTree/DeclStmt.cc
===================================================================
--- src/SynTree/DeclStmt.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/DeclStmt.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// DeclStmt.cc -- 
+// DeclStmt.cc --
 //
 // Author           : Richard C. Bilson
@@ -14,7 +14,12 @@
 //
 
-#include "Statement.h"
-#include "Declaration.h"
-#include "Common/utility.h"
+#include <cassert>           // for assert
+#include <list>              // for list
+#include <ostream>           // for operator<<, ostream
+
+#include "Common/utility.h"  // for maybeClone
+#include "Declaration.h"     // for Declaration
+#include "Statement.h"       // for DeclStmt, Statement
+#include "SynTree/Label.h"   // for Label
 
 DeclStmt::DeclStmt( std::list<Label> labels, Declaration *decl ) : Statement( labels ), decl( decl ) {
Index: src/SynTree/Declaration.cc
===================================================================
--- src/SynTree/Declaration.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/Declaration.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,12 +14,15 @@
 //
 
-#include <string>
-#include <map>
+#include <map>                       // for _Rb_tree_const_iterator, map<>::...
+#include <ostream>                   // for ostream, operator<<, basic_ostre...
+#include <string>                    // for string
+#include <utility>                   // for pair
+
+#include "Common/utility.h"          // for maybeClone
 #include "Declaration.h"
-#include "Expression.h"
-#include "Initializer.h"
-#include "Type.h"
-#include "Attribute.h"
-#include "Common/utility.h"
+#include "SynTree/BaseSyntaxNode.h"  // for BaseSyntaxNode
+#include "SynTree/Statement.h"       // for AsmStmt
+#include "SynTree/SynTree.h"         // for UniqueId
+#include "Type.h"                    // for Type, Type::StorageClasses
 
 static UniqueId lastUniqueId = 0;
Index: src/SynTree/Declaration.h
===================================================================
--- src/SynTree/Declaration.h	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/Declaration.h	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -16,12 +16,24 @@
 #pragma once
 
-#include <string>
-
-#include "BaseSyntaxNode.h"
-#include "Mutator.h"
-#include "Visitor.h"
-#include "SynTree.h"
-#include "Parser/LinkageSpec.h"
-#include "Parser/ParseNode.h"
+#include <cassert>               // for assertf
+#include <iosfwd>                // for ostream
+#include <list>                  // for list
+#include <string>                // for string, operator+, allocator, to_string
+
+#include "BaseSyntaxNode.h"      // for BaseSyntaxNode
+#include "Mutator.h"             // for Mutator
+#include "Parser/LinkageSpec.h"  // for Spec, Cforall
+#include "Parser/ParseNode.h"    // for DeclarationNode, DeclarationNode::Ag...
+#include "SynTree.h"             // for UniqueId
+#include "SynTree/Type.h"        // for Type, Type::StorageClasses, Type::Fu...
+#include "Visitor.h"             // for Visitor
+
+class AsmStmt;
+class Attribute;
+class CompoundStmt;
+class ConstantExpr;
+class Expression;
+class Initializer;
+class TypeDecl;
 
 class Declaration : public BaseSyntaxNode {
Index: src/SynTree/DeclarationWithType.cc
===================================================================
--- src/SynTree/DeclarationWithType.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/DeclarationWithType.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,8 +14,13 @@
 //
 
-#include "Declaration.h"
-#include "Type.h"
-#include "Attribute.h"
-#include "Common/utility.h"
+#include <list>                  // for list
+#include <string>                // for string
+
+#include "Attribute.h"           // for Attribute
+#include "Common/utility.h"      // for cloneAll, deleteAll, maybeClone
+#include "Declaration.h"         // for DeclarationWithType, Declaration
+#include "Parser/LinkageSpec.h"  // for Spec
+#include "SynTree/Expression.h"  // for ConstantExpr
+#include "Type.h"                // for Type, Type::FuncSpecifiers, Type::St...
 
 DeclarationWithType::DeclarationWithType( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes, Type::FuncSpecifiers fs )
Index: src/SynTree/Expression.cc
===================================================================
--- src/SynTree/Expression.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/Expression.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,23 +14,20 @@
 //
 
-#include <iostream>
-#include <cassert>
-#include <list>
-#include <algorithm>
-
-#include <iterator>
-
-#include "Declaration.h"
-#include "Expression.h"
-#include "Initializer.h"
-#include "Statement.h"
-#include "Type.h"
-#include "TypeSubstitution.h"
-#include "VarExprReplacer.h"
-
-#include "Common/utility.h"
-#include "Common/PassVisitor.h"
-
-#include "InitTweak/InitTweak.h"
+#include "SynTree/Expression.h"
+
+#include <cassert>                   // for assert, assertf
+#include <iostream>                  // for ostream, operator<<, basic_ostream
+#include <list>                      // for list, _List_iterator, list<>::co...
+
+#include "Common/utility.h"          // for maybeClone, cloneAll, deleteAll
+#include "Declaration.h"             // for ObjectDecl, DeclarationWithType
+#include "Expression.h"              // for Expression, ImplicitCopyCtorExpr
+#include "InitTweak/InitTweak.h"     // for getCallArg, getPointerBase
+#include "Initializer.h"             // for Designation, Initializer
+#include "Statement.h"               // for CompoundStmt, ExprStmt, Statement
+#include "SynTree/BaseSyntaxNode.h"  // for BaseSyntaxNode
+#include "SynTree/Constant.h"        // for Constant
+#include "Type.h"                    // for Type, BasicType, Type::Qualifiers
+#include "TypeSubstitution.h"        // for TypeSubstitution
 
 #include "GenPoly/Lvalue.h"
Index: src/SynTree/Expression.h
===================================================================
--- src/SynTree/Expression.h	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/Expression.h	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -13,16 +13,19 @@
 // Update Count     : 44
 //
-
 #pragma once
 
-#include <map>
-#include <memory>
-
-#include "BaseSyntaxNode.h"
-#include "Constant.h"
-#include "Mutator.h"
-#include "SynTree.h"
-#include "Visitor.h"
-#include "Common/UniqueName.h"
+#include <iosfwd>                 // for ostream
+#include <list>                   // for list, list<>::iterator
+#include <map>                    // for map, map<>::value_compare
+#include <memory>                 // for allocator, unique_ptr
+#include <string>                 // for string
+
+#include "BaseSyntaxNode.h"       // for BaseSyntaxNode
+#include "Constant.h"             // for Constant
+#include "Initializer.h"          // for Designation (ptr only), Initializer
+#include "Mutator.h"              // for Mutator
+#include "SynTree.h"              // for UniqueId
+#include "Visitor.h"              // for Visitor
+
 
 /// Expression is the root type for all expressions
@@ -57,4 +60,5 @@
 
 struct ParamEntry;
+
 typedef std::map< UniqueId, ParamEntry > InferredParams;
 
Index: src/SynTree/FunctionDecl.cc
===================================================================
--- src/SynTree/FunctionDecl.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/FunctionDecl.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,13 +14,16 @@
 //
 
-#include <cassert>
+#include <cassert>               // for assert
+#include <list>                  // for list
+#include <ostream>               // for operator<<, ostream, basic_ostream
+#include <string>                // for operator<<, string, char_traits, ope...
 
-#include "Declaration.h"
-#include "Statement.h"
-#include "Type.h"
-#include "Attribute.h"
-#include "Common/utility.h"
-#include "InitTweak/InitTweak.h"
-#include "CodeGen/FixMain.h"
+#include "Attribute.h"           // for Attribute
+#include "CodeGen/FixMain.h"     // for FixMain
+#include "Common/utility.h"      // for maybeClone, printAll
+#include "Declaration.h"         // for FunctionDecl, FunctionDecl::Parent
+#include "Parser/LinkageSpec.h"  // for Spec, linkageName, Cforall
+#include "Statement.h"           // for CompoundStmt
+#include "Type.h"                // for Type, FunctionType, Type::FuncSpecif...
 
 extern bool translation_unit_nomain;
Index: src/SynTree/FunctionType.cc
===================================================================
--- src/SynTree/FunctionType.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/FunctionType.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,10 +14,14 @@
 //
 
-#include <algorithm>
+#include <list>              // for list
+#include <ostream>           // for operator<<, basic_ostream, ostream, endl
+#include <string>            // for operator<<, char_traits, string
 
-#include "Type.h"
-#include "Declaration.h"
-#include "Common/utility.h"
-#include "Tuples/Tuples.h"
+#include "Common/utility.h"  // for cloneAll, deleteAll, printAll
+#include "Declaration.h"     // for DeclarationWithType
+#include "Tuples/Tuples.h"   // for isTtype
+#include "Type.h"            // for FunctionType, Type, Type::Qualifiers
+
+class Attribute;
 
 FunctionType::FunctionType( const Type::Qualifiers &tq, bool isVarArgs, const std::list< Attribute * > & attributes ) : Type( tq, attributes ), isVarArgs( isVarArgs ) {
Index: src/SynTree/Initializer.cc
===================================================================
--- src/SynTree/Initializer.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/Initializer.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -9,13 +9,19 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Aug  3 11:33:00 2016
-// Update Count     : 29
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Aug 21 09:53:15 2017
+// Update Count     : 30
 //
 
 #include "Initializer.h"
-#include "Expression.h"
-#include "Statement.h"
-#include "Common/utility.h"
+
+#include <cassert>                   // for assertf
+#include <ostream>                   // for ostream, operator<<, basic_ostream
+#include <string>                    // for operator<<, string, char_traits
+
+#include "Common/utility.h"          // for maybeClone, cloneAll, deleteAll
+#include "Expression.h"              // for Expression
+#include "Statement.h"               // for Statement
+#include "SynTree/BaseSyntaxNode.h"  // for BaseSyntaxNode
 
 Designation::Designation( const std::list< Expression * > & designators ) : designators( designators ) {}
@@ -74,5 +80,5 @@
 			}
 		}
-		assertf( initializers.size() == designations.size(), "Created ListInit with mismatching initializers (%lu) and designations (%lu)", initializers.size(), designations.size() );
+		assertf( initializers.size() == designations.size(), "Created ListInit with mismatching initializers (%zd) and designations (%zd)", initializers.size(), designations.size() );
 }
 
Index: src/SynTree/Initializer.h
===================================================================
--- src/SynTree/Initializer.h	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/Initializer.h	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -16,11 +16,13 @@
 #pragma once
 
-#include <cassert>
+#include <iosfwd>            // for ostream
+#include <list>              // for list, list<>::const_iterator, list<>::it...
 
-#include "BaseSyntaxNode.h"
-#include "Mutator.h"
-#include "SynTree.h"
-#include "Type.h"
-#include "Visitor.h"
+#include "BaseSyntaxNode.h"  // for BaseSyntaxNode
+#include "Mutator.h"         // for Mutator
+#include "Visitor.h"         // for Visitor
+
+class Expression;
+class Statement;
 
 // Designation: list of designator (NameExpr, VariableExpr, and ConstantExpr) expressions that specify an object being initialized.
Index: src/SynTree/Mutator.cc
===================================================================
--- src/SynTree/Mutator.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/Mutator.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -9,19 +9,22 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Jul 24 16:32:00 2017
-// Update Count     : 25
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 17 15:39:37 2017
+// Update Count     : 27
 //
 
-#include <cassert>
+#include <cassert>             // for assert
+#include <list>                // for list
+
+#include "Declaration.h"       // for ObjectDecl, Declaration, DeclarationWi...
+#include "Expression.h"        // for Expression, ConstantExpr, ConditionalExpr
+#include "Initializer.h"       // for ConstructorInit, Initializer, Designation
 #include "Mutator.h"
-#include "Initializer.h"
-#include "Statement.h"
-#include "Type.h"
-#include "Declaration.h"
-#include "Expression.h"
-#include "Constant.h"
-#include "Common/utility.h"
-#include "TypeSubstitution.h"
+#include "Statement.h"         // for Statement, CatchStmt, AsmStmt, ForStmt
+#include "Type.h"              // for Type, Type::ForallList, AttrType, Arra...
+#include "TypeSubstitution.h"  // for TypeSubstitution
+
+class Constant;
+class Subrange;
 
 Mutator::Mutator() {}
@@ -111,4 +114,5 @@
 
 Statement *Mutator::mutate( IfStmt *ifStmt ) {
+	mutateAll( ifStmt->get_initialization(), *this );
 	ifStmt->set_condition( maybeMutate( ifStmt->get_condition(), *this ) );
 	ifStmt->set_thenPart( maybeMutate( ifStmt->get_thenPart(), *this ) );
Index: src/SynTree/Mutator.h
===================================================================
--- src/SynTree/Mutator.h	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/Mutator.h	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -13,10 +13,10 @@
 // Update Count     : 16
 //
-#include <cassert>
+#pragma once
 
-#include "SynTree.h"
-#include "Common/SemanticError.h"
+#include <cassert>                 // for assert
 
-#pragma once
+#include "Common/SemanticError.h"  // for SemanticError
+#include "SynTree/SynTree.h"       // for AST nodes
 
 class Mutator {
Index: src/SynTree/NamedTypeDecl.cc
===================================================================
--- src/SynTree/NamedTypeDecl.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/NamedTypeDecl.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,7 +14,12 @@
 //
 
-#include "Declaration.h"
-#include "Type.h"
-#include "Common/utility.h"
+#include <list>                  // for list
+#include <ostream>               // for operator<<, ostream, basic_ostream
+#include <string>                // for operator<<, string, char_traits, ope...
+
+#include "Common/utility.h"      // for printAll, cloneAll, deleteAll, maybe...
+#include "Declaration.h"         // for NamedTypeDecl, DeclarationWithType
+#include "Parser/LinkageSpec.h"  // for Spec, Cforall, linkageName
+#include "Type.h"                // for Type, Type::StorageClasses
 
 NamedTypeDecl::NamedTypeDecl( const std::string &name, Type::StorageClasses scs, Type *base )
Index: src/SynTree/ObjectDecl.cc
===================================================================
--- src/SynTree/ObjectDecl.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/ObjectDecl.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,11 +14,15 @@
 //
 
-#include "Declaration.h"
-#include "Type.h"
-#include "Initializer.h"
-#include "Expression.h"
-#include "Attribute.h"
-#include "Common/utility.h"
-#include "Statement.h"
+#include <list>                  // for list
+#include <ostream>               // for operator<<, ostream, basic_ostream
+#include <string>                // for operator<<, string, char_traits, ope...
+
+#include "Attribute.h"           // for Attribute
+#include "Common/utility.h"      // for maybeClone, printAll
+#include "Declaration.h"         // for ObjectDecl, ObjectDecl::Parent
+#include "Expression.h"          // for Expression
+#include "Initializer.h"         // for Initializer
+#include "Parser/LinkageSpec.h"  // for Spec, linkageName, Cforall
+#include "Type.h"                // for Type, Type::StorageClasses, Type::Fu...
 
 ObjectDecl::ObjectDecl( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes, Type::FuncSpecifiers fs )
Index: src/SynTree/PointerType.cc
===================================================================
--- src/SynTree/PointerType.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/PointerType.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,7 +14,12 @@
 //
 
-#include "Type.h"
-#include "Expression.h"
-#include "Common/utility.h"
+#include <list>              // for list
+#include <ostream>           // for operator<<, ostream
+
+#include "Common/utility.h"  // for maybeClone
+#include "Expression.h"      // for Expression
+#include "Type.h"            // for PointerType, Type, Type::Qualifiers
+
+class Attribute;
 
 PointerType::PointerType( const Type::Qualifiers &tq, Type *base, const std::list< Attribute * > & attributes )
Index: src/SynTree/ReferenceToType.cc
===================================================================
--- src/SynTree/ReferenceToType.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/ReferenceToType.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,12 +14,16 @@
 //
 
-#include <string>
-#include <cassert>
+#include <stddef.h>          // for NULL
+#include <cassert>           // for assert
+#include <list>              // for list, _List_const_iterator, list<>::cons...
+#include <ostream>           // for operator<<, basic_ostream, ostream, endl
+#include <string>            // for string, operator<<, char_traits, operator==
 
-#include "Type.h"
-#include "Declaration.h"
-#include "Expression.h"
-#include "TypeSubstitution.h"
-#include "Common/utility.h"
+#include "Common/utility.h"  // for printAll, cloneAll, deleteAll
+#include "Declaration.h"     // for StructDecl, UnionDecl, EnumDecl, Declara...
+#include "Expression.h"      // for Expression
+#include "Type.h"            // for TypeInstType, StructInstType, UnionInstType
+
+class Attribute;
 
 ReferenceToType::ReferenceToType( const Type::Qualifiers &tq, const std::string &name, const std::list< Attribute * > & attributes ) : Type( tq, attributes ), name( name ), hoistType( false ) {
Index: src/SynTree/Statement.cc
===================================================================
--- src/SynTree/Statement.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/Statement.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -9,24 +9,28 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Jun 12 10:37:00 2017
-// Update Count     : 64
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 17 16:17:20 2017
+// Update Count     : 67
 //
 
-#include <functional>
-#include <algorithm>
-#include <iostream>
-#include <list>
-#include <cassert>
-
-#include "Statement.h"
-#include "Expression.h"
-#include "Declaration.h"
-#include "Common/SemanticError.h"
+#include "SynTree/Statement.h"
+
+#include <stddef.h>                // for NULL
+#include <cassert>                 // for assert, assertf
+#include <iostream>                // for operator<<, basic_ostream, endl
+#include <list>                    // for list, list<>::const_iterator, _Lis...
+#include <string>                  // for operator<<, string, char_traits
+
+#include "Common/SemanticError.h"  // for SemanticError
+#include "Common/utility.h"        // for maybeClone, cloneAll, deleteAll
+#include "Declaration.h"           // for Declaration
+#include "Expression.h"            // for Expression, ConstantExpr
+#include "Statement.h"             // for Statement, ForStmt, AsmStmt, Catch...
+#include "SynTree/Label.h"         // for Label, operator<<
 
 using std::string;
 using std::endl;
 
-Statement::Statement( std::list<Label> _labels ) : labels( _labels ) {}
+Statement::Statement( std::list<Label> labels ) : labels( labels ) {}
 
 void Statement::print( __attribute__((unused)) std::ostream &, __attribute__((unused)) int indent ) const {}
@@ -34,5 +38,5 @@
 Statement::~Statement() {}
 
-ExprStmt::ExprStmt( std::list<Label> _labels, Expression *_expr ) : Statement( _labels ), expr( _expr ) {}
+ExprStmt::ExprStmt( std::list<Label> labels, Expression *expr ) : Statement( labels ), expr( expr ) {}
 
 ExprStmt::ExprStmt( const ExprStmt &other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
@@ -84,6 +88,6 @@
 const char *BranchStmt::brType[] = { "Goto", "Break", "Continue" };
 
-BranchStmt::BranchStmt( std::list<Label> labels, Label _target, Type _type ) throw ( SemanticError ) :
-	Statement( labels ), originalTarget( _target ), target( _target ), computedTarget( NULL ), type( _type ) {
+BranchStmt::BranchStmt( std::list<Label> labels, Label target, Type type ) throw ( SemanticError ) :
+	Statement( labels ), originalTarget( target ), target( target ), computedTarget( NULL ), type( type ) {
 	//actually this is a syntactic error signaled by the parser
 	if ( type == BranchStmt::Goto && target.empty() )
@@ -91,6 +95,6 @@
 }
 
-BranchStmt::BranchStmt( std::list<Label> labels, Expression *_computedTarget, Type _type ) throw ( SemanticError ) :
-	Statement( labels ), computedTarget( _computedTarget ), type( _type ) {
+BranchStmt::BranchStmt( std::list<Label> labels, Expression *computedTarget, Type type ) throw ( SemanticError ) :
+	Statement( labels ), computedTarget( computedTarget ), type( type ) {
 	if ( type != BranchStmt::Goto || computedTarget == 0 )
 		throw SemanticError("Computed target not valid in branch statement");
@@ -101,5 +105,5 @@
 }
 
-ReturnStmt::ReturnStmt( std::list<Label> labels, Expression *_expr ) : Statement( labels ), expr( _expr ) {}
+ReturnStmt::ReturnStmt( std::list<Label> labels, Expression *expr ) : Statement( labels ), expr( expr ) {}
 
 ReturnStmt::ReturnStmt( const ReturnStmt & other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
@@ -118,11 +122,14 @@
 }
 
-IfStmt::IfStmt( std::list<Label> _labels, Expression *_condition, Statement *_thenPart, Statement *_elsePart ):
-	Statement( _labels ), condition( _condition ), thenPart( _thenPart ), elsePart( _elsePart ) {}
+IfStmt::IfStmt( std::list<Label> labels, Expression *condition, Statement *thenPart, Statement *elsePart, std::list<Statement *> initialization ):
+	Statement( labels ), condition( condition ), thenPart( thenPart ), elsePart( elsePart ), initialization( initialization ) {}
 
 IfStmt::IfStmt( const IfStmt & other ) :
-	Statement( other ), condition( maybeClone( other.condition ) ), thenPart( maybeClone( other.thenPart ) ), elsePart( maybeClone( other.elsePart ) ) {}
+	Statement( other ), condition( maybeClone( other.condition ) ), thenPart( maybeClone( other.thenPart ) ), elsePart( maybeClone( other.elsePart ) ) {
+	cloneAll( other.initialization, initialization );
+}
 
 IfStmt::~IfStmt() {
+	deleteAll( initialization );
 	delete condition;
 	delete thenPart;
@@ -135,4 +142,13 @@
 	condition->print( os, indent + 4 );
 
+	if ( !initialization.empty() ) {
+		os << string( indent + 2, ' ' ) << "initialization: \n";
+		for ( std::list<Statement *>::const_iterator it = initialization.begin(); it != initialization.end(); ++it ) {
+			os << string( indent + 4, ' ' );
+			(*it)->print( os, indent + 4 );
+		}
+		os << endl;
+	}
+
 	os << string( indent+2, ' ' ) << "... then: " << endl;
 
@@ -147,6 +163,6 @@
 }
 
-SwitchStmt::SwitchStmt( std::list<Label> _labels, Expression * _condition, std::list<Statement *> &_statements ):
-	Statement( _labels ), condition( _condition ), statements( _statements ) {
+SwitchStmt::SwitchStmt( std::list<Label> labels, Expression * condition, std::list<Statement *> &statements ):
+	Statement( labels ), condition( condition ), statements( statements ) {
 }
 
@@ -175,6 +191,6 @@
 }
 
-CaseStmt::CaseStmt( std::list<Label> _labels, Expression *_condition, std::list<Statement *> &_statements, bool deflt ) throw ( SemanticError ) :
-	Statement( _labels ), condition( _condition ), stmts( _statements ), _isDefault( deflt ) {
+CaseStmt::CaseStmt( std::list<Label> labels, Expression *condition, std::list<Statement *> &statements, bool deflt ) throw ( SemanticError ) :
+	Statement( labels ), condition( condition ), stmts( statements ), _isDefault( deflt ) {
 	if ( isDefault() && condition != 0 )
 		throw SemanticError("default with conditions");
@@ -212,6 +228,6 @@
 }
 
-WhileStmt::WhileStmt( std::list<Label> labels, Expression *condition_, Statement *body_, bool isDoWhile_ ):
-	Statement( labels ), condition( condition_), body( body_), isDoWhile( isDoWhile_) {
+WhileStmt::WhileStmt( std::list<Label> labels, Expression *condition, Statement *body, bool isDoWhile ):
+	Statement( labels ), condition( condition), body( body), isDoWhile( isDoWhile) {
 }
 
@@ -234,6 +250,6 @@
 }
 
-ForStmt::ForStmt( std::list<Label> labels, std::list<Statement *> initialization_, Expression *condition_, Expression *increment_, Statement *body_ ):
-	Statement( labels ), initialization( initialization_ ), condition( condition_ ), increment( increment_ ), body( body_ ) {
+ForStmt::ForStmt( std::list<Label> labels, std::list<Statement *> initialization, Expression *condition, Expression *increment, Statement *body ):
+	Statement( labels ), initialization( initialization ), condition( condition ), increment( increment ), body( body ) {
 }
 
@@ -313,6 +329,6 @@
 }
 
-TryStmt::TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<CatchStmt *> &_handlers, FinallyStmt *_finallyBlock ) :
-	Statement( labels ), block( tryBlock ),  handlers( _handlers ), finallyBlock( _finallyBlock ) {
+TryStmt::TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<CatchStmt *> &handlers, FinallyStmt *finallyBlock ) :
+	Statement( labels ), block( tryBlock ),  handlers( handlers ), finallyBlock( finallyBlock ) {
 }
 
@@ -329,21 +345,24 @@
 void TryStmt::print( std::ostream &os, int indent ) const {
 	os << "Try Statement" << endl;
-	os << string( indent + 2, ' ' ) << "with block: " << endl;
+	os << string( indent + 2, ' ' ) << "with block:" << endl;
+	os << string( indent + 4, ' ' );
 	block->print( os, indent + 4 );
 
 	// handlers
-	os << string( indent + 2, ' ' ) << "and handlers: " << endl;
-	for ( std::list<CatchStmt *>::const_iterator i = handlers.begin(); i != handlers.end(); i++)
+	os << string( indent + 2, ' ' ) << "and handlers:" << endl;
+	for ( std::list<CatchStmt *>::const_iterator i = handlers.begin(); i != handlers.end(); i++) {
+		os << string( indent + 4, ' ' );
 		(*i )->print( os, indent + 4 );
+	}
 
 	// finally block
 	if ( finallyBlock != 0 ) {
-		os << string( indent + 2, ' ' ) << "Finally block: " << endl;
+		os << string( indent + 2, ' ' ) << "and finally:" << endl;
 		finallyBlock->print( os, indent + 4 );
 	} // if
 }
 
-CatchStmt::CatchStmt( std::list<Label> labels, Kind _kind, Declaration *_decl, Expression *_cond, Statement *_body ) :
-	Statement( labels ), kind ( _kind ), decl ( _decl ), cond ( _cond ), body( _body ) {
+CatchStmt::CatchStmt( std::list<Label> labels, Kind kind, Declaration *decl, Expression *cond, Statement *body ) :
+	Statement( labels ), kind ( kind ), decl ( decl ), cond ( cond ), body( body ) {
 }
 
@@ -360,5 +379,5 @@
 	os << "Catch " << ((Terminate == kind) ? "Terminate" : "Resume") << " Statement" << endl;
 
-	os << string( indent, ' ' ) << "... catching" << endl;
+	os << string( indent + 2, ' ' ) << "... catching: ";
 	if ( decl ) {
 		decl->printShort( os, indent + 4 );
@@ -367,8 +386,20 @@
 	else
 		os << string( indent + 4 , ' ' ) << ">>> Error:  this catch clause must have a declaration <<<" << endl;
-}
-
-
-FinallyStmt::FinallyStmt( std::list<Label> labels, CompoundStmt *_block ) : Statement( labels ), block( _block ) {
+
+	if ( cond ) {
+		os << string( indent + 2, ' ' ) << "with conditional:" << endl;
+		os << string( indent + 4, ' ' );
+		cond->print( os, indent + 4 );
+	}
+	else
+		os << string( indent + 2, ' ' ) << "with no conditional" << endl;
+
+	os << string( indent + 2, ' ' ) << "with block:" << endl;
+	os << string( indent + 4, ' ' );
+	body->print( os, indent + 4 );
+}
+
+
+FinallyStmt::FinallyStmt( std::list<Label> labels, CompoundStmt *block ) : Statement( labels ), block( block ) {
 	assert( labels.empty() ); // finally statement cannot be labeled
 }
@@ -383,5 +414,6 @@
 void FinallyStmt::print( std::ostream &os, int indent ) const {
 	os << "Finally Statement" << endl;
-	os << string( indent + 2, ' ' ) << "with block: " << endl;
+	os << string( indent + 2, ' ' ) << "with block:" << endl;
+	os << string( indent + 4, ' ' );
 	block->print( os, indent + 4 );
 }
Index: src/SynTree/Statement.h
===================================================================
--- src/SynTree/Statement.h	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/Statement.h	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -9,18 +9,26 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Aug  3 14:08:00 2017
-// Update Count     : 69
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 17 15:37:53 2017
+// Update Count     : 72
 //
 
 #pragma once
 
-#include "BaseSyntaxNode.h"
-#include "Label.h"
-#include "Mutator.h"
-#include "SynTree.h"
-#include "Type.h"
-#include "Visitor.h"
-#include "Common/SemanticError.h"
+#include <iosfwd>                  // for ostream
+#include <list>                    // for list
+#include <memory>                  // for allocator
+
+#include "BaseSyntaxNode.h"        // for BaseSyntaxNode
+#include "Common/SemanticError.h"  // for SemanticError
+#include "Label.h"                 // for Label
+#include "Mutator.h"               // for Mutator
+#include "Visitor.h"               // for Visitor
+
+class CatchStmt;
+class ConstantExpr;
+class Declaration;
+class Expression;
+class FinallyStmt;
 
 class Statement : public BaseSyntaxNode {
@@ -122,9 +130,12 @@
 	Statement *thenPart;
 	Statement *elsePart;
-
-	IfStmt( std::list<Label> labels, Expression *condition, Statement *thenPart, Statement *elsePart );
+	std::list<Statement *> initialization;
+
+	IfStmt( std::list<Label> labels, Expression *condition, Statement *thenPart, Statement *elsePart,
+			std::list<Statement *> initialization = std::list<Statement *>() );
 	IfStmt( const IfStmt &other );
 	virtual ~IfStmt();
 
+	std::list<Statement *> &get_initialization() { return initialization; }
 	Expression *get_condition() { return condition; }
 	void set_condition( Expression *newValue ) { condition = newValue; }
@@ -228,5 +239,4 @@
 
 	std::list<Statement *> &get_initialization() { return initialization; }
-	void set_initialization( std::list<Statement *> newValue ) { initialization = newValue; }
 	Expression *get_condition() { return condition; }
 	void set_condition( Expression *newValue ) { condition = newValue; }
Index: src/SynTree/TupleExpr.cc
===================================================================
--- src/SynTree/TupleExpr.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/TupleExpr.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,10 +14,17 @@
 //
 
-#include "Expression.h"
-#include "Common/utility.h"
-#include "Type.h"
-#include "Declaration.h"
-#include "Tuples/Tuples.h"
-#include "VarExprReplacer.h"
+#include <cassert>              // for assert, safe_dynamic_cast, assertf
+#include <iterator>             // for next
+#include <list>                 // for list, _List_iterator
+#include <ostream>              // for ostream, operator<<, basic_ostream, endl
+#include <string>               // for operator<<, string, char_traits
+
+#include "Common/utility.h"     // for cloneAll, deleteAll, printAll, toString
+#include "Declaration.h"        // for ObjectDecl
+#include "Expression.h"         // for Expression, TupleExpr, TupleIndexExpr
+#include "SynTree/Label.h"      // for Label, noLabels
+#include "SynTree/Statement.h"  // for CompoundStmt, DeclStmt, ExprStmt, Sta...
+#include "Tuples/Tuples.h"      // for makeTupleType
+#include "Type.h"               // for TupleType, Type
 
 UntypedTupleExpr::UntypedTupleExpr( const std::list< Expression * > & exprs, Expression *_aname ) : Expression( _aname ), exprs( exprs ) {
Index: src/SynTree/TupleType.cc
===================================================================
--- src/SynTree/TupleType.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/TupleType.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,9 +14,14 @@
 //
 
-#include "Declaration.h"
-#include "Initializer.h"
-#include "Type.h"
-#include "Common/utility.h"
-#include "Parser/LinkageSpec.h"
+#include <list>                  // for list
+#include <ostream>               // for operator<<, ostream, basic_ostream
+
+#include "Common/utility.h"      // for cloneAll, deleteAll, printAll
+#include "Declaration.h"         // for Declaration, ObjectDecl
+#include "Initializer.h"         // for ListInit
+#include "Parser/LinkageSpec.h"  // for Cforall
+#include "Type.h"                // for TupleType, Type, Type::Qualifiers
+
+class Attribute;
 
 TupleType::TupleType( const Type::Qualifiers &tq, const std::list< Type * > & types, const std::list< Attribute * > & attributes ) : Type( tq, attributes ), types( types ) {
Index: src/SynTree/Type.cc
===================================================================
--- src/SynTree/Type.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/Type.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -13,12 +13,11 @@
 // Update Count     : 29
 //
+#include "Type.h"
 
-#include "SynTree.h"
-#include "Visitor.h"
-#include "Type.h"
-#include "Declaration.h"
-#include "Attribute.h"
-#include "InitTweak/InitTweak.h"
-#include "Common/utility.h"
+#include "Attribute.h"               // for Attribute
+#include "Common/utility.h"          // for cloneAll, deleteAll, printAll
+#include "InitTweak/InitTweak.h"     // for getPointerBase
+#include "SynTree/BaseSyntaxNode.h"  // for BaseSyntaxNode
+#include "SynTree/Declaration.h"     // for TypeDecl
 
 using namespace std;
Index: src/SynTree/Type.h
===================================================================
--- src/SynTree/Type.h	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/Type.h	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -16,9 +16,15 @@
 #pragma once
 
-#include "BaseSyntaxNode.h"
-#include "Mutator.h"
-#include "SynTree.h"
-#include "Visitor.h"
-#include <strings.h>									// ffs
+#include <strings.h>         // for ffs
+#include <cassert>           // for assert, assertf
+#include <list>              // for list, _List_iterator
+#include <ostream>           // for ostream, operator<<, basic_ostream
+#include <string>            // for string
+
+#include "BaseSyntaxNode.h"  // for BaseSyntaxNode
+#include "Common/utility.h"  // for operator+
+#include "Mutator.h"         // for Mutator
+#include "SynTree.h"         // for AST nodes
+#include "Visitor.h"         // for Visitor
 
 class Type : public BaseSyntaxNode {
Index: src/SynTree/TypeDecl.cc
===================================================================
--- src/SynTree/TypeDecl.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/TypeDecl.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,7 +14,10 @@
 //
 
-#include "Declaration.h"
-#include "Type.h"
-#include "Common/utility.h"
+#include <ostream>           // for ostream, operator<<, basic_ostream, basi...
+#include <string>            // for string, char_traits, operator+, operator<<
+
+#include "Common/utility.h"  // for maybeClone
+#include "Declaration.h"     // for TypeDecl, TypeDecl::Data, TypeDecl::Kind...
+#include "Type.h"            // for Type, Type::StorageClasses
 
 TypeDecl::TypeDecl( const std::string &name, Type::StorageClasses scs, Type *type, Kind kind, Type * init ) : Parent( name, scs, type ), init( init ), sized( kind == Any || kind == Ttype ), kind( kind ) {
Index: src/SynTree/TypeExpr.cc
===================================================================
--- src/SynTree/TypeExpr.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/TypeExpr.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,7 +14,9 @@
 //
 
-#include "Expression.h"
-#include "Type.h"
-#include "Common/utility.h"
+#include <iosfwd>            // for ostream
+
+#include "Common/utility.h"  // for maybeClone
+#include "Expression.h"      // for TypeExpr, Expression
+#include "Type.h"            // for Type
 
 TypeExpr::TypeExpr( Type *type ) : type( type ) {
Index: src/SynTree/TypeSubstitution.cc
===================================================================
--- src/SynTree/TypeSubstitution.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/TypeSubstitution.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,5 +14,7 @@
 //
 
-#include "Type.h"
+#include <ostream>  // for ostream, basic_ostream, operator<<, endl
+
+#include "Type.h"   // for TypeInstType, Type, StructInstType, UnionInstType
 #include "TypeSubstitution.h"
 
Index: src/SynTree/TypeSubstitution.h
===================================================================
--- src/SynTree/TypeSubstitution.h	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/TypeSubstitution.h	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -16,11 +16,17 @@
 #pragma once
 
-#include <map>
-#include <set>
-#include <cassert>
+#include <cassert>                 // for assert
+#include <iosfwd>                  // for ostream
+#include <list>                    // for list<>::iterator, _List_iterator
+#include <map>                     // for _Rb_tree_iterator, map, map<>::val...
+#include <set>                     // for set
+#include <string>                  // for string, operator!=
+#include <utility>                 // for pair
 
-#include "SynTree/Mutator.h"
-#include "SynTree/Declaration.h"
-#include "SynTree/Expression.h"
+#include "Common/SemanticError.h"  // for SemanticError
+#include "SynTree/Declaration.h"   // for TypeDecl, Declaration (ptr only)
+#include "SynTree/Expression.h"    // for Expression (ptr only), NameExpr (p...
+#include "SynTree/Mutator.h"       // for Mutator
+#include "SynTree/Type.h"          // for Type, ArrayType (ptr only), BasicT...
 
 class TypeSubstitution : public Mutator {
Index: src/SynTree/TypeofType.cc
===================================================================
--- src/SynTree/TypeofType.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/TypeofType.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,7 +14,12 @@
 //
 
-#include "Type.h"
-#include "Expression.h"
-#include "Common/utility.h"
+#include <list>              // for list
+#include <ostream>           // for operator<<, ostream
+
+#include "Common/utility.h"  // for maybeClone
+#include "Expression.h"      // for Expression
+#include "Type.h"            // for TypeofType, Type, Type::Qualifiers
+
+class Attribute;
 
 TypeofType::TypeofType( const Type::Qualifiers &tq, Expression *expr, const std::list< Attribute * > & attributes ) : Type( tq, attributes ), expr( expr ) {
Index: src/SynTree/VarArgsType.cc
===================================================================
--- src/SynTree/VarArgsType.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/VarArgsType.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,5 +14,10 @@
 //
 
-#include "Type.h"
+#include <list>     // for list
+#include <ostream>  // for operator<<, ostream
+
+#include "Type.h"   // for Type, VarArgsType, Type::Qualifiers
+
+class Attribute;
 
 VarArgsType::VarArgsType() : Type( Type::Qualifiers(), std::list< Attribute * >() ) {}
Index: src/SynTree/VarExprReplacer.cc
===================================================================
--- src/SynTree/VarExprReplacer.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/VarExprReplacer.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,6 +14,8 @@
 //
 
-#include "Declaration.h"
-#include "Expression.h"
+#include <iostream>       // for operator<<, basic_ostream, ostream, basic_o...
+
+#include "Declaration.h"  // for operator<<, DeclarationWithType
+#include "Expression.h"   // for VariableExpr
 #include "VarExprReplacer.h"
 
Index: src/SynTree/VarExprReplacer.h
===================================================================
--- src/SynTree/VarExprReplacer.h	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/VarExprReplacer.h	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -16,7 +16,10 @@
 #pragma once
 
-#include <map>
+#include <map>                // for map, map<>::value_compare
 
-#include "SynTree/SynTree.h"
+#include "SynTree/Visitor.h"  // for Visitor
+
+class DeclarationWithType;
+class VariableExpr;
 
 /// Visitor that replaces the declarations that VariableExprs refer to, according to the supplied mapping
Index: src/SynTree/Visitor.cc
===================================================================
--- src/SynTree/Visitor.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/Visitor.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -9,17 +9,21 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Jul 24 16:30:00 2017
-// Update Count     : 27
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 17 15:39:38 2017
+// Update Count     : 29
 //
 
-#include <cassert>
+#include <cassert>        // for assert
+#include <list>           // for list
+
+#include "Constant.h"     // for Constant
+#include "Declaration.h"  // for DeclarationWithType, ObjectDecl, Declaration
+#include "Expression.h"   // for Expression, ConstantExpr, ImplicitCopyCtorExpr
+#include "Initializer.h"  // for Initializer, Designation, ConstructorInit
+#include "Statement.h"    // for Statement, CatchStmt, AsmStmt, CompoundStmt
+#include "Type.h"         // for Type, Type::ForallList, AttrType, FunctionType
 #include "Visitor.h"
-#include "Initializer.h"
-#include "Statement.h"
-#include "Type.h"
-#include "Declaration.h"
-#include "Expression.h"
-#include "Constant.h"
+
+class Subrange;
 
 Visitor::Visitor() {}
@@ -95,4 +99,5 @@
 
 void Visitor::visit( IfStmt *ifStmt ) {
+	acceptAll( ifStmt->get_initialization(), *this );
 	maybeAccept( ifStmt->get_condition(), *this );
 	maybeAccept( ifStmt->get_thenPart(), *this );
Index: src/SynTree/Visitor.h
===================================================================
--- src/SynTree/Visitor.h	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/Visitor.h	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -16,7 +16,6 @@
 #pragma once
 
-#include "SynTree.h"
-#include "Common/SemanticError.h"
-#include "Common/CompilerError.h"
+#include "Common/SemanticError.h"  // for SemanticError
+#include "SynTree.h"               // for AST nodes
 
 class Visitor {
Index: src/SynTree/VoidType.cc
===================================================================
--- src/SynTree/VoidType.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/VoidType.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,5 +14,10 @@
 //
 
-#include "Type.h"
+#include <list>     // for list
+#include <ostream>  // for operator<<, ostream
+
+#include "Type.h"   // for VoidType, Type, Type::Qualifiers
+
+class Attribute;
 
 VoidType::VoidType( const Type::Qualifiers &tq, const std::list< Attribute * > & attributes ) : Type( tq, attributes ) {
Index: src/SynTree/ZeroOneType.cc
===================================================================
--- src/SynTree/ZeroOneType.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/ZeroOneType.cc	(revision 8135d4c79504a6c3047246007261186efa5ba4c9)
@@ -14,5 +14,10 @@
 //
 
-#include "Type.h"
+#include <list>     // for list
+#include <ostream>  // for operator<<, ostream
+
+#include "Type.h"   // for Type, Type::Qualifiers, OneType, ZeroType
+
+class Attribute;
 
 ZeroType::ZeroType() : Type( Type::Qualifiers(), std::list< Attribute * >() ) {}