diff --git a/src/collection/groupbydialog.cpp b/src/collection/groupbydialog.cpp
index 28eac9319..428cdaeab 100644
--- a/src/collection/groupbydialog.cpp
+++ b/src/collection/groupbydialog.cpp
@@ -42,7 +42,6 @@ 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;
diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp
index 0aa175d06..b071900c1 100644
--- a/src/core/mergedproxymodel.cpp
+++ b/src/core/mergedproxymodel.cpp
@@ -23,8 +23,6 @@
 #include <functional>
 #include <limits>
 
-#include <boost/multi_index/detail/ord_index_impl.hpp>
-
 #include <QObject>
 #include <QMimeData>
 #include <QList>
diff --git a/src/covermanager/albumcoverfetcher.cpp b/src/covermanager/albumcoverfetcher.cpp
index 1c3576806..2a5ed03e0 100644
--- a/src/covermanager/albumcoverfetcher.cpp
+++ b/src/covermanager/albumcoverfetcher.cpp
@@ -22,11 +22,10 @@
 
 #include <QtGlobal>
 #include <QObject>
+#include <QNetworkAccessManager>
 #include <QTimer>
 #include <QString>
-#include <QRegExp>
 #include <QImage>
-#include <QNetworkAccessManager>
 
 #include "core/network.h"
 #include "core/song.h"
diff --git a/src/covermanager/albumcoverfetcher.h b/src/covermanager/albumcoverfetcher.h
index 0098ef8ba..0cb6fb508 100644
--- a/src/covermanager/albumcoverfetcher.h
+++ b/src/covermanager/albumcoverfetcher.h
@@ -23,20 +23,19 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
-#include <QQueue>
-#include <QTimer>
 #include <QMetaType>
-#include <QHash>
-#include <QList>
 #include <QSet>
+#include <QList>
+#include <QHash>
+#include <QQueue>
 #include <QString>
 #include <QUrl>
 #include <QImage>
-#include <QNetworkAccessManager>
 
+class QTimer;
+class QNetworkAccessManager;
 class CoverProviders;
 class AlbumCoverFetcherSearch;
 struct CoverSearchStatistics;
diff --git a/src/covermanager/albumcovermanager.cpp b/src/covermanager/albumcovermanager.cpp
index a328b2a4a..0fb766ea2 100644
--- a/src/covermanager/albumcovermanager.cpp
+++ b/src/covermanager/albumcovermanager.cpp
@@ -29,12 +29,9 @@
 #include <QWidget>
 #include <QItemSelectionModel>
 #include <QListWidgetItem>
-#include <QAction>
-#include <QActionGroup>
+#include <QNetworkAccessManager>
 #include <QFile>
-#include <QMenu>
 #include <QSet>
-#include <QTimer>
 #include <QVariant>
 #include <QString>
 #include <QStringBuilder>
@@ -43,7 +40,10 @@
 #include <QImage>
 #include <QPixmap>
 #include <QPainter>
-#include <QNetworkAccessManager>
+#include <QTimer>
+#include <QMenu>
+#include <QAction>
+#include <QActionGroup>
 #include <QShortcut>
 #include <QSplitter>
 #include <QStatusBar>
@@ -54,9 +54,10 @@
 #include <QPushButton>
 #include <QToolButton>
 #include <QKeySequence>
-#include <QtAlgorithms>
-#include <QtEvents>
 #include <QSettings>
+#include <QFlags>
+#include <QSize>
+#include <QtEvents>
 
 #include "core/application.h"
 #include "core/iconloader.h"
diff --git a/src/covermanager/albumcovermanager.h b/src/covermanager/albumcovermanager.h
index d90df41f6..fd7c7d109 100644
--- a/src/covermanager/albumcovermanager.h
+++ b/src/covermanager/albumcovermanager.h
@@ -23,30 +23,32 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
-#include <QObject>
-#include <QWidget>
 #include <QMainWindow>
+#include <QObject>
 #include <QAbstractItemModel>
-#include <QNetworkAccessManager>
 #include <QList>
 #include <QListWidgetItem>
 #include <QMap>
 #include <QString>
 #include <QImage>
 #include <QIcon>
-#include <QAction>
-#include <QMenu>
-#include <QMimeData>
-#include <QProgressBar>
-#include <QPushButton>
-#include <QtEvents>
 
 #include "core/song.h"
 #include "albumcoverloaderoptions.h"
 #include "coversearchstatistics.h"
 
+class QWidget;
+class QMimeData;
+class QNetworkAccessManager;
+class QMenu;
+class QAction;
+class QProgressBar;
+class QPushButton;
+class QEvent;
+class QCloseEvent;
+class QShowEvent;
+
 class Application;
 class CollectionBackend;
 class SongMimeData;
diff --git a/src/covermanager/albumcovermanagerlist.cpp b/src/covermanager/albumcovermanagerlist.cpp
index 646631d22..cbfe856bb 100644
--- a/src/covermanager/albumcovermanagerlist.cpp
+++ b/src/covermanager/albumcovermanagerlist.cpp
@@ -27,6 +27,7 @@
 #include <QListView>
 #include <QListWidget>
 #include <QListWidgetItem>
+#include <QStringList>
 #include <QMimeData>
 #include <QUrl>
 #include <QDropEvent>
diff --git a/src/covermanager/albumcovermanagerlist.h b/src/covermanager/albumcovermanagerlist.h
index c7414a47e..36e5b6f69 100644
--- a/src/covermanager/albumcovermanagerlist.h
+++ b/src/covermanager/albumcovermanagerlist.h
@@ -24,14 +24,14 @@
 #include "config.h"
 
 #include <QObject>
-#include <QWidget>
 #include <QList>
 #include <QListWidget>
-#include <QListWidgetItem>
 #include <QString>
-#include <QMimeData>
-#include <QDropEvent>
 
+class QWidget;
+class QMimeData;
+class QListWidgetItem;
+class QDropEvent;
 class AlbumCoverManager;
 
 class AlbumCoverManagerList : public QListWidget {
diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp
index 32320d878..d7fdc5f82 100644
--- a/src/playlist/playlist.cpp
+++ b/src/playlist/playlist.cpp
@@ -33,7 +33,6 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QCoreApplication>
-#include <QtAlgorithms>
 #include <QtConcurrentRun>
 #include <QFuture>
 #include <QIODevice>
@@ -48,18 +47,17 @@
 #include <QString>
 #include <QStringList>
 #include <QUrl>
-#include <QColor>
 #include <QFont>
 #include <QBrush>
 #include <QLinkedList>
 #include <QUndoStack>
 #include <QUndoCommand>
 #include <QAbstractListModel>
-#include <QPersistentModelIndex>
 #include <QMutableListIterator>
 #include <QMutableLinkedListIterator>
 #include <QFlags>
 #include <QSettings>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"
@@ -85,7 +83,6 @@
 #include "songplaylistitem.h"
 #include "tagreadermessages.pb.h"
 
-#include "internet/internetservices.h"
 #include "internet/internetplaylistitem.h"
 #include "internet/internetsongmimedata.h"
 
diff --git a/src/playlist/playlist.h b/src/playlist/playlist.h
index 1e4279280..6e684467b 100644
--- a/src/playlist/playlist.h
+++ b/src/playlist/playlist.h
@@ -24,30 +24,31 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QAbstractItemModel>
 #include <QAbstractListModel>
-#include <QSortFilterProxyModel>
 #include <QPersistentModelIndex>
 #include <QFuture>
 #include <QList>
 #include <QMap>
 #include <QMetaType>
-#include <QMimeData>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
 #include <QColor>
-#include <QUndoStack>
+#include <QRgb>
 
 #include "core/song.h"
 #include "core/tagreaderclient.h"
 #include "playlistitem.h"
 #include "playlistsequence.h"
 
+class QMimeData;
+class QSortFilterProxyModel;
+class QUndoStack;
+
 class CollectionBackend;
 class PlaylistBackend;
 class PlaylistFilter;
diff --git a/src/playlist/playlistcontainer.h b/src/playlist/playlistcontainer.h
index b667d42ee..83a8f89b0 100644
--- a/src/playlist/playlistcontainer.h
+++ b/src/playlist/playlistcontainer.h
@@ -23,19 +23,17 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QWidget>
 #include <QString>
 #include <QIcon>
-#include <QTimer>
-#include <QTimeLine>
 #include <QSettings>
-#include <QAction>
-#include <QEvent>
-#include <QLabel>
-#include <QtEvents>
 
+class QTimer;
+class QTimeLine;
+class QLabel;
+class QAction;
+class QEvent;
 class QKeyEvent;
 class QResizeEvent;
 
diff --git a/src/playlist/playlistdelegates.cpp b/src/playlist/playlistdelegates.cpp
index b31fdf067..8ed5e5b16 100644
--- a/src/playlist/playlistdelegates.cpp
+++ b/src/playlist/playlistdelegates.cpp
@@ -25,6 +25,7 @@
 #include <QApplication>
 #include <QObject>
 #include <QWidget>
+#include <QThread>
 #include <QtConcurrentRun>
 #include <QFuture>
 #include <QAbstractItemModel>
diff --git a/src/playlist/playlistdelegates.h b/src/playlist/playlistdelegates.h
index a0b287ae7..14ff4e745 100644
--- a/src/playlist/playlistdelegates.h
+++ b/src/playlist/playlistdelegates.h
@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QWidget>
 #include <QAbstractItemView>
@@ -41,6 +40,7 @@
 #include <QPainter>
 #include <QRect>
 #include <QColor>
+#include <QRgb>
 #include <QSize>
 #include <QFont>
 #include <QString>
@@ -50,6 +50,7 @@
 #include <QLineEdit>
 
 #include "playlist.h"
+#include "core/song.h"
 
 class CollectionBackend;
 class Player;
diff --git a/src/playlist/playlistfilter.h b/src/playlist/playlistfilter.h
index ee966546a..cb8004157 100644
--- a/src/playlist/playlistfilter.h
+++ b/src/playlist/playlistfilter.h
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QMap>
@@ -32,8 +31,6 @@
 #include <QString>
 #include <QSortFilterProxyModel>
 
-#include "playlist.h"
-
 class FilterTree;
 
 class PlaylistFilter : public QSortFilterProxyModel {
diff --git a/src/playlist/playlistfilterparser.cpp b/src/playlist/playlistfilterparser.cpp
index 7beb366e8..e0af18c28 100644
--- a/src/playlist/playlistfilterparser.cpp
+++ b/src/playlist/playlistfilterparser.cpp
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-
 #include <QList>
 #include <QMap>
 #include <QSet>
diff --git a/src/playlist/playlistfilterparser.h b/src/playlist/playlistfilterparser.h
index 060a727b5..fd051407c 100644
--- a/src/playlist/playlistfilterparser.h
+++ b/src/playlist/playlistfilterparser.h
@@ -23,12 +23,11 @@
 
 #include "config.h"
 
-
-#include <QMap>
 #include <QSet>
+#include <QMap>
 #include <QString>
-#include <QAbstractItemModel>
 
+class QAbstractItemModel;
 class QModelIndex;
 
 // structure for filter parse tree
diff --git a/src/playlist/playlistheader.cpp b/src/playlist/playlistheader.cpp
index d13b0e158..14a9f9292 100644
--- a/src/playlist/playlistheader.cpp
+++ b/src/playlist/playlistheader.cpp
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-
+#include <QAbstractItemModel>
 #include <QWidget>
 #include <QFlags>
 #include <QVariant>
@@ -29,8 +29,8 @@
 #include <QMenu>
 #include <QAction>
 #include <QActionGroup>
+#include <QEvent>
 #include <QContextMenuEvent>
-#include <QtEvents>
 
 #include "playlistheader.h"
 #include "playlistview.h"
diff --git a/src/playlist/playlistheader.h b/src/playlist/playlistheader.h
index 71861b2d0..cfbfd94b3 100644
--- a/src/playlist/playlistheader.h
+++ b/src/playlist/playlistheader.h
@@ -23,16 +23,16 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QWidget>
 #include <QList>
-#include <QtEvents>
 
 #include "widgets/stretchheaderview.h"
 
 class QMenu;
 class QAction;
+class QEvent;
+class QContextMenuEvent;
 
 class PlaylistView;
 
diff --git a/src/playlist/playlistitem.cpp b/src/playlist/playlistitem.cpp
index 4c33914f7..9c48e31cd 100644
--- a/src/playlist/playlistitem.cpp
+++ b/src/playlist/playlistitem.cpp
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-
 #include <QtConcurrentRun>
 #include <QFuture>
 #include <QString>
diff --git a/src/playlist/playlistitem.h b/src/playlist/playlistitem.h
index ed05d5f47..598308592 100644
--- a/src/playlist/playlistitem.h
+++ b/src/playlist/playlistitem.h
@@ -27,7 +27,6 @@
 #include <memory>
 
 #include <QFuture>
-#include <QFlags>
 #include <QMetaType>
 #include <QList>
 #include <QMap>
@@ -36,12 +35,12 @@
 #include <QString>
 #include <QUrl>
 #include <QColor>
-#include <QVector>
-#include <QAction>
-#include <QSqlQuery>
 
 #include "core/song.h"
 
+class QSqlQuery;
+class QAction;
+
 class SqlRow;
 
 class PlaylistItem : public std::enable_shared_from_this<PlaylistItem> {
diff --git a/src/playlist/playlistlistcontainer.cpp b/src/playlist/playlistlistcontainer.cpp
index 1ff5e35d2..15d6eeda1 100644
--- a/src/playlist/playlistlistcontainer.cpp
+++ b/src/playlist/playlistlistcontainer.cpp
@@ -22,26 +22,25 @@
 
 #include <QObject>
 #include <QWidget>
-#include <QAction>
-#include <QList>
+#include <QStandardItemModel>
+#include <QAbstractItemModel>
+#include <QItemSelectionModel>
+#include <QSortFilterProxyModel>
 #include <QSet>
+#include <QList>
 #include <QVariant>
 #include <QString>
-#include <QStringBuilder>
-#include <QMenu>
 #include <QPixmap>
 #include <QPainter>
 #include <QIcon>
 #include <QSize>
-#include <QStandardItemModel>
-#include <QAbstractItemModel>
-#include <QItemSelectionModel>
-#include <QPersistentModelIndex>
-#include <QSortFilterProxyModel>
+#include <QMenu>
+#include <QAction>
 #include <QMessageBox>
 #include <QInputDialog>
 #include <QToolButton>
-#include <QtEvents>
+#include <QShowEvent>
+#include <QContextMenuEvent>
 
 #include "core/application.h"
 #include "core/iconloader.h"
@@ -53,7 +52,7 @@
 #include "playlistlistmodel.h"
 #include "playlistmanager.h"
 #include "ui_playlistlistcontainer.h"
-#include "collection/collectionmodel.h"
+#include "organise/organisedialog.h"
 #ifndef Q_OS_WIN
 #  include "device/devicemanager.h"
 #  include "device/devicestatefiltermodel.h"
diff --git a/src/playlist/playlistlistcontainer.h b/src/playlist/playlistlistcontainer.h
index 494d7fcc0..33cf5cc64 100644
--- a/src/playlist/playlistlistcontainer.h
+++ b/src/playlist/playlistlistcontainer.h
@@ -23,24 +23,26 @@
 
 #include "config.h"
 
+#include <memory>
 
 #include <QObject>
 #include <QWidget>
 #include <QString>
 #include <QIcon>
-#include <QAction>
-#include <QMenu>
-#include <QSortFilterProxyModel>
-#include <QStandardItem>
-#include <QtEvents>
 
-#include <organise/organisedialog.h>
+class QStandardItem;
+class QSortFilterProxyModel;
+class QMenu;
+class QAction;
+class QContextMenuEvent;
+class QShowEvent;
 
 class QModelIndex;
 class Application;
 class Playlist;
 class PlaylistListModel;
 class Ui_PlaylistListContainer;
+class OrganiseDialog;
 
 class PlaylistListContainer : public QWidget {
   Q_OBJECT
diff --git a/src/playlist/playlistlistmodel.h b/src/playlist/playlistlistmodel.h
index a8192a703..c0f0835e9 100644
--- a/src/playlist/playlistlistmodel.h
+++ b/src/playlist/playlistlistmodel.h
@@ -30,8 +30,8 @@
 #include <QIcon>
 #include <QVariant>
 #include <QString>
-#include <QMimeData>
 
+class QMimeData;
 class QModelIndex;
 
 class PlaylistListModel : public QStandardItemModel {
diff --git a/src/playlist/playlistlistview.cpp b/src/playlist/playlistlistview.cpp
index 3a7fbd317..7de698a40 100644
--- a/src/playlist/playlistlistview.cpp
+++ b/src/playlist/playlistlistview.cpp
@@ -20,13 +20,14 @@
 
 #include "config.h"
 
-
+#include <QAbstractItemModel>
 #include <QWidget>
 #include <QFlags>
 #include <QFont>
 #include <QPainter>
 #include <QPalette>
 #include <QRect>
+#include <QPaintEvent>
 
 #include "playlistlistview.h"
 
diff --git a/src/playlist/playlistlistview.h b/src/playlist/playlistlistview.h
index 8690634e3..d26e9bdd6 100644
--- a/src/playlist/playlistlistview.h
+++ b/src/playlist/playlistlistview.h
@@ -26,10 +26,11 @@
 #include <QObject>
 #include <QWidget>
 #include <QString>
-#include <QPaintEvent>
 
 #include "widgets/autoexpandingtreeview.h"
 
+class QPaintEvent;
+
 class PlaylistListView : public AutoExpandingTreeView {
   Q_OBJECT
 
diff --git a/src/playlist/playlistmanager.h b/src/playlist/playlistmanager.h
index 3003b7d32..68f91453a 100644
--- a/src/playlist/playlistmanager.h
+++ b/src/playlist/playlistmanager.h
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
 #include <QItemSelectionModel>
 #include <QFuture>
@@ -35,6 +35,8 @@
 #include "core/song.h"
 #include "playlist.h"
 
+class QModelIndex;
+
 class Application;
 class CollectionBackend;
 class PlaylistBackend;
diff --git a/src/playlist/playlistsaveoptionsdialog.h b/src/playlist/playlistsaveoptionsdialog.h
index 7598c9e98..15c2a47cd 100644
--- a/src/playlist/playlistsaveoptionsdialog.h
+++ b/src/playlist/playlistsaveoptionsdialog.h
@@ -24,12 +24,13 @@
 #include "config.h"
 
 #include <QObject>
-#include <QWidget>
 #include <QDialog>
 #include <QString>
 
 #include "playlist.h"
 
+class QWidget;
+
 namespace Ui {
 class PlaylistSaveOptionsDialog;
 }
diff --git a/src/playlist/playlistsequence.cpp b/src/playlist/playlistsequence.cpp
index 2ef73ede6..01e099bbc 100644
--- a/src/playlist/playlistsequence.cpp
+++ b/src/playlist/playlistsequence.cpp
@@ -21,12 +21,13 @@
 #include "config.h"
 
 #include <QWidget>
-#include <QMenu>
-#include <QSize>
+#include <QList>
 #include <QVariant>
 #include <QIcon>
 #include <QPixmap>
 #include <QPainter>
+#include <QMenu>
+#include <QSize>
 #include <QAction>
 #include <QActionGroup>
 #include <QToolButton>
diff --git a/src/playlist/playlistsequence.h b/src/playlist/playlistsequence.h
index 4a84ff0cb..246999cd4 100644
--- a/src/playlist/playlistsequence.h
+++ b/src/playlist/playlistsequence.h
@@ -30,8 +30,9 @@
 #include <QString>
 #include <QIcon>
 #include <QPixmap>
-#include <QAction>
-#include <QMenu>
+
+class QMenu;
+class QAction;
 
 class SettingsProvider;
 class Ui_PlaylistSequence;
diff --git a/src/playlist/playlisttabbar.h b/src/playlist/playlisttabbar.h
index f40a90ceb..d2158ea88 100644
--- a/src/playlist/playlisttabbar.h
+++ b/src/playlist/playlisttabbar.h
@@ -23,18 +23,16 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QWidget>
 #include <QBasicTimer>
 #include <QList>
 #include <QString>
 #include <QIcon>
 #include <QTabBar>
-#include <QAction>
-#include <QMenu>
-#include <QtEvents>
 
+class QWidget;
+class QMenu;
+class QAction;
 class QEvent;
 class QContextMenuEvent;
 class QDragEnterEvent;
diff --git a/src/playlist/playlistundocommands.cpp b/src/playlist/playlistundocommands.cpp
index 1623343ed..b665c8e03 100644
--- a/src/playlist/playlistundocommands.cpp
+++ b/src/playlist/playlistundocommands.cpp
@@ -22,6 +22,7 @@
 
 #include <memory>
 
+#include <QtGlobal>
 #include <QList>
 #include <QUrl>
 #include <QUndoStack>
diff --git a/src/playlist/playlistundocommands.h b/src/playlist/playlistundocommands.h
index aab6a0b59..536adb36d 100644
--- a/src/playlist/playlistundocommands.h
+++ b/src/playlist/playlistundocommands.h
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QCoreApplication>
 #include <QList>
 #include <QUndoStack>
diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp
index d942b7c9f..6c9bb4ef5 100644
--- a/src/playlist/playlistview.cpp
+++ b/src/playlist/playlistview.cpp
@@ -27,18 +27,19 @@
 #include <QApplication>
 #include <QObject>
 #include <QWidget>
-#include <QList>
 #include <QAbstractItemView>
+#include <QItemSelectionModel>
+#include <QSortFilterProxyModel>
+#include <QTreeView>
+#include <QHeaderView>
 #include <QByteArray>
 #include <QClipboard>
 #include <QCommonStyle>
 #include <QFontMetrics>
-#include <QHeaderView>
-#include <QItemSelectionModel>
 #include <QKeySequence>
 #include <QMimeData>
+#include <QList>
 #include <QSize>
-#include <QSortFilterProxyModel>
 #include <QTimeLine>
 #include <QTimer>
 #include <QVariant>
@@ -56,11 +57,9 @@
 #include <QPoint>
 #include <QRect>
 #include <QRegion>
-#include <QtAlgorithms>
 #include <QStyleOptionHeader>
 #include <QStyleOptionViewItem>
 #include <QProxyStyle>
-#include <QTreeView>
 #include <QLinearGradient>
 #include <QScrollBar>
 #include <QtEvents>
diff --git a/src/playlist/playlistview.h b/src/playlist/playlistview.h
index 72cd3d8f0..0f3b66369 100644
--- a/src/playlist/playlistview.h
+++ b/src/playlist/playlistview.h
@@ -28,8 +28,13 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QWidget>
+#include <QAbstractItemDelegate>
+#include <QAbstractItemModel>
+#include <QStyleOptionViewItem>
+#include <QAbstractItemView>
+#include <QTreeView>
 #include <QList>
+#include <QByteArray>
 #include <QString>
 #include <QImage>
 #include <QPixmap>
@@ -38,22 +43,18 @@
 #include <QStyle>
 #include <QStyleOption>
 #include <QProxyStyle>
-#include <QTreeView>
 #include <QPoint>
-#include <QTimer>
 #include <QBasicTimer>
-#include <QTimeLine>
 #include <QCommonStyle>
-#include <QPainter>
-#include <QAbstractItemDelegate>
-#include <QAbstractItemModel>
-#include <QStyleOptionViewItem>
-#include <QtEvents>
 
 #include "core/song.h"
 #include "settings/appearancesettingspage.h"
 #include "playlist.h"
 
+class QWidget;
+class QTimer;
+class QTimeLine;
+class QPainter;
 class QEvent;
 class QShowEvent;
 class QContextMenuEvent;
diff --git a/src/playlist/songloaderinserter.h b/src/playlist/songloaderinserter.h
index b3601ec0c..68bfda683 100644
--- a/src/playlist/songloaderinserter.h
+++ b/src/playlist/songloaderinserter.h
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QList>
 #include <QString>
diff --git a/src/playlist/songplaylistitem.cpp b/src/playlist/songplaylistitem.cpp
index aeafaae54..50e841919 100644
--- a/src/playlist/songplaylistitem.cpp
+++ b/src/playlist/songplaylistitem.cpp
@@ -21,11 +21,10 @@
 
 #include "config.h"
 
-#include <QString>
-#include <QStringList>
 #include <QUrl>
 
 #include "core/tagreaderclient.h"
+#include "core/song.h"
 #include "collection/sqlrow.h"
 #include "playlistitem.h"
 #include "songplaylistitem.h"
diff --git a/src/playlist/songplaylistitem.h b/src/playlist/songplaylistitem.h
index 363731b21..466649924 100644
--- a/src/playlist/songplaylistitem.h
+++ b/src/playlist/songplaylistitem.h
@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-#include <QString>
 #include <QUrl>
 
 #include "core/song.h"
@@ -52,4 +51,4 @@ class SongPlaylistItem : public PlaylistItem {
   Song song_;
 };
 
-#endif // SONGPLAYLISTITEM_H
+#endif  // SONGPLAYLISTITEM_H
diff --git a/src/playlistparsers/asxiniparser.cpp b/src/playlistparsers/asxiniparser.cpp
index e2f676cb7..b0d3578b2 100644
--- a/src/playlistparsers/asxiniparser.cpp
+++ b/src/playlistparsers/asxiniparser.cpp
@@ -18,6 +18,7 @@
  *
  */
 
+#include <QtGlobal>
 #include <QObject>
 #include <QIODevice>
 #include <QByteArray>
diff --git a/src/playlistparsers/asxiniparser.h b/src/playlistparsers/asxiniparser.h
index 4fa9bbdab..9914af845 100644
--- a/src/playlistparsers/asxiniparser.h
+++ b/src/playlistparsers/asxiniparser.h
@@ -22,17 +22,17 @@
 #define ASXINIPARSER_H
 
 #include <QObject>
-#include <QIODevice>
 #include <QByteArray>
-#include <QDir>
 #include <QString>
 #include <QStringList>
+#include <QDir>
 
 #include "config.h"
 #include "core/song.h"
 #include "parserbase.h"
 #include "playlist/playlist.h"
 
+class QIODevice;
 class CollectionBackendInterface;
 
 class AsxIniParser : public ParserBase {
diff --git a/src/playlistparsers/asxparser.cpp b/src/playlistparsers/asxparser.cpp
index 6a08a2de8..7c163e277 100644
--- a/src/playlistparsers/asxparser.cpp
+++ b/src/playlistparsers/asxparser.cpp
@@ -18,6 +18,7 @@
  *
  */
 
+#include <QtGlobal>
 #include <QObject>
 #include <QIODevice>
 #include <QBuffer>
diff --git a/src/playlistparsers/asxparser.h b/src/playlistparsers/asxparser.h
index 2dfff11a5..128f4f777 100644
--- a/src/playlistparsers/asxparser.h
+++ b/src/playlistparsers/asxparser.h
@@ -23,18 +23,19 @@
 
 
 #include <QObject>
-#include <QIODevice>
 #include <QByteArray>
-#include <QDir>
 #include <QString>
 #include <QStringList>
-#include <QXmlStreamReader>
+#include <QDir>
 
 #include "config.h"
 #include "core/song.h"
 #include "playlist/playlist.h"
 #include "xmlparser.h"
 
+class QIODevice;
+class QXmlStreamReader;
+
 class CollectionBackendInterface;
 
 class ASXParser : public XMLParser {
diff --git a/src/playlistparsers/cueparser.h b/src/playlistparsers/cueparser.h
index e2de55d10..f321a5ba4 100644
--- a/src/playlistparsers/cueparser.h
+++ b/src/playlistparsers/cueparser.h
@@ -23,19 +23,18 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
-#include <QIODevice>
 #include <QByteArray>
-#include <QDir>
 #include <QString>
 #include <QStringList>
+#include <QDir>
 
 #include "core/song.h"
 #include "parserbase.h"
 #include "playlist/playlist.h"
 
+class QIODevice;
 class CollectionBackendInterface;
 
 // This parser will try to detect the real encoding of a .cue file
diff --git a/src/playlistparsers/m3uparser.h b/src/playlistparsers/m3uparser.h
index 20013f86b..1a87526f7 100644
--- a/src/playlistparsers/m3uparser.h
+++ b/src/playlistparsers/m3uparser.h
@@ -23,19 +23,18 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
-#include <QIODevice>
 #include <QByteArray>
-#include <QDir>
 #include <QString>
 #include <QStringList>
+#include <QDir>
 
 #include "core/song.h"
 #include "parserbase.h"
 #include "playlist/playlist.h"
 
+class QIODevice;
 class CollectionBackendInterface;
 
 class M3UParser : public ParserBase {
diff --git a/src/playlistparsers/parserbase.cpp b/src/playlistparsers/parserbase.cpp
index 27118ffe4..d9fbea897 100644
--- a/src/playlistparsers/parserbase.cpp
+++ b/src/playlistparsers/parserbase.cpp
@@ -26,10 +26,11 @@
 #include <QRegExp>
 #include <QUrl>
 
-#include "collection/collectionbackend.h"
+#include "core/logging.h"
 #include "core/tagreaderclient.h"
-#include "parserbase.h"
+#include "collection/collectionbackend.h"
 #include "playlist/playlist.h"
+#include "parserbase.h"
 
 ParserBase::ParserBase(CollectionBackendInterface *collection, QObject *parent)
     : QObject(parent), collection_(collection) {}
diff --git a/src/playlistparsers/parserbase.h b/src/playlistparsers/parserbase.h
index 7117de804..f0cb5691d 100644
--- a/src/playlistparsers/parserbase.h
+++ b/src/playlistparsers/parserbase.h
@@ -21,10 +21,8 @@
 #ifndef PARSERBASE_H
 #define PARSERBASE_H
 
-
 #include <QtGlobal>
 #include <QObject>
-#include <QIODevice>
 #include <QDir>
 #include <QByteArray>
 #include <QString>
@@ -35,6 +33,7 @@
 #include "core/song.h"
 #include "playlist/playlist.h"
 
+class QIODevice;
 class CollectionBackendInterface;
 
 class ParserBase : public QObject {
diff --git a/src/playlistparsers/playlistparser.cpp b/src/playlistparsers/playlistparser.cpp
index 4971c9be2..7e022b58b 100644
--- a/src/playlistparsers/playlistparser.cpp
+++ b/src/playlistparsers/playlistparser.cpp
@@ -18,6 +18,8 @@
  *
  */
 
+#include <algorithm>
+
 #include <QObject>
 #include <QIODevice>
 #include <QDir>
@@ -27,7 +29,6 @@
 #include <QString>
 #include <QStringBuilder>
 #include <QStringList>
-#include <QtAlgorithms>
 #include <QtDebug>
 
 #include "asxiniparser.h"
diff --git a/src/playlistparsers/playlistparser.h b/src/playlistparsers/playlistparser.h
index 7c2f5b821..9a8aad05f 100644
--- a/src/playlistparsers/playlistparser.h
+++ b/src/playlistparsers/playlistparser.h
@@ -22,7 +22,6 @@
 #define PLAYLISTPARSER_H
 
 #include <QObject>
-#include <QIODevice>
 #include <QDir>
 #include <QByteArray>
 #include <QList>
@@ -33,6 +32,7 @@
 #include "core/song.h"
 #include "playlist/playlist.h"
 
+class QIODevice;
 class CollectionBackendInterface;
 class ParserBase;
 
diff --git a/src/playlistparsers/plsparser.h b/src/playlistparsers/plsparser.h
index a0d5d9c8f..b200a5473 100644
--- a/src/playlistparsers/plsparser.h
+++ b/src/playlistparsers/plsparser.h
@@ -21,9 +21,7 @@
 #ifndef PLSPARSER_H
 #define PLSPARSER_H
 
-
 #include <QObject>
-#include <QIODevice>
 #include <QDir>
 #include <QByteArray>
 #include <QString>
@@ -34,6 +32,7 @@
 #include "parserbase.h"
 #include "playlist/playlist.h"
 
+class QIODevice;
 class CollectionBackendInterface;
 
 class PLSParser : public ParserBase {
diff --git a/src/playlistparsers/wplparser.cpp b/src/playlistparsers/wplparser.cpp
index fd5af4568..b2dd5067d 100644
--- a/src/playlistparsers/wplparser.cpp
+++ b/src/playlistparsers/wplparser.cpp
@@ -18,6 +18,7 @@
  *
  */
 
+#include <QtGlobal>
 #include <QObject>
 #include <QIODevice>
 #include <QDir>
diff --git a/src/playlistparsers/wplparser.h b/src/playlistparsers/wplparser.h
index 490954438..75433b339 100644
--- a/src/playlistparsers/wplparser.h
+++ b/src/playlistparsers/wplparser.h
@@ -22,21 +22,21 @@
 #define WPLPARSER_H
 
 #include <QObject>
-#include <QIODevice>
 #include <QDir>
 #include <QByteArray>
 #include <QString>
 #include <QStringList>
-#include <QXmlStreamReader>
-#include <QXmlStreamWriter>
 
 #include "config.h"
 #include "core/song.h"
 #include "playlist/playlist.h"
 #include "xmlparser.h"
 
-class CollectionBackendInterface;
+class QIODevice;
+class QXmlStreamReader;
+class QXmlStreamWriter;
 
+class CollectionBackendInterface;
 
 class WplParser : public XMLParser {
  public:
diff --git a/src/playlistparsers/xspfparser.h b/src/playlistparsers/xspfparser.h
index 89a240e72..dcd648f9f 100644
--- a/src/playlistparsers/xspfparser.h
+++ b/src/playlistparsers/xspfparser.h
@@ -23,19 +23,18 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QIODevice>
 #include <QByteArray>
 #include <QDir>
 #include <QString>
 #include <QStringList>
-#include <QXmlStreamReader>
 
 #include "core/song.h"
 #include "playlist/playlist.h"
 #include "xmlparser.h"
 
+class QIODevice;
+class QXmlStreamReader;
 class CollectionBackendInterface;
 
 class XSPFParser : public XMLParser {
diff --git a/src/queue/queue.cpp b/src/queue/queue.cpp
index 2822fbb7a..eafdcdfd2 100644
--- a/src/queue/queue.cpp
+++ b/src/queue/queue.cpp
@@ -20,26 +20,26 @@
 
 #include "config.h"
 
+#include <memory>
 #include <algorithm>
 
 #include <QObject>
 #include <QIODevice>
 #include <QDataStream>
 #include <QBuffer>
-#include <QFlags>
 #include <QList>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QStringBuilder>
 #include <QMimeData>
-#include <QtAlgorithms>
 #include <QAbstractItemModel>
 #include <QAbstractProxyModel>
-#include <QPersistentModelIndex>
 
 #include "core/utilities.h"
+#include "core/song.h"
 #include "playlist/playlist.h"
+#include "playlist/playlistitem.h"
 #include "queue.h"
 
 using std::stable_sort;
diff --git a/src/queue/queue.h b/src/queue/queue.h
index ce46a761d..c57a30055 100644
--- a/src/queue/queue.h
+++ b/src/queue/queue.h
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QAbstractItemModel>
 #include <QAbstractProxyModel>
@@ -31,9 +30,9 @@
 #include <QVariant>
 #include <QString>
 #include <QStringList>
-#include <QMimeData>
 
-#include "playlist/playlist.h"
+class QMimeData;
+class Playlist;
 
 class Queue : public QAbstractProxyModel {
   Q_OBJECT
diff --git a/src/queue/queueview.cpp b/src/queue/queueview.cpp
index eab9a3994..b8c2dec56 100644
--- a/src/queue/queueview.cpp
+++ b/src/queue/queueview.cpp
@@ -23,13 +23,12 @@
 #include <QWidget>
 #include <QAbstractItemModel>
 #include <QItemSelectionModel>
-#include <QKeySequence>
-#include <QList>
-#include <QPushButton>
-#include <QShortcut>
 #include <QTreeView>
-#include <QtAlgorithms>
+#include <QList>
 #include <QTimer>
+#include <QKeySequence>
+#include <QLabel>
+#include <QToolButton>
 
 #include "core/iconloader.h"
 #include "playlist/playlist.h"
diff --git a/src/queue/queueview.h b/src/queue/queueview.h
index 3493c8629..cca892010 100644
--- a/src/queue/queueview.h
+++ b/src/queue/queueview.h
@@ -25,7 +25,6 @@
 
 #include <QObject>
 #include <QWidget>
-#include <QDialog>
 #include <QString>
 
 class Playlist;