cleanup

49 files changed, 180 insertions, 216 deletions

diff --git a/.gitignore b/.gitignore
index dbdb389..382dbee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,6 @@
-JsonBox/
-MicroJSON*/
-gason/
-json-cpp.hpp
-jsoncpp/
-jsonxx/
-libjson/
-nosjob*/
-picojson/
-proto_map/
-rapidjson/
-sajson/
-msgpack-c/
+MicroJSON-*/
+libjson-*/
+nosjob-*/
 *.o
 test_JsonBox
 test_MicroJSON
@@ -26,8 +16,8 @@ test_rapidjson
 test_sajson
 test_msgpack
 test_msgpack_streaming
-data/make_paks
-data/make_paks2
+make_pak
+make_pak_s
 data/*.pak*
 data/*.json
 data/*.in
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..d7259ef
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,27 @@
+[submodule "sajson"]
+	path = lib/sajson
+	url = https://github.com/chadaustin/sajson
+[submodule "rapidjson"]
+	path = lib/rapidjson
+	url = https://github.com/miloyip/rapidjson
+[submodule "picojson"]
+	path = lib/picojson
+	url = https://github.com/kazuho/picojson.git
+[submodule "msgpack-c"]
+	path = lib/msgpack-c
+	url = https://github.com/msgpack/msgpack-c.git
+[submodule "gason"]
+	path = lib/gason
+	url = https://github.com/vivkin/gason/
+[submodule "JsonBox"]
+	path = lib/JsonBox
+	url = https://github.com/anhero/JsonBox.git
+[submodule "jsoncpp"]
+	path = lib/jsoncpp
+	url = https://github.com/open-source-parsers/jsoncpp
+[submodule "jsonxx"]
+	path = lib/jsonxx
+	url = https://github.com/hjiang/jsonxx.git
+[submodule "json-cpp"]
+	path = lib/json-cpp
+	url = https://github.com/ascheglov/json-cpp.git
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 3013d32..0000000
--- a/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-COMPILER := g++
-CXXFLAGS := -O3 -march=native -mtune=native
-
-
-all: test_gason test_json-cpp test_jsoncpp test_libjson test_picojson test_rapidjson test_sajson test_JsonBox test_jsonxx test_MicroJSON test_nosjob test_cdec_json_parser
-
-test_gason: test_gason.cc
-	$(COMPILER) $(CXXFLAGS) -std=c++11 test_gason.cc -o test_gason gason/gason.o
-
-test_json-cpp: test_json-cpp.cc
-	$(COMPILER) $(CXXFLAGS) -std=c++11 test_json-cpp.cc -o test_json-cpp
-
-test_jsoncpp: test_jsoncpp.cc
-	$(COMPILER) $(CXXFLAGS) test_jsoncpp.cc jsoncpp/lib/libjsoncpp.a -o test_jsoncpp
-
-test_libjson: test_libjson.cc
-	$(COMPILER) $(CXXFLAGS) test_libjson.cc libjson/libjson.a -o test_libjson
-
-test_picojson: test_picojson.cc
-	$(COMPILER) $(CXXFLAGS) test_picojson.cc -o test_picojson
-
-test_rapidjson: test_rapidjson.cc
-	$(COMPILER) $(CXXFLAGS) test_rapidjson.cc -o test_rapidjson
-
-test_sajson: test_sajson.cc
-	$(COMPILER) $(CXXFLAGS) test_sajson.cc -o test_sajson
-
-test_JsonBox: test_JsonBox.cc
-	$(COMPILER) $(CXXFLAGS) test_JsonBox.cc -I./JsonBox/include/ JsonBox/libJsonBox.a -o test_JsonBox
-
-test_jsonxx: test_jsonxx.cc
-	$(COMPILER) $(CXXFLAGS) test_jsonxx.cc jsonxx/jsonxx.o -o test_jsonxx
-
-test_MicroJSON: test_MicroJSON.cc
-	#$(COMPILER) $(CXXFLAGS) test_MicroJSON.cc MicroJSON-0.3.2/libMicroJSON-0.so -lUTF8Strings-1 -o test_MicroJSON
-
-test_nosjob: test_nosjob.cc
-	$(COMPILER) $(CXXFLAGS) test_nosjob.cc nosjob-e1d67401fcda6e05/libnosjob.a -o test_nosjob
-
-test_cdec_json_parser: test_cdec_json_parser.cc
-	$(COMPILER) $(CXXFLAGS) test_cdec_json_parser.cc cdec_json_parser/json_parse.o cdec_json_parser/JSON_parser.o -o test_cdec_json_parser
-
-test_msgpack: test_msgpack.cc
-	 $(COMPILER) $(CXXFLAGS) test_msgpack.cc -I./msgpack-c/include/ ./msgpack-c/lib/libmsgpack.a -o test_msgpack
-
-test_msgpack_streaming: test_msgpack_streaming.cc
-	 $(COMPILER) $(CXXFLAGS) test_msgpack_streaming.cc -I./msgpack-c/include/ ./msgpack-c/lib/libmsgpack.a -o test_msgpack_streaming
-
-clean:
-	rm -f test_gason test_json-cpp test_jsoncpp test_libjson
-	rm -f test_picojson test_rapidjson test_sajson test_JsonBox
-	rm -f test_jsonxx test_MicroJSON test_nosjob test_cdec_json_parser
-	rm -f test_msgpack
-
diff --git a/README.md b/README.md
index 78d60d6..79b18f6 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ with data (e.g. the cdec json parser).
 * gason: git clone https://github.com/vivkin/gason.git
 * JsonBox: git clone https://github.com/anhero/JsonBox.git
 * jsoncpp: git clone https://github.com/open-source-parsers/jsoncpp.git
-* json-cpp: wget "https://raw.githubusercontent.com/ascheglov/json-cpp/master/single_include/json-cpp.hpp"
+* json-cpp: git clone "https://github.com/ascheglov/json-cpp.git"
 * jsonxx: git clone https://github.com/hjiang/jsonxx.git
 * libjson: wget "http://downloads.sourceforge.net/project/libjson/libjson_7.6.1.zip?r=&ts=1405248411&use_mirror=heanet"
 * MicroJSON: wget http://grigory.info/distfiles/MicroJSON-0.3.2.tar.bz2
@@ -23,6 +23,8 @@ with data (e.g. the cdec json parser).
 * rapidjson: git clone https://github.com/miloyip/rapidjson.git
 * sajson: git clone https://github.com/chadaustin/sajson.git
 
+Put all libraries in lib/ and build as described by the authors of the respective
+library.
 To run the benchmark You'll need root privileges to clear the disk caches.
 The run scripts assume that these scripts [3] are in the PATH.
 
diff --git a/benchmark.rb b/benchmark/benchmark.rb
index 81e11f8..81e11f8 100755
--- a/benchmark.rb
+++ b/benchmark/benchmark.rb
diff --git a/benchmark/run.sh b/benchmark/run.sh
new file mode 100755
index 0000000..c4bf31f
--- /dev/null
+++ b/benchmark/run.sh
@@ -0,0 +1,41 @@
+#!/bin/zsh
+
+
+REPEAT=10
+TMP_OVERALL=/tmp/.overall
+
+
+echo
+echo "JSON parsing benchmark"
+echo "----------------------"
+echo " REAPEAT=$REPEAT"
+echo
+
+for prg in \
+  test_cdec_json_parser \
+  test_gason \
+  test_JsonBox \
+  test_jsoncpp \
+  test_json-cpp \
+  test_jsonxx \
+  test_libjson \
+  test_nosjob \
+  test_picojson \
+  test_rapidjson \
+  test_sajson
+do
+  echo "[$prg]"
+  sudo sync
+  sudo sh -c "echo 3 > /proc/sys/vm/drop_caches"
+  echo > $TMP_OVERALL
+  for file in `ls -S ../data/*.json`; do
+    echo "$file:\t$(./benchmark.rb $REPEAT ../src/$prg $file 2>/dev/null | tee -a $TMP_OVERALL | avg | round 2) s"
+  done
+  echo "---"
+  echo "overall:\t$(avg < $TMP_OVERALL | round 2)"
+  echo " memory:\t$(./memusg.sh ../src/$prg data/1020.json 2>/dev/null)"
+  echo
+done
+
+rm $TMP_OVERALL
+
diff --git a/benchmark/run_msgpack.sh b/benchmark/run_msgpack.sh
new file mode 100755
index 0000000..7a45df0
--- /dev/null
+++ b/benchmark/run_msgpack.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+
+REPEAT=10
+TMP_OVERALL=/tmp/.overall_msgpack
+
+
+echo
+echo "MSGPACK parsing benchmark"
+echo "-------------------------"
+echo " REAPEAT=$REPEAT"
+echo
+
+for prg in \
+  test_msgpack \
+  test_msgpack_streaming \
+  test_msgpack_ruby
+do
+  echo "[$prg]"
+  sudo sync
+  sudo sh -c "echo 3 > /proc/sys/vm/drop_caches"
+  echo > $TMP_OVERALL
+  if [[ $prg == test_msgpack_streaming ]]; then
+    A="_s" # special format for streaming
+  else
+    A=""
+  fi
+  for file in `ls -S ../data/*.pak$A`; do
+    echo "$file:\t$(./benchmark.rb $REPEAT ../src/$prg $file 2>/dev/null | tee -a $TMP_OVERALL | avg | round 2) s"
+  done
+  echo "---"
+  echo "overall:\t$(avg < $TMP_OVERALL | round 2)"
+  echo " memory:\t$(./memusg.sh ../src/$prg ../data/1020.pak 2>/dev/null)"
+  echo
+done
+
+rm $TMP_OVERALL
+
diff --git a/data/Makefile b/data/Makefile
deleted file mode 100644
index 24d85a3..0000000
--- a/data/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-make_paks: make_paks.cc
-	g++ -std=c++11 make_paks.cc -I../msgpack-c/include/ ../msgpack-c/lib/libmsgpack.a -o make_paks
-
-make_paks2: make_paks2.cc
-	g++ -std=c++11 make_paks2.cc -I../msgpack-c/include/ ../msgpack-c/lib/libmsgpack.a -o make_paks2
-
-clean:
-	rm -f make_paks
-
diff --git a/data/cdec.ini b/data/cdec.ini
deleted file mode 100644
index ddbe54c..0000000
--- a/data/cdec.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-formalism=scfg
-intersection_strategy=full
-add_pass_through_rules=true
-
diff --git a/data/make.sh b/data/make.sh
deleted file mode 100755
index 5e0c31b..0000000
--- a/data/make.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/zsh
-
-
-# wmt/14/newstest2008 data
-for i in 1020 1391 1495 1570 1889 2002 429 748; do
-  ~/src/weaver/util/cdec2json.py -c cdec.ini -w weights.init -g grammar.$i.gz < $i.in | ./to_ascii.rb > $i.json 
-done
-
diff --git a/data/to_ascii.rb b/data/to_ascii.rb
deleted file mode 100755
index 6c1d23e..0000000
--- a/data/to_ascii.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-
-
-while line = STDIN.gets
-  encoding_options = {
-    :invalid           => :replace,
-    :undef             => :replace,
-    :replace           => '?',
-    :universal_newline => true
-  }
-  puts line.encode 'ASCII', encoding_options
-end
-
diff --git a/data/weights.init b/data/weights.init
deleted file mode 100644
index 0d09f9f..0000000
--- a/data/weights.init
+++ /dev/null
@@ -1,12 +0,0 @@
-CountEF 0.1
-EgivenFCoherent -0.1
-Glue 0.01
-IsSingletonF -0.01
-IsSingletonFE -0.01
-LanguageModel 0.1
-LanguageModel_OOV -1
-MaxLexFgivenE -0.1
-MaxLexEgivenF -0.1
-PassThrough -0.1
-SampleCountF -0.1
-WordPenalty -0.1
diff --git a/lib/JsonBox b/lib/JsonBox
new file mode 160000
+Subproject fcb82ebae41dffb90d32a49ac236d1608d9a67e
diff --git a/cdec_json_parser/JSON_parser.c b/lib/cdec_json_parser/JSON_parser.c
index 5e392bc..5e392bc 100644
--- a/cdec_json_parser/JSON_parser.c
+++ b/lib/cdec_json_parser/JSON_parser.c
diff --git a/cdec_json_parser/JSON_parser.h b/lib/cdec_json_parser/JSON_parser.h
index de98007..de98007 100644
--- a/cdec_json_parser/JSON_parser.h
+++ b/lib/cdec_json_parser/JSON_parser.h
diff --git a/cdec_json_parser/LICENSE b/lib/cdec_json_parser/LICENSE
index a390938..a390938 100644
--- a/cdec_json_parser/LICENSE
+++ b/lib/cdec_json_parser/LICENSE
diff --git a/cdec_json_parser/Makefile b/lib/cdec_json_parser/Makefile
index c976aba..d7bb81f 100644
--- a/cdec_json_parser/Makefile
+++ b/lib/cdec_json_parser/Makefile
@@ -3,5 +3,5 @@ all:
 	g++ json_parse.cc -c
 
 clean:
-	rm *.o
+	rm -f *.o
 
diff --git a/cdec_json_parser/json_parse.cc b/lib/cdec_json_parser/json_parse.cc
index 4580fc8..4580fc8 100644
--- a/cdec_json_parser/json_parse.cc
+++ b/lib/cdec_json_parser/json_parse.cc
diff --git a/cdec_json_parser/json_parse.h b/lib/cdec_json_parser/json_parse.h
index 80c037b..80c037b 100644
--- a/cdec_json_parser/json_parse.h
+++ b/lib/cdec_json_parser/json_parse.h
diff --git a/lib/gason b/lib/gason
new file mode 160000
+Subproject ede29fc5f0de8e47fd82c09f2f98123d2c867f2
diff --git a/lib/json-cpp b/lib/json-cpp
new file mode 160000
+Subproject 4eb4b47cf4d622bc7bf34071d6b68fc5beb3705
diff --git a/lib/jsoncpp b/lib/jsoncpp
new file mode 160000
+Subproject 3515db184a836ce73b99c064bcc83884570657c
diff --git a/lib/jsonxx b/lib/jsonxx
new file mode 160000
+Subproject b76bd0e69d94cbec23a0db4e9b73930f55a4a80
diff --git a/lib/msgpack-c b/lib/msgpack-c
new file mode 160000
+Subproject dd083ca933fde2a23955372eb87fe7f890c6dc1
diff --git a/lib/picojson b/lib/picojson
new file mode 160000
+Subproject 2120a6c219d9b08922ba0ffe56fbb5b8862d62b
diff --git a/lib/rapidjson b/lib/rapidjson
new file mode 160000
+Subproject 4600680a56ac007b0c790cfe27db55e26f3d556
diff --git a/lib/sajson b/lib/sajson
new file mode 160000
+Subproject d9be1c482b9a8fa4ff223ee6a0dcf06fba2e669
diff --git a/memusg.sh b/memusg.sh
deleted file mode 100755
index e3b6f90..0000000
--- a/memusg.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-
-"$@" &
-pid=$! peak=0
-while true; do
-  sleep 1
-  sample="$(ps -o rss= $pid 2> /dev/null)" || break
-  let peak='sample > peak ? sample : peak'
-done
-#echo "Peak: $peak" 1>&2
-echo "$(( ${peak%% *} / 1024)) m"
-
diff --git a/run.sh b/run.sh
deleted file mode 100755
index 83144b3..0000000
--- a/run.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/zsh
-
-
-export PATH=$PATH:/home/pks/src/scripts/
-export GEM_PATH=$GEM_PATH:/home/pks/lib/ruby
-REPEAT=10
-
-rm -f .overall
-
-echo
-echo "JSON parsing benchmark"
-echo "----------------------"
-echo " REAPEAT=$REPEAT"
-echo
-
-# fails: test_MicroJSON.sh \
-for prg in \
-  test_cdec_json_parser \
-  test_gason \
-  test_JsonBox \
-  test_jsoncpp \
-  test_json-cpp \
-  test_jsonxx \
-  test_libjson \
-  test_nosjob \
-  test_picojson \
-  test_rapidjson \
-  test_sajson
-do
-  echo "[$prg]"
-  sync; echo 3 > /proc/sys/vm/drop_caches
-  echo > .overall
-  for file in `ls -S data/*.json`; do
-    echo "$file:\t$(./benchmark.rb $REPEAT ./$prg $file 2>/dev/null | tee -a .overall | avg | round 2) s"
-  done
-  echo "---"
-  echo "overall:\t$(avg < .overall | round 2)"
-  echo " memory:\t$(./memusg.sh ./$prg data/1020.json 2>/dev/null)"
-  echo
-done
-
-rm .overall
-
diff --git a/run_msgpack.sh b/run_msgpack.sh
deleted file mode 100755
index b2f6eb5..0000000
--- a/run_msgpack.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/zsh
-
-
-export PATH=$PATH:/home/pks/src/scripts/
-export GEM_PATH=$GEM_PATH:/home/pks/lib/ruby
-REPEAT=10
-
-rm -f .overall_msgpack
-
-echo
-echo "MSGPACK parsing benchmark"
-echo "-------------------------"
-echo " REAPEAT=$REPEAT"
-echo
-
-for prg in \
-  test_msgpack \
-  test_msgpack_streaming \
-  test_msgpack_ruby
-do
-  echo "[$prg]"
-  sync; echo 3 > /proc/sys/vm/drop_caches
-  echo > .overall_msgpack
-  if [[ $prg == test_msgpack_streaming ]]; then
-    A="2" 
-  else
-    A=""
-  fi
-  for file in `ls -S data/*.pak$A`; do
-    echo "$file:\t$(./benchmark.rb $REPEAT ./$prg $file 2>/dev/null | tee -a .overall_msgpack | avg | round 2) s"
-  done
-  echo "---"
-  echo "overall:\t$(avg < .overall_msgpack | round 2)"
-  echo " memory:\t$(./memusg.sh ./$prg data/1020.pak 2>/dev/null)"
-  echo
-done
-
-rm .overall_msgpack
-
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 0000000..c81c7dd
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,61 @@
+COMPILER := g++
+CXXFLAGS := -O3 -march=native -mtune=native -I../lib
+
+
+all: test_gason test_json-cpp test_jsoncpp test_libjson test_picojson test_rapidjson test_sajson test_JsonBox test_jsonxx test_MicroJSON test_nosjob test_cdec_json_parser test_msgpack test_msgpack_streaming
+
+test_gason: test_gason.cc
+	$(COMPILER) $(CXXFLAGS) -std=c++11 test_gason.cc -o test_gason ../lib/gason/gason.o
+
+test_json-cpp: test_json-cpp.cc
+	$(COMPILER) $(CXXFLAGS) -std=c++11 test_json-cpp.cc -o test_json-cpp
+
+test_jsoncpp: test_jsoncpp.cc
+	$(COMPILER) $(CXXFLAGS) test_jsoncpp.cc ../lib/jsoncpp/lib/libjsoncpp.a -o test_jsoncpp
+
+test_libjson: test_libjson.cc
+	$(COMPILER) $(CXXFLAGS) test_libjson.cc ../lib/libjson-7.6.1/libjson.a -o test_libjson
+
+test_picojson: test_picojson.cc
+	$(COMPILER) $(CXXFLAGS) test_picojson.cc -o test_picojson
+
+test_rapidjson: test_rapidjson.cc
+	$(COMPILER) $(CXXFLAGS) test_rapidjson.cc -o test_rapidjson
+
+test_sajson: test_sajson.cc
+	$(COMPILER) $(CXXFLAGS) test_sajson.cc -o test_sajson
+
+test_JsonBox: test_JsonBox.cc
+	$(COMPILER) $(CXXFLAGS) test_JsonBox.cc -I../lib/JsonBox/include/ ../lib/JsonBox/libJsonBox.a -o test_JsonBox
+
+test_jsonxx: test_jsonxx.cc
+	$(COMPILER) $(CXXFLAGS) test_jsonxx.cc ../lib/jsonxx/jsonxx.o -o test_jsonxx
+
+test_MicroJSON: test_MicroJSON.cc
+	#$(COMPILER) $(CXXFLAGS) test_MicroJSON.cc ../lib/MicroJSON-0.3.2/libMicroJSON-0.so -lUTF8Strings-1 -o test_MicroJSON
+
+test_nosjob: test_nosjob.cc
+	$(COMPILER) $(CXXFLAGS) test_nosjob.cc ../lib/nosjob-e1d67401fcda6e05/libnosjob.a -o test_nosjob
+
+test_cdec_json_parser: test_cdec_json_parser.cc
+	$(COMPILER) $(CXXFLAGS) test_cdec_json_parser.cc ../lib/cdec_json_parser/json_parse.o ../lib/cdec_json_parser/JSON_parser.o -o test_cdec_json_parser
+
+test_msgpack: test_msgpack.cc
+	 $(COMPILER) $(CXXFLAGS) test_msgpack.cc -I../lib/msgpack-c/include/ ../lib/msgpack-c/lib/libmsgpack.a -o test_msgpack
+
+test_msgpack_streaming: test_msgpack_streaming.cc
+	 $(COMPILER) $(CXXFLAGS) test_msgpack_streaming.cc -I../lib/msgpack-c/include/ ../lib/msgpack-c/lib/libmsgpack.a -o test_msgpack_streaming
+
+make_pak: make_pak.cc
+	$(COMPILER) $(CXXFLAGS) -std=c++11 make_pak.cc ../lib/msgpack-c/lib/libmsgpack.a -o make_pak
+
+make_pak_s: make_pak_s.cc
+	$(COMPILER) $(CXXFLAGS) -std=c++11 make_pak_s.cc ../lib/msgpack-c/lib/libmsgpack.a -o make_pak_s
+
+clean:
+	rm -f test_gason test_json-cpp test_jsoncpp test_libjson
+	rm -f test_picojson test_rapidjson test_sajson test_JsonBox
+	rm -f test_jsonxx test_MicroJSON test_nosjob test_cdec_json_parser
+	rm -f test_msgpack test_msgpack_streaming
+	rm -f make_pak make_pak_s
+
diff --git a/data/make_paks.cc b/src/make_pak.cc
index ca6c9b2..bacdfe3 100644
--- a/data/make_paks.cc
+++ b/src/make_pak.cc
@@ -10,7 +10,7 @@
  * https://github.com/ascheglov/json-cpp
  *
  */
-#include "../json-cpp.hpp"
+#include "json-cpp/single_include/json-cpp.hpp"
 
 using namespace std;
 
diff --git a/data/make_paks2.cc b/src/make_pak_s.cc
index 1b5895b..a72bc60 100644
--- a/data/make_paks2.cc
+++ b/src/make_pak_s.cc
@@ -10,7 +10,7 @@
  * https://github.com/ascheglov/json-cpp
  *
  */
-#include "../json-cpp.hpp"
+#include "json-cpp/single_include/json-cpp.hpp"
 
 using namespace std;
 
diff --git a/test_JsonBox.cc b/src/test_JsonBox.cc
index e1b22c4..e1b22c4 100644
--- a/test_JsonBox.cc
+++ b/src/test_JsonBox.cc
diff --git a/test_MicroJSON.cc b/src/test_MicroJSON.cc
index d8d4969..d8d4969 100644
--- a/test_MicroJSON.cc
+++ b/src/test_MicroJSON.cc
diff --git a/test_MicroJSON.sh b/src/test_MicroJSON.sh
index 89d1d3d..89d1d3d 100755
--- a/test_MicroJSON.sh
+++ b/src/test_MicroJSON.sh
diff --git a/test_cdec_json_parser.cc b/src/test_cdec_json_parser.cc
index e805318..e805318 100644
--- a/test_cdec_json_parser.cc
+++ b/src/test_cdec_json_parser.cc
diff --git a/test_gason.cc b/src/test_gason.cc
index d78c385..d78c385 100644
--- a/test_gason.cc
+++ b/src/test_gason.cc
diff --git a/test_json-cpp.cc b/src/test_json-cpp.cc
index 0791704..c27db06 100644
--- a/test_json-cpp.cc
+++ b/src/test_json-cpp.cc
@@ -6,7 +6,7 @@
  * https://github.com/ascheglov/json-cpp
  *
  */
-#include "json-cpp.hpp"
+#include "json-cpp/single_include/json-cpp.hpp"
 
 using namespace std;
 
diff --git a/test_jsoncpp.cc b/src/test_jsoncpp.cc
index ab3bd0c..ab3bd0c 100644
--- a/test_jsoncpp.cc
+++ b/src/test_jsoncpp.cc
diff --git a/test_jsonxx.cc b/src/test_jsonxx.cc
index d06640e..d06640e 100644
--- a/test_jsonxx.cc
+++ b/src/test_jsonxx.cc
diff --git a/test_libjson.cc b/src/test_libjson.cc
index 6b3e2a9..03dc3bf 100644
--- a/test_libjson.cc
+++ b/src/test_libjson.cc
@@ -6,7 +6,7 @@
  * http://sourceforge.net/projects/libjson/
  *
  */
-#include "libjson/libjson.h"
+#include "libjson-7.6.1/libjson.h"
 
 using namespace std;
 
diff --git a/test_msgpack.cc b/src/test_msgpack.cc
index 70cf1c8..70cf1c8 100644
--- a/test_msgpack.cc
+++ b/src/test_msgpack.cc
diff --git a/test_msgpack_ruby b/src/test_msgpack_ruby
index 0f2d387..0f2d387 100755
--- a/test_msgpack_ruby
+++ b/src/test_msgpack_ruby
diff --git a/test_msgpack_streaming.cc b/src/test_msgpack_streaming.cc
index 1a3cf55..1a3cf55 100644
--- a/test_msgpack_streaming.cc
+++ b/src/test_msgpack_streaming.cc
diff --git a/test_nosjob.cc b/src/test_nosjob.cc
index cf8891f..cf8891f 100644
--- a/test_nosjob.cc
+++ b/src/test_nosjob.cc
diff --git a/test_picojson.cc b/src/test_picojson.cc
index cf3b621..cf3b621 100644
--- a/test_picojson.cc
+++ b/src/test_picojson.cc
diff --git a/test_rapidjson.cc b/src/test_rapidjson.cc
index b344ed0..b344ed0 100644
--- a/test_rapidjson.cc
+++ b/src/test_rapidjson.cc
diff --git a/test_sajson.cc b/src/test_sajson.cc
index 4081d43..4081d43 100644
--- a/test_sajson.cc
+++ b/src/test_sajson.cc