diff --git a/.hgignore b/.hgignore
index 945534cb..20ad0976 100644
--- a/.hgignore
+++ b/.hgignore
@@ -86,7 +86,7 @@ src/query/position.hh
 src/query/recollq
 src/query/stack.hh
 src/query/wasaparse.cpp
-src/query/wasaparse.hpp
+src/query/wasaparse.h
 src/query/xadump
 src/recollinstall
 src/sampleconf/rclmon.sh
diff --git a/src/query/wasaparse.ypp b/src/query/wasaparse.ypp
index bfd87c05..09a583c3 100644
--- a/src/query/wasaparse.ypp
+++ b/src/query/wasaparse.ypp
@@ -8,7 +8,7 @@
 
 #include "searchdata.h"
 #include "wasaparserdriver.h"
-#include "wasaparse.hpp"
+#include "wasaparse.h"
 
 using namespace std;
 
diff --git a/src/query/wasaparseaux.cpp b/src/query/wasaparseaux.cpp
index 4e45666a..4a4deb42 100644
--- a/src/query/wasaparseaux.cpp
+++ b/src/query/wasaparseaux.cpp
@@ -26,7 +26,7 @@
 #define YYDEBUG 1
 
 // bison-generated file
-#include "wasaparse.hpp"
+#include "wasaparse.h"
 
 using namespace std;
 using namespace Rcl;
diff --git a/src/query/y.tab.h b/src/query/y.tab.h
deleted file mode 100644
index 78637777..00000000
--- a/src/query/y.tab.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Bogus file to solve the following problem:
-
-// Bison generates y.tab.h and inserts a line in the generated cpp
-// file to include it
-
-// However, we tell automake to use wasaparse.cpp and wasaparse.hpp as
-// names for the generated files. This does not fix the #include
-// y.tab.h line, so it fails.
-
-// This workaround file just includes the appropriate file as
-// generated by automake
-
-#include "wasaparse.hpp"
diff --git a/src/ylwrap b/src/ylwrap
index 59db5508..8893b8b5 100755
--- a/src/ylwrap
+++ b/src/ylwrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # ylwrap - wrapper for lex/yacc invocations.  Local version, the
-# autotools scriptversion=2015-08-05.09; # UTC doesnt work for us
+# autotools scriptversion=2015-08-06.06; # UTC doesnt work for us
 # because it does not move location.hh position.hh stack.hh into the
 # appropriate directory (which is a bug, but it's simpler to rewrite a
 # simple version for our needs than to fix the original).
@@ -11,7 +11,7 @@ fatal() {
     exit 1
 }
 usage() {
-    fatal "Usage: ylwrap query/wasaparse.ypp"
+    fatal "Usage: ylwrap query/wasaparse.y"
 }
 
 test $# -ge 1 || usage
@@ -42,7 +42,13 @@ for f in location.hh position.hh stack.hh; do
     cmp -s "${tmpdir}"/$f "${inputdir}"/$f || cp -p "${tmpdir}"/$f "${inputdir}"
 done
 
+# Fix the include line in y.tab.c (it wants to include y.tab.h, but we already
+# include it as wasaparse.h
+(cd "${tmpdir}"; \
+    sed -e 's/#include "y.tab.h"//' < y.tab.c > toto; \
+    mv -f toto y.tab.c)
+
 cmp -s "${tmpdir}"/y.tab.c "${inputdir}"/wasaparse.cpp || \
         cp -p "${tmpdir}"/y.tab.c "${inputdir}"/wasaparse.cpp
-cmp -s "${tmpdir}"/y.tab.h "${inputdir}"/wasaparse.hpp || \
-        cp -p "${tmpdir}"/y.tab.h "${inputdir}"/wasaparse.hpp
+cmp -s "${tmpdir}"/y.tab.h "${inputdir}"/wasaparse.h || \
+        cp -p "${tmpdir}"/y.tab.h "${inputdir}"/wasaparse.h