diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp
index 396c3e274aa..11eb4b27162 100644
--- a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp
+++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp
@@ -7,6 +7,8 @@
 #include <qmldesignerplugin.h>
 #include <uniquename.h>
 
+#include <qmldesignerbase/settings/designersettings.h>
+
 #include <coreplugin/icore.h>
 
 #include <qmldesignerutils/asset.h>
diff --git a/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp b/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp
index 005e353be25..c6843b5b4f7 100644
--- a/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp
@@ -8,6 +8,8 @@
 #include <nodeabstractproperty.h>
 #include <toolbar.h>
 
+#include <qmldesignerbase/settings/designersettings.h>
+
 #include <coreplugin/documentmanager.h>
 #include <coreplugin/idocument.h>
 #include <coreplugin/imode.h>
diff --git a/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp b/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp
index 293e3838189..9694aa4802d 100644
--- a/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp
@@ -30,6 +30,8 @@
 #include <texteditorview.h>
 #include <textureeditorview.h>
 
+#include <qmldesignerbase/settings/designersettings.h>
+
 #include <coreplugin/icore.h>
 
 #include <sqlitedatabase.h>
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterialsmodel.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterialsmodel.cpp
index e407a851340..20635706cf4 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterialsmodel.cpp
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterialsmodel.cpp
@@ -15,6 +15,8 @@
 #include <bundleimporter.h>
 #include <qmldesignerplugin.h>
 
+#include <qmldesignerbase/settings/designersettings.h>
+
 #include <utils/algorithm.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp
index d7850a695c8..7e24114318c 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp
@@ -20,6 +20,8 @@
 #include <studioquickwidget.h>
 #include <theme.h>
 
+#include <qmldesignerbase/settings/designersettings.h>
+
 #include <coreplugin/icore.h>
 
 #include <qmldesignerutils/filedownloader.h>
diff --git a/src/plugins/qmldesigner/components/debugview/debugview.cpp b/src/plugins/qmldesigner/components/debugview/debugview.cpp
index 6635f06f376..059c203c8a6 100644
--- a/src/plugins/qmldesigner/components/debugview/debugview.cpp
+++ b/src/plugins/qmldesigner/components/debugview/debugview.cpp
@@ -6,6 +6,8 @@
 
 #include <qmldesignerplugin.h>
 
+#include <qmldesignerbase/settings/designersettings.h>
+
 #include <bindingproperty.h>
 #include <modelutils.h>
 #include <nodeabstractproperty.h>
diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dviewconfig.h b/src/plugins/qmldesigner/components/edit3d/edit3dviewconfig.h
index 33d40b332e7..1e53768957b 100644
--- a/src/plugins/qmldesigner/components/edit3d/edit3dviewconfig.h
+++ b/src/plugins/qmldesigner/components/edit3d/edit3dviewconfig.h
@@ -6,6 +6,8 @@
 #include <auxiliarydata.h>
 #include <qmldesignerplugin.h>
 
+#include <qmldesignerbase/settings/designersettings.h>
+
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
index 749701f508d..e2bac7f26da 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
@@ -29,6 +29,8 @@
 #  include <metainfo.h>
 #endif
 
+#include <qmldesignerbase/settings/designersettings.h>
+
 #include <utils/algorithm.h>
 #include <utils/environment.h>
 #include <utils/filesystemwatcher.h>
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
index 2fdd5416b71..48135109c11 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
@@ -14,6 +14,8 @@
 #include "qmlobjectnode.h"
 #include "qmltimeline.h"
 
+#include <qmldesignerbase/settings/designersettings.h>
+
 #include <coreplugin/messagebox.h>
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
index 24ab8337410..0c28e5503df 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
@@ -20,6 +20,8 @@
 
 #include <theme.h>
 
+#include <qmldesignerbase/settings/designersettings.h>
+
 #include <coreplugin/icore.h>
 #include <coreplugin/messagebox.h>
 #include <qmljs/qmljssimplereader.h>
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp
index 6a366b877a3..ea0f4ad8e40 100644
--- a/src/plugins/qmldesigner/designmodewidget.cpp
+++ b/src/plugins/qmldesigner/designmodewidget.cpp
@@ -21,6 +21,7 @@
 #include <coreplugin/modemanager.h>
 #include <qmldesigner/qmldesignerconstants.h>
 #include <qmldesignerbase/qmldesignerbaseplugin.h>
+#include <qmldesignerbase/settings/designersettings.h>
 
 #include <coreplugin/outputpane.h>
 #include <coreplugin/modemanager.h>
diff --git a/src/plugins/qmldesigner/documentwarningwidget.cpp b/src/plugins/qmldesigner/documentwarningwidget.cpp
index a1cc12d8254..cdd06b7bb28 100644
--- a/src/plugins/qmldesigner/documentwarningwidget.cpp
+++ b/src/plugins/qmldesigner/documentwarningwidget.cpp
@@ -8,6 +8,8 @@
 #include <utils/stylehelper.h>
 #include <utils/theme/theme.h>
 
+#include <qmldesignerbase/settings/designersettings.h>
+
 #include <QBoxLayout>
 #include <QCheckBox>
 #include <QEvent>
diff --git a/src/plugins/qmldesigner/instances/interactiveconnectionmanager.cpp b/src/plugins/qmldesigner/instances/interactiveconnectionmanager.cpp
index 2c3de8082a3..b6c045f763f 100644
--- a/src/plugins/qmldesigner/instances/interactiveconnectionmanager.cpp
+++ b/src/plugins/qmldesigner/instances/interactiveconnectionmanager.cpp
@@ -7,6 +7,8 @@
 
 #include <qmldesignerplugin.h>
 
+#include <qmldesignerbase/settings/designersettings.h>
+
 #include <coreplugin/messagebox.h>
 
 #include <QLocalSocket>
diff --git a/src/plugins/qmldesigner/openuiqmlfiledialog.cpp b/src/plugins/qmldesigner/openuiqmlfiledialog.cpp
index eacb81aa000..3c62c593c12 100644
--- a/src/plugins/qmldesigner/openuiqmlfiledialog.cpp
+++ b/src/plugins/qmldesigner/openuiqmlfiledialog.cpp
@@ -5,6 +5,8 @@
 
 #include <qmldesignerplugin.h>
 
+#include <qmldesignerbase/settings/designersettings.h>
+
 #include <utils/layoutbuilder.h>
 
 #include <QCheckBox>
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.h b/src/plugins/qmldesigner/qmldesignerplugin.h
index 797250766a9..7487420a1f8 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.h
+++ b/src/plugins/qmldesigner/qmldesignerplugin.h
@@ -12,7 +12,6 @@
 #include <extensionsystem/iplugin.h>
 
 #include <qmldesignerbase/qmldesignerbaseplugin.h>
-#include <qmldesignerbase/settings/designersettings.h>
 
 #include <QElapsedTimer>