diff --git a/src/plugins/coco/coco.qbs b/src/plugins/coco/coco.qbs
index abfe8e939f8..3e9f928f982 100644
--- a/src/plugins/coco/coco.qbs
+++ b/src/plugins/coco/coco.qbs
@@ -25,7 +25,6 @@ QtcPlugin {
         "cocobuild/cococmakesettings.h",
         "cocobuild/cocoprojectwidget.cpp",
         "cocobuild/cocoprojectwidget.h",
-        "cocobuild/cocoprojectwidget.ui",
         "cocobuild/cocoqmakesettings.cpp",
         "cocobuild/cocoqmakesettings.h",
         "cocobuild/modificationfile.cpp",
@@ -55,7 +54,6 @@ QtcPlugin {
         "settings/globalsettings.h",
         "settings/globalsettingspage.cpp",
         "settings/globalsettingspage.h",
-        "settings/globalsettingspage.ui",
     ]
 }
 
diff --git a/src/plugins/coco/cocobuild/buildsettings.cpp b/src/plugins/coco/cocobuild/buildsettings.cpp
index c905b6806d1..0a16087f47f 100644
--- a/src/plugins/coco/cocobuild/buildsettings.cpp
+++ b/src/plugins/coco/cocobuild/buildsettings.cpp
@@ -8,6 +8,7 @@
 #include "cocoqmakesettings.h"
 #include "modificationfile.h"
 
+#include <projectexplorer/buildsystem.h>
 #include <projectexplorer/target.h>
 #include <cmakeprojectmanager/cmakeprojectconstants.h>
 #include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>
diff --git a/src/plugins/coco/cocobuild/cmakemodificationfile.cpp b/src/plugins/coco/cocobuild/cmakemodificationfile.cpp
index 9813e92be0c..5becd809b88 100644
--- a/src/plugins/coco/cocobuild/cmakemodificationfile.cpp
+++ b/src/plugins/coco/cocobuild/cmakemodificationfile.cpp
@@ -3,7 +3,7 @@
 
 #include "cmakemodificationfile.h"
 
-#include "cocopluginconstants.h"
+#include "../cocopluginconstants.h"
 
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
diff --git a/src/plugins/coco/cocobuild/cocobuildstep.cpp b/src/plugins/coco/cocobuild/cocobuildstep.cpp
index 6a71157e7b6..31d61f615da 100644
--- a/src/plugins/coco/cocobuild/cocobuildstep.cpp
+++ b/src/plugins/coco/cocobuild/cocobuildstep.cpp
@@ -3,13 +3,12 @@
 
 #include "cocobuildstep.h"
 
-#include "cocopluginconstants.h"
-#include "cocotr.h"
+#include "../cocopluginconstants.h"
+#include "../cocotr.h"
+#include "../settings/cocoinstallation.h"
 
 #include <cmakeprojectmanager/cmakeprojectconstants.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <settings/cocoinstallation.h>
-#include <settings/globalsettingspage.h>
 #include <solutions/tasking/tasktree.h>
 #include <utils/layoutbuilder.h>
 #include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>
diff --git a/src/plugins/coco/cocobuild/cococmakesettings.cpp b/src/plugins/coco/cocobuild/cococmakesettings.cpp
index ceb3ec8012a..55cb8a19015 100644
--- a/src/plugins/coco/cocobuild/cococmakesettings.cpp
+++ b/src/plugins/coco/cocobuild/cococmakesettings.cpp
@@ -3,9 +3,9 @@
 
 #include "cococmakesettings.h"
 
-#include "cocobuild/cocoprojectwidget.h"
-#include "cocotr.h"
-#include "common.h"
+#include "../cocotr.h"
+#include "../common.h"
+#include "cocoprojectwidget.h"
 
 #include <cmakeprojectmanager/cmakebuildconfiguration.h>
 #include <cmakeprojectmanager/cmakebuildsystem.h>
diff --git a/src/plugins/coco/cocobuild/cococmakesettings.h b/src/plugins/coco/cocobuild/cococmakesettings.h
index 8535744b9f7..e641dc6098a 100644
--- a/src/plugins/coco/cocobuild/cococmakesettings.h
+++ b/src/plugins/coco/cocobuild/cococmakesettings.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "cocobuild/buildsettings.h"
-#include "cocobuild/cmakemodificationfile.h"
+#include "buildsettings.h"
+#include "cmakemodificationfile.h"
 
 #include <QObject>
 #include <QStringList>
diff --git a/src/plugins/coco/cocobuild/cocoprojectwidget.cpp b/src/plugins/coco/cocobuild/cocoprojectwidget.cpp
index 7cf55610eba..2a4d2f65c99 100644
--- a/src/plugins/coco/cocobuild/cocoprojectwidget.cpp
+++ b/src/plugins/coco/cocobuild/cocoprojectwidget.cpp
@@ -3,11 +3,11 @@
 
 #include "cocoprojectwidget.h"
 
+#include "../cocopluginconstants.h"
+#include "../cocotr.h"
+#include "../common.h"
+#include "../settings/globalsettingspage.h"
 #include "buildsettings.h"
-#include "cocopluginconstants.h"
-#include "cocotr.h"
-#include "common.h"
-#include "settings/globalsettingspage.h"
 
 #include <coreplugin/icore.h>
 #include <projectexplorer/buildsystem.h>
diff --git a/src/plugins/coco/cocobuild/cocoprojectwidget.h b/src/plugins/coco/cocobuild/cocoprojectwidget.h
index b7f2cf4e12c..454ad22432a 100644
--- a/src/plugins/coco/cocobuild/cocoprojectwidget.h
+++ b/src/plugins/coco/cocobuild/cocoprojectwidget.h
@@ -3,9 +3,10 @@
 
 #pragma once
 
+#include "../settings/cocoinstallation.h"
 #include "buildsettings.h"
-#include "projectexplorer/buildconfiguration.h"
-#include "settings/cocoinstallation.h"
+
+#include <projectexplorer/buildconfiguration.h>
 #include <utils/aspects.h>
 #include <utils/layoutbuilder.h>
 
diff --git a/src/plugins/coco/cocobuild/cocoqmakesettings.cpp b/src/plugins/coco/cocobuild/cocoqmakesettings.cpp
index c86b53ed2f7..b85763c5471 100644
--- a/src/plugins/coco/cocobuild/cocoqmakesettings.cpp
+++ b/src/plugins/coco/cocobuild/cocoqmakesettings.cpp
@@ -3,10 +3,10 @@
 
 #include "cocoqmakesettings.h"
 
-#include "cocobuild/cocoprojectwidget.h"
-#include "cocopluginconstants.h"
-#include "cocotr.h"
-#include "common.h"
+#include "../cocobuild/cocoprojectwidget.h"
+#include "../cocopluginconstants.h"
+#include "../cocotr.h"
+#include "../common.h"
 
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/project.h>
diff --git a/src/plugins/coco/cocobuild/cocoqmakesettings.h b/src/plugins/coco/cocobuild/cocoqmakesettings.h
index a081bb1e080..91dc8515982 100644
--- a/src/plugins/coco/cocobuild/cocoqmakesettings.h
+++ b/src/plugins/coco/cocobuild/cocoqmakesettings.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
+#include "../settings/cocoinstallation.h"
 #include "buildsettings.h"
 #include "qmakefeaturefile.h"
-#include "settings/cocoinstallation.h"
 
 #include <utils/commandline.h>
 #include <utils/environment.h>
diff --git a/src/plugins/coco/cocobuild/qmakefeaturefile.cpp b/src/plugins/coco/cocobuild/qmakefeaturefile.cpp
index 897cbaefa7b..b02f545370b 100644
--- a/src/plugins/coco/cocobuild/qmakefeaturefile.cpp
+++ b/src/plugins/coco/cocobuild/qmakefeaturefile.cpp
@@ -3,7 +3,7 @@
 
 #include "qmakefeaturefile.h"
 
-#include "cocopluginconstants.h"
+#include "../cocopluginconstants.h"
 
 #include <QFile>
 #include <QRegularExpression>
@@ -14,12 +14,6 @@ namespace Coco::Internal {
 static const char assignment[] = "COVERAGE_OPTIONS = \\\n";
 static const char tweaksLine[] = "# User-supplied settings follow here:\n";
 
-static void cutTail(QStringList &list)
-{
-    while (!list.isEmpty() && list.last().trimmed().isEmpty())
-        list.removeLast();
-}
-
 QMakeFeatureFile::QMakeFeatureFile() {}
 
 QString QMakeFeatureFile::fileName() const
diff --git a/src/plugins/coco/settings/cocoinstallation.cpp b/src/plugins/coco/settings/cocoinstallation.cpp
index 77d466eed3e..fa95eafe2fd 100644
--- a/src/plugins/coco/settings/cocoinstallation.cpp
+++ b/src/plugins/coco/settings/cocoinstallation.cpp
@@ -3,8 +3,8 @@
 
 #include "cocoinstallation.h"
 
-#include "cocotr.h"
-#include "common.h"
+#include "../cocotr.h"
+#include "../common.h"
 #include "globalsettings.h"
 
 #include <utils/fileutils.h>
diff --git a/src/plugins/coco/settings/cocoprojectsettingswidget.cpp b/src/plugins/coco/settings/cocoprojectsettingswidget.cpp
index 8e6f10cc5ec..880d3a823f3 100644
--- a/src/plugins/coco/settings/cocoprojectsettingswidget.cpp
+++ b/src/plugins/coco/settings/cocoprojectsettingswidget.cpp
@@ -3,8 +3,8 @@
 
 #include "cocoprojectsettingswidget.h"
 
-#include "cocobuild/cocoprojectwidget.h"
-#include "cocopluginconstants.h"
+#include "../cocobuild/cocoprojectwidget.h"
+#include "../cocopluginconstants.h"
 
 #include <cmakeprojectmanager/cmakeprojectconstants.h>
 #include <projectexplorer/buildconfiguration.h>
diff --git a/src/plugins/coco/settings/globalsettings.cpp b/src/plugins/coco/settings/globalsettings.cpp
index 594355964ee..89129b7c2a0 100644
--- a/src/plugins/coco/settings/globalsettings.cpp
+++ b/src/plugins/coco/settings/globalsettings.cpp
@@ -3,8 +3,8 @@
 
 #include "globalsettings.h"
 
+#include "../cocopluginconstants.h"
 #include "cocoinstallation.h"
-#include "cocopluginconstants.h"
 
 #include <coreplugin/icore.h>
 #include <utils/filepath.h>
diff --git a/src/plugins/coco/settings/globalsettingspage.cpp b/src/plugins/coco/settings/globalsettingspage.cpp
index b4eda76d0ba..f8f6bb4748b 100644
--- a/src/plugins/coco/settings/globalsettingspage.cpp
+++ b/src/plugins/coco/settings/globalsettingspage.cpp
@@ -3,9 +3,9 @@
 
 #include "globalsettingspage.h"
 
+#include "../cocopluginconstants.h"
+#include "../cocotr.h"
 #include "cocoinstallation.h"
-#include "cocopluginconstants.h"
-#include "cocotr.h"
 #include "globalsettings.h"
 
 #include <utils/fancylineedit.h>