diff --git a/message/jsonMessage.h b/message/jsonMessage.h
index b1afc458..4ef89060 100644
--- a/message/jsonMessage.h
+++ b/message/jsonMessage.h
@@ -20,7 +20,12 @@
 #define JSON_MESSAGE_H
 
 #include "message.h"
+
+#ifdef HAS_JSONRPCPP
+#include <jsonrpcpp/json.hpp>
+#else
 #include "externals/json.hpp"
+#endif
 
 
 using json = nlohmann::json;
diff --git a/server/config.h b/server/config.h
index 027a46d5..82896936 100644
--- a/server/config.h
+++ b/server/config.h
@@ -23,6 +23,10 @@
 #include <memory>
 #include <vector>
 #include <sys/time.h>
+
+#ifdef HAS_JSONRPCPP
+#include <jsonrpcpp/json.hpp>
+#else
 #include "externals/json.hpp"
 #include "common/utils/string_utils.h"
 #include "common/utils.h"
diff --git a/server/controlServer.cpp b/server/controlServer.cpp
index abcbce2f..ddcd1e7e 100644
--- a/server/controlServer.cpp
+++ b/server/controlServer.cpp
@@ -16,12 +16,17 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#ifdef HAS_JSONRPCPP
+#include <jsonrpcpp/jsonrp.hpp>
+#else
+#include "jsonrp.hpp"
+#endif
+
 #include "controlServer.h"
 #include "message/time.h"
 #include "aixlog.hpp"
 #include "common/utils.h"
 #include "common/snapException.h"
-#include "jsonrp.hpp"
 #include "config.h"
 #include <iostream>
 
diff --git a/server/streamServer.h b/server/streamServer.h
index 9c43a843..0130c6a3 100644
--- a/server/streamServer.h
+++ b/server/streamServer.h
@@ -27,7 +27,12 @@
 #include <sstream>
 #include <mutex>
 
+#ifdef HAS_JSONRPCPP
+#include <jsonrpcpp/jsonrp.hpp>
+#else
 #include "jsonrp.hpp"
+#endif
+
 #include "streamSession.h"
 #include "streamreader/streamManager.h"
 #include "common/queue.h"
diff --git a/server/streamreader/pcmStream.h b/server/streamreader/pcmStream.h
index 6f151e66..ee2e5d6d 100644
--- a/server/streamreader/pcmStream.h
+++ b/server/streamreader/pcmStream.h
@@ -27,11 +27,15 @@
 #include <map>
 #include "streamUri.h"
 #include "encoder/encoder.h"
-#include "externals/json.hpp"
 #include "common/sampleFormat.h"
 #include "message/codecHeader.h"
 #include "message/streamTags.h"
 
+#ifdef HAS_JSONRPCPP
+#include <jsonrpcpp/json.hpp>
+#else
+#include "externals/json.hpp"
+#endif
 
 class PcmStream;
 
diff --git a/server/streamreader/streamUri.h b/server/streamreader/streamUri.h
index c174a498..e5ccf6b9 100644
--- a/server/streamreader/streamUri.h
+++ b/server/streamreader/streamUri.h
@@ -21,7 +21,12 @@
 
 #include <string>
 #include <map>
+
+#ifdef HAS_JSONRPCPP
+#include <jsonrpcpp/json.hpp>
+#else
 #include "externals/json.hpp"
+#endif
 
 using json = nlohmann::json;