diff --git a/projects/rapidjson/Dockerfile b/projects/rapidjson/Dockerfile
index a550f4a84..afd7ea5ff 100644
--- a/projects/rapidjson/Dockerfile
+++ b/projects/rapidjson/Dockerfile
@@ -19,5 +19,6 @@ MAINTAINER guidovranken@gmail.com
 RUN apt-get update && apt-get install -y make autoconf automake libtool cmake
 RUN git clone --depth 1 https://github.com/Tencent/rapidjson.git rapidjson
 RUN git clone --depth 1 https://github.com/guidovranken/rapidjson-fuzzers.git rapidjson-fuzzers
+RUN git clone --depth 1 https://github.com/guidovranken/fuzzing-headers.git
 WORKDIR rapidjson-fuzzers
 COPY build.sh $SRC/
diff --git a/projects/rapidjson/build.sh b/projects/rapidjson/build.sh
index dbfa524bf..0dec1112c 100755
--- a/projects/rapidjson/build.sh
+++ b/projects/rapidjson/build.sh
@@ -20,5 +20,13 @@ then
     export CXXFLAGS="$CXXFLAGS -DMSAN"
 fi
 
+if [[ $CFLAGS = *sanitize=address* ]]
+then
+    export CXXFLAGS="$CXXFLAGS -DASAN"
+fi
+
 $CXX $CXXFLAGS -D_GLIBCXX_DEBUG -I $SRC/rapidjson/include fuzzer.cpp $LIB_FUZZING_ENGINE -o $OUT/fuzzer
 cp fuzzer_seed_corpus.zip $OUT
+
+cd $SRC/fuzzing-headers/tests
+$CXX $CXXFLAGS -std=c++2a -D_GLIBCXX_DEBUG -I $SRC/rapidjson/include -I ../include rapidjson.cpp $LIB_FUZZING_ENGINE -o $OUT/fuzzer-extended