diff --git a/evaluator.cpp b/evaluator.cpp
index c976c447..3f113ff8 100644
--- a/evaluator.cpp
+++ b/evaluator.cpp
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <map>
 #include "mvt.hpp"
 #include "evaluator.hpp"
diff --git a/jsonpull/jsonpull.c b/jsonpull/jsonpull.c
index 35caac89..3067f4fe 100644
--- a/jsonpull/jsonpull.c
+++ b/jsonpull/jsonpull.c
@@ -77,12 +77,12 @@ static ssize_t read_string(json_pull *j, char *buffer, size_t n) {
 		out++;
 	}
 
-	j->source = cp + out;
+	j->source = (void *) (cp + out);
 	return out;
 }
 
 json_pull *json_begin_string(const char *s) {
-	return json_begin(read_string, s);
+	return json_begin(read_string, (void *) s);
 }
 
 void json_end(json_pull *p) {
diff --git a/jsonpull/jsonpull.h b/jsonpull/jsonpull.h
index 2f44b1d9..1983a354 100644
--- a/jsonpull/jsonpull.h
+++ b/jsonpull/jsonpull.h
@@ -46,7 +46,7 @@ typedef struct json_pull {
 	int line;
 
 	ssize_t (*read)(struct json_pull *, char *buf, size_t n);
-	const void *source;
+	void *source;
 	char *buffer;
 	ssize_t buffer_tail;
 	ssize_t buffer_head;