diff --git a/src/libs/advanceddockingsystem/advanceddockingsystem.qbs b/src/libs/advanceddockingsystem/advanceddockingsystem.qbs
index 9778f629492..751449cf15d 100644
--- a/src/libs/advanceddockingsystem/advanceddockingsystem.qbs
+++ b/src/libs/advanceddockingsystem/advanceddockingsystem.qbs
@@ -7,7 +7,7 @@ QtcLibrary {
     cpp.defines: base.concat("ADVANCEDDOCKINGSYSTEM_LIBRARY")
     cpp.includePaths: base.concat([".", linux.prefix])
 
-    Depends { name: "Qt"; submodules: ["widgets", "core", "gui"] }
+    Depends { name: "Qt"; submodules: ["widgets", "xml"] }
     Depends { name: "Utils" }
 
     Group {
@@ -31,6 +31,7 @@ QtcLibrary {
             "floatingdockcontainer.cpp", "floatingdockcontainer.h",
             "floatingdragpreview.cpp", "floatingdragpreview.h",
             "iconprovider.cpp", "iconprovider.h",
+            "workspace.cpp", "workspace.h",
             "workspacedialog.cpp", "workspacedialog.h",
             "workspacemodel.cpp", "workspacemodel.h",
             "workspaceview.cpp", "workspaceview.h",
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 3196d9b34b0..298b23c1e9f 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -337,7 +337,7 @@ Project {
             "headerviewstretcher.h",
             "uncommentselection.cpp",
             "uncommentselection.h",
-            "uniqueobjectptr.h"
+            "uniqueobjectptr.h",
             "unixutils.cpp",
             "unixutils.h",
             "url.cpp",
diff --git a/src/plugins/qmldesignerbase/qmldesignerbase.qbs b/src/plugins/qmldesignerbase/qmldesignerbase.qbs
index 937f180c32c..98f4cdf5562 100644
--- a/src/plugins/qmldesignerbase/qmldesignerbase.qbs
+++ b/src/plugins/qmldesignerbase/qmldesignerbase.qbs
@@ -16,14 +16,25 @@ QtcPlugin {
     ]
 
     Group {
-        prefix: "utils/"
+        prefix: "studio/"
         files: [
-            "designersettings.cpp",
-            "designersettings.h",
-            "qmlpuppetpaths.cpp",
-            "qmlpuppetpaths.h",
+            "studiosettingspage.cpp",
+            "studiosettingspage.h",
+            "studiostyle.cpp",
+            "studiostyle.h",
             "studioquickwidget.cpp",
             "studioquickwidget.h",
         ]
     }
+    Group {
+        prefix: "utils/"
+        files: [
+            "designerpaths.cpp",
+            "designerpaths.h",
+            "designersettings.cpp",
+            "designersettings.h",
+            "qmlpuppetpaths.cpp",
+            "qmlpuppetpaths.h",
+        ]
+    }
 }
diff --git a/src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp b/src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp
index c9af4f22836..c59fcbb2ea1 100644
--- a/src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp
+++ b/src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp
@@ -3,7 +3,7 @@
 
 #include "qmldesignerbaseplugin.h"
 
-#include "studiosettingspage.h"
+#include "studio/studiosettingspage.h"
 
 #include "studio/studiostyle.h"
 #include "utils/designersettings.h"
diff --git a/src/plugins/qmldesignerbase/studio/studiostyle.h b/src/plugins/qmldesignerbase/studio/studiostyle.h
index 4d6424cbef1..c55797354b3 100644
--- a/src/plugins/qmldesignerbase/studio/studiostyle.h
+++ b/src/plugins/qmldesignerbase/studio/studiostyle.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "qmldesignerbase_global.h"
+#include "../qmldesignerbase_global.h"
 
 #include <QProxyStyle>
 
diff --git a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
index 86645dc8c50..2b600210736 100644
--- a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
+++ b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "qmlbuildsystem.h"
-#include "qmlprojectconstants.h"
+#include "../qmlprojectconstants.h"
 
 #include <QtCore5Compat/qtextcodec.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
index e4e4d0bc247..2ab9417704e 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
@@ -26,7 +26,6 @@ QtcPlugin {
             "qmlprojectconstants.h",
             "qmlprojectmanager_global.h", "qmlprojectmanagertr.h",
             "qmlprojectmanagerconstants.h",
-            "qmlprojectnodes.cpp", "qmlprojectnodes.h",
             "qmlprojectplugin.cpp", "qmlprojectplugin.h",
             "qmlprojectrunconfiguration.cpp", "qmlprojectrunconfiguration.h",
             project.ide_source_tree + "/src/share/3rdparty/studiofonts/studiofonts.qrc"
diff --git a/tests/auto/qml/qml.qbs b/tests/auto/qml/qml.qbs
index 76659a5256b..9f887bfcacd 100644
--- a/tests/auto/qml/qml.qbs
+++ b/tests/auto/qml/qml.qbs
@@ -7,7 +7,7 @@ Project {
 //        "qmldesigner/qmldesigner.qbs",
         "qmleditor/qmleditor.qbs",
         "qmljssimplereader/qmljssimplereader.qbs",
-        "qmlprojectmanager/qmlprojectmanager.qbs",
+//        "qmlprojectmanager/qmlprojectmanager.qbs",
         "qrcparser/qrcparser.qbs",
         "reformatter/reformatter.qbs",
         "persistenttrie/persistenttrie.qbs"
diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
index 07ed3a924e6..7abe08bf40b 100644
--- a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
+++ b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
@@ -4,7 +4,7 @@ QtcAutotest {
     name: "QmlProjectManager file format autotest"
     Depends { name: "QmlJS" }
     Depends { name: "Utils" }
-    property path fileFormatDir: project.ide_source_tree + "/src/plugins/qmlprojectmanager/fileformat"
+    property path fileFormatDir: project.ide_source_tree + "/src/plugins/qmlprojectmanager/buildsystem/projectitem"
     files: "tst_fileformat.cpp"
     Group {
         name: "Files from QmlProjectManager"
@@ -12,8 +12,6 @@ QtcAutotest {
         files: [
             "filefilteritems.cpp",
             "filefilteritems.h",
-            "qmlprojectfileformat.cpp",
-            "qmlprojectfileformat.h",
             "qmlprojectitem.cpp",
             "qmlprojectitem.h",
         ]