--- a/absyntax_utils/search_constant_type.cc	Sat Jul 09 14:05:53 2011 +0100
+++ b/absyntax_utils/search_constant_type.cc	Sat Jul 09 14:17:52 2011 +0100
@@ -43,13 +43,8 @@
 
 #include "../util/symtable.hh"
 #include "search_constant_type.hh"
+#include "absyntax_utils.hh"
 
-/* A symbol table with all values declared for enumerated type... */
-/* Note that if the value is defined multiple times the value
- * is the null pointer.
- */
-extern symbol_c null_symbol4;
-extern symtable_c<symbol_c *, &null_symbol4> enumerated_value_symtable;
 
 #define ERROR error_exit(__FILE__,__LINE__)
 /* function defined in main.cc */

--- a/absyntax_utils/search_constant_type.hh	Sat Jul 09 14:05:53 2011 +0100
+++ b/absyntax_utils/search_constant_type.hh	Sat Jul 09 14:17:52 2011 +0100
@@ -43,6 +43,8 @@
 
 #include "../absyntax/visitor.hh"
 
+#ifndef _SEARCH_CONSTANT_TYPE_HH
+#define _SEARCH_CONSTANT_TYPE_HH
 
 class search_constant_type_c: public search_visitor_c {
 
@@ -162,3 +164,4 @@
 
 
 
+#endif /* ifndef _SEARCH_CONSTANT_TYPE_HH */