diff --git a/cli/kdeconnect-cli.cpp b/cli/kdeconnect-cli.cpp
index 454143edf..e44aaf501 100644
--- a/cli/kdeconnect-cli.cpp
+++ b/cli/kdeconnect-cli.cpp
@@ -22,7 +22,6 @@
 #include <KUrl>
 #include <kcmdlineargs.h>
 #include <k4aboutdata.h>
-#include <kaboutdata.h>
 #include <interfaces/devicesmodel.h>
 #include <interfaces/notificationsmodel.h>
 #include <interfaces/dbusinterfaces.h>
@@ -32,8 +31,8 @@
 
 int main(int argc, char** argv)
 {
-    KAboutData about("kdeconnect-cli", "kdeconnect-cli", ki18n(("kdeconnect-cli")), "1.0", ki18n("KDE Connect CLI tool"),
-                     KAboutData::License_GPL, ki18n("(C) 2013 Aleix Pol Gonzalez"));
+    K4AboutData about("kdeconnect-cli", "kdeconnect-cli", ki18n(("kdeconnect-cli")), "1.0", ki18n("KDE Connect CLI tool"),
+                     K4AboutData::License_GPL, ki18n("(C) 2013 Aleix Pol Gonzalez"));
 
     about.addAuthor( ki18n("Aleix Pol Gonzalez"), KLocalizedString(), "aleixpol@kde.org" );
     KCmdLineArgs::init(argc, argv, &about);
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index d8ed92c62..88084ed36 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -36,6 +36,8 @@ target_link_libraries(kdeconnectcore
 PUBLIC
     KF5::KDELibs4Support
 PRIVATE
+    ${QCA2_LIBRARIES}
+    ${QJSON_LIBRARIES}
     KF5::KIOWidgets
     KF5::KCMUtils
     Qt5::Network
diff --git a/plugins/mousepad/mousepadplugin.cpp b/plugins/mousepad/mousepadplugin.cpp
index 64aae5cc9..2f8f21621 100644
--- a/plugins/mousepad/mousepadplugin.cpp
+++ b/plugins/mousepad/mousepadplugin.cpp
@@ -20,7 +20,6 @@
 
 #include "mousepadplugin.h"
 
-#include <core/networkpackage.h>
 #include <X11/extensions/XTest.h>
 
 K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< MousepadPlugin >(); )
@@ -90,3 +89,5 @@ bool MousepadPlugin::receivePackage(const NetworkPackage& np)
     }
     return true;
 }
+
+#include "mousepadplugin.moc"
diff --git a/plugins/mousepad/mousepadplugin.h b/plugins/mousepad/mousepadplugin.h
index 64f5d8800..f579b7257 100644
--- a/plugins/mousepad/mousepadplugin.h
+++ b/plugins/mousepad/mousepadplugin.h
@@ -21,10 +21,9 @@
 #ifndef MOUSEPADPLUGIN_H
 #define MOUSEPADPLUGIN_H
 
-#include <QObject>
-#include <QApplication>
-
+#include <QtGui/QCursor>
 #include <core/kdeconnectplugin.h>
+#include <X11/Xlib.h>
 
 #define PACKAGE_TYPE_MOUSEPAD QLatin1String("kdeconnect.mousepad")
 
@@ -45,7 +44,6 @@ public:
     explicit MousepadPlugin(QObject *parent, const QVariantList &args);
     virtual ~MousepadPlugin();
 
-public Q_SLOTS:
     virtual bool receivePackage(const NetworkPackage& np);
     virtual void connected() { }