--- a/util/dsymtable.cc	Thu Jun 14 17:50:37 2012 +0100
+++ b/util/dsymtable.cc	Fri Jun 15 19:54:33 2012 +0100
@@ -33,14 +33,10 @@
 
 #include <iostream>
 #include "symtable.hh"
+#include "../main.hh" // required for ERROR() and ERROR_MSG() macros.
 
 
 
-/* A macro for printing out internal parser errors... */
-#define ERROR error_exit(__FILE__,__LINE__)
-/* function defined in main.cc */
-extern void error_exit(const char *file_name, int line_no);
-