diff --git a/3rdparty/singleapplication/singleapplication_p.h b/3rdparty/singleapplication/singleapplication_p.h
index 4893e1e00..9ddb5f8f4 100644
--- a/3rdparty/singleapplication/singleapplication_p.h
+++ b/3rdparty/singleapplication/singleapplication_p.h
@@ -37,7 +37,7 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QString>
-#include <QMap>
+#include <QHash>
 
 #include "singleapplication.h"
 
@@ -100,7 +100,7 @@ class SingleApplicationPrivate : public QObject {
   quint32 instanceNumber_;
   QString blockServerName_;
   SingleApplication::Options options_;
-  QMap<QLocalSocket*, ConnectionInfo> connectionMap_;
+  QHash<QLocalSocket*, ConnectionInfo> connectionMap_;
 
  public slots:
   void slotConnectionEstablished();
diff --git a/3rdparty/singleapplication/singlecoreapplication_p.h b/3rdparty/singleapplication/singlecoreapplication_p.h
index cf3f7dd5f..9451826b1 100644
--- a/3rdparty/singleapplication/singlecoreapplication_p.h
+++ b/3rdparty/singleapplication/singlecoreapplication_p.h
@@ -37,7 +37,7 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QString>
-#include <QMap>
+#include <QHash>
 
 #include "singlecoreapplication.h"
 
@@ -100,7 +100,7 @@ class SingleCoreApplicationPrivate : public QObject {
   quint32 instanceNumber_;
   QString blockServerName_;
   SingleCoreApplication::Options options_;
-  QMap<QLocalSocket*, ConnectionInfo> connectionMap_;
+  QHash<QLocalSocket*, ConnectionInfo> connectionMap_;
 
  public slots:
   void slotConnectionEstablished();
diff --git a/src/collection/collectionfilterwidget.h b/src/collection/collectionfilterwidget.h
index 6fbfbd916..3595449ce 100644
--- a/src/collection/collectionfilterwidget.h
+++ b/src/collection/collectionfilterwidget.h
@@ -27,7 +27,7 @@
 
 #include <QWidget>
 #include <QObject>
-#include <QMap>
+#include <QHash>
 #include <QString>
 
 #include "collectionquery.h"
@@ -119,7 +119,7 @@ class CollectionFilterWidget : public QWidget {
   QMenu *group_by_menu_;
   QMenu *collection_menu_;
   QActionGroup *group_by_group_;
-  QMap<QAction*, int> filter_ages_;
+  QHash<QAction*, int> filter_ages_;
 
   QTimer *filter_delay_;
 
diff --git a/src/core/macsystemtrayicon.mm b/src/core/macsystemtrayicon.mm
index 919f2dee0..ca781dcf7 100644
--- a/src/core/macsystemtrayicon.mm
+++ b/src/core/macsystemtrayicon.mm
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <QApplication>
-#include <QMap>
+#include <QHash>
 #include <QString>
 #include <QUrl>
 #include <QIcon>
@@ -140,7 +140,7 @@ class MacSystemTrayIconPrivate {
     }
   }
 
-  QMap<QAction*, NSMenuItem*> actions_;
+  QHash<QAction*, NSMenuItem*> actions_;
 
   NSMenu *dock_menu_;
   NSMenuItem *now_playing_;
diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp
index 23f03873b..2e1349815 100644
--- a/src/core/mergedproxymodel.cpp
+++ b/src/core/mergedproxymodel.cpp
@@ -28,6 +28,7 @@
 #include <QMimeData>
 #include <QList>
 #include <QStringList>
+#include <QMap>
 #include <QtAlgorithms>
 #include <QAbstractItemModel>
 #include <QAbstractProxyModel>
diff --git a/src/core/mergedproxymodel.h b/src/core/mergedproxymodel.h
index 79c82497f..bdeed3447 100644
--- a/src/core/mergedproxymodel.h
+++ b/src/core/mergedproxymodel.h
@@ -31,6 +31,7 @@
 #include <QAbstractItemModel>
 #include <QAbstractProxyModel>
 #include <QMap>
+#include <QHash>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
@@ -106,10 +107,10 @@ class MergedProxyModel : public QAbstractProxyModel {
   void DeleteAllMappings();
   bool IsKnownModel(const QAbstractItemModel *model) const;
 
-  QMap<QAbstractItemModel*, QPersistentModelIndex> merge_points_;
+  QHash<QAbstractItemModel*, QPersistentModelIndex> merge_points_;
   QAbstractItemModel *resetting_model_;
 
-  QMap<QAbstractItemModel*, QModelIndex> old_merge_points_;
+  QHash<QAbstractItemModel*, QModelIndex> old_merge_points_;
 
   std::unique_ptr<MergedProxyModelPrivate> p_;
 };
diff --git a/src/core/networktimeouts.h b/src/core/networktimeouts.h
index 740cdeada..4ebd40ff1 100644
--- a/src/core/networktimeouts.h
+++ b/src/core/networktimeouts.h
@@ -25,7 +25,7 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QMap>
+#include <QHash>
 
 class QNetworkReply;
 class QTimerEvent;
@@ -47,7 +47,7 @@ class NetworkTimeouts : public QObject {
 
  private:
   int timeout_msec_;
-  QMap<QNetworkReply*, int> timers_;
+  QHash<QNetworkReply*, int> timers_;
 
 };
 
diff --git a/src/core/stylesheetloader.cpp b/src/core/stylesheetloader.cpp
index 1613b42db..41db9833b 100644
--- a/src/core/stylesheetloader.cpp
+++ b/src/core/stylesheetloader.cpp
@@ -26,6 +26,7 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QWidget>
+#include <QHash>
 #include <QTimer>
 #include <QIODevice>
 #include <QTextStream>
@@ -156,8 +157,8 @@ bool StyleSheetLoader::eventFilter(QObject *obj, QEvent *event) {
 
 void StyleSheetLoader::ResetCounters() {
 
-  for (QMap<QWidget*, StyleSheetData>::iterator i = styledata_.begin() ; i != styledata_.end() ; ++i) {
-    i.value().count_ = 0;
+  for (QHash<QWidget*, StyleSheetData>::iterator it = styledata_.begin(); it != styledata_.end(); ++it) {
+    it.value().count_ = 0;
   }
 
 }
diff --git a/src/core/stylesheetloader.h b/src/core/stylesheetloader.h
index cef673b9a..a6a702d6c 100644
--- a/src/core/stylesheetloader.h
+++ b/src/core/stylesheetloader.h
@@ -26,7 +26,7 @@
 
 #include <QObject>
 #include <QPair>
-#include <QMap>
+#include <QHash>
 #include <QPalette>
 #include <QString>
 
@@ -65,7 +65,7 @@ class StyleSheetLoader : public QObject {
   void ResetCounters();
 
  private:
-  QMap<QWidget*, StyleSheetData> styledata_;
+  QHash<QWidget*, StyleSheetData> styledata_;
   QTimer *timer_reset_counter_;
 };
 
diff --git a/src/covermanager/albumcoverfetchersearch.cpp b/src/covermanager/albumcoverfetchersearch.cpp
index 3a48235cd..813379ad9 100644
--- a/src/covermanager/albumcoverfetchersearch.cpp
+++ b/src/covermanager/albumcoverfetchersearch.cpp
@@ -30,6 +30,7 @@
 #include <QList>
 #include <QMap>
 #include <QMultiMap>
+#include <QHash>
 #include <QString>
 #include <QUrl>
 #include <QImage>
diff --git a/src/covermanager/albumcoverfetchersearch.h b/src/covermanager/albumcoverfetchersearch.h
index 8d8700fd1..e575ebf5d 100644
--- a/src/covermanager/albumcoverfetchersearch.h
+++ b/src/covermanager/albumcoverfetchersearch.h
@@ -29,6 +29,7 @@
 #include <QPair>
 #include <QMap>
 #include <QMultiMap>
+#include <QHash>
 #include <QByteArray>
 #include <QString>
 #include <QUrl>
@@ -102,7 +103,7 @@ class AlbumCoverFetcherSearch : public QObject {
   CoverProviderSearchResults results_;
 
   QMap<int, CoverProvider*> pending_requests_;
-  QMap<QNetworkReply*, CoverProviderSearchResult> pending_image_loads_;
+  QHash<QNetworkReply*, CoverProviderSearchResult> pending_image_loads_;
   NetworkTimeouts *image_load_timeout_;
 
   // QMap is sorted by key (score).
diff --git a/src/covermanager/albumcoverloader.h b/src/covermanager/albumcoverloader.h
index 983b7df3b..c175938ba 100644
--- a/src/covermanager/albumcoverloader.h
+++ b/src/covermanager/albumcoverloader.h
@@ -29,7 +29,7 @@
 #include <QMutex>
 #include <QPair>
 #include <QSet>
-#include <QMap>
+#include <QHash>
 #include <QMultiMap>
 #include <QQueue>
 #include <QByteArray>
@@ -150,7 +150,7 @@ class AlbumCoverLoader : public QObject {
   QMutex mutex_load_image_async_;
   QMutex mutex_save_image_async_;
   QQueue<Task> tasks_;
-  QMap<QNetworkReply*, Task> remote_tasks_;
+  QHash<QNetworkReply*, Task> remote_tasks_;
   quint64 load_image_async_id_;
   quint64 save_image_async_id_;
 
diff --git a/src/widgets/fancytabwidget.cpp b/src/widgets/fancytabwidget.cpp
index e37d8ee6c..320eb0c34 100644
--- a/src/widgets/fancytabwidget.cpp
+++ b/src/widgets/fancytabwidget.cpp
@@ -32,6 +32,7 @@
 #include <QTimer>
 #include <QList>
 #include <QMap>
+#include <QHash>
 #include <QVariant>
 #include <QString>
 #include <QIcon>
@@ -74,7 +75,7 @@ class FancyTabBar : public QTabBar {  // clazy:exclude=missing-qobject-macro
 
  private:
   int mouseHoverTabIndex = -1;
-  QMap<QWidget*, QString> labelCache;
+  QHash<QWidget*, QString> labelCache;
   QMap<int, QWidget*> spacers;
 
  public:
diff --git a/src/widgets/fancytabwidget.h b/src/widgets/fancytabwidget.h
index 4e4e999ab..cbacf0512 100644
--- a/src/widgets/fancytabwidget.h
+++ b/src/widgets/fancytabwidget.h
@@ -26,7 +26,7 @@
 
 #include <QObject>
 #include <QTabWidget>
-#include <QMap>
+#include <QHash>
 #include <QString>
 #include <QIcon>
 #include <QPixmap>
@@ -109,7 +109,7 @@ class FancyTabWidget : public QTabWidget {
   Mode mode_;
   QWidget *bottom_widget_;
 
-  QMap<QWidget*, TabData*> tabs_;
+  QHash<QWidget*, TabData*> tabs_;
 
   bool bg_color_system_;
   bool bg_gradient_;