Index: src/GenPoly/Lvalue.cc
===================================================================
--- src/GenPoly/Lvalue.cc	(revision c9c9ac4f37b1932b3b5d84b2da1ab654a58e3069)
+++ src/GenPoly/Lvalue.cc	(revision 2bfc6b281e65c5e8bdf4d021589a170c2cb15418)
@@ -21,9 +21,9 @@
 #include "Lvalue.h"
 
+#include "InitTweak/InitTweak.h"
 #include "Parser/LinkageSpec.h"          // for Spec, isBuiltin, Intrinsic
 #include "ResolvExpr/TypeEnvironment.h"  // for AssertionSet, OpenVarSet
 #include "ResolvExpr/Unify.h"            // for unify
 #include "ResolvExpr/typeops.h"
-#include "SymTab/Autogen.h"
 #include "SymTab/Indexer.h"              // for Indexer
 #include "SynTree/Declaration.h"         // for Declaration, FunctionDecl
@@ -33,4 +33,5 @@
 #include "SynTree/Type.h"                // for PointerType, Type, FunctionType
 #include "SynTree/Visitor.h"             // for Visitor, acceptAll
+#include "Validate/FindSpecialDecls.h"   // for dereferenceOperator
 
 #if 0
@@ -44,7 +45,7 @@
 		// TODO: fold this into the general createDeref function??
 		Expression * mkDeref( Expression * arg ) {
-			if ( SymTab::dereferenceOperator ) {
+			if ( Validate::dereferenceOperator ) {
 				// note: reference depth can be arbitrarily deep here, so peel off the outermost pointer/reference, not just pointer because they are effecitvely equivalent in this pass
-				VariableExpr * deref = new VariableExpr( SymTab::dereferenceOperator );
+				VariableExpr * deref = new VariableExpr( Validate::dereferenceOperator );
 				deref->result = new PointerType( Type::Qualifiers(), deref->result );
 				Type * base = InitTweak::getPointerBase( arg->result );