--- a/absyntax_utils/function_param_iterator.cc	Thu Jun 14 17:50:37 2012 +0100
+++ b/absyntax_utils/function_param_iterator.cc	Fri Jun 15 19:54:33 2012 +0100
@@ -54,6 +54,7 @@
 #include <strings.h>
 #include <limits> // required for std::numeric_limits< XXX >::max()
 #include <errno.h> // required for errno
+#include "../main.hh" // required for ERROR() and ERROR_MSG() macros.
 
 //#define DEBUG
 #ifdef DEBUG
@@ -63,11 +64,6 @@
 #endif
 
 
-#define ERROR error_exit(__FILE__,__LINE__)
-/* function defined in main.cc */
-extern void error_exit(const char *file_name, int line_no);
-
-