diff -r c41975a290ce -r 4efb11e44065 absyntax_utils/search_constant_type.cc
--- a/absyntax_utils/search_constant_type.cc	Thu Jun 14 17:50:37 2012 +0100
+++ b/absyntax_utils/search_constant_type.cc	Fri Jun 15 19:54:33 2012 +0100
@@ -44,11 +44,9 @@
 #include "../util/symtable.hh"
 #include "search_constant_type.hh"
 #include "absyntax_utils.hh"
+#include "../main.hh" // required for ERROR() and ERROR_MSG() macros.
 
 
-#define ERROR error_exit(__FILE__,__LINE__)
-/* function defined in main.cc */
-extern void error_exit(const char *file_name, int line_no);
 
 symbol_c *search_constant_type_c::get_type(symbol_c *constant) {
   return (symbol_c *)constant->accept(*this);