diff --git a/libnymea-core/jsonrpc/configurationhandler.cpp b/libnymea-core/jsonrpc/configurationhandler.cpp
index 65053482..6de2111b 100644
--- a/libnymea-core/jsonrpc/configurationhandler.cpp
+++ b/libnymea-core/jsonrpc/configurationhandler.cpp
@@ -71,6 +71,7 @@
 #include "configurationhandler.h"
 #include "nymeacore.h"
 #include "nymeaconfiguration.h"
+#include "loggingcategories.h"
 #include "platform/platform.h"
 #include "platform/platformsystemcontroller.h"
 
diff --git a/libnymea-core/jsonrpc/jsonrpcserverimplementation.cpp b/libnymea-core/jsonrpc/jsonrpcserverimplementation.cpp
index 2722516e..7eb8788b 100644
--- a/libnymea-core/jsonrpc/jsonrpcserverimplementation.cpp
+++ b/libnymea-core/jsonrpc/jsonrpcserverimplementation.cpp
@@ -576,7 +576,7 @@ void JsonRPCServerImplementation::processJsonPacket(TransportInterface *interfac
     QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &error);
 
     if(error.error != QJsonParseError::NoError) {
-        qCWarning(dcJsonRpc) << "Failed to parse JSON data" << data << ":" << error.errorString();
+        qCWarning(dcJsonRpc()) << "Failed to parse JSON data" << data << ":" << error.errorString();
         sendErrorResponse(interface, clientId, -1, QString("Failed to parse JSON data: %1").arg(error.errorString()));
         return;
     }
@@ -586,7 +586,7 @@ void JsonRPCServerImplementation::processJsonPacket(TransportInterface *interfac
     bool success;
     int commandId = message.value("id").toInt(&success);
     if (!success) {
-        qCWarning(dcJsonRpc) << "Error parsing command. Missing \"id\":" << message;
+        qCWarning(dcJsonRpc()) << "Error parsing command. Missing \"id\":" << message;
         sendErrorResponse(interface, clientId, commandId, "Error parsing command. Missing 'id'");
         return;
     }
@@ -594,7 +594,7 @@ void JsonRPCServerImplementation::processJsonPacket(TransportInterface *interfac
     QString methodString = message.value("method").toString();
     QStringList commandList = methodString.split('.');
     if (commandList.count() != 2) {
-        qCWarning(dcJsonRpc) << "Error parsing method.\nGot:" << message.value("method").toString() << "\nExpected: \"Namespace.method\"";
+        qCWarning(dcJsonRpc()) << "Error parsing method.\nGot:" << message.value("method").toString() << "\nExpected: \"Namespace.method\"";
         sendErrorResponse(interface, clientId, commandId, QString("Error parsing method. Got: '%1'', Expected: 'Namespace.method'").arg(message.value("method").toString()));
         return;
     }
@@ -607,7 +607,7 @@ void JsonRPCServerImplementation::processJsonPacket(TransportInterface *interfac
         token = message.value("token").toByteArray();
     } else if (message.value("token").toByteArray() != token) {
         qCWarning(dcJsonRpc()) << "Client changed token without redoing the handshake.";
-        qCDebug(dcJsonRpc) << "Old token:" << token << "new token:" << message.value("token").toByteArray();
+        qCDebug(dcJsonRpc()) << "Old token:" << token << "new token:" << message.value("token").toByteArray();
         sendUnauthorizedResponse(interface, clientId, commandId, "Changing the user (token) requires a new handshake. Call JSONRPC.Hello.");
         interface->terminateClientConnection(clientId);
         qCWarning(dcJsonRpc()) << "Staring connection lockdown timer";
diff --git a/libnymea-core/jsonrpc/tagshandler.cpp b/libnymea-core/jsonrpc/tagshandler.cpp
index f1845d90..45a4cefb 100644
--- a/libnymea-core/jsonrpc/tagshandler.cpp
+++ b/libnymea-core/jsonrpc/tagshandler.cpp
@@ -142,7 +142,7 @@ JsonReply *TagsHandler::RemoveTag(const QVariantMap &params) const
 
 void TagsHandler::onTagAdded(const Tag &tag)
 {
-    qCDebug(dcJsonRpc) << "Notify \"Tags.TagAdded\"";
+    qCDebug(dcJsonRpc()) << "Notify \"Tags.TagAdded\"";
     QVariantMap params;
     params.insert("tag", pack(tag));
     emit TagAdded(params);
@@ -150,7 +150,7 @@ void TagsHandler::onTagAdded(const Tag &tag)
 
 void TagsHandler::onTagRemoved(const Tag &tag)
 {
-    qCDebug(dcJsonRpc) << "Notify \"Tags.TagRemoved\"";
+    qCDebug(dcJsonRpc()) << "Notify \"Tags.TagRemoved\"";
     QVariantMap params;
     params.insert("tag", pack(tag));
     emit TagRemoved(params);
@@ -158,7 +158,7 @@ void TagsHandler::onTagRemoved(const Tag &tag)
 
 void TagsHandler::onTagValueChanged(const Tag &tag)
 {
-    qCDebug(dcJsonRpc) << "Notify \"Tags.TagValueChanged\"";
+    qCDebug(dcJsonRpc()) << "Notify \"Tags.TagValueChanged\"";
     QVariantMap params;
     params.insert("tag", pack(tag));
     emit TagValueChanged(params);
diff --git a/tests/auto/mqttbroker/testmqttbroker.cpp b/tests/auto/mqttbroker/testmqttbroker.cpp
index 84a6965a..2dc2aa31 100644
--- a/tests/auto/mqttbroker/testmqttbroker.cpp
+++ b/tests/auto/mqttbroker/testmqttbroker.cpp
@@ -32,6 +32,7 @@
 #include "nymeacore.h"
 #include "servers/mqttbroker.h"
 #include "servers/mocktcpserver.h"
+#include "loggingcategories.h"
 
 #include <mqttclient.h>