Merge remote-tracking branch 'stagrlee/master' into autotools

Conflicts:
	Makefile
	jq_test.c

1 files changed, 1 insertions, 1 deletions

diff --git a/builtin.c b/builtin.c
index 39570188..4fb14dc7 100644
--- a/builtin.c
+++ b/builtin.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include "builtin.h"
 #include "compile.h"
-#include "parser.h"
+#include "jq_parser.h"
 #include "locfile.h"
 #include "jv_aux.h"
 #include "jv_unicode.h"