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
similarity index 100%
rename from src/common/rapidjson/allocators.h
rename to external/rapidjson/allocators.h
diff --git a/src/common/rapidjson/document.h b/external/rapidjson/document.h
similarity index 100%
rename from src/common/rapidjson/document.h
rename to external/rapidjson/document.h
diff --git a/src/common/rapidjson/encodedstream.h b/external/rapidjson/encodedstream.h
similarity index 100%
rename from src/common/rapidjson/encodedstream.h
rename to external/rapidjson/encodedstream.h
diff --git a/src/common/rapidjson/encodings.h b/external/rapidjson/encodings.h
similarity index 100%
rename from src/common/rapidjson/encodings.h
rename to external/rapidjson/encodings.h
diff --git a/src/common/rapidjson/error/en.h b/external/rapidjson/error/en.h
similarity index 100%
rename from src/common/rapidjson/error/en.h
rename to external/rapidjson/error/en.h
diff --git a/src/common/rapidjson/error/error.h b/external/rapidjson/error/error.h
similarity index 100%
rename from src/common/rapidjson/error/error.h
rename to external/rapidjson/error/error.h
diff --git a/src/common/rapidjson/filereadstream.h b/external/rapidjson/filereadstream.h
similarity index 100%
rename from src/common/rapidjson/filereadstream.h
rename to external/rapidjson/filereadstream.h
diff --git a/src/common/rapidjson/filestream.h b/external/rapidjson/filestream.h
similarity index 100%
rename from src/common/rapidjson/filestream.h
rename to external/rapidjson/filestream.h
diff --git a/src/common/rapidjson/filewritestream.h b/external/rapidjson/filewritestream.h
similarity index 100%
rename from src/common/rapidjson/filewritestream.h
rename to external/rapidjson/filewritestream.h
diff --git a/src/common/rapidjson/internal/dtoa.h b/external/rapidjson/internal/dtoa.h
similarity index 100%
rename from src/common/rapidjson/internal/dtoa.h
rename to external/rapidjson/internal/dtoa.h
diff --git a/src/common/rapidjson/internal/itoa.h b/external/rapidjson/internal/itoa.h
similarity index 100%
rename from src/common/rapidjson/internal/itoa.h
rename to external/rapidjson/internal/itoa.h
diff --git a/src/common/rapidjson/internal/meta.h b/external/rapidjson/internal/meta.h
similarity index 100%
rename from src/common/rapidjson/internal/meta.h
rename to external/rapidjson/internal/meta.h
diff --git a/src/common/rapidjson/internal/pow10.h b/external/rapidjson/internal/pow10.h
similarity index 100%
rename from src/common/rapidjson/internal/pow10.h
rename to external/rapidjson/internal/pow10.h
diff --git a/src/common/rapidjson/internal/stack.h b/external/rapidjson/internal/stack.h
similarity index 100%
rename from src/common/rapidjson/internal/stack.h
rename to external/rapidjson/internal/stack.h
diff --git a/src/common/rapidjson/internal/strfunc.h b/external/rapidjson/internal/strfunc.h
similarity index 100%
rename from src/common/rapidjson/internal/strfunc.h
rename to external/rapidjson/internal/strfunc.h
diff --git a/src/common/rapidjson/memorybuffer.h b/external/rapidjson/memorybuffer.h
similarity index 100%
rename from src/common/rapidjson/memorybuffer.h
rename to external/rapidjson/memorybuffer.h
diff --git a/src/common/rapidjson/memorystream.h b/external/rapidjson/memorystream.h
similarity index 100%
rename from src/common/rapidjson/memorystream.h
rename to external/rapidjson/memorystream.h
diff --git a/src/common/rapidjson/msinttypes/inttypes.h b/external/rapidjson/msinttypes/inttypes.h
similarity index 100%
rename from src/common/rapidjson/msinttypes/inttypes.h
rename to external/rapidjson/msinttypes/inttypes.h
diff --git a/src/common/rapidjson/msinttypes/stdint.h b/external/rapidjson/msinttypes/stdint.h
similarity index 100%
rename from src/common/rapidjson/msinttypes/stdint.h
rename to external/rapidjson/msinttypes/stdint.h
diff --git a/src/common/rapidjson/prettywriter.h b/external/rapidjson/prettywriter.h
similarity index 100%
rename from src/common/rapidjson/prettywriter.h
rename to external/rapidjson/prettywriter.h
diff --git a/src/common/rapidjson/rapidjson.h b/external/rapidjson/rapidjson.h
similarity index 100%
rename from src/common/rapidjson/rapidjson.h
rename to external/rapidjson/rapidjson.h
diff --git a/src/common/rapidjson/reader.h b/external/rapidjson/reader.h
similarity index 100%
rename from src/common/rapidjson/reader.h
rename to external/rapidjson/reader.h
diff --git a/src/common/rapidjson/stringbuffer.h b/external/rapidjson/stringbuffer.h
similarity index 100%
rename from src/common/rapidjson/stringbuffer.h
rename to external/rapidjson/stringbuffer.h
diff --git a/src/common/rapidjson/writer.h b/external/rapidjson/writer.h
similarity index 100%
rename from src/common/rapidjson/writer.h
rename to external/rapidjson/writer.h