Cleanup includes

src/device/devicemanager.cpp

@@ -44,10 +44,10 @@
 
 #include "devicemanager.h"
 
+#include "core/logging.h"
 #include "core/application.h"
 #include "core/database.h"
 #include "core/iconloader.h"
-#include "core/logging.h"
 #include "core/musicstorage.h"
 #include "core/taskmanager.h"
 #include "core/simpletreemodel.h"

src/device/filesystemdevice.cpp

@@ -25,8 +25,8 @@
 #include <QString>
 #include <QUrl>
 
-#include "core/application.h"
 #include "core/logging.h"
+#include "core/application.h"
 #include "core/song.h"
 
 #include "collection/collectionbackend.h"

src/device/gpodloader.cpp

@@ -29,10 +29,10 @@
 #include <QByteArray>
 #include <QString>
 
-#include "collection/collectionbackend.h"
 #include "core/logging.h"
 #include "core/song.h"
 #include "core/taskmanager.h"
+#include "collection/collectionbackend.h"
 #include "gpodloader.h"
 
 GPodLoader::GPodLoader(const QString &mount_point, TaskManager *task_manager, CollectionBackend *backend, std::shared_ptr<ConnectedDevice> device, QObject *parent)

src/device/mtpconnection.h

@@ -25,6 +25,7 @@
 #include "config.h"
 
 #include <memory>
+
 #include <libmtp.h>
 
 #include <QtGlobal>

src/device/mtpdevice.cpp

@@ -33,11 +33,11 @@
 #include <QString>
 #include <QUrl>
 
-#include "collection/collectionmodel.h"
-#include "collection/collectionbackend.h"
 #include "core/logging.h"
 #include "core/application.h"
 #include "core/musicstorage.h"
+#include "collection/collectionmodel.h"
+#include "collection/collectionbackend.h"
 #include "connecteddevice.h"
 #include "mtpdevice.h"
 #include "mtploader.h"