Index: src/Parser/ParserTypes.h
===================================================================
--- src/Parser/ParserTypes.h	(revision 55a68c3dc9290e2bb34da101039e435d02bc9dea)
+++ src/Parser/ParserTypes.h	(revision 55a68c3dc9290e2bb34da101039e435d02bc9dea)
@@ -0,0 +1,50 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// parser.hh -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Sat Sep 22 08:58:10 2001
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jun 28 22:10:17 2017
+// Update Count     : 349
+//
+
+#ifndef PARSER_HH
+#define PARSER_HH
+
+int yylex();
+void yyerror( const char * );
+
+#include <string>
+#include "ParseNode.h"
+// External declarations for information sharing between lexer and scanner
+class TypedefTable;
+extern TypedefTable typedefTable;
+
+// current location in the input
+extern int yylineno;
+extern char *yyfilename;
+
+struct Location {
+    char *file;
+    int line;
+}; // Location
+
+struct Token {
+    std::string *str;									// must be pointer as used in union
+    Location loc;
+
+    operator std::string *() { return str; }
+}; // Token
+
+#endif // PARSER_HH
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/Parser/TypedefTable.h
===================================================================
--- src/Parser/TypedefTable.h	(revision 307a732f5fa4b97b19f405fc215fcd76f473e3a1)
+++ src/Parser/TypedefTable.h	(revision 55a68c3dc9290e2bb34da101039e435d02bc9dea)
@@ -22,6 +22,6 @@
 #include <stack>
 
+#include "ParserTypes.h"
 #include "parser.hh"
-#include "parser.h"
 
 class TypedefTable {
Index: src/Parser/module.mk
===================================================================
--- src/Parser/module.mk	(revision 307a732f5fa4b97b19f405fc215fcd76f473e3a1)
+++ src/Parser/module.mk	(revision 55a68c3dc9290e2bb34da101039e435d02bc9dea)
@@ -15,5 +15,5 @@
 ###############################################################################
 
-BUILT_SOURCES = Parser/parser.h
+BUILT_SOURCES = Parser/parser.hh
 
 AM_YFLAGS = -d -t -v
Index: src/Parser/parser.hh
===================================================================
--- src/Parser/parser.hh	(revision 307a732f5fa4b97b19f405fc215fcd76f473e3a1)
+++ 	(revision )
@@ -1,50 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-// 
-// parser.hh -- 
-// 
-// Author           : Peter A. Buhr
-// Created On       : Sat Sep 22 08:58:10 2001
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 28 22:10:17 2017
-// Update Count     : 349
-//
-
-#ifndef PARSER_HH
-#define PARSER_HH
-
-int yylex();
-void yyerror( const char * );
-
-#include <string>
-#include "ParseNode.h"
-// External declarations for information sharing between lexer and scanner
-class TypedefTable;
-extern TypedefTable typedefTable;
-
-// current location in the input
-extern int yylineno;
-extern char *yyfilename;
-
-struct Location {
-    char *file;
-    int line;
-}; // Location
-
-struct Token {
-    std::string *str;									// must be pointer as used in union
-    Location loc;
-
-    operator std::string *() { return str; }
-}; // Token
-
-#endif // PARSER_HH
-
-// Local Variables: //
-// tab-width: 4 //
-// mode: c++ //
-// compile-command: "make install" //
-// End: //