diff --git a/src/covers/albumcoverexporter.cpp b/src/covers/albumcoverexporter.cpp
index 0cf7c7a8d..991151494 100644
--- a/src/covers/albumcoverexporter.cpp
+++ b/src/covers/albumcoverexporter.cpp
@@ -18,12 +18,13 @@
 */
 
 #include "albumcoverexporter.h"
-#include "coverexportrunnable.h"
-#include "core/song.h"
 
 #include <QFile>
 #include <QThreadPool>
 
+#include "coverexportrunnable.h"
+#include "core/song.h"
+
 const int AlbumCoverExporter::kMaxConcurrentRequests = 3;
 
 AlbumCoverExporter::AlbumCoverExporter(QObject* parent)
diff --git a/src/covers/albumcoverfetcher.cpp b/src/covers/albumcoverfetcher.cpp
index 2ea5043a7..f32305eb3 100644
--- a/src/covers/albumcoverfetcher.cpp
+++ b/src/covers/albumcoverfetcher.cpp
@@ -19,11 +19,12 @@
 */
 
 #include "albumcoverfetcher.h"
-#include "albumcoverfetchersearch.h"
-#include "core/network.h"
 
 #include <QTimer>
 
+#include "albumcoverfetchersearch.h"
+#include "core/network.h"
+
 const int AlbumCoverFetcher::kMaxConcurrentRequests = 5;
 
 AlbumCoverFetcher::AlbumCoverFetcher(CoverProviders* cover_providers,
diff --git a/src/covers/amazoncoverprovider.cpp b/src/covers/amazoncoverprovider.cpp
index 5dbed2e38..63aead35a 100644
--- a/src/covers/amazoncoverprovider.cpp
+++ b/src/covers/amazoncoverprovider.cpp
@@ -19,16 +19,17 @@
 */
 
 #include "amazoncoverprovider.h"
-#include "core/closure.h"
-#include "core/logging.h"
-#include "core/network.h"
-#include "core/utilities.h"
 
 #include <QDateTime>
 #include <QNetworkReply>
 #include <QStringList>
 #include <QXmlStreamReader>
 
+#include "core/closure.h"
+#include "core/logging.h"
+#include "core/network.h"
+#include "core/utilities.h"
+
 // Amazon has a web crawler that looks for access keys in public source code,
 // so we apply some sophisticated encryption to these keys.
 const char* AmazonCoverProvider::kAccessKeyB64 = "QUtJQUlRSDI2UlZNNlVaNFdBNlE=";
diff --git a/src/covers/coverexportrunnable.cpp b/src/covers/coverexportrunnable.cpp
index cc0a2002e..2dc9a3959 100644
--- a/src/covers/coverexportrunnable.cpp
+++ b/src/covers/coverexportrunnable.cpp
@@ -17,13 +17,15 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "albumcoverexporter.h"
-#include "core/song.h"
-#include "core/tagreaderclient.h"
+#include "coverexportrunnable.h"
 
 #include <QFile>
 #include <QUrl>
 
+#include "albumcoverexporter.h"
+#include "core/song.h"
+#include "core/tagreaderclient.h"
+
 CoverExportRunnable::CoverExportRunnable(
     const AlbumCoverExport::DialogResult& dialog_result, const Song& song)
     : dialog_result_(dialog_result), song_(song) {}
diff --git a/src/covers/coverproviders.cpp b/src/covers/coverproviders.cpp
index 5ed320294..c78acf571 100644
--- a/src/covers/coverproviders.cpp
+++ b/src/covers/coverproviders.cpp
@@ -18,9 +18,9 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "coverproviders.h"
 #include "config.h"
 #include "coverprovider.h"
-#include "coverproviders.h"
 #include "core/logging.h"
 
 CoverProviders::CoverProviders(QObject* parent) : QObject(parent) {}
diff --git a/src/covers/currentartloader.cpp b/src/covers/currentartloader.cpp
index 796fec35f..e1de2f3a8 100644
--- a/src/covers/currentartloader.cpp
+++ b/src/covers/currentartloader.cpp
@@ -18,14 +18,15 @@
 */
 
 #include "currentartloader.h"
-#include "core/application.h"
-#include "covers/albumcoverloader.h"
-#include "playlist/playlistmanager.h"
 
 #include <QDir>
 #include <QTemporaryFile>
 #include <QUrl>
 
+#include "core/application.h"
+#include "covers/albumcoverloader.h"
+#include "playlist/playlistmanager.h"
+
 CurrentArtLoader::CurrentArtLoader(Application* app, QObject* parent)
     : QObject(parent),
       app_(app),
diff --git a/src/covers/discogscoverprovider.cpp b/src/covers/discogscoverprovider.cpp
index b5b2e63d4..9325b17dc 100644
--- a/src/covers/discogscoverprovider.cpp
+++ b/src/covers/discogscoverprovider.cpp
@@ -18,14 +18,15 @@
 */
 
 #include "discogscoverprovider.h"
+
+#include <QNetworkReply>
+#include <qjson/parser.h>
+
 #include "core/closure.h"
 #include "core/logging.h"
 #include "core/network.h"
 #include "core/utilities.h"
 
-#include <QNetworkReply>
-#include <qjson/parser.h>
-
 const char* DiscogsCoverProvider::kSearchUrl =
     "http://api.discogs.com/database/search";