diff --git a/libnymea-remoteproxyclient/libnymea-remoteproxyclient.pri b/libnymea-remoteproxyclient/libnymea-remoteproxyclient.pri
index 949c4e2..2a7edce 100644
--- a/libnymea-remoteproxyclient/libnymea-remoteproxyclient.pri
+++ b/libnymea-remoteproxyclient/libnymea-remoteproxyclient.pri
@@ -1,14 +1,14 @@
 INCLUDEPATH += $${PWD}
 
 HEADERS += \
-    $${PWD}/jsonrpcclient2.h \
+    $${PWD}/proxyjsonrpcclient.h \
     $${PWD}/jsonreply.h \
     $${PWD}/remoteproxyconnection.h \
     $${PWD}/proxyconnection.h \
     $${PWD}/websocketconnection.h
 
 SOURCES += \
-    $${PWD}/jsonrpcclient2.cpp \
+    $${PWD}/proxyjsonrpcclient.cpp \
     $${PWD}/jsonreply.cpp \
     $${PWD}/remoteproxyconnection.cpp \
     $${PWD}/proxyconnection.cpp \
diff --git a/libnymea-remoteproxyclient/jsonrpcclient2.cpp b/libnymea-remoteproxyclient/proxyjsonrpcclient.cpp
similarity index 99%
rename from libnymea-remoteproxyclient/jsonrpcclient2.cpp
rename to libnymea-remoteproxyclient/proxyjsonrpcclient.cpp
index adb68be..b421642 100644
--- a/libnymea-remoteproxyclient/jsonrpcclient2.cpp
+++ b/libnymea-remoteproxyclient/proxyjsonrpcclient.cpp
@@ -1,4 +1,4 @@
-#include "jsonrpcclient2.h"
+#include "proxyjsonrpcclient.h"
 #include "proxyconnection.h"
 
 #include <QJsonDocument>
diff --git a/libnymea-remoteproxyclient/jsonrpcclient2.h b/libnymea-remoteproxyclient/proxyjsonrpcclient.h
similarity index 100%
rename from libnymea-remoteproxyclient/jsonrpcclient2.h
rename to libnymea-remoteproxyclient/proxyjsonrpcclient.h
diff --git a/libnymea-remoteproxyclient/remoteproxyconnection.cpp b/libnymea-remoteproxyclient/remoteproxyconnection.cpp
index 7780b13..b476013 100644
--- a/libnymea-remoteproxyclient/remoteproxyconnection.cpp
+++ b/libnymea-remoteproxyclient/remoteproxyconnection.cpp
@@ -1,5 +1,7 @@
 #include "remoteproxyconnection.h"
 #include "websocketconnection.h"
+#include "proxyjsonrpcclient.h"
+#include "proxyconnection.h"
 
 Q_LOGGING_CATEGORY(dcRemoteProxyClientConnection, "RemoteProxyClientConnection")
 Q_LOGGING_CATEGORY(dcRemoteProxyClientConnectionTraffic, "RemoteProxyClientConnectionTraffic")
diff --git a/libnymea-remoteproxyclient/remoteproxyconnection.h b/libnymea-remoteproxyclient/remoteproxyconnection.h
index bc1a3db..ed625c8 100644
--- a/libnymea-remoteproxyclient/remoteproxyconnection.h
+++ b/libnymea-remoteproxyclient/remoteproxyconnection.h
@@ -8,14 +8,14 @@
 #include <QHostAddress>
 #include <QLoggingCategory>
 
-#include "jsonrpcclient2.h"
-#include "proxyconnection.h"
-
 Q_DECLARE_LOGGING_CATEGORY(dcRemoteProxyClientConnection)
 Q_DECLARE_LOGGING_CATEGORY(dcRemoteProxyClientConnectionTraffic)
 
 namespace remoteproxyclient {
 
+class JsonRpcClient;
+class ProxyConnection;
+
 class RemoteProxyConnection : public QObject
 {
     Q_OBJECT