Index: src/SymTab/Validate.cc
===================================================================
--- src/SymTab/Validate.cc	(revision 1ba88a0e455e57ec77fa646372ffd0c5ef7e999c)
+++ src/SymTab/Validate.cc	(revision 5fda7143cbcbc2c8f66e8862aecc99dfa3619c54)
@@ -40,4 +40,5 @@
 #include <list>
 #include <iterator>
+#include "Common/ScopedMap.h"
 #include "Common/utility.h"
 #include "Common/UniqueName.h"
@@ -49,5 +50,4 @@
 #include "SynTree/Statement.h"
 #include "SynTree/TypeSubstitution.h"
-#include "GenPoly/ScopedMap.h"
 #include "Indexer.h"
 #include "FixFunction.h"
@@ -164,5 +164,5 @@
 
 		typedef std::unique_ptr<TypedefDecl> TypedefDeclPtr;
-		typedef GenPoly::ScopedMap< std::string, std::pair< TypedefDeclPtr, int > > TypedefMap;
+		typedef ScopedMap< std::string, std::pair< TypedefDeclPtr, int > > TypedefMap;
 		typedef std::map< std::string, TypeDecl * > TypeDeclMap;
 		TypedefMap typedefNames;