Index: src/InitTweak/FixGlobalInit.cc
===================================================================
--- src/InitTweak/FixGlobalInit.cc	(revision 4eb31f2b13d7cf03cdf3f67290325b3cf371535b)
+++ src/InitTweak/FixGlobalInit.cc	(revision 6a0d1b1e8d0e8397f8de83a000ffac69f486b89d)
@@ -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 4eb31f2b13d7cf03cdf3f67290325b3cf371535b)
+++ src/InitTweak/GenInit.cc	(revision 6a0d1b1e8d0e8397f8de83a000ffac69f486b89d)
@@ -21,4 +21,10 @@
 
 #include "Common/PassVisitor.h"
+
+#include "GenPoly/DeclMutator.h"
+#include "GenPoly/PolyMutator.h"
+#include "GenPoly/ScopedSet.h"
+
+#include "ResolvExpr/typeops.h"
 
 #include "SynTree/Declaration.h"
@@ -31,10 +37,4 @@
 #include "SymTab/Autogen.h"
 #include "SymTab/Mangler.h"
-
-#include "GenPoly/DeclMutator.h"
-#include "GenPoly/PolyMutator.h"
-#include "GenPoly/ScopedSet.h"
-
-#include "ResolvExpr/typeops.h"
 
 namespace InitTweak {