Index: src/SynTree/TupleExpr.cc
===================================================================
--- src/SynTree/TupleExpr.cc	(revision 5ccb10d750e81ef921035bdd254327997acd80ae)
+++ src/SynTree/TupleExpr.cc	(revision 28b894904b38aa5f6c7a345edebac93b65416674)
@@ -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 ) {