diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp
index c3f79374cba..a06c060dd16 100644
--- a/src/libs/utils/fancymainwindow.cpp
+++ b/src/libs/utils/fancymainwindow.cpp
@@ -563,23 +563,23 @@ void FancyMainWindow::handleVisibilityChanged(bool visible)
 
 void FancyMainWindow::saveSettings(QtcSettings *settings) const
 {
-    const QHash<Key, QVariant> hash = saveSettings();
+    const Store hash = saveSettings();
     for (auto it = hash.cbegin(), end = hash.cend(); it != end; ++it)
         settings->setValue(it.key(), it.value());
 }
 
 void FancyMainWindow::restoreSettings(const QtcSettings *settings)
 {
-    QHash<Key, QVariant> hash;
+    Store hash;
     const KeyList childKeys = settings->childKeys();
     for (const Key &key : childKeys)
         hash.insert(key, settings->value(key));
     restoreSettings(hash);
 }
 
-QHash<Key, QVariant> FancyMainWindow::saveSettings() const
+Store FancyMainWindow::saveSettings() const
 {
-    QHash<Key, QVariant> settings;
+    Store settings;
     settings.insert(StateKey, saveState(settingsVersion));
     settings.insert(ShowCentralWidgetKey, d->m_showCentralWidget.isChecked());
     for (QDockWidget *dockWidget : dockWidgets()) {
@@ -590,7 +590,7 @@ QHash<Key, QVariant> FancyMainWindow::saveSettings() const
     return settings;
 }
 
-void FancyMainWindow::restoreSettings(const QHash<Key, QVariant> &settings)
+void FancyMainWindow::restoreSettings(const Store &settings)
 {
     QByteArray ba = settings.value(StateKey, QByteArray()).toByteArray();
     if (!ba.isEmpty()) {
diff --git a/src/libs/utils/fancymainwindow.h b/src/libs/utils/fancymainwindow.h
index 3762b7b6e5e..8967affb749 100644
--- a/src/libs/utils/fancymainwindow.h
+++ b/src/libs/utils/fancymainwindow.h
@@ -5,7 +5,7 @@
 
 #include "utils_global.h"
 
-#include "storekey.h"
+#include "store.h"
 
 #include <QMainWindow>
 
@@ -32,8 +32,8 @@ public:
 
     void saveSettings(QtcSettings *settings) const;
     void restoreSettings(const QtcSettings *settings);
-    QHash<Key, QVariant> saveSettings() const;
-    void restoreSettings(const QHash<Key, QVariant> &settings);
+    Store saveSettings() const;
+    void restoreSettings(const Store &settings);
     bool restoreFancyState(const QByteArray &state, int version = 0);
 
     // Additional context menu actions
diff --git a/src/plugins/compilerexplorer/compilerexplorereditor.cpp b/src/plugins/compilerexplorer/compilerexplorereditor.cpp
index 5f8f218ab5e..e91725bd8c7 100644
--- a/src/plugins/compilerexplorer/compilerexplorereditor.cpp
+++ b/src/plugins/compilerexplorer/compilerexplorereditor.cpp
@@ -672,7 +672,7 @@ void EditorWidget::recreateEditors()
     Store windowState = m_document->settings()->windowState.value();
 
     if (!windowState.isEmpty()) {
-        QHash<Key, QVariant> hashMap;
+        Store hashMap;
         for (const auto &key : windowState.keys()) {
             if (key.view() != "State")
                 hashMap.insert(key, windowState.value(key));