diff --git a/src/libs/solutions/tasking/barrier.cpp b/src/libs/solutions/tasking/barrier.cpp
index e160dbac769..74c11f50de5 100644
--- a/src/libs/solutions/tasking/barrier.cpp
+++ b/src/libs/solutions/tasking/barrier.cpp
@@ -6,23 +6,20 @@
 namespace Tasking {
 
 // That's cut down qtcassert.{c,h} to avoid the dependency.
-#define QTC_STRINGIFY_HELPER(x) #x
-#define QTC_STRINGIFY(x) QTC_STRINGIFY_HELPER(x)
-#define QTC_STRING(cond) qDebug("SOFT ASSERT: \"%s\" in %s: %s", cond,  __FILE__, QTC_STRINGIFY(__LINE__))
-#define QTC_ASSERT(cond, action) if (Q_LIKELY(cond)) {} else { QTC_STRING(#cond); action; } do {} while (0)
-#define QTC_CHECK(cond) if (cond) {} else { QTC_STRING(#cond); } do {} while (0)
+#define QT_STRING(cond) qDebug("SOFT ASSERT: \"%s\" in %s: %s", cond,  __FILE__, QT_STRINGIFY(__LINE__))
+#define QT_ASSERT(cond, action) if (Q_LIKELY(cond)) {} else { QT_STRING(#cond); action; } do {} while (0)
 
 void Barrier::setLimit(int value)
 {
-    QTC_ASSERT(!isRunning(), return);
-    QTC_ASSERT(value > 0, return);
+    QT_ASSERT(!isRunning(), return);
+    QT_ASSERT(value > 0, return);
 
     m_limit = value;
 }
 
 void Barrier::start()
 {
-    QTC_ASSERT(!isRunning(), return);
+    QT_ASSERT(!isRunning(), return);
     m_current = 0;
     m_result = {};
 }
@@ -30,7 +27,7 @@ void Barrier::start()
 void Barrier::advance()
 {
     // Calling advance on finished is OK
-    QTC_ASSERT(isRunning() || m_result, return);
+    QT_ASSERT(isRunning() || m_result, return);
     if (!isRunning()) // no-op
         return;
     ++m_current;
@@ -41,7 +38,7 @@ void Barrier::advance()
 void Barrier::stopWithResult(DoneResult result)
 {
     // Calling stopWithResult on finished is OK when the same success is passed
-    QTC_ASSERT(isRunning() || (m_result && *m_result == result), return);
+    QT_ASSERT(isRunning() || (m_result && *m_result == result), return);
     if (!isRunning()) // no-op
         return;
     m_current = -1;
diff --git a/src/libs/solutions/tasking/barrier.h b/src/libs/solutions/tasking/barrier.h
index a9ed9949f06..88ef5f9a96e 100644
--- a/src/libs/solutions/tasking/barrier.h
+++ b/src/libs/solutions/tasking/barrier.h
@@ -25,7 +25,7 @@ public:
     int current() const { return m_current; }
     std::optional<DoneResult> result() const { return m_result; }
 
-signals:
+Q_SIGNALS:
     void done(DoneResult success);
 
 private:
diff --git a/src/libs/solutions/tasking/concurrentcall.h b/src/libs/solutions/tasking/concurrentcall.h
index 6bd44601318..a3721fca0cf 100644
--- a/src/libs/solutions/tasking/concurrentcall.h
+++ b/src/libs/solutions/tasking/concurrentcall.h
@@ -5,7 +5,7 @@
 
 #include "tasktree.h"
 
-#include <QtConcurrent>
+#include <QtConcurrent/QtConcurrent>
 
 namespace Tasking {
 
@@ -76,7 +76,7 @@ public:
         }
     }
 
-    void start() {
+    void start() final {
         if (!this->task()->m_startHandler) {
             emit this->done(DoneResult::Error); // TODO: Add runtime assert
             return;
diff --git a/src/libs/solutions/tasking/networkquery.cpp b/src/libs/solutions/tasking/networkquery.cpp
index 335f79afd94..c3de4455eb6 100644
--- a/src/libs/solutions/tasking/networkquery.cpp
+++ b/src/libs/solutions/tasking/networkquery.cpp
@@ -3,7 +3,7 @@
 
 #include "networkquery.h"
 
-#include <QNetworkAccessManager>
+#include <QtNetwork/QNetworkAccessManager>
 
 namespace Tasking {
 
diff --git a/src/libs/solutions/tasking/networkquery.h b/src/libs/solutions/tasking/networkquery.h
index dd099dc7a88..b8ad13bdfae 100644
--- a/src/libs/solutions/tasking/networkquery.h
+++ b/src/libs/solutions/tasking/networkquery.h
@@ -7,8 +7,8 @@
 
 #include "tasktree.h"
 
-#include <QNetworkReply>
-#include <QNetworkRequest>
+#include <QtNetwork/QNetworkReply>
+#include <QtNetwork/QNetworkRequest>
 
 #include <memory>
 
@@ -37,7 +37,7 @@ public:
     QNetworkReply *reply() const { return m_reply.get(); }
     void start();
 
-signals:
+Q_SIGNALS:
     void started();
     void done(DoneResult result);
 
diff --git a/src/libs/solutions/tasking/qprocesstask.cpp b/src/libs/solutions/tasking/qprocesstask.cpp
index 7d63e658478..70f9cc2ad8e 100644
--- a/src/libs/solutions/tasking/qprocesstask.cpp
+++ b/src/libs/solutions/tasking/qprocesstask.cpp
@@ -3,12 +3,12 @@
 
 #include "qprocesstask.h"
 
-#include <QCoreApplication>
-#include <QDebug>
-#include <QMutex>
-#include <QThread>
-#include <QTimer>
-#include <QWaitCondition>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+#include <QtCore/QMutex>
+#include <QtCore/QThread>
+#include <QtCore/QTimer>
+#include <QtCore/QWaitCondition>
 
 namespace Tasking {
 
@@ -60,7 +60,7 @@ public:
         terminate();
     }
 
-signals:
+Q_SIGNALS:
     void finished();
 
 private:
diff --git a/src/libs/solutions/tasking/qprocesstask.h b/src/libs/solutions/tasking/qprocesstask.h
index cc0b83698b8..fb71d159aab 100644
--- a/src/libs/solutions/tasking/qprocesstask.h
+++ b/src/libs/solutions/tasking/qprocesstask.h
@@ -7,7 +7,7 @@
 
 #include "tasktree.h"
 
-#include <QProcess>
+#include <QtCore/QProcess>
 
 namespace Tasking {
 
@@ -45,17 +45,17 @@ public:
 class TASKING_EXPORT QProcessAdapter : public TaskAdapter<QProcess, QProcessDeleter>
 {
 private:
-    void start() override {
+    void start() final {
         connect(task(), &QProcess::finished, this, [this] {
             const bool success = task()->exitStatus() == QProcess::NormalExit
                                  && task()->error() == QProcess::UnknownError
                                  && task()->exitCode() == 0;
-            emit done(toDoneResult(success));
+            Q_EMIT done(toDoneResult(success));
         });
         connect(task(), &QProcess::errorOccurred, this, [this](QProcess::ProcessError error) {
             if (error != QProcess::FailedToStart)
                 return;
-            emit done(DoneResult::Error);
+            Q_EMIT done(DoneResult::Error);
         });
         task()->start();
     }
diff --git a/src/libs/solutions/tasking/tasking_global.h b/src/libs/solutions/tasking/tasking_global.h
index d7e76fa9e6f..9d9e183b9a3 100644
--- a/src/libs/solutions/tasking/tasking_global.h
+++ b/src/libs/solutions/tasking/tasking_global.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <qglobal.h>
+#include <QtCore/qglobal.h>
 
 #if defined(TASKING_LIBRARY)
 #  define TASKING_EXPORT Q_DECL_EXPORT
diff --git a/src/libs/solutions/tasking/tasktree.cpp b/src/libs/solutions/tasking/tasktree.cpp
index 107559d6a53..c5a6ed6a70e 100644
--- a/src/libs/solutions/tasking/tasktree.cpp
+++ b/src/libs/solutions/tasking/tasktree.cpp
@@ -5,17 +5,17 @@
 
 #include "barrier.h"
 
-#include <QDebug>
-#include <QEventLoop>
-#include <QFutureWatcher>
-#include <QHash>
-#include <QMetaEnum>
-#include <QMutex>
-#include <QPromise>
-#include <QPointer>
-#include <QSet>
-#include <QTime>
-#include <QTimer>
+#include <QtCore/QDebug>
+#include <QtCore/QEventLoop>
+#include <QtCore/QFutureWatcher>
+#include <QtCore/QHash>
+#include <QtCore/QMetaEnum>
+#include <QtCore/QMutex>
+#include <QtCore/QPointer>
+#include <QtCore/QPromise>
+#include <QtCore/QSet>
+#include <QtCore/QTime>
+#include <QtCore/QTimer>
 
 using namespace std::chrono;
 
@@ -1461,7 +1461,7 @@ static QString currentTime() { return QTime::currentTime().toString(Qt::ISODateW
 ExecutableItem ExecutableItem::withLog(const QString &logName) const
 {
     const auto header = [logName] {
-        return QString("TASK TREE LOG [%1] \"%2\"").arg(currentTime(), logName);
+        return QString::fromLatin1("TASK TREE LOG [%1] \"%2\"").arg(currentTime(), logName);
     };
     struct LogStorage
     {
@@ -1482,8 +1482,8 @@ ExecutableItem ExecutableItem::withLog(const QString &logName) const
             const int asyncCountDiff = activeTaskTree()->asyncCount() - storage->asyncCount;
             QT_CHECK(asyncCountDiff >= 0);
             const QMetaEnum doneWithEnum = QMetaEnum::fromType<DoneWith>();
-            const QString syncType = asyncCountDiff ? QString("asynchronously")
-                                                    : QString("synchronously");
+            const QString syncType = asyncCountDiff ? QString::fromLatin1("asynchronously")
+                                                    : QString::fromLatin1("synchronously");
             qDebug().noquote().nospace() << header() << " finished " << syncType << " with "
                 << doneWithEnum.valueToKey(int(result)) << " within " << elapsed.count() << "ms.";
         })
diff --git a/src/libs/solutions/tasking/tasktree.h b/src/libs/solutions/tasking/tasktree.h
index 9b1e4b9eafd..06a3d4ea79c 100644
--- a/src/libs/solutions/tasking/tasktree.h
+++ b/src/libs/solutions/tasking/tasktree.h
@@ -5,8 +5,8 @@
 
 #include "tasking_global.h"
 
-#include <QObject>
-#include <QList>
+#include <QtCore/QList>
+#include <QtCore/QObject>
 
 #include <memory>
 
@@ -84,7 +84,7 @@ class TASKING_EXPORT TaskInterface : public QObject
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void done(DoneResult result);
 
 private:
@@ -345,7 +345,7 @@ private:
             std::invoke(handler);
             return SetupResult::Continue;
         };
-    };
+    }
     template <typename Handler>
     static GroupDoneHandler wrapGroupDone(Handler &&handler)
     {
@@ -368,7 +368,7 @@ private:
                 std::invoke(handler);
             return result == DoneWith::Success ? DoneResult::Success : DoneResult::Error;
         };
-    };
+    }
 };
 
 template <typename Handler>
@@ -433,7 +433,7 @@ private:
             std::invoke(handler);
             return SetupResult::StopWithSuccess;
         };
-    };
+    }
 };
 
 template <typename Task, typename Deleter = std::default_delete<Task>>
@@ -490,7 +490,7 @@ private:
             std::invoke(handler, *adapter.task());
             return SetupResult::Continue;
         };
-    };
+    }
 
     template <typename Handler>
     static InterfaceDoneHandler wrapDone(Handler &&handler) {
@@ -529,7 +529,7 @@ private:
                 std::invoke(handler);
             return result == DoneWith::Success ? DoneResult::Success : DoneResult::Error;
         };
-    };
+    }
 };
 
 class TASKING_EXPORT TaskTree final : public QObject
@@ -579,7 +579,7 @@ public:
                             wrapHandler<const StorageStruct>(std::forward<Handler>(handler)));
     }
 
-signals:
+Q_SIGNALS:
     void started();
     void done(DoneWith result);
     void asyncCountChanged(int count);
diff --git a/src/libs/solutions/tasking/tasktreerunner.h b/src/libs/solutions/tasking/tasktreerunner.h
index 92d9f9c0b45..766ea074f50 100644
--- a/src/libs/solutions/tasking/tasktreerunner.h
+++ b/src/libs/solutions/tasking/tasktreerunner.h
@@ -6,7 +6,7 @@
 #include "tasking_global.h"
 #include "tasktree.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace Tasking {
 
@@ -33,7 +33,7 @@ public:
     // No done() signal is emitted.
     void reset();
 
-signals:
+Q_SIGNALS:
     void aboutToStart(TaskTree *taskTree);
     void done(DoneWith result);