--- a/absyntax_utils/function_call_iterator.cc	Thu Jun 14 17:50:37 2012 +0100
+++ b/absyntax_utils/function_call_iterator.cc	Fri Jun 15 19:54:33 2012 +0100
@@ -45,6 +45,7 @@
 
 
 #include "function_call_iterator.hh"
+#include "../main.hh" // required for ERROR() and ERROR_MSG() macros.
 
 
 //#define DEBUG
@@ -54,10 +55,6 @@
 #define TRACE(classname)
 #endif
 
-#define ERROR error_exit(__FILE__,__LINE__)
-/* function defined in main.cc */
-extern void error_exit(const char *file_name, int line_no);
-