diff --git a/src/collection/collectionmodel.cpp b/src/collection/collectionmodel.cpp
index 0dd03de2a..067816356 100644
--- a/src/collection/collectionmodel.cpp
+++ b/src/collection/collectionmodel.cpp
@@ -27,7 +27,7 @@
 
 #include <QObject>
 #include <QtGlobal>
-#include <QtConcurrent>
+#include <QtConcurrentRun>
 #include <QThread>
 #include <QMutex>
 #include <QFuture>
diff --git a/src/covermanager/albumcovermanager.cpp b/src/covermanager/albumcovermanager.cpp
index 7052d5ccc..712ecd5dc 100644
--- a/src/covermanager/albumcovermanager.cpp
+++ b/src/covermanager/albumcovermanager.cpp
@@ -27,9 +27,6 @@
 #include <QObject>
 #include <QMainWindow>
 #include <QWidget>
-#include <QtConcurrent>
-#include <QFuture>
-#include <QFutureWatcher>
 #include <QScreen>
 #include <QItemSelectionModel>
 #include <QListWidgetItem>
diff --git a/src/device/devicemanager.cpp b/src/device/devicemanager.cpp
index df263978b..ba1de71db 100644
--- a/src/device/devicemanager.cpp
+++ b/src/device/devicemanager.cpp
@@ -30,7 +30,7 @@
 #include <QObject>
 #include <QMetaObject>
 #include <QThread>
-#include <QtConcurrent>
+#include <QtConcurrentRun>
 #include <QAbstractItemModel>
 #include <QDir>
 #include <QList>
diff --git a/src/dialogs/edittagdialog.cpp b/src/dialogs/edittagdialog.cpp
index e65083e78..726e9478a 100644
--- a/src/dialogs/edittagdialog.cpp
+++ b/src/dialogs/edittagdialog.cpp
@@ -28,7 +28,7 @@
 #include <limits>
 
 #include <QtGlobal>
-#include <QtConcurrent>
+#include <QtConcurrentRun>
 #include <QFuture>
 #include <QFutureWatcher>
 #include <QObject>
@@ -68,6 +68,7 @@
 #include <QAbstractButton>
 #include <QtEvents>
 #include <QSettings>
+#include <QMimeData>
 
 #include "core/application.h"
 #include "core/iconloader.h"
diff --git a/src/engine/gstenginepipeline.cpp b/src/engine/gstenginepipeline.cpp
index 54aee71ca..675514387 100644
--- a/src/engine/gstenginepipeline.cpp
+++ b/src/engine/gstenginepipeline.cpp
@@ -41,7 +41,9 @@
 
 #include <QObject>
 #include <QCoreApplication>
-#include <QtConcurrent>
+#include <QtConcurrentRun>
+#include <QFuture>
+#include <QFutureWatcher>
 #include <QMutex>
 #include <QMetaType>
 #include <QByteArray>
@@ -54,6 +56,7 @@
 #include <QEasingCurve>
 #include <QMetaObject>
 #include <QUuid>
+#include <QVersionNumber>
 
 #include "core/logging.h"
 #include "core/signalchecker.h"
diff --git a/src/engine/gststartup.cpp b/src/engine/gststartup.cpp
index d82b60767..6316f32b8 100644
--- a/src/engine/gststartup.cpp
+++ b/src/engine/gststartup.cpp
@@ -29,7 +29,7 @@
 #include <QMetaObject>
 #include <QCoreApplication>
 #include <QStandardPaths>
-#include <QtConcurrent>
+#include <QtConcurrentRun>
 #include <QString>
 #include <QDir>
 #include <QFile>
diff --git a/src/organize/organizedialog.cpp b/src/organize/organizedialog.cpp
index f133cd43b..78b1f7f68 100644
--- a/src/organize/organizedialog.cpp
+++ b/src/organize/organizedialog.cpp
@@ -28,7 +28,7 @@
 
 #include <QtGlobal>
 #include <QGuiApplication>
-#include <QtConcurrent>
+#include <QtConcurrentRun>
 #include <QFuture>
 #include <QFutureWatcher>
 #include <QAbstractItemModel>
diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp
index 1116815e8..fc1c990fa 100644
--- a/src/playlist/playlist.cpp
+++ b/src/playlist/playlist.cpp
@@ -32,7 +32,7 @@
 
 #include <QObject>
 #include <QCoreApplication>
-#include <QtConcurrent>
+#include <QtConcurrentRun>
 #include <QFuture>
 #include <QFutureWatcher>
 #include <QIODevice>
diff --git a/src/playlist/playlistmanager.cpp b/src/playlist/playlistmanager.cpp
index 7dac0227f..0661497ef 100644
--- a/src/playlist/playlistmanager.cpp
+++ b/src/playlist/playlistmanager.cpp
@@ -26,7 +26,7 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QDialog>
-#include <QtConcurrent>
+#include <QtConcurrentRun>
 #include <QFuture>
 #include <QFutureWatcher>
 #include <QDir>
diff --git a/src/playlist/songloaderinserter.cpp b/src/playlist/songloaderinserter.cpp
index d657b8dc4..71f2f22e2 100644
--- a/src/playlist/songloaderinserter.cpp
+++ b/src/playlist/songloaderinserter.cpp
@@ -23,7 +23,7 @@
 
 #include <utility>
 
-#include <QtConcurrent>
+#include <QtConcurrentRun>
 #include <QtAlgorithms>
 #include <QList>
 #include <QUrl>