Index: src/CodeTools/TrackLoc.cc
===================================================================
--- src/CodeTools/TrackLoc.cc	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
+++ src/CodeTools/TrackLoc.cc	(revision 322b97e2a57358cc53dbed9518af5bd8ae638ada)
@@ -16,18 +16,13 @@
 #include "TrackLoc.h"
 
-#include <cstdlib>                    // for size_t, exit, EXIT_FAILURE
-#include <iostream>                   // for operator<<, ostream, basic_ostream
-#include <iterator>                   // for back_inserter, inserter
-#include <stack>                      // for stack
-#include <string>                     // for operator<<, string
-#include <typeindex>                  // for type_index
+#include <cstdlib>                   // for exit, EXIT_FAILURE
+#include <iostream>                  // for operator<<, ostream, basic_ostream
+#include <stack>                     // for stack
+#include <string>                    // for operator<<, string
+#include <typeindex>                 // for type_index
 
-#include "Common/PassVisitor.h"       // for PassVisitor
-#include "Common/PassVisitor.impl.h"  // for acceptAll
-#include "Common/SemanticError.h"     // for SemanticError
-#include "Common/utility.h"           // for CodeLocation
-#include "SynTree/BaseSyntaxNode.h"   // for BaseSyntaxNode
-#include "SynTree/Mutator.h"          // for mutateAll
-#include "SynTree/Visitor.h"          // for acceptAll
+#include "Common/PassVisitor.h"      // for PassVisitor
+#include "Common/utility.h"          // for CodeLocation
+#include "SynTree/BaseSyntaxNode.h"  // for BaseSyntaxNode
 
 class Declaration;
@@ -46,5 +41,5 @@
 		std::stack< CodeLocation * > parents;
 	public:
-		LocationPrinter(size_t printLevel) : 
+		LocationPrinter(size_t printLevel) :
 			printLevel(printLevel), lastNode(nullptr)
 		{}
@@ -65,8 +60,8 @@
 				if ( !parents.empty() ) {
 					node->location = *parents.top();
-				} 
+				}
 				else if (nullptr != lastNode) {
 					node->location = *lastNode;
-				} 
+				}
 				else {
 					std::cerr << "Top level node has no CodeLocation " << name << std::endl;