Reduce includes

src/organise/organise.cpp

@@ -26,10 +26,10 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QTimer>
+#include <QDateTime>
 #include <QString>
-#include <QStringBuilder>
 #include <QUrl>
-#include <QStandardPaths>
+#include <QImage>
 #include <QtDebug>
 
 #include "core/logging.h"

src/organise/organise.h

@@ -27,20 +27,18 @@
 #include <memory>
 
 #include <QObject>
-#include <QThread>
 #include <QBasicTimer>
 #include <QFileInfo>
-#include <QList>
-#include <QVector>
-#include <QMap>
 #include <QSet>
+#include <QList>
+#include <QMap>
 #include <QString>
 #include <QStringList>
-#include <QTemporaryFile>
 
 #include "core/song.h"
 #include "organiseformat.h"
 
+class QThread;
 class QTimerEvent;
 
 class MusicStorage;

src/organise/organisedialog.cpp

@@ -26,7 +26,6 @@
 
 #include <QtGlobal>
 #include <QtConcurrentRun>
-#include <QtAlgorithms>
 #include <QAbstractItemModel>
 #include <QDialog>
 #include <QHash>
@@ -49,7 +48,7 @@
 #include <QStackedWidget>
 #include <QToolButton>
 #include <QFlags>
-#include <QtEvents>
+#include <QShowEvent>
 #include <QSettings>
 
 #include "core/closure.h"
@@ -61,6 +60,7 @@
 #include "widgets/linetextedit.h"
 #include "collection/collectionbackend.h"
 #include "organise.h"
+#include "organiseformat.h"
 #include "organisedialog.h"
 #include "organiseerrordialog.h"
 #include "ui_organisedialog.h"

src/organise/organisedialog.h

@@ -28,9 +28,7 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QWidget>
 #include <QDialog>
-#include <QAbstractItemModel>
 #include <QFuture>
 #include <QList>
 #include <QSize>
@@ -43,6 +41,8 @@
 #include "organise.h"
 #include "organiseformat.h"
 
+class QAbstractItemModel;
+class QWidget;
 class QResizeEvent;
 class QShowEvent;
 

src/organise/organiseerrordialog.cpp

@@ -25,9 +25,9 @@
 
 #include <QWidget>
 #include <QDialog>
-#include <QtAlgorithms>
 #include <QIcon>
 #include <QStyle>
+#include <QList>
 #include <QStringList>
 #include <QUrl>
 #include <QLabel>

src/organise/organiseformat.h

@@ -23,16 +23,16 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QString>
 #include <QStringList>
-#include <QColor>
-#include <QTextDocument>
-#include <QTextEdit>
+#include <QRegExp>
+#include <QRgb>
 #include <QSyntaxHighlighter>
 #include <QValidator>
 
+class QTextDocument;
+class QTextEdit;
 class Song;
 
 class OrganiseFormat {