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