25 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e994698b1..0e5dfce75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,7 +83,6 @@ endif()
 #   set(BSDI TRUE)
 
 include_directories(src contrib/epee/include external "${CMAKE_BINARY_DIR}/version")
-include_directories(src/common)
 
 if(APPLE)
   include_directories(SYSTEM /usr/include/malloc)
@@ -136,6 +135,9 @@ endif()
 include_directories(${UNBOUND_INCLUDE})
 link_directories(${UNBOUND_LIBRARY_DIRS})
 
+# Final setup for rapidjson
+include_directories(external/rapidjson)
+
 if(MSVC)
   add_definitions("/bigobj /MP /W3 /GS- /D_CRT_SECURE_NO_WARNINGS /wd4996 /wd4345 /D_WIN32_WINNT=0x0600 /DWIN32_LEAN_AND_MEAN /DGTEST_HAS_TR1_TUPLE=0 /FIinline_c.h /D__SSE4_1__")
   # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Dinline=__inline")
diff --git a/src/common/rapidjson/allocators.h b/external/rapidjson/allocators.h
index c99485e50..c99485e50 100644
--- a/src/common/rapidjson/allocators.h
+++ b/external/rapidjson/allocators.h
diff --git a/src/common/rapidjson/document.h b/external/rapidjson/document.h
index ea161ceed..ea161ceed 100644
--- a/src/common/rapidjson/document.h
+++ b/external/rapidjson/document.h
diff --git a/src/common/rapidjson/encodedstream.h b/external/rapidjson/encodedstream.h
index 9dc00c7af..9dc00c7af 100644
--- a/src/common/rapidjson/encodedstream.h
+++ b/external/rapidjson/encodedstream.h
diff --git a/src/common/rapidjson/encodings.h b/external/rapidjson/encodings.h
index 5c7da3e04..5c7da3e04 100644
--- a/src/common/rapidjson/encodings.h
+++ b/external/rapidjson/encodings.h
diff --git a/src/common/rapidjson/error/en.h b/external/rapidjson/error/en.h
index d153e04fc..d153e04fc 100644
--- a/src/common/rapidjson/error/en.h
+++ b/external/rapidjson/error/en.h
diff --git a/src/common/rapidjson/error/error.h b/external/rapidjson/error/error.h
index 146604439..146604439 100644
--- a/src/common/rapidjson/error/error.h
+++ b/external/rapidjson/error/error.h
diff --git a/src/common/rapidjson/filereadstream.h b/external/rapidjson/filereadstream.h
index 31c193bf9..31c193bf9 100644
--- a/src/common/rapidjson/filereadstream.h
+++ b/external/rapidjson/filereadstream.h
diff --git a/src/common/rapidjson/filestream.h b/external/rapidjson/filestream.h
index 6995b3d3f..6995b3d3f 100644
--- a/src/common/rapidjson/filestream.h
+++ b/external/rapidjson/filestream.h
diff --git a/src/common/rapidjson/filewritestream.h b/external/rapidjson/filewritestream.h
index 05c5ca090..05c5ca090 100644
--- a/src/common/rapidjson/filewritestream.h
+++ b/external/rapidjson/filewritestream.h
diff --git a/src/common/rapidjson/internal/dtoa.h b/external/rapidjson/internal/dtoa.h
index 6ae588ac4..6ae588ac4 100644
--- a/src/common/rapidjson/internal/dtoa.h
+++ b/external/rapidjson/internal/dtoa.h
diff --git a/src/common/rapidjson/internal/itoa.h b/external/rapidjson/internal/itoa.h
index 425e9830c..425e9830c 100644
--- a/src/common/rapidjson/internal/itoa.h
+++ b/external/rapidjson/internal/itoa.h
diff --git a/src/common/rapidjson/internal/meta.h b/external/rapidjson/internal/meta.h
index dbe5450d6..dbe5450d6 100644
--- a/src/common/rapidjson/internal/meta.h
+++ b/external/rapidjson/internal/meta.h
diff --git a/src/common/rapidjson/internal/pow10.h b/external/rapidjson/internal/pow10.h
index 72e0dac9f..72e0dac9f 100644
--- a/src/common/rapidjson/internal/pow10.h
+++ b/external/rapidjson/internal/pow10.h
diff --git a/src/common/rapidjson/internal/stack.h b/external/rapidjson/internal/stack.h
index d4d3c92de..d4d3c92de 100644
--- a/src/common/rapidjson/internal/stack.h
+++ b/external/rapidjson/internal/stack.h
diff --git a/src/common/rapidjson/internal/strfunc.h b/external/rapidjson/internal/strfunc.h
index 80adcb6b7..80adcb6b7 100644
--- a/src/common/rapidjson/internal/strfunc.h
+++ b/external/rapidjson/internal/strfunc.h
diff --git a/src/common/rapidjson/memorybuffer.h b/external/rapidjson/memorybuffer.h
index ef15c4678..ef15c4678 100644
--- a/src/common/rapidjson/memorybuffer.h
+++ b/external/rapidjson/memorybuffer.h
diff --git a/src/common/rapidjson/memorystream.h b/external/rapidjson/memorystream.h
index 8701c33c5..8701c33c5 100644
--- a/src/common/rapidjson/memorystream.h
+++ b/external/rapidjson/memorystream.h
diff --git a/src/common/rapidjson/msinttypes/inttypes.h b/external/rapidjson/msinttypes/inttypes.h
index ac7e32b6e..ac7e32b6e 100644
--- a/src/common/rapidjson/msinttypes/inttypes.h
+++ b/external/rapidjson/msinttypes/inttypes.h
diff --git a/src/common/rapidjson/msinttypes/stdint.h b/external/rapidjson/msinttypes/stdint.h
index bbad95af1..bbad95af1 100644
--- a/src/common/rapidjson/msinttypes/stdint.h
+++ b/external/rapidjson/msinttypes/stdint.h
diff --git a/src/common/rapidjson/prettywriter.h b/external/rapidjson/prettywriter.h
index 4eac8d76f..4eac8d76f 100644
--- a/src/common/rapidjson/prettywriter.h
+++ b/external/rapidjson/prettywriter.h
diff --git a/src/common/rapidjson/rapidjson.h b/external/rapidjson/rapidjson.h
index 3f743234d..3f743234d 100644
--- a/src/common/rapidjson/rapidjson.h
+++ b/external/rapidjson/rapidjson.h
diff --git a/src/common/rapidjson/reader.h b/external/rapidjson/reader.h
index f41ba2fd7..f41ba2fd7 100644
--- a/src/common/rapidjson/reader.h
+++ b/external/rapidjson/reader.h
diff --git a/src/common/rapidjson/stringbuffer.h b/external/rapidjson/stringbuffer.h
index 55124f117..55124f117 100644
--- a/src/common/rapidjson/stringbuffer.h
+++ b/external/rapidjson/stringbuffer.h
diff --git a/src/common/rapidjson/writer.h b/external/rapidjson/writer.h
index fb6601ef9..fb6601ef9 100644
--- a/src/common/rapidjson/writer.h
+++ b/external/rapidjson/writer.h