More of that json/ include path madness.

indra/llmessage/llcorehttputil.cpp

@@ -35,8 +35,15 @@
 #include "llsd.h"
 #include "llsdjson.h"
 #include "llsdserialize.h"
+
+#ifndef LL_USESYSTEMLIBS
 #include "reader.h" // JSON
 #include "writer.h" // JSON
+#else
+#include "json/reader.h" // JSON
+#include "json/writer.h" // JSON
+#endif
+
 #include "llvfile.h"
 
 #include "message.h" // for getting the port

indra/newview/llmarketplacefunctions.cpp

@@ -41,8 +41,15 @@
 #include "llviewermedia.h"
 #include "llviewernetwork.h"
 #include "llviewerregion.h"
+
+#ifndef LL_USESYSTEMLIBS
 #include "reader.h" // JSON
 #include "writer.h" // JSON
+#else
+#include "json/reader.h" // JSON
+#include "json/writer.h" // JSON
+#endif
+
 #include "lleventcoro.h"
 #include "llcoros.h"
 #include "llcorehttputil.h"

indra/newview/lltranslate.cpp

@@ -36,7 +36,13 @@
 #include "llversioninfo.h"
 #include "llviewercontrol.h"
 #include "llcoros.h"
+
+#ifndef LL_USESYSTEMLIBS
 #include "reader.h"
+#else
+#include "json/reader.h"
+#endif
+
 #include "llcorehttputil.h"