Reduce includes

3rdparty/singleapplication/singleapplication.cpp

@@ -31,13 +31,18 @@
 //
 //
 
+#include <stdlib.h>
+#include <limits>
+
 #include <QtGlobal>
 #include <QCoreApplication>
 #include <QThread>
 #include <QSharedMemory>
+#include <QLocalSocket>
 #include <QByteArray>
 #include <QDateTime>
 #include <QElapsedTimer>
+#include <QtDebug>
 
 #include "singleapplication.h"
 #include "singleapplication_p.h"

3rdparty/singleapplication/singleapplication.h

@@ -36,7 +36,8 @@
 
 #include <QtGlobal>
 #include <QApplication>
-#include <QLocalSocket>
+#include <QFlags>
+#include <QByteArray>
 
 class SingleApplicationPrivate;
 

3rdparty/singleapplication/singleapplication_p.cpp

@@ -44,12 +44,14 @@
 #  include <pwd.h>
 #endif
 
-#include <QDir>
+#include <QIODevice>
+#include <QSharedMemory>
 #include <QByteArray>
 #include <QDataStream>
 #include <QCryptographicHash>
 #include <QLocalServer>
 #include <QLocalSocket>
+#include <QDir>
 
 #include "singleapplication.h"
 #include "singleapplication_p.h"

3rdparty/singleapplication/singleapplication_p.h

@@ -35,13 +35,15 @@
 #define SINGLEAPPLICATION_P_H
 
 #include <QtGlobal>
-#include <QLocalSocket>
+#include <QObject>
-#include <QLocalServer>
-#include <QSharedMemory>
 #include <QMap>
 
 #include "singleapplication.h"
 
+class QLocalServer;
+class QLocalSocket;
+class QSharedMemory;
+
 struct InstancesInfo {
   bool primary;
   quint32 secondary;

3rdparty/singleapplication/singlecoreapplication.cpp

@@ -31,13 +31,18 @@
 //
 //
 
+#include <stdlib.h>
+#include <limits>
+
 #include <QtGlobal>
 #include <QCoreApplication>
 #include <QThread>
 #include <QSharedMemory>
+#include <QLocalSocket>
 #include <QByteArray>
 #include <QDateTime>
 #include <QElapsedTimer>
+#include <QtDebug>
 
 #include "singlecoreapplication.h"
 #include "singlecoreapplication_p.h"

3rdparty/singleapplication/singlecoreapplication.h

@@ -36,7 +36,8 @@
 
 #include <QtGlobal>
 #include <QCoreApplication>
-#include <QLocalSocket>
+#include <QFlags>
+#include <QByteArray>
 
 class SingleCoreApplicationPrivate;
 

3rdparty/singleapplication/singlecoreapplication_p.cpp

@@ -44,12 +44,14 @@
 #  include <pwd.h>
 #endif
 
-#include <QDir>
+#include <QIODevice>
+#include <QSharedMemory>
 #include <QByteArray>
 #include <QDataStream>
 #include <QCryptographicHash>
 #include <QLocalServer>
 #include <QLocalSocket>
+#include <QDir>
 
 #include "singlecoreapplication.h"
 #include "singlecoreapplication_p.h"

3rdparty/singleapplication/singlecoreapplication_p.h

@@ -35,13 +35,15 @@
 #define SINGLECOREAPPLICATION_P_H
 
 #include <QtGlobal>
-#include <QLocalSocket>
+#include <QObject>
-#include <QLocalServer>
-#include <QSharedMemory>
 #include <QMap>
 
 #include "singlecoreapplication.h"
 
+class QLocalServer;
+class QLocalSocket;
+class QSharedMemory;
+
 struct InstancesInfo {
   bool primary;
   quint32 secondary;

ext/gstmoodbar/gstfastspectrum.cpp

@@ -19,14 +19,16 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <QtGlobal>
+
 #include <cstring>
-#include <cmath>
+
+#include <glib.h>
 
 #include <gst/gst.h>
 #include <gst/audio/gstaudiofilter.h>
 
 #include <QMutex>
-#include <QMutexLocker>
 
 #include "gstfastspectrum.h"
 

ext/gstmoodbar/gstmoodbarplugin.cpp

@@ -15,6 +15,7 @@
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <glib.h>
 #include <gst/gst.h>
 
 #include "gstfastspectrum.h"

ext/libstrawberry-common/core/closure.cpp

@@ -22,7 +22,6 @@
 
 #include "closure.h"
 
-#include "core/logging.h"
 #include "core/timeconstants.h"
 
 namespace _detail {

ext/libstrawberry-common/core/messagehandler.h

@@ -23,7 +23,6 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QThread>
-#include <QIODevice>
 #include <QBuffer>
 #include <QByteArray>
 #include <QMap>
@@ -33,6 +32,8 @@
 
 #include "core/messagereply.h"
 
+class QIODevice;
+
 #define QStringFromStdString(x) QString::fromUtf8(x.data(), x.size())
 #define DataCommaSizeFromQString(x) x.toUtf8().constData(), x.toUtf8().length()
 

ext/libstrawberry-common/core/workerpool.h

@@ -25,12 +25,11 @@
 #include <QCoreApplication>
 #include <QThread>
 #include <QMutex>
+#include <QLocalServer>
 #include <QProcess>
-#include <QQueue>
 #include <QFile>
 #include <QList>
-#include <QLocalServer>
+#include <QQueue>
-#include <QLocalSocket>
 #include <QString>
 #include <QStringList>
 #include <QAtomicInt>
@@ -39,7 +38,6 @@
 
 class QLocalSocket;
 
-
 // Base class containing signals and slots - required because moc doesn't do templated objects.
 class _WorkerPoolBase : public QObject {
   Q_OBJECT

ext/libstrawberry-tagreader/fmpsparser.cpp

@@ -22,6 +22,7 @@
 #include <QList>
 #include <QVariant>
 #include <QString>
+#include <QChar>
 
 #include "fmpsparser.h"
 

ext/libstrawberry-tagreader/fmpsparser.h

@@ -22,10 +22,11 @@
 
 #include <QList>
 #include <QMetaType>
-#include <QVariant>
 #include <QString>
 #include <QRegExp>
 
+class QVariant;
+
 class FMPSParser {
 public:
   FMPSParser();

ext/libstrawberry-tagreader/tagreader.cpp

@@ -23,7 +23,6 @@
 #include <memory>
 #include <list>
 #include <map>
-#include <utility>
 #include <sys/stat.h>
 
 #include <taglib/taglib.h>
@@ -42,6 +41,8 @@
 #include <taglib/commentsframe.h>
 #include <taglib/tag.h>
 #include <taglib/apetag.h>
+#include <taglib/apeitem.h>
+#include <taglib/apeproperties.h>
 #include <taglib/id3v2tag.h>
 #include <taglib/id3v2frame.h>
 #include <taglib/flacfile.h>
@@ -52,6 +53,7 @@
 #include <taglib/speexfile.h>
 #include <taglib/wavfile.h>
 #include <taglib/wavpackfile.h>
+#include <taglib/wavpackproperties.h>
 #include <taglib/aifffile.h>
 #include <taglib/asffile.h>
 #include <taglib/asftag.h>

ext/libstrawberry-tagreader/tagreader.h

@@ -25,7 +25,6 @@
 
 #include <QByteArray>
 #include <QString>
-#include <QTextCodec>
 
 #include <taglib/xiphcomment.h>
 #include <taglib/apetag.h>
@@ -33,6 +32,8 @@
 
 #include "tagreadermessages.pb.h"
 
+class QTextCodec;
+
 #ifndef USE_SYSTEM_TAGLIB
 namespace Strawberry_TagLib {
 #endif

ext/strawberry-tagreader/tagreaderworker.h

@@ -20,15 +20,14 @@
 
 #include "config.h"
 
-#include <stddef.h>
-
 #include <QObject>
-#include <QIODevice>
 
 #include "core/messagehandler.h"
 #include "tagreader.h"
 #include "tagreadermessages.pb.h"
 
+class QIODevice;
+
 class TagReaderWorker : public AbstractMessageHandler<pb::tagreader::Message> {
 public:
   TagReaderWorker(QIODevice *socket, QObject *parent = nullptr);

src/analyzer/analyzerbase.h

@@ -37,7 +37,6 @@
 #include <QBasicTimer>
 #include <QString>
 #include <QPainter>
-#include <QtEvents>
 
 #include "analyzer/fht.h"
 #include "engine/engine_fwd.h"

src/analyzer/analyzercontainer.cpp

@@ -41,6 +41,7 @@
 #include "rainbowanalyzer.h"
 
 #include "core/logging.h"
+#include "engine/enginebase.h"
 #include "engine/enginetype.h"
 
 const char *AnalyzerContainer::kSettingsGroup = "Analyzer";

src/analyzer/analyzercontainer.h

@@ -22,18 +22,17 @@
 
 #include "config.h"
 
-
 #include <QWidget>
 #include <QList>
 #include <QString>
 #include <QPoint>
 #include <QMenu>
 #include <QAction>
-#include <QActionGroup>
 
 #include "engine/engine_fwd.h"
 
 class QTimer;
+class QActionGroup;
 class QMouseEvent;
 class QWheelEvent;
 

src/analyzer/blockanalyzer.cpp

@@ -31,7 +31,6 @@
 #include <QPainter>
 #include <QPalette>
 #include <QColor>
-#include <QtEvents>
 
 #include "analyzerbase.h"
 #include "fht.h"

src/analyzer/blockanalyzer.h

@@ -24,20 +24,17 @@
 #ifndef BLOCKANALYZER_H
 #define BLOCKANALYZER_H
 
-#include <vector>
-
 #include <QtGlobal>
 #include <QObject>
-#include <QWidget>
 #include <QVector>
 #include <QString>
 #include <QPixmap>
 #include <QPainter>
 #include <QPalette>
-#include <QtEvents>
 
 #include "analyzerbase.h"
 
+class QWidget;
 class QResizeEvent;
 
 class BlockAnalyzer : public Analyzer::Base {

src/analyzer/boomanalyzer.cpp

@@ -26,12 +26,17 @@
 
 #include <cmath>
 
-#include <QObject>
 #include <QWidget>
 #include <QPixmap>
 #include <QPainter>
+#include <QPalette>
 #include <QColor>
 
+#include "engine/engine_fwd.h"
+#include "engine/enginebase.h"
+#include "fht.h"
+#include "analyzerbase.h"
+
 using Analyzer::Scope;
 
 const uint BoomAnalyzer::kColumnWidth = 4;

src/analyzer/boomanalyzer.h

@@ -27,12 +27,13 @@
 
 #include "analyzerbase.h"
 
+#include <QtGlobal>
 #include <QObject>
-#include <QWidget>
 #include <QPixmap>
 #include <QPainter>
 #include <QColor>
 
+class QWidget;
 class QResizeEvent;
 
 class BoomAnalyzer : public Analyzer::Base {

src/analyzer/rainbowanalyzer.cpp

@@ -27,17 +27,19 @@
 
 #include <cmath>
 
-#include <QObject>
+#include <QtGlobal>
 #include <QWidget>
 #include <QPixmap>
 #include <QPainter>
 #include <QColor>
 #include <QBrush>
 #include <QPen>
+#include <QPoint>
+#include <QSize>
 #include <QTimerEvent>
 
-#include "core/arraysize.h"
+#include "fht.h"
-#include "core/logging.h"
+#include "analyzerbase.h"
 
 using Analyzer::Scope;
 

src/analyzer/rainbowanalyzer.h

@@ -30,9 +30,15 @@
 
 #include <QObject>
 #include <QWidget>
-#include <QDateTime>
+#include <QPixmap>
 #include <QPainter>
 #include <QPen>
+#include <QBrush>
+#include <QRect>
+
+class QWidget;
+class QTimerEvent;
+class QResizeEvent;
 
 namespace Rainbow {
 class RainbowAnalyzer : public Analyzer::Base {

src/collection/collection.cpp

@@ -21,11 +21,11 @@
 
 #include "config.h"
 
-#include <unistd.h>
+#include <QtGlobal>
-
 #include <QObject>
 #include <QThread>
 #include <QList>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/database.h"
@@ -34,6 +34,7 @@
 #include "core/thread.h"
 #include "core/utilities.h"
 #include "core/song.h"
+#include "core/logging.h"
 #include "collection.h"
 #include "collectionwatcher.h"
 #include "collectionbackend.h"

src/collection/collection.h

@@ -25,12 +25,14 @@
 #include "config.h"
 
 #include <QObject>
+#include <QList>
 #include <QHash>
 #include <QString>
-#include <QUrl>
 
 #include "core/song.h"
 
+class QThread;
+
 class Application;
 class Thread;
 class CollectionBackend;

src/collection/collectionbackend.cpp

@@ -30,23 +30,20 @@
 #include <QMutex>
 #include <QSet>
 #include <QMap>
-#include <QByteArray>
+#include <QVector>
-#include <QFileInfo>
-#include <QDateTime>
 #include <QVariant>
+#include <QByteArray>
 #include <QString>
 #include <QStringList>
-#include <QRegExp>
 #include <QUrl>
+#include <QFileInfo>
+#include <QDateTime>
+#include <QRegExp>
 #include <QSqlDatabase>
 #include <QSqlQuery>
-#include <QtDebug>
 
-#include "core/application.h"
 #include "core/database.h"
-#include "core/logging.h"
 #include "core/scopedtransaction.h"
-#include "core/utilities.h"
 
 #include "directory.h"
 #include "collectionbackend.h"

src/collection/collectionbackend.h

@@ -24,13 +24,10 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QFileInfo>
 #include <QList>
-#include <QVector>
-#include <QSet>
 #include <QString>
 #include <QStringList>
 #include <QUrl>

src/collection/collectiondirectorymodel.cpp

@@ -25,9 +25,7 @@
 #include <QAbstractItemModel>
 #include <QVariant>
 #include <QString>
-#include <QUrl>
 
-#include "core/application.h"
 #include "core/filesystemmusicstorage.h"
 #include "core/iconloader.h"
 #include "core/musicstorage.h"

src/collection/collectionfilterwidget.cpp

@@ -49,6 +49,7 @@
 #include "collectionfilterwidget.h"
 #include "groupbydialog.h"
 #include "ui_collectionfilterwidget.h"
+#include "widgets/qsearchfield.h"
 
 CollectionFilterWidget::CollectionFilterWidget(QWidget *parent)
     : QWidget(parent),

src/collection/collectionfilterwidget.h

@@ -29,7 +29,6 @@
 #include <QObject>
 #include <QMap>
 #include <QString>
-#include <QtEvents>
 
 #include "collectionquery.h"
 #include "collectionmodel.h"
@@ -44,7 +43,6 @@ class GroupByDialog;
 class SavedGroupingManager;
 class SettingsDialog;
 class Ui_CollectionFilterWidget;
-struct QueryOptions;
 
 class CollectionFilterWidget : public QWidget {
   Q_OBJECT

src/collection/collectionitemdelegate.cpp

@@ -21,11 +21,14 @@
 #include "config.h"
 
 #include <QtGlobal>
+#include <QAbstractItemModel>
 #include <QAbstractItemView>
 #include <QStyleOptionViewItem>
 #include <QVariant>
 #include <QString>
 #include <QLocale>
+#include <QPixmap>
+#include <QIcon>
 #include <QPainter>
 #include <QPalette>
 #include <QPen>
@@ -34,8 +37,7 @@
 #include <QBrush>
 #include <QColor>
 #include <QFont>
-#include <QPixmap>
+#include <QPoint>
-#include <QIcon>
 #include <QLinearGradient>
 #include <QToolTip>
 #include <QWhatsThis>

src/collection/collectionitemdelegate.h

@@ -23,12 +23,13 @@
 
 #include "config.h"
 
-
+#include <QObject>
 #include <QStyledItemDelegate>
-#include <QAbstractItemView>
+#include <QStyleOption>
-#include <QPainter>
 #include <QStyleOptionViewItem>
 
+class QAbstractItemView;
+class QPainter;
 class QHelpEvent;
 
 class CollectionItemDelegate : public QStyledItemDelegate {

src/collection/collectionmodel.cpp

@@ -21,30 +21,32 @@
 
 #include "config.h"
 
+#include <memory>
 #include <functional>
 #include <algorithm>
 
 #include <QObject>
 #include <QtGlobal>
 #include <QtConcurrentRun>
-#include <QtAlgorithms>
+#include <QThread>
 #include <QMutex>
 #include <QFuture>
 #include <QDataStream>
 #include <QMimeData>
 #include <QIODevice>
-#include <QByteArray>
-#include <QVariant>
 #include <QList>
 #include <QSet>
 #include <QMap>
-#include <QChar>
+#include <QVariant>
-#include <QRegExp>
+#include <QByteArray>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
 #include <QImage>
+#include <QChar>
+#include <QRegExp>
 #include <QPixmapCache>
+#include <QNetworkDiskCache>
 #include <QSettings>
 #include <QStandardPaths>
 #include <QtDebug>

src/collection/collectionmodel.h

@@ -24,18 +24,16 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QAbstractItemModel>
 #include <QFuture>
 #include <QDataStream>
-#include <QList>
-#include <QMap>
 #include <QMetaType>
-#include <QMimeData>
 #include <QPair>
 #include <QSet>
+#include <QList>
+#include <QMap>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
@@ -43,8 +41,6 @@
 #include <QImage>
 #include <QIcon>
 #include <QPixmap>
-#include <QNetworkDiskCache>
-#include <QSettings>
 
 #include "core/simpletreemodel.h"
 #include "core/song.h"
@@ -53,10 +49,12 @@
 #include "sqlrow.h"
 #include "covermanager/albumcoverloaderoptions.h"
 
+class QSettings;
+class QNetworkDiskCache;
+
 class Application;
 class CollectionBackend;
 class CollectionDirectoryModel;
-class CollectionItem;
 
 class CollectionModel : public SimpleTreeModel<CollectionItem> {
   Q_OBJECT

src/collection/collectionplaylistitem.cpp

@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <QVariant>
-#include <QString>
 #include <QUrl>
 
 #include "collectionplaylistitem.h"

src/collection/collectionplaylistitem.h

@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-
 #include <QVariant>
-#include <QString>
 #include <QUrl>
 
 #include "core/song.h"

src/collection/collectionquery.cpp

@@ -31,7 +31,6 @@
 #include <QSqlQuery>
 
 #include "collectionquery.h"
-#include "core/logging.h"
 #include "core/song.h"
 
 QueryOptions::QueryOptions() : max_age_(-1), query_mode_(QueryMode_All) {}

src/collection/collectionquery.h

@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QMetaType>
 #include <QVariant>
 #include <QString>
@@ -32,7 +31,6 @@
 #include <QSqlQuery>
 
 class Song;
-class CollectionBackend;
 
 // This structure let's you customize behaviour of any CollectionQuery.
 struct QueryOptions {

src/collection/collectionview.cpp

@@ -22,37 +22,25 @@
 
 #include <QtGlobal>
 #include <QWidget>
+#include <QAbstractItemView>
+#include <QTreeView>
 #include <QItemSelectionModel>
 #include <QSortFilterProxyModel>
-#include <QAbstractItemView>
+#include <QMimeData>
-#include <QStyleOptionViewItem>
+#include <QSet>
-#include <QAction>
+#include <QList>
+#include <QMap>
 #include <QVariant>
 #include <QString>
 #include <QUrl>
-#include <QList>
+#include <QPixmap>
-#include <QLocale>
-#include <QMap>
-#include <QMessageBox>
-#include <QMenu>
-#include <QMimeData>
 #include <QPainter>
-#include <QPalette>
-#include <QPen>
-#include <QPoint>
 #include <QRect>
-#include <QSet>
-#include <QSize>
-#include <QToolTip>
-#include <QTreeView>
-#include <QWhatsThis>
-#include <QBrush>
-#include <QColor>
 #include <QFont>
 #include <QFontMetrics>
-#include <QPixmap>
+#include <QMenu>
-#include <QIcon>
+#include <QAction>
-#include <QLinearGradient>
+#include <QMessageBox>
 #include <QSettings>
 #include <QtEvents>
 

src/collection/collectionview.h

@@ -26,25 +26,19 @@
 #include <memory>
 
 #include <QObject>
-#include <QWidget>
 #include <QAbstractItemModel>
 #include <QAbstractItemView>
 #include <QString>
 #include <QPixmap>
-#include <QPainter>
 #include <QSet>
-#include <QStyleOption>
-#include <QStyledItemDelegate>
-#include <QStyleOptionViewItem>
-#include <QAction>
-#include <QMenu>
-#include <QtEvents>
 
 #include "core/song.h"
 #include "widgets/autoexpandingtreeview.h"
 
+class QWidget;
+class QMenu;
+class QAction;
 class QContextMenuEvent;
-class QHelpEvent;
 class QMouseEvent;
 class QPaintEvent;
 

src/collection/collectionwatcher.cpp

@@ -24,7 +24,6 @@
 #include <assert.h>
 
 #include <QObject>
-#include <QApplication>
 #include <QThread>
 #include <QIODevice>
 #include <QDir>
@@ -50,7 +49,6 @@
 #include "core/logging.h"
 #include "core/tagreaderclient.h"
 #include "core/taskmanager.h"
-#include "core/utilities.h"
 #include "directory.h"
 #include "collectionbackend.h"
 #include "collectionwatcher.h"

src/collection/collectionwatcher.h

@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QHash>
@@ -32,11 +31,14 @@
 #include <QSet>
 #include <QString>
 #include <QStringList>
-#include <QTimer>
+#include <QUrl>
 
 #include "directory.h"
 #include "core/song.h"
 
+class QThread;
+class QTimer;
+
 class CollectionBackend;
 class FileSystemWatcherInterface;
 class TaskManager;

src/collection/groupbydialog.cpp

@@ -23,10 +23,10 @@
 #include <functional>
 
 #include <QDialog>
+#include <QWidget>
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <QPushButton>
-#include <QWidget>
 
 #include "collectionmodel.h"
 #include "groupbydialog.h"
@@ -42,6 +42,7 @@ using std::placeholders::_2;
 #include <boost/multi_index/tag.hpp>
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index_container_fwd.hpp>
+#include <boost/multi_index/detail/ord_index_impl.hpp>
 #include <boost/operators.hpp>
 
 using boost::multi_index_container;

src/collection/groupbydialog.h

@@ -27,11 +27,12 @@
 
 #include <QDialog>
 #include <QObject>
-#include <QWidget>
 #include <QString>
 
 #include "collectionmodel.h"
 
+class QWidget;
+
 class GroupByDialogPrivate;
 class Ui_GroupByDialog;
 

src/collection/savedgroupingmanager.h

@@ -25,12 +25,13 @@
 
 #include <QDialog>
 #include <QObject>
-#include <QWidget>
-#include <QStandardItemModel>
 #include <QString>
 
 #include "collectionmodel.h"
 
+class QWidget;
+class QStandardItemModel;
+
 class CollectionFilterWidget;
 class Ui_SavedGroupingManager;
 

src/context/contextalbumsmodel.cpp

@@ -26,7 +26,6 @@
 
 #include <QObject>
 #include <QtGlobal>
-#include <QtAlgorithms>
 #include <QMutex>
 #include <QMimeData>
 #include <QVariant>
@@ -38,14 +37,10 @@
 #include <QUrl>
 #include <QImage>
 #include <QPixmapCache>
-#include <QSettings>
-#include <QtDebug>
 
 #include "core/application.h"
-#include "core/closure.h"
 #include "core/database.h"
 #include "core/iconloader.h"
-#include "core/logging.h"
 #include "collection/collectionquery.h"
 #include "collection/collectionbackend.h"
 #include "collection/collectionitem.h"

src/context/contextalbumsmodel.h

@@ -24,22 +24,20 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QAbstractItemModel>
-#include <QList>
-#include <QMap>
 #include <QPair>
 #include <QSet>
+#include <QList>
+#include <QMap>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
 #include <QImage>
-#include <QIcon>
 #include <QPixmap>
-#include <QSettings>
+#include <QIcon>
 
 #include "core/simpletreemodel.h"
 #include "core/song.h"

src/context/contextalbumsview.cpp

@@ -24,47 +24,30 @@
 #include <qcoreevent.h>
 
 #include <QtGlobal>
-#include <QWidget>
+#include <QTreeView>
 #include <QItemSelectionModel>
 #include <QSortFilterProxyModel>
 #include <QAbstractItemView>
 #include <QStyleOptionViewItem>
-#include <QAction>
+#include <QAbstractScrollArea>
+#include <QMimeData>
+#include <QList>
 #include <QVariant>
 #include <QString>
 #include <QUrl>
-#include <QList>
 #include <QLocale>
-#include <QMap>
 #include <QMessageBox>
 #include <QMenu>
-#include <QMimeData>
+#include <QAction>
-#include <QPainter>
-#include <QPalette>
-#include <QPen>
-#include <QPoint>
 #include <QRect>
-#include <QSet>
 #include <QSize>
 #include <QToolTip>
-#include <QTreeView>
-#include <QHeaderView>
 #include <QWhatsThis>
-#include <QBrush>
-#include <QColor>
-#include <QFont>
-#include <QFontMetrics>
-#include <QPixmap>
-#include <QIcon>
-#include <QLinearGradient>
-#include <QSettings>
-#include <QtEvents>
 
 #include "core/application.h"
 #include "core/iconloader.h"
 #include "core/mimedata.h"
 #include "core/utilities.h"
-#include "collection/collectionbackend.h"
 #include "collection/collectiondirectorymodel.h"
 #include "collection/collectionmodel.h"
 #include "collection/collectionitem.h"
@@ -74,9 +57,7 @@
 #endif
 #include "dialogs/edittagdialog.h"
 #include "organise/organisedialog.h"
-#include "settings/collectionsettingspage.h"
 
-#include "contextview.h"
 #include "contextalbumsmodel.h"
 #include "contextalbumsview.h"
 

src/context/contextalbumsview.h

@@ -27,23 +27,24 @@
 #include <memory>
 
 #include <QObject>
-#include <QWidget>
 #include <QAbstractItemModel>
 #include <QAbstractItemView>
-#include <QString>
-#include <QPixmap>
-#include <QPainter>
-#include <QSet>
-#include <QStyleOption>
 #include <QStyledItemDelegate>
-#include <QStyleOptionViewItem>
+#include <QStyleOption>
-#include <QAction>
+#include <QSet>
-#include <QMenu>
+#include <QString>
-#include <QtEvents>
 
 #include "core/song.h"
 #include "widgets/autoexpandingtreeview.h"
 
+class QWidget;
+class QMenu;
+class QAction;
+class QContextMenuEvent;
+class QHelpEvent;
+class QMouseEvent;
+class QPaintEvent;
+
 class Application;
 class EditTagDialog;
 class OrganiseDialog;

src/context/contextview.cpp

@@ -22,28 +22,32 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QWidget>
-#include <QIODevice>
-#include <QFile>
 #include <QByteArray>
 #include <QList>
 #include <QVariant>
 #include <QString>
+#include <QUrl>
 #include <QImage>
 #include <QPixmap>
+#include <QIcon>
 #include <QMovie>
-#include <QAction>
 #include <QPainter>
 #include <QPalette>
 #include <QBrush>
+#include <QSize>
 #include <QMenu>
+#include <QAction>
 #include <QSettings>
 #include <QSizePolicy>
 #include <QTimeLine>
 #include <QtEvents>
 #include <QFontDatabase>
+#include <QLabel>
+#include <QLayoutItem>
+#include <QGridLayout>
+#include <QStackedWidget>
 
 #include "core/application.h"
-#include "core/logging.h"
 #include "core/player.h"
 #include "core/song.h"
 #include "core/utilities.h"
@@ -53,20 +57,17 @@
 #include "engine/enginetype.h"
 #include "engine/devicefinders.h"
 #include "engine/devicefinder.h"
-#include "collection/collection.h"
 #include "collection/collectionbackend.h"
 #include "collection/collectionquery.h"
-#include "collection/collectionmodel.h"
 #include "collection/collectionview.h"
 #include "covermanager/albumcoverchoicecontroller.h"
 #include "covermanager/albumcoverloader.h"
-#include "covermanager/currentalbumcoverloader.h"
 #include "lyrics/lyricsfetcher.h"
 #include "settings/contextsettingspage.h"
-#include "widgets/osd.h"
 
 #include "contextview.h"
 #include "contextalbumsmodel.h"
+#include "contextalbumsview.h"
 #include "ui_contextviewcontainer.h"
 
 using std::unique_ptr;

src/context/contextview.h

@@ -30,13 +30,7 @@
 #include <QString>
 #include <QImage>
 #include <QPixmap>
-#include <QPainter>
 #include <QMovie>
-#include <QTimeLine>
-#include <QAction>
-#include <QMenu>
-#include <QLabel>
-#include <QtEvents>
 
 #include "core/song.h"
 #include "covermanager/albumcoverloaderoptions.h"
@@ -45,6 +39,17 @@
 
 using std::unique_ptr;
 
+class QTimeLine;
+class QPainter;
+class QMenu;
+class QAction;
+class QLabel;
+class QEvent;
+class QContextMenuEvent;
+class QMouseEvent;
+class QDragEnterEvent;
+class QDropEvent;
+
 class Application;
 class CollectionView;
 class CollectionModel;

src/core/application.cpp

@@ -35,6 +35,7 @@
 #include "core/lazy.h"
 #include "core/tagreaderclient.h"
 #include "core/song.h"
+#include "core/logging.h"
 
 #include "database.h"
 #include "taskmanager.h"
@@ -57,7 +58,6 @@
 #include "covermanager/deezercoverprovider.h"
 
 #include "lyrics/lyricsproviders.h"
-#include "lyrics/lyricsprovider.h"
 #include "lyrics/auddlyricsprovider.h"
 #include "lyrics/ovhlyricsprovider.h"
 #include "lyrics/lololyricsprovider.h"

src/core/application.h

@@ -28,7 +28,6 @@
 #include <memory>
 
 #include <QObject>
-#include <QThread>
 #include <QList>
 #include <QString>
 
@@ -36,6 +35,8 @@
 
 using std::unique_ptr;
 
+class QThread;
+
 class TaskManager;
 class ApplicationImpl;
 class TagReaderClient;

src/core/commandlineoptions.cpp

@@ -24,6 +24,7 @@
 #include <cstdlib>
 #include <getopt.h>
 #include <iostream>
+#include <type_traits>
 
 #include <QtGlobal>
 #include <QObject>

src/core/database.cpp

@@ -21,6 +21,7 @@
 
 #include "config.h"
 
+#include <stddef.h>
 #include <assert.h>
 #include <sqlite3.h>
 #include <boost/scope_exit.hpp>
@@ -31,7 +32,6 @@
 #include <QIODevice>
 #include <QDir>
 #include <QFile>
-#include <QChar>
 #include <QList>
 #include <QByteArray>
 #include <QVariant>
@@ -43,7 +43,6 @@
 #include <QSqlDriver>
 #include <QSqlDatabase>
 #include <QSqlQuery>
-#include <QSqlResult>
 #include <QSqlError>
 #include <QStandardPaths>
 #include <QtDebug>

src/core/database.h

@@ -29,8 +29,6 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QMutex>
-#include <QByteArray>
-#include <QList>
 #include <QMap>
 #include <QSqlDatabase>
 #include <QSqlQuery>

src/core/deletefiles.h

@@ -26,12 +26,11 @@
 #include <memory>
 
 #include <QObject>
-#include <QThread>
-#include <QString>
 #include <QStringList>
 
 #include "song.h"
 
+class QThread;
 class TaskManager;
 class MusicStorage;
 

src/core/iconloader.h

@@ -20,7 +20,6 @@
 #ifndef ICONLOADER_H
 #define ICONLOADER_H
 
-#include <QList>
 #include <QString>
 #include <QIcon>
 

src/core/mainwindow.cpp

@@ -23,12 +23,14 @@
 
 #include <memory>
 #include <functional>
+#include <algorithm>
 #include <cmath>
 
 #include <QMainWindow>
 #include <QApplication>
 #include <QObject>
 #include <QWidget>
+#include <QThread>
 #include <QSystemTrayIcon>
 #include <QSortFilterProxyModel>
 #include <QByteArray>
@@ -47,7 +49,6 @@
 #include <QMimeData>
 #include <QPalette>
 #include <QTimer>
-#include <QtAlgorithms>
 #include <QKeySequence>
 #include <QMenu>
 #include <QAction>
@@ -56,7 +57,16 @@
 #include <QMessageBox>
 #include <QtEvents>
 #include <QSettings>
-#include <QtDebug>
+#include <QColor>
+#include <QFrame>
+#include <QItemSelectionModel>
+#include <QLabel>
+#include <QLayout>
+#include <QSize>
+#include <QSplitter>
+#include <QStackedWidget>
+#include <QTabBar>
+#include <QToolButton>
 
 #include "core/logging.h"
 #include "core/closure.h"
@@ -80,6 +90,7 @@
 #include "appearance.h"
 #include "engine/enginetype.h"
 #include "engine/enginebase.h"
+#include "engine/engine_fwd.h"
 #include "dialogs/errordialog.h"
 #include "dialogs/about.h"
 #include "dialogs/console.h"
@@ -94,7 +105,7 @@
 #include "widgets/osd.h"
 #include "widgets/trackslider.h"
 #include "context/contextview.h"
-#include "collection/collectionview.h"
+#include "context/contextalbumsview.h"
 #include "collection/collection.h"
 #include "collection/collectionbackend.h"
 #include "collection/collectiondirectorymodel.h"
@@ -138,11 +149,9 @@
 #  include "settings/tidalsettingspage.h"
 #endif
 #ifdef HAVE_QOBUZ
-#  include "qobuz/qobuzservice.h"
 #  include "settings/qobuzsettingspage.h"
 #endif
 #ifdef HAVE_SUBSONIC
-#  include "subsonic/subsonicservice.h"
 #  include "settings/subsonicsettingspage.h"
 #endif
 
@@ -150,6 +159,8 @@
 #include "internet/internetservice.h"
 #include "internet/internetsongsview.h"
 #include "internet/internettabsview.h"
+#include "internet/internetcollectionview.h"
+#include "internet/internetsearchview.h"
 
 #include "scrobbler/audioscrobbler.h"
 

src/core/mainwindow.h

@@ -39,8 +39,10 @@
 #include <QPoint>
 #include <QMimeData>
 #include <QList>
+#include <QByteArray>
 #include <QString>
 #include <QUrl>
+#include <QImage>
 #include <QPixmap>
 #include <QTimer>
 #include <QSettings>
@@ -48,6 +50,7 @@
 
 #include "core/lazy.h"
 #include "core/tagreaderclient.h"
+#include "core/song.h"
 #include "engine/enginetype.h"
 #include "engine/engine_fwd.h"
 #include "mac_startup.h"
@@ -67,7 +70,6 @@ class CollectionViewContainer;
 class AlbumCoverChoiceController;
 class CommandlineOptions;
 #ifndef Q_OS_WIN
-class DeviceView;
 class DeviceViewContainer;
 #endif
 class EditTagDialog;
@@ -79,7 +81,6 @@ class MimeData;
 class OrganiseDialog;
 class PlaylistListContainer;
 class QueueView;
-class Song;
 class SystemTrayIcon;
 #if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
 class TagFetcher;

src/core/mergedproxymodel.cpp

@@ -23,8 +23,11 @@
 #include <functional>
 #include <limits>
 
+#include <boost/multi_index/detail/ord_index_impl.hpp>
+
 #include <QObject>
 #include <QMimeData>
+#include <QList>
 #include <QStringList>
 #include <QtAlgorithms>
 #include <QAbstractItemModel>

src/core/mergedproxymodel.h

@@ -27,15 +27,15 @@
 #include <cstddef>
 
 #include <QObject>
-#include <QMimeData>
 #include <QAbstractItemModel>
 #include <QAbstractProxyModel>
-#include <QPersistentModelIndex>
 #include <QMap>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
 
+class QMimeData;
+
 std::size_t hash_value(const QModelIndex &index);
 
 class MergedProxyModelPrivate;

src/core/metatypes.cpp

@@ -27,7 +27,7 @@
 #  include <gst/gstelement.h>
 #endif
 
-#include <QtGlobal>
+#include <QDataStream>
 #include <QAbstractSocket>
 #include <QMetaType>
 #include <QFileInfo>

src/core/multisortfilterproxy.cpp

@@ -22,11 +22,13 @@
 
 #include <QtGlobal>
 #include <QObject>
+#include <QAbstractItemModel>
 #include <QSortFilterProxyModel>
 #include <QMetaType>
 #include <QDateTime>
 #include <QVariant>
 #include <QString>
+#include <QChar>
 
 #include "multisortfilterproxy.h"
 

src/core/multisortfilterproxy.h

@@ -23,13 +23,13 @@
 
 #include "config.h"
 
-
-#include <QObject>
 #include <QSortFilterProxyModel>
 #include <QList>
 #include <QPair>
 #include <QVariant>
 
+class QObject;
+
 class MultiSortFilterProxy : public QSortFilterProxyModel {
  public:
   MultiSortFilterProxy(QObject *parent = nullptr);

src/core/musicstorage.h

@@ -23,6 +23,8 @@
 
 #include "config.h"
 
+#include <QtGlobal>
+
 #include <functional>
 #include <memory>
 

src/core/network.cpp

@@ -21,12 +21,16 @@
 
 #include "config.h"
 
+#include <type_traits>
+
 #include <QtGlobal>
 #include <QObject>
 #include <QCoreApplication>
 #include <QStandardPaths>
 #include <QIODevice>
 #include <QMutex>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
 #include <QUrl>
 #include <QNetworkAccessManager>
@@ -42,8 +46,7 @@ QMutex ThreadSafeNetworkDiskCache::sMutex;
 ThreadSafeNetworkDiskCache *ThreadSafeNetworkDiskCache::sInstance = nullptr;
 QNetworkDiskCache *ThreadSafeNetworkDiskCache::sCache = nullptr;
 
-ThreadSafeNetworkDiskCache::ThreadSafeNetworkDiskCache(QObject *parent)
+ThreadSafeNetworkDiskCache::ThreadSafeNetworkDiskCache(QObject *parent) : QAbstractNetworkCache(parent) {
-: QAbstractNetworkCache(parent) {
 
   QMutexLocker l(&sMutex);
   if (!sCache) {

src/core/network.h

@@ -24,19 +24,19 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QNetworkAccessManager>
 #include <QAbstractNetworkCache>
-#include <QIODevice>
 #include <QMutex>
 #include <QUrl>
 #include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QNetworkDiskCache>
 #include <QNetworkCacheMetaData>
 
+class QIODevice;
+class QNetworkReply;
+class QNetworkDiskCache;
+
 class NetworkAccessManager : public QNetworkAccessManager {
   Q_OBJECT
 

src/core/networkproxyfactory.h

@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QMutex>
 #include <QList>

src/core/networktimeouts.h

@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QMap>

src/core/player.h

@@ -37,9 +37,6 @@
 #include "urlhandler.h"
 #include "engine/engine_fwd.h"
 #include "engine/enginetype.h"
-#ifdef HAVE_GSTREAMER
-#include "engine/gststartup.h"
-#endif
 #include "playlist/playlistitem.h"
 #include "settings/behavioursettingspage.h"
 
@@ -47,6 +44,9 @@ class Application;
 class Song;
 class AnalyzerContainer;
 class Equalizer;
+#ifdef HAVE_GSTREAMER
+class GstStartup;
+#endif
 
 using std::unique_ptr;
 

src/core/qtfslistener.cpp

@@ -23,8 +23,6 @@
 #include <QFileSystemWatcher>
 #include <QString>
 
-#include "core/logging.h"
-
 #include "filesystemwatcherinterface.h"
 #include "qtfslistener.h"
 

src/core/qtsystemtrayicon.h

@@ -23,18 +23,18 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QSystemTrayIcon>
 #include <QString>
 #include <QUrl>
+#include <QIcon>
 #include <QPixmap>
 #include <QAction>
-#include <QMenu>
 #include <QtEvents>
 
 #include "systemtrayicon.h"
 
+class QMenu;
 class QEvent;
 
 class Song;

src/core/scangiomodulepath.cpp

@@ -22,7 +22,6 @@
 
 #include <gio/gio.h>
 
-#include <QApplication>
 #include <QCoreApplication>
 #include <QDir>
 #include <QByteArray>
@@ -32,6 +31,7 @@
 #include "core/logging.h"
 
 void ScanGIOModulePath() {
+
   QString gio_module_path;
 
 #if defined(Q_OS_WIN32)
@@ -43,4 +43,5 @@ void ScanGIOModulePath() {
     QByteArray bytes = gio_module_path.toLocal8Bit();
     g_io_modules_scan_all_in_directory(bytes.data());
   }
+
 }

src/core/scopedtransaction.h

@@ -25,7 +25,7 @@
 
 #include <boost/noncopyable.hpp>
 
-#include <QSqlDatabase>
+class QSqlDatabase;
 
 // Opens a transaction on a database.
 // Rolls back the transaction if the object goes out of scope before Commit() is called.

src/core/song.cpp

@@ -27,12 +27,10 @@
 #include <taglib/id3v1genres.h>
 
 #include <QtGlobal>
-#include <QCoreApplication>
 #include <QObject>
 #include <QFile>
 #include <QFileInfo>
 #include <QSharedData>
-#include <QtAlgorithms>
 #include <QHash>
 #include <QByteArray>
 #include <QVariant>

src/core/song.h

@@ -38,8 +38,9 @@
 #include <QUrl>
 #include <QImage>
 #include <QIcon>
-#include <QTextCodec>
+
-#include <QSqlQuery>
+class QTextCodec;
+class QSqlQuery;
 
 namespace Engine {
 struct SimpleMetaBundle;

src/core/songloader.cpp

@@ -33,7 +33,6 @@
 #include <QIODevice>
 #include <QBuffer>
 #include <QByteArray>
-#include <QtAlgorithms>
 #include <QDir>
 #include <QDirIterator>
 #include <QFile>

src/core/songloader.h

@@ -40,10 +40,10 @@
 #include <QString>
 #include <QStringList>
 #include <QUrl>
-#include <QTimer>
 
 #include "song.h"
 
+class QTimer;
 class Player;
 class CollectionBackendInterface;
 class PlaylistParser;

src/core/standarditemiconloader.cpp

@@ -23,9 +23,9 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QAbstractItemModel>
+#include <QStandardItem>
 #include <QMap>
 #include <QSet>
-#include <QString>
 #include <QImage>
 #include <QPixmap>
 #include <QIcon>

src/core/standarditemiconloader.h

@@ -26,13 +26,13 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QMap>
-#include <QString>
 #include <QImage>
-#include <QStandardItem>
-#include <QAbstractItemModel>
 
 #include "covermanager/albumcoverloaderoptions.h"
 
+class QAbstractItemModel;
+class QStandardItem;
+
 class Song;
 class AlbumCoverLoader;
 

src/core/stylesheetloader.cpp

@@ -21,13 +21,16 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QObject>
 #include <QWidget>
 #include <QIODevice>
+#include <QTextStream>
 #include <QFile>
 #include <QString>
 #include <QColor>
 #include <QPalette>
+#include <QEvent>
 #include <QtDebug>
 
 #include "core/logging.h"

src/core/stylesheetloader.h

@@ -24,14 +24,15 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QWidget>
+#include <QPair>
-#include <QEvent>
 #include <QMap>
 #include <QPalette>
 #include <QString>
 
+class QWidget;
+class QEvent;
+
 class StyleSheetLoader : public QObject {
  public:
   explicit StyleSheetLoader(QObject *parent = nullptr);

src/core/systemtrayicon.h

@@ -23,11 +23,12 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
 #include <QString>
 #include <QPixmap>
-#include <QAction>
+
+class QAction;
 
 class Song;
 

src/core/thread.h

@@ -20,11 +20,12 @@
 
 #include "config.h"
 
-#include <QObject>
 #include <QThread>
 
 #include "utilities.h"
 
+class QObject;
+
 // Improve QThread by adding a SetIoPriority function
 class Thread : public QThread {
  public:

src/core/translations.h

@@ -20,10 +20,11 @@
 #include "config.h"
 
 #include <QObject>
-#include <QTranslator>
 #include <QList>
 #include <QString>
 
+class QTranslator;
+
 class Translations : public QObject {
  public:
   Translations();

src/core/utilities.cpp

@@ -42,18 +42,19 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QHostAddress>
-#include <QPoint>
-#include <QRect>
-#include <QSize>
-#include <QMap>
-#include <QList>
 #include <QSet>
+#include <QList>
+#include <QMap>
+#include <QVariant>
 #include <QString>
 #include <QStringList>
+#include <QUrl>
 #include <QRegExp>
 #include <QTcpServer>
 #include <QTemporaryFile>
-#include <QUrl>
+#include <QPoint>
+#include <QRect>
+#include <QSize>
 #include <QMetaEnum>
 #include <QXmlStreamReader>
 #include <QSettings>
@@ -62,6 +63,8 @@
 #include <QNetworkInterface>
 #include <QtDebug>
 
+#include <stdio.h>
+
 #ifdef Q_OS_LINUX
 #  include <unistd.h>
 #  include <sys/syscall.h>

src/core/utilities.h

@@ -27,8 +27,6 @@
 #include <memory>
 
 #include <QtGlobal>
-#include <QWidget>
-#include <QIODevice>
 #include <QByteArray>
 #include <QFile>
 #include <QSize>
@@ -40,11 +38,14 @@
 #include <QStringList>
 #include <QUrl>
 #include <QColor>
-#include <QXmlStreamReader>
 #include <QtEvents>
 
 #include "core/song.h"
 
+class QWidget;
+class QIODevice;
+class QXmlStreamReader;
+
 namespace Utilities {
 QString PrettyTime(int seconds);
 QString PrettyTimeDelta(int seconds);

src/engine/devicefinders.cpp

@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include <QtGlobal>
 #include <QtAlgorithms>
 #include <QObject>
 #include <QList>

src/engine/enginetype.cpp

@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include <QObject>
 #include <QString>
 
 #include "enginetype.h"

src/equalizer/equalizer.cpp

@@ -41,8 +41,8 @@
 #include <QToolButton>
 #include <QCheckBox>
 #include <QComboBox>
+#include <QBoxLayout>
 #include <QSettings>
-#include <QtEvents>
 
 #include "core/iconloader.h"
 #include "equalizer.h"

src/equalizer/equalizer.h

@@ -26,13 +26,13 @@
 
 #include <QObject>
 #include <QDialog>
-#include <QWidget>
 #include <QList>
 #include <QMap>
 #include <QMetaType>
 #include <QDataStream>
 #include <QString>
 
+class QWidget;
 class QCloseEvent;
 
 class EqualizerSlider;

src/equalizer/equalizerslider.cpp

@@ -20,9 +20,11 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QWidget>
 #include <QString>
 #include <QLabel>
+#include <QFontMetrics>
 
 #include "widgets/stickyslider.h"
 #include "equalizerslider.h"

src/playlist/playlistbackend.h

@@ -32,7 +32,6 @@
 #include <QList>
 #include <QSet>
 #include <QString>
-#include <QVector>
 #include <QSqlQuery>
 
 #include "core/song.h"