diff --git a/src/dbus/metatypes.h b/src/dbus/metatypes.h
index db6cb624..f3e8d1db 100644
--- a/src/dbus/metatypes.h
+++ b/src/dbus/metatypes.h
@@ -2,13 +2,13 @@
 #define DBUS_METATYPES_H
 
 #include <QMetaType>
-#include <QList>
 #include <QByteArray>
+#include <QByteArrayList>
 #include <QMap>
 #include <QString>
 #include <QDBusObjectPath>
 
-Q_DECLARE_METATYPE(QList<QByteArray>)
+Q_DECLARE_METATYPE(QByteArrayList)
 
 using InterfacesAndProperties = QMap<QString, QVariantMap>;
 using ManagedObjectList = QMap<QDBusObjectPath, InterfacesAndProperties>;
diff --git a/src/internet/localredirectserver.cpp b/src/internet/localredirectserver.cpp
index ffe741c2..470fbd64 100644
--- a/src/internet/localredirectserver.cpp
+++ b/src/internet/localredirectserver.cpp
@@ -31,6 +31,7 @@
 #include <QFile>
 #include <QList>
 #include <QByteArray>
+#include <QByteArrayList>
 #include <QString>
 #include <QUrl>
 #include <QRegularExpression>
@@ -377,7 +378,7 @@ void LocalRedirectServer::WriteTemplate() const {
 
 QUrl LocalRedirectServer::ParseUrlFromRequest(const QByteArray &request) const {
 
-  QList<QByteArray> lines = request.split('\r');
+  const QByteArrayList lines = request.split('\r');
   const QByteArray &request_line = lines[0];
   QByteArray path = request_line.split(' ')[1];
   QUrl base_url = url_;
diff --git a/src/qobuz/qobuzrequest.cpp b/src/qobuz/qobuzrequest.cpp
index f68ec612..2b25c68f 100644
--- a/src/qobuz/qobuzrequest.cpp
+++ b/src/qobuz/qobuzrequest.cpp
@@ -20,7 +20,9 @@
 #include "config.h"
 
 #include <QObject>
+#include <QList>
 #include <QByteArray>
+#include <QByteArrayList>
 #include <QString>
 #include <QUrl>
 #include <QImage>
@@ -1349,7 +1351,7 @@ void QobuzRequest::AlbumCoverReceived(QNetworkReply *reply, const QUrl &cover_ur
     return;
   }
 
-  QList<QByteArray> format_list = ImageUtils::ImageFormatsForMimeType(mimetype.toUtf8());
+  QByteArrayList format_list = ImageUtils::ImageFormatsForMimeType(mimetype.toUtf8());
   char *format = nullptr;
   if (!format_list.isEmpty()) {
     format = format_list.first().data();
diff --git a/src/subsonic/subsonicrequest.cpp b/src/subsonic/subsonicrequest.cpp
index fc8efce0..7b6c66aa 100644
--- a/src/subsonic/subsonicrequest.cpp
+++ b/src/subsonic/subsonicrequest.cpp
@@ -23,6 +23,7 @@
 #include <QDir>
 #include <QMimeDatabase>
 #include <QByteArray>
+#include <QByteArrayList>
 #include <QString>
 #include <QUrl>
 #include <QUrlQuery>
@@ -818,7 +819,7 @@ void SubsonicRequest::AlbumCoverReceived(QNetworkReply *reply, const AlbumCoverR
     return;
   }
 
-  QList<QByteArray> format_list = ImageUtils::ImageFormatsForMimeType(mimetype.toUtf8());
+  QByteArrayList format_list = ImageUtils::ImageFormatsForMimeType(mimetype.toUtf8());
   char *format = nullptr;
   if (!format_list.isEmpty()) {
     format = format_list.first().data();
diff --git a/src/tidal/tidalrequest.cpp b/src/tidal/tidalrequest.cpp
index 24b7e637..98dc043d 100644
--- a/src/tidal/tidalrequest.cpp
+++ b/src/tidal/tidalrequest.cpp
@@ -20,7 +20,9 @@
 #include "config.h"
 
 #include <QObject>
+#include <QList>
 #include <QByteArray>
+#include <QByteArrayList>
 #include <QString>
 #include <QUrl>
 #include <QImage>
@@ -1291,7 +1293,7 @@ void TidalRequest::AlbumCoverReceived(QNetworkReply *reply, const QString &album
     return;
   }
 
-  QList<QByteArray> format_list = ImageUtils::ImageFormatsForMimeType(mimetype.toUtf8());
+  QByteArrayList format_list = ImageUtils::ImageFormatsForMimeType(mimetype.toUtf8());
   char *format = nullptr;
   if (!format_list.isEmpty()) {
     format = format_list.first().data();
diff --git a/src/utilities/imageutils.cpp b/src/utilities/imageutils.cpp
index 5ecd29d8..8a0b9a99 100644
--- a/src/utilities/imageutils.cpp
+++ b/src/utilities/imageutils.cpp
@@ -17,12 +17,12 @@
  *
  */
 
-#include <QList>
-#include <QBuffer>
 #include <QByteArray>
+#include <QByteArrayList>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
+#include <QBuffer>
 #include <QImage>
 #include <QImageReader>
 #include <QPixmap>
@@ -61,16 +61,16 @@ QStringList ImageUtils::SupportedImageFormats() {
 
 }
 
-QList<QByteArray> ImageUtils::ImageFormatsForMimeType(const QByteArray &mimetype) {
+QByteArrayList ImageUtils::ImageFormatsForMimeType(const QByteArray &mimetype) {
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
   return QImageReader::imageFormatsForMimeType(mimetype);
 #else
-  if (mimetype == "image/bmp") return QList<QByteArray>() << "BMP";
-  else if (mimetype == "image/gif") return QList<QByteArray>() << "GIF";
-  else if (mimetype == "image/jpeg") return QList<QByteArray>() << "JPG";
-  else if (mimetype == "image/png") return QList<QByteArray>() << "PNG";
-  else return QList<QByteArray>();
+  if (mimetype == "image/bmp") return QByteArrayList() << "BMP";
+  else if (mimetype == "image/gif") return QByteArrayList() << "GIF";
+  else if (mimetype == "image/jpeg") return QByteArrayList() << "JPG";
+  else if (mimetype == "image/png") return QByteArrayList() << "PNG";
+  else return QByteArrayList();
 #endif
 
 }
diff --git a/src/utilities/imageutils.h b/src/utilities/imageutils.h
index 29cb8400..0692eec8 100644
--- a/src/utilities/imageutils.h
+++ b/src/utilities/imageutils.h
@@ -20,8 +20,8 @@
 #ifndef IMAGEUTILS_H
 #define IMAGEUTILS_H
 
-#include <QList>
 #include <QByteArray>
+#include <QByteArrayList>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
@@ -37,7 +37,7 @@ class ImageUtils {
  public:
   static QStringList SupportedImageMimeTypes();
   static QStringList SupportedImageFormats();
-  static QList<QByteArray> ImageFormatsForMimeType(const QByteArray &mimetype);
+  static QByteArrayList ImageFormatsForMimeType(const QByteArray &mimetype);
   static QByteArray SaveImageToJpegData(const QImage &image = QImage());
   static QByteArray FileToJpegData(const QString &filename);
   static QPixmap TryLoadPixmap(const QUrl &automatic, const QUrl &manual, const QUrl &url = QUrl());