--- a/stage4/generate_iec/generate_iec.cc	Thu Jun 14 17:50:37 2012 +0100
+++ b/stage4/generate_iec/generate_iec.cc	Fri Jun 15 19:54:33 2012 +0100
@@ -57,12 +57,10 @@
 #include "generate_iec.hh"
 
 #include "../stage4.hh"
-
-
-
-#define ERROR error_exit(__FILE__,__LINE__)
-/* function defined in main.cc */
-extern void error_exit(const char *file_name, int line_no);
+#include "../../main.hh" // required for ERROR() and ERROR_MSG() macros.
+
+
+