diff --git a/Makefile b/Makefile
index 5689b42..9420761 100644
--- a/Makefile
+++ b/Makefile
@@ -34,3 +34,5 @@ clean:
 
 .SUFFIXES:	.l .y .c
 
+exec.o:	exec.c sql-parser.h
+
diff --git a/exec.c b/exec.c
index 087cdb8..f275da1 100644
--- a/exec.c
+++ b/exec.c
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include "sql.tab.h"
 #include "sql-parser.h"
 
 static const char *attr_names[] = {
diff --git a/sql-parser-state.h b/sql-parser-state.h
deleted file mode 100644
index 67e0943..0000000
--- a/sql-parser-state.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __SQL_PARSER_STATE__
-#define __SQL_PARSER_STATE__
-
-struct psql_state {
-	yyscan_t	scanner;
-};
-
-#endif /* __SQL_PARSER_STATE__ */
diff --git a/sql-parser.h b/sql-parser.h
index 083e526..684c2e3 100644
--- a/sql-parser.h
+++ b/sql-parser.h
@@ -52,6 +52,10 @@ enum sqlp_date_intervals {
 	SDI_HOUR_SECOND		= 8,
 };
 
+struct psql_state {
+	yyscan_t	scanner;
+};
+
 extern void sqlp_alias(const char *alias);
 extern void sqlp_assign(const char *db_name, const char *name);
 extern void sqlp_assign_at(const char *name);
diff --git a/sql.l b/sql.l
index dd00f81..4bcd6f4 100644
--- a/sql.l
+++ b/sql.l
@@ -24,7 +24,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include "sql.tab.h"
-#include "sql-parser-state.h"
+#include "sql-parser.h"
 
 void yyerror(YYLTYPE *, struct psql_state *pstate, const char *s, ...);
 
diff --git a/sql.y b/sql.y
index af03e98..f9e29a4 100644
--- a/sql.y
+++ b/sql.y
@@ -19,7 +19,6 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include "sql-parser.h"
 %}
 
 %define api.pure full
@@ -76,7 +75,7 @@ struct psql_state;
 
 %{
 #include "sql.lex.h"
-#include "sql-parser-state.h"
+#include "sql-parser.h"
 %}
 	
 	/* names and literal values */