Index: src/InitTweak/GenInit.cc
===================================================================
--- src/InitTweak/GenInit.cc	(revision d180746e9c094bb8a0500bb2383c1d5d8616da38)
+++ src/InitTweak/GenInit.cc	(revision 135b43118e38aa40c2f0cbfa16829e4b41313af7)
@@ -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