diff -r fa4569bf1538 -r a7d9e0b8636b stage1_2/iec_bison.yy
--- a/stage1_2/iec_bison.yy	Fri Oct 11 12:38:36 2013 +0200
+++ b/stage1_2/iec_bison.yy	Wed Feb 19 22:25:10 2014 +0100
@@ -96,7 +96,7 @@
 #include "../absyntax/absyntax.hh"
 
 /* file with declaration of token constants. Generated by bison! */
-#include "iec_bison.h"
+#include "iec_bison.hh"
 
 /* The interface through which bison and flex interact. */
 #include "stage1_2_priv.hh"
@@ -169,10 +169,10 @@
 /* global variables...   */
 /*************************/
 /* NOTE: For some strange reason bison ver 2.3 is including these declarations
- *       in the iec_bison.h file, which is in turn included by flex.
+ *       in the iec_bison.hh file, which is in turn included by flex.
  *       We cannot therefore define any variables over here, but merely declare 
  *       their existance (otherwise we get errors when linking the code, since we
- *       would get a new variable defined each time iec_bison.h is included!).
+ *       would get a new variable defined each time iec_bison.hh is included!).
  *       Even though the variables are declared 'extern' over here, they will in
  *       fact be defined towards the end of this same file (i.e. in the prologue)
  */
@@ -250,14 +250,14 @@
 /* The following definitions need to be inside a '%code requires' 
  * so that they are also included in the header files. If this were not the case,
  * YYLTYPE would be delcared as something in the iec.cc file, and another thing
- * (actually the default value of YYLTYPE) in the iec_bison.h heder file.
+ * (actually the default value of YYLTYPE) in the iec_bison.hh heder file.
  */
 %code requires {
 /* define a new data type to store the locations, so we can also store
  * the filename in which the token is expressed.
  */
-/* NOTE: since this code will be placed in the iec_bison.h header file,
- * as well as the iec.cc file that also includes the iec_bison.h header file,
+/* NOTE: since this code will be placed in the iec_bison.hh header file,
+ * as well as the iec.cc file that also includes the iec_bison.hh header file,
  * declaring the typedef struct yyltype__local here would result in a 
  * compilation error when compiling iec.cc, as this struct would be
  * declared twice.