3 files changed, 5 insertions, 3 deletions

diff --git a/src/json/Makefile.am b/src/json/Makefile.am
index 5968a3596..9cd80851c 100644
--- a/src/json/Makefile.am
+++ b/src/json/Makefile.am
@@ -37,6 +37,7 @@ TESTS = \
 
 test_json_SOURCES = \
   test_json.c
+test_json_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
 test_json_LDADD = \
   libgnunetjson.la \
   $(top_builddir)/src/util/libgnunetutil.la \
diff --git a/src/json/json_gnsrecord.c b/src/json/json_gnsrecord.c
index bfbdd96ee..37f0c03da 100644
--- a/src/json/json_gnsrecord.c
+++ b/src/json/json_gnsrecord.c
@@ -50,10 +50,10 @@ cleanup_recordinfo (struct GnsRecordInfo *gnsrecord_info)
 {
   if (NULL != *(gnsrecord_info->rd))
   {
-    for (int i = 0; i < *(gnsrecord_info->rd_count); i++)
+    for (unsigned int i = 0; i < *(gnsrecord_info->rd_count); i++)
     {
       if (NULL != (*(gnsrecord_info->rd))[i].data)
-        GNUNET_free ((char *) (*(gnsrecord_info->rd))[i].data);
+        GNUNET_free_nz ((char *) (*(gnsrecord_info->rd))[i].data);
     }
     GNUNET_free (*(gnsrecord_info->rd));
     *(gnsrecord_info->rd) = NULL;
diff --git a/src/json/test_json_mhd.c b/src/json/test_json_mhd.c
index 5ab1b63ca..642715f25 100644
--- a/src/json/test_json_mhd.c
+++ b/src/json/test_json_mhd.c
@@ -27,6 +27,7 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_json_lib.h"
 #include "gnunet_curl_lib.h"
+#include "gnunet_mhd_compat.h"
 #include <zlib.h>
 
 #define MAX_SIZE 1024 * 1024
@@ -36,7 +37,7 @@ static json_t *bigj;
 static int global_ret;
 
 
-static int
+static MHD_RESULT
 access_handler_cb (void *cls,
                    struct MHD_Connection *connection,
                    const char *url,