Index: src/InitTweak/FixGlobalInit.cc
===================================================================
--- src/InitTweak/FixGlobalInit.cc	(revision 0db6fc0e30a15a277876f071902c2fced6294c93)
+++ src/InitTweak/FixGlobalInit.cc	(revision 8ca3a72b36ccb51a65310cc76b8097bfeab9dcef)
@@ -26,8 +26,4 @@
 
 namespace InitTweak {
-	namespace {
-		const std::list<Label> noLabels;
-	}
-
 	class GlobalFixer : public Visitor {
 	  public:
Index: src/InitTweak/GenInit.cc
===================================================================
--- src/InitTweak/GenInit.cc	(revision 0db6fc0e30a15a277876f071902c2fced6294c93)
+++ src/InitTweak/GenInit.cc	(revision 8ca3a72b36ccb51a65310cc76b8097bfeab9dcef)
@@ -16,25 +16,27 @@
 #include <stack>
 #include <list>
+
+#include "InitTweak.h"
 #include "GenInit.h"
-#include "InitTweak.h"
+
+#include "Common/PassVisitor.h"
+
+#include "GenPoly/DeclMutator.h"
+#include "GenPoly/PolyMutator.h"
+#include "GenPoly/ScopedSet.h"
+
+#include "ResolvExpr/typeops.h"
+
 #include "SynTree/Declaration.h"
-#include "SynTree/Type.h"
 #include "SynTree/Expression.h"
-#include "SynTree/Statement.h"
 #include "SynTree/Initializer.h"
 #include "SynTree/Mutator.h"
+#include "SynTree/Statement.h"
+#include "SynTree/Type.h"
+
 #include "SymTab/Autogen.h"
 #include "SymTab/Mangler.h"
-#include "GenPoly/PolyMutator.h"
-#include "GenPoly/DeclMutator.h"
-#include "GenPoly/ScopedSet.h"
-#include "ResolvExpr/typeops.h"
 
 namespace InitTweak {
-	namespace {
-		const std::list<Label> noLabels;
-		const std::list<Expression *> noDesignators;
-	}
-
 	class ReturnFixer final : public GenPoly::PolyMutator {
 	  public: