diff -r 17bffb57a8c5 -r 0f24db96b519 stage1_2/stage1_2.cc
--- a/stage1_2/stage1_2.cc	Fri Jul 29 16:08:40 2011 +0100
+++ b/stage1_2/stage1_2.cc	Fri Aug 19 17:33:57 2011 +0100
@@ -44,7 +44,7 @@
 
 
 #include "stage1_2.hh"
-#include "iec.y.hh"
+#include "iec_bison.h"
 #include "stage1_2_priv.hh"
 
 
@@ -127,14 +127,14 @@
 /* NOTE: only accessed indirectly by the lexical parser (flex)
  *       through the function get_identifier_token()
  */
-/* NOTE: BOGUS_TOKEN_ID is defined in the bison generated file iec.y.hh.
+/* NOTE: BOGUS_TOKEN_ID is defined in the bison generated file iec_bison.h.
  *       We need this constant defined before we can declare the symbol tables.
- *       However, we cannot #include "iec.y.hh" in this file (stage1_2_priv.hh) directly
+ *       However, we cannot #include "iec_bison.h" in this file (stage1_2_priv.hh) directly
  *       because of the way bison ver. 3.2 is copying all declarations in the prologue
- *       of iec.y to the iec.y.hh file (including an #include stage1_2_priv.hh).
- *       So, if we were to include "iec.y.hh" here, we would get a circular include.
+ *       of iec.y to the iec_bison.h file (including an #include stage1_2_priv.hh).
+ *       So, if we were to include "iec_bison.h" here, we would get a circular include.
  *       All this means that whoever includes this file (stage1_2_priv.hh) will need
- *       to take care to first inlcude iec.y.hh !!
+ *       to take care to first inlcude iec_bison.h !!
  */ 
 /* A symbol table to store all the library elements */
 /* e.g.: <function_name , function_decl>