diff -r bc90dd4bbf4f -r f86d5d6bb04e stage3/constant_folding.hh
--- a/stage3/constant_folding.hh	Fri Dec 26 10:09:27 2014 +0000
+++ b/stage3/constant_folding.hh	Fri Dec 26 12:43:13 2014 +0000
@@ -41,6 +41,7 @@
 
 #include <vector>
 #include "../absyntax_utils/absyntax_utils.hh"
+#include "../util/symtable.hh"
 
 
 
@@ -68,7 +69,7 @@
     virtual ~constant_folding_c(void);
     int get_error_count();
     int handle_var_extern_global_pair(symbol_c *extern_var_name, symbol_c *extern_var_decl, symbol_c *global_var_name, symbol_c *global_var_decl);
-    typedef std::map <std::string, const_value_c> map_values_t;
+    typedef symtable_c<const_value_c> map_values_t;
   private:
     map_values_t values;
     void *handle_var_list_decl(symbol_c *var_list, symbol_c *type_decl);