diff --git a/src/core/mainwindow.h b/src/core/mainwindow.h
index 7e7484eac..128c43743 100644
--- a/src/core/mainwindow.h
+++ b/src/core/mainwindow.h
@@ -34,7 +34,6 @@
 #include <QSystemTrayIcon>
 #include <QSortFilterProxyModel>
 #include <QAbstractItemModel>
-#include <QModelIndex>
 #include <QPersistentModelIndex>
 #include <QMenu>
 #include <QAction>
diff --git a/src/core/mergedproxymodel.h b/src/core/mergedproxymodel.h
index a01d38563..65c141339 100644
--- a/src/core/mergedproxymodel.h
+++ b/src/core/mergedproxymodel.h
@@ -29,7 +29,6 @@
 
 #include <QObject>
 #include <QMimeData>
-#include <QModelIndex>
 #include <QAbstractItemModel>
 #include <QAbstractProxyModel>
 #include <QPersistentModelIndex>
diff --git a/src/core/multisortfilterproxy.cpp b/src/core/multisortfilterproxy.cpp
index 0e322a969..e1b474f5b 100644
--- a/src/core/multisortfilterproxy.cpp
+++ b/src/core/multisortfilterproxy.cpp
@@ -23,7 +23,6 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QSortFilterProxyModel>
-#include <QModelIndex>
 #include <QMetaType>
 #include <QDateTime>
 #include <QVariant>
diff --git a/src/core/multisortfilterproxy.h b/src/core/multisortfilterproxy.h
index aca02bba2..8630d133e 100644
--- a/src/core/multisortfilterproxy.h
+++ b/src/core/multisortfilterproxy.h
@@ -26,11 +26,10 @@
 #include <stdbool.h>
 
 #include <QObject>
-#include <QModelIndex>
 #include <QSortFilterProxyModel>
 #include <QList>
-#include <QVariant>
 #include <QPair>
+#include <QVariant>
 
 class MultiSortFilterProxy : public QSortFilterProxyModel {
  public:
diff --git a/src/core/simpletreemodel.h b/src/core/simpletreemodel.h
index e539eb351..002d85ec3 100644
--- a/src/core/simpletreemodel.h
+++ b/src/core/simpletreemodel.h
@@ -25,7 +25,6 @@
 
 #include <QObject>
 #include <QAbstractItemModel>
-#include <QModelIndex>
 
 template <typename T>
 class SimpleTreeModel : public QAbstractItemModel {
diff --git a/src/core/standarditemiconloader.cpp b/src/core/standarditemiconloader.cpp
index ede3fa69b..3b6fcd2c3 100644
--- a/src/core/standarditemiconloader.cpp
+++ b/src/core/standarditemiconloader.cpp
@@ -22,9 +22,6 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QModelIndex>
-#include <QStandardItem>
-#include <QStandardItemModel>
 #include <QAbstractItemModel>
 #include <QMap>
 #include <QSet>
@@ -39,8 +36,8 @@
 StandardItemIconLoader::StandardItemIconLoader(AlbumCoverLoader *cover_loader, QObject *parent)
   : QObject(parent),
     cover_loader_(cover_loader),
-    model_(nullptr)
-{
+    model_(nullptr) {
+
   cover_options_.desired_height_ = 16;
 
   connect(cover_loader_, SIGNAL(ImageLoaded(quint64, QImage)), SLOT(ImageLoaded(quint64, QImage)));
diff --git a/src/covermanager/albumcovermanager.cpp b/src/covermanager/albumcovermanager.cpp
index dd999cf5c..59cf673df 100644
--- a/src/covermanager/albumcovermanager.cpp
+++ b/src/covermanager/albumcovermanager.cpp
@@ -27,7 +27,6 @@
 #include <QObject>
 #include <QMainWindow>
 #include <QWidget>
-#include <QModelIndex>
 #include <QItemSelectionModel>
 #include <QListWidgetItem>
 #include <QAction>
diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp
index 44eee24fe..636554c33 100644
--- a/src/playlist/playlist.cpp
+++ b/src/playlist/playlist.cpp
@@ -54,7 +54,6 @@
 #include <QLinkedList>
 #include <QUndoStack>
 #include <QUndoCommand>
-#include <QModelIndex>
 #include <QAbstractListModel>
 #include <QPersistentModelIndex>
 #include <QMutableListIterator>
diff --git a/src/playlist/playlist.h b/src/playlist/playlist.h
index 52162c56d..944ca0608 100644
--- a/src/playlist/playlist.h
+++ b/src/playlist/playlist.h
@@ -27,6 +27,10 @@
 
 #include <QtGlobal>
 #include <QObject>
+#include <QAbstractItemModel>
+#include <QAbstractListModel>
+#include <QSortFilterProxyModel>
+#include <QPersistentModelIndex>
 #include <QFuture>
 #include <QList>
 #include <QMap>
@@ -37,11 +41,6 @@
 #include <QStringList>
 #include <QUrl>
 #include <QColor>
-#include <QModelIndex>
-#include <QAbstractItemModel>
-#include <QAbstractListModel>
-#include <QSortFilterProxyModel>
-#include <QPersistentModelIndex>
 #include <QUndoStack>
 
 #include "core/song.h"
diff --git a/src/playlist/playlistcontainer.cpp b/src/playlist/playlistcontainer.cpp
index 6eccb7ed1..a0f6324a3 100644
--- a/src/playlist/playlistcontainer.cpp
+++ b/src/playlist/playlistcontainer.cpp
@@ -21,6 +21,8 @@
 #include <QApplication>
 #include <QObject>
 #include <QWidget>
+#include <QItemSelectionModel>
+#include <QSortFilterProxyModel>
 #include <QAction>
 #include <QList>
 #include <QVariant>
@@ -33,9 +35,6 @@
 #include <QColor>
 #include <QFrame>
 #include <QPalette>
-#include <QModelIndex>
-#include <QItemSelectionModel>
-#include <QSortFilterProxyModel>
 #include <QTimer>
 #include <QTimeLine>
 #include <QFileDialog>
diff --git a/src/playlist/playlistdelegates.h b/src/playlist/playlistdelegates.h
index 027465d5a..267211418 100644
--- a/src/playlist/playlistdelegates.h
+++ b/src/playlist/playlistdelegates.h
@@ -28,6 +28,10 @@
 
 #include <QObject>
 #include <QWidget>
+#include <QAbstractItemView>
+#include <QStyledItemDelegate>
+#include <QStyleOptionViewItem>
+#include <QTreeView>
 #include <QFuture>
 #include <QCompleter>
 #include <QLocale>
@@ -42,14 +46,9 @@
 #include <QFont>
 #include <QString>
 #include <QStringListModel>
-#include <QModelIndex>
 #include <QStyleOption>
-#include <QStyledItemDelegate>
-#include <QAbstractItemView>
-#include <QStyleOptionViewItem>
 #include <QHelpEvent>
 #include <QLineEdit>
-#include <QTreeView>
 
 #include "playlist.h"
 
diff --git a/src/playlist/playlistmanager.h b/src/playlist/playlistmanager.h
index 5ae214cca..0a68b3bd7 100644
--- a/src/playlist/playlistmanager.h
+++ b/src/playlist/playlistmanager.h
@@ -26,13 +26,12 @@
 #include <stdbool.h>
 
 #include <QObject>
+#include <QItemSelectionModel>
+#include <QFuture>
 #include <QList>
 #include <QMap>
-#include <QFuture>
 #include <QString>
 #include <QUrl>
-#include <QModelIndex>
-#include <QItemSelectionModel>
 
 #include "core/song.h"
 #include "playlist.h"
@@ -103,7 +102,7 @@ public slots:
   virtual void SetActivePaused() = 0;
   virtual void SetActiveStopped() = 0;
 
-signals:
+ signals:
   void PlaylistManagerInitialized();
 
   void PlaylistAdded(int id, const QString &name, bool favorite);
@@ -167,7 +166,7 @@ class PlaylistManager : public PlaylistManagerInterface {
   PlaylistParser *parser() const { return parser_; }
   PlaylistContainer *playlist_container() const { return playlist_container_; }
 
-public slots:
+ public slots:
   void New(const QString &name, const SongList &songs = SongList(), const QString &special_type = QString());
   void Load(const QString &filename);
   void Save(int id, const QString &filename, Playlist::Path path_type);
@@ -218,7 +217,7 @@ public slots:
  private:
   Playlist *AddPlaylist(int id, const QString& name, const QString &special_type, const QString& ui_path, bool favorite);
 
-private:
+ private:
   struct Data {
     Data(Playlist *_p = nullptr, const QString& _name = QString()) : p(_p), name(_name) {}
     Playlist *p;