diff --git a/src/networkremote/incomingdataparser.cpp b/src/networkremote/incomingdataparser.cpp
index add895337..dbe4c1aaf 100644
--- a/src/networkremote/incomingdataparser.cpp
+++ b/src/networkremote/incomingdataparser.cpp
@@ -22,6 +22,7 @@
 #include "core/logging.h"
 #include "engines/enginebase.h"
 #include "internet/core/internetmodel.h"
+#include "networkremote/songsender.h"
 #include "playlist/playlistmanager.h"
 #include "playlist/playlistsequence.h"
 #include "playlist/playlist.h"
diff --git a/src/networkremote/remoteclient.cpp b/src/networkremote/remoteclient.cpp
index 8931207c5..b3faa7a44 100644
--- a/src/networkremote/remoteclient.cpp
+++ b/src/networkremote/remoteclient.cpp
@@ -1,7 +1,10 @@
 #include "remoteclient.h"
 
+#include "networkremote/songsender.h"
+
 RemoteClient::RemoteClient(Application* app, QObject* parent)
     : QObject(parent),
       app_(app),
-      downloader_(false) {
+      downloader_(false),
+      song_sender_(new SongSender(app, this)) {
 }
diff --git a/src/networkremote/remoteclient.h b/src/networkremote/remoteclient.h
index 7b6b71416..9b504eed6 100644
--- a/src/networkremote/remoteclient.h
+++ b/src/networkremote/remoteclient.h
@@ -4,13 +4,11 @@
 #include <QAbstractSocket>
 #include <QObject>
 
-#include "songsender.h"
-
-#include "core/application.h"
 #include "remotecontrolmessages.pb.h"
 
 class Application;
 class QByteArray;
+class SongSender;
 
 class RemoteClient : public QObject {
   Q_OBJECT
@@ -31,6 +29,7 @@ class RemoteClient : public QObject {
  protected:
   Application* app_;
   bool downloader_;
+  SongSender* song_sender_;
 };
 
 #endif  // REMOTECLIENT_H
diff --git a/src/networkremote/songsender.cpp b/src/networkremote/songsender.cpp
index 8ec4a30b7..1639e1aad 100644
--- a/src/networkremote/songsender.cpp
+++ b/src/networkremote/songsender.cpp
@@ -23,8 +23,11 @@
 
 #include "core/application.h"
 #include "core/logging.h"
+#include "core/player.h"
 #include "core/utilities.h"
 #include "library/librarybackend.h"
+#include "networkremote/outgoingdatacreator.h"
+#include "networkremote/remoteclient.h"
 #include "playlist/playlistitem.h"
 
 const quint32 SongSender::kFileChunkSize = 100000;  // in Bytes