diff --git a/core/backends/lan/downloadjob.cpp b/core/backends/lan/downloadjob.cpp
index 3ddc08a16..50fa0da0c 100644
--- a/core/backends/lan/downloadjob.cpp
+++ b/core/backends/lan/downloadjob.cpp
@@ -18,11 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <kdeconnectconfig.h>
 #include "downloadjob.h"
-#include "lanlinkprovider.h"
-
-#include <core/core_debug.h>
 
 #ifndef Q_OS_WIN
 #include <sys/socket.h>
@@ -31,7 +27,9 @@
 #include <netdb.h>
 #endif
 
+#include "kdeconnectconfig.h"
 #include "lanlinkprovider.h"
+#include "core/core_debug.h"
 
 DownloadJob::DownloadJob(const QHostAddress &address, const QVariantMap &transferInfo)
     : KJob()
diff --git a/core/backends/lan/downloadjob.h b/core/backends/lan/downloadjob.h
index 76a74b72a..daa898eb2 100644
--- a/core/backends/lan/downloadjob.h
+++ b/core/backends/lan/downloadjob.h
@@ -26,11 +26,11 @@
 #include <QIODevice>
 #include <QVariantMap>
 #include <QHostAddress>
-#include <QTcpSocket>
 #include <QSharedPointer>
 #include <QSslSocket>
 #include <QBuffer>
-#include <kdeconnectcore_export.h>
+
+#include "kdeconnectcore_export.h"
 
 
 class KDECONNECTCORE_EXPORT DownloadJob
diff --git a/core/backends/lan/landevicelink.cpp b/core/backends/lan/landevicelink.cpp
index 569b5cc4c..a6658e92f 100644
--- a/core/backends/lan/landevicelink.cpp
+++ b/core/backends/lan/landevicelink.cpp
@@ -22,8 +22,8 @@
 
 #include "landevicelink.h"
 #include "core_debug.h"
-#include <kdeconnectconfig.h>
-#include "../linkprovider.h"
+#include "kdeconnectconfig.h"
+#include "backends/linkprovider.h"
 #include "uploadjob.h"
 #include "downloadjob.h"
 #include "socketlinereader.h"
diff --git a/core/backends/lan/landevicelink.h b/core/backends/lan/landevicelink.h
index dfb4f6d97..8eb158687 100644
--- a/core/backends/lan/landevicelink.h
+++ b/core/backends/lan/landevicelink.h
@@ -27,7 +27,7 @@
 #include <QSslCertificate>
 
 #include <kdeconnectcore_export.h>
-#include "../devicelink.h"
+#include "backends/devicelink.h"
 #include "uploadjob.h"
 
 class SocketLineReader;
diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index 7630f0c1e..7fe58f822 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -31,17 +31,15 @@
 #include <QHostInfo>
 #include <QTcpServer>
 #include <QUdpSocket>
-#include <QtGlobal>
 #include <QNetworkSession>
 #include <QNetworkConfigurationManager>
+#include <QSslCipher>
+#include <QSslConfiguration>
 
-#include "../../daemon.h"
+#include "daemon.h"
 #include "landevicelink.h"
 #include "lanpairinghandler.h"
-#include <kdeconnectconfig.h>
-#include <QDBusPendingReply>
-#include <QtNetwork/qsslcipher.h>
-#include <QtNetwork/qsslconfiguration.h>
+#include "kdeconnectconfig.h"
 
 #define MIN_VERSION_WITH_SSL_SUPPORT 6
 
diff --git a/core/backends/lan/lanlinkprovider.h b/core/backends/lan/lanlinkprovider.h
index 88f416ddc..133fc691b 100644
--- a/core/backends/lan/lanlinkprovider.h
+++ b/core/backends/lan/lanlinkprovider.h
@@ -29,8 +29,8 @@
 #include <QNetworkSession>
 #include <QSslSocket>
 
-#include <kdeconnectcore_export.h>
-#include "../linkprovider.h"
+#include "kdeconnectcore_export.h"
+#include "backends/linkprovider.h"
 #include "server.h"
 #include "landevicelink.h"
 
diff --git a/core/backends/lan/lanpairinghandler.h b/core/backends/lan/lanpairinghandler.h
index cd4da2db4..363f64c64 100644
--- a/core/backends/lan/lanpairinghandler.h
+++ b/core/backends/lan/lanpairinghandler.h
@@ -25,8 +25,8 @@
 #include <QTimer>
 
 #include "device.h"
-#include "../devicelink.h"
-#include "../pairinghandler.h"
+#include "backends/devicelink.h"
+#include "backends/pairinghandler.h"
 
 // This class is used pairing related stuff. It has direct access to links and can directly send packages
 class LanPairingHandler
diff --git a/core/backends/lan/server.h b/core/backends/lan/server.h
index 977cf82d5..ad1af0031 100644
--- a/core/backends/lan/server.h
+++ b/core/backends/lan/server.h
@@ -22,10 +22,9 @@
 #define KDECONNECT_SERVER_H
 
 #include <QTcpServer>
-#include <QSslError>
-#include <QtNetwork/qsslsocket.h>
-#include <kdeconnectcore_export.h>
+#include <QSslSocket>
 
+#include "kdeconnectcore_export.h"
 
 // This class overrides QTcpServer to bind QSslSocket to native socket descriptor instead of QTcpSocket
 class KDECONNECTCORE_EXPORT Server
diff --git a/core/backends/lan/socketlinereader.h b/core/backends/lan/socketlinereader.h
index 66b9ceebe..bdaf24ae0 100644
--- a/core/backends/lan/socketlinereader.h
+++ b/core/backends/lan/socketlinereader.h
@@ -22,7 +22,6 @@
 #define SOCKETLINEREADER_H
 
 #include <QObject>
-#include <QString>
 #include <QQueue>
 #include <QSslSocket>
 #include <QHostAddress>
diff --git a/core/backends/lan/uploadjob.cpp b/core/backends/lan/uploadjob.cpp
index a2b14a319..9cdf702ec 100644
--- a/core/backends/lan/uploadjob.cpp
+++ b/core/backends/lan/uploadjob.cpp
@@ -19,13 +19,11 @@
  */
 
 #include "uploadjob.h"
-#include "lanlinkprovider.h"
 
-#include <qalgorithms.h>
-#include <QtGlobal>
 #include <KLocalizedString>
-#include <kdeconnectconfig.h>
 
+#include "lanlinkprovider.h"
+#include "kdeconnectconfig.h"
 #include "core_debug.h"
 
 UploadJob::UploadJob(const QSharedPointer<QIODevice>& source, const QString& deviceId)
diff --git a/core/filetransferjob.h b/core/filetransferjob.h
index 202103461..ee434de87 100644
--- a/core/filetransferjob.h
+++ b/core/filetransferjob.h
@@ -22,16 +22,13 @@
 #ifndef FILETRANSFERJOB_H
 #define FILETRANSFERJOB_H
 
+#include <KJob>
+
 #include <QIODevice>
 #include <QTime>
-#include <QTemporaryFile>
 #include <QSharedPointer>
-
-#include <KJob>
 #include <QUrl>
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QBuffer>
 
 #include "kdeconnectcore_export.h"
 
diff --git a/plugins/findmyphone/findmyphoneplugin.cpp b/plugins/findmyphone/findmyphoneplugin.cpp
index e40549769..2bfb09daa 100644
--- a/plugins/findmyphone/findmyphoneplugin.cpp
+++ b/plugins/findmyphone/findmyphoneplugin.cpp
@@ -21,7 +21,6 @@
 
 #include "findmyphoneplugin.h"
 
-#include <core/device.h>
 #include <QDBusConnection>
 #include <QDebug>
 
diff --git a/plugins/sendnotifications/notifyingapplication.h b/plugins/sendnotifications/notifyingapplication.h
index 97421aa87..d0d8226df 100644
--- a/plugins/sendnotifications/notifyingapplication.h
+++ b/plugins/sendnotifications/notifyingapplication.h
@@ -22,7 +22,6 @@
 #define NOTIFYINGAPPLICATION_H
 
 #include <QRegularExpression>
-#include <QList>
 
 struct NotifyingApplication {
     QString name;
diff --git a/plugins/sendnotifications/notifyingapplicationmodel.cpp b/plugins/sendnotifications/notifyingapplicationmodel.cpp
index eadd46a61..c6e6f3c0b 100644
--- a/plugins/sendnotifications/notifyingapplicationmodel.cpp
+++ b/plugins/sendnotifications/notifyingapplicationmodel.cpp
@@ -18,13 +18,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "notifyingapplicationmodel.h"
+
+#include <algorithm>
+
 #include <QString>
 #include <QIcon>
 #include <QDebug>
-#include <KLocalizedString>
-#include <algorithm>
 
-#include "notifyingapplicationmodel.h"
+#include <KLocalizedString>
+
 //#include "modeltest.h"
 
 NotifyingApplicationModel::NotifyingApplicationModel(QObject *parent)
diff --git a/plugins/sendnotifications/sendnotificationsplugin.h b/plugins/sendnotifications/sendnotificationsplugin.h
index 3c52c0b1a..c428af81d 100644
--- a/plugins/sendnotifications/sendnotificationsplugin.h
+++ b/plugins/sendnotifications/sendnotificationsplugin.h
@@ -21,9 +21,8 @@
 #ifndef SENDNOTIFICATIONSPLUGIN_H
 #define SENDNOTIFICATIONSPLUGIN_H
 
-#include <knotification.h>
+#include "core/kdeconnectplugin.h"
 
-#include <core/kdeconnectplugin.h>
 #define PACKAGE_TYPE_NOTIFICATION QLatin1String("kdeconnect.notification")
 
 /*
diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp
index 9c98dff93..375f0734c 100644
--- a/plugins/sftp/mounter.cpp
+++ b/plugins/sftp/mounter.cpp
@@ -27,7 +27,7 @@
 
 #include "mountloop.h"
 #include "sftp_debug.h"
-#include <kdeconnectconfig.h>
+#include "kdeconnectconfig.h"
 
 Mounter::Mounter(SftpPlugin* sftp)
     : QObject(sftp)
diff --git a/plugins/share/shareplugin.cpp b/plugins/share/shareplugin.cpp
index d6c16a409..cc75e6361 100644
--- a/plugins/share/shareplugin.cpp
+++ b/plugins/share/shareplugin.cpp
@@ -27,13 +27,14 @@
 #include <QDesktopServices>
 #include <QDBusConnection>
 #include <QDebug>
+#include <QTemporaryFile>
 
 #include <KLocalizedString>
 #include <KJobTrackerInterface>
 #include <KPluginFactory>
 #include <KIO/MkpathJob>
 
-#include <core/filetransferjob.h>
+#include "core/filetransferjob.h"
 #include "autoclosingqfile.h"
 
 K_PLUGIN_FACTORY_WITH_JSON( KdeConnectPluginFactory, "kdeconnect_share.json", registerPlugin< SharePlugin >(); )