Fix include style to what's mandated for public headers

This fixes errors for the developer-build.

Task-number: QTBUG-109337
Change-Id: I145e5eb5074f6e8b03e3304f58f0dd57ee1dfe95
Reviewed-by: Zoltan Gera <zoltan.gera@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Robert Griebl <robert.griebl@qt.io>

84 files changed, 275 insertions, 275 deletions

diff --git a/src/application-lib/applicationinfo.h b/src/application-lib/applicationinfo.h
index b962ec77..8edd8e66 100644
--- a/src/application-lib/applicationinfo.h
+++ b/src/application-lib/applicationinfo.h
@@ -5,12 +5,12 @@
 
 #pragma once
 
-#include <QDir>
-#include <QMap>
-#include <QString>
-#include <QStringList>
-#include <QVariantMap>
-#include <QVector>
+#include <QtCore/QDir>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariantMap>
+#include <QtCore/QVector>
 
 #include <QtAppManCommon/global.h>
 
diff --git a/src/application-lib/applicationinterface.h b/src/application-lib/applicationinterface.h
index 568fb58b..9f580b29 100644
--- a/src/application-lib/applicationinterface.h
+++ b/src/application-lib/applicationinterface.h
@@ -5,9 +5,9 @@
 
 #pragma once
 
-#include <QObject>
-#include <QUrl>
-#include <QVariantMap>
+#include <QtCore/QObject>
+#include <QtCore/QUrl>
+#include <QtCore/QVariantMap>
 #include <QtAppManCommon/global.h>
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/application-lib/installationreport.h b/src/application-lib/installationreport.h
index 43338ddb..0875fc40 100644
--- a/src/application-lib/installationreport.h
+++ b/src/application-lib/installationreport.h
@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include <QString>
-#include <QStringList>
-#include <QByteArray>
-#include <QVariantMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QByteArray>
+#include <QtCore/QVariantMap>
 #include <QtAppManCommon/global.h>
 
 QT_FORWARD_DECLARE_CLASS(QIODevice)
diff --git a/src/application-lib/intentinfo.h b/src/application-lib/intentinfo.h
index 94b9d2b7..66c30551 100644
--- a/src/application-lib/intentinfo.h
+++ b/src/application-lib/intentinfo.h
@@ -4,11 +4,11 @@
 
 #pragma once
 
-#include <QMap>
-#include <QString>
-#include <QStringList>
-#include <QVariantMap>
-#include <QVector>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariantMap>
+#include <QtCore/QVector>
 
 #include <QtAppManCommon/global.h>
 
diff --git a/src/application-lib/packagedatabase.h b/src/application-lib/packagedatabase.h
index c5fec41e..b09b6862 100644
--- a/src/application-lib/packagedatabase.h
+++ b/src/application-lib/packagedatabase.h
@@ -5,8 +5,8 @@
 #pragma once
 
 #include <QtAppManCommon/global.h>
-#include <QVector>
-#include <QString>
+#include <QtCore/QVector>
+#include <QtCore/QString>
 
 #include <QtAppManApplication/packageinfo.h>
 
diff --git a/src/application-lib/packageinfo.h b/src/application-lib/packageinfo.h
index 761f3ba8..739d96e2 100644
--- a/src/application-lib/packageinfo.h
+++ b/src/application-lib/packageinfo.h
@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include <QDir>
-#include <QMap>
-#include <QString>
-#include <QStringList>
-#include <QVariantMap>
-#include <QVector>
+#include <QtCore/QDir>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariantMap>
+#include <QtCore/QVector>
 
 #include <memory>
 
diff --git a/src/application-lib/yamlpackagescanner.h b/src/application-lib/yamlpackagescanner.h
index 2d137b6a..a47ddc53 100644
--- a/src/application-lib/yamlpackagescanner.h
+++ b/src/application-lib/yamlpackagescanner.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <QIODevice>
+#include <QtCore/QIODevice>
 #include <QtAppManApplication/packagescanner.h>
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/common-lib/configcache.h b/src/common-lib/configcache.h
index 1934b959..9e535c73 100644
--- a/src/common-lib/configcache.h
+++ b/src/common-lib/configcache.h
@@ -6,11 +6,11 @@
 
 #include <functional>
 
-#include <QPair>
-#include <QVector>
-#include <QStringList>
-#include <QVariant>
-#include <QIODevice>
+#include <QtCore/QPair>
+#include <QtCore/QVector>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+#include <QtCore/QIODevice>
 #include <QtAppManCommon/global.h>
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/common-lib/crashhandler.h b/src/common-lib/crashhandler.h
index 71dd881c..9f5dcb0f 100644
--- a/src/common-lib/crashhandler.h
+++ b/src/common-lib/crashhandler.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #include <QtAppManCommon/global.h>
-#include <QVariantMap>
+#include <QtCore/QVariantMap>
 
 QT_FORWARD_DECLARE_CLASS(QQmlEngine)
 
diff --git a/src/common-lib/dbus-utilities.h b/src/common-lib/dbus-utilities.h
index 2373f2eb..a4cad0ab 100644
--- a/src/common-lib/dbus-utilities.h
+++ b/src/common-lib/dbus-utilities.h
@@ -6,10 +6,10 @@
 #pragma once
 
 #include <QtAppManCommon/global.h>
-#include <QVariant>
+#include <QtCore/QVariant>
 
 #if defined(QT_DBUS_LIB)
-#  include <QDBusUnixFileDescriptor>
+#  include <QtDBus/QDBusUnixFileDescriptor>
 
 QT_BEGIN_NAMESPACE_AM
 typedef QMap<QString, QDBusUnixFileDescriptor> UnixFdMap;
diff --git a/src/common-lib/error.h b/src/common-lib/error.h
index 4d404b87..3b334d3a 100644
--- a/src/common-lib/error.h
+++ b/src/common-lib/error.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <QDebug>
+#include <QtCore/QDebug>
 #include <QtAppManCommon/global.h>
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/common-lib/exception.h b/src/common-lib/exception.h
index ecb9b7a1..bc952e9e 100644
--- a/src/common-lib/exception.h
+++ b/src/common-lib/exception.h
@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include <QString>
-#include <QDir>
-#include <QByteArray>
-#include <QException>
+#include <QtCore/QString>
+#include <QtCore/QDir>
+#include <QtCore/QByteArray>
+#include <QtCore/QException>
 
 #include <exception>
 #include <QtAppManCommon/error.h>
diff --git a/src/common-lib/filesystemmountwatcher.h b/src/common-lib/filesystemmountwatcher.h
index d310d1bb..b574363e 100644
--- a/src/common-lib/filesystemmountwatcher.h
+++ b/src/common-lib/filesystemmountwatcher.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QMultiMap>
+#include <QtCore/QObject>
+#include <QtCore/QMultiMap>
 #include <QtAppManCommon/global.h>
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/common-lib/logging.h b/src/common-lib/logging.h
index 807c3572..079d5713 100644
--- a/src/common-lib/logging.h
+++ b/src/common-lib/logging.h
@@ -6,8 +6,8 @@
 #pragma once
 
 #include <QtAppManCommon/global.h>
-#include <QLoggingCategory>
-#include <QMutex>
+#include <QtCore/QLoggingCategory>
+#include <QtCore/QMutex>
 
 QT_BEGIN_NAMESPACE_AM
 
diff --git a/src/common-lib/qml-utilities.h b/src/common-lib/qml-utilities.h
index 5626b65c..170073db 100644
--- a/src/common-lib/qml-utilities.h
+++ b/src/common-lib/qml-utilities.h
@@ -6,8 +6,8 @@
 #pragma once
 
 #include <QtAppManCommon/global.h>
-#include <QQmlEngine>
-#include <qqml.h>
+#include <QtQml/QQmlEngine>
+#include <QtQml/qqml.h>
 
 QT_BEGIN_NAMESPACE_AM
 
diff --git a/src/common-lib/qtyaml.h b/src/common-lib/qtyaml.h
index 03f8d389..85895256 100644
--- a/src/common-lib/qtyaml.h
+++ b/src/common-lib/qtyaml.h
@@ -8,11 +8,11 @@
 #include <functional>
 #include <vector>
 
-#include <QJsonParseError>
-#include <QVector>
-#include <QByteArray>
-#include <QString>
-#include <QVariant>
+#include <QtCore/QJsonParseError>
+#include <QtCore/QVector>
+#include <QtCore/QByteArray>
+#include <QtCore/QString>
+#include <QtCore/QVariant>
 #include <QtAppManCommon/global.h>
 #include <QtAppManCommon/exception.h>
 
diff --git a/src/common-lib/startuptimer.h b/src/common-lib/startuptimer.h
index b0e0bd8d..3ca3d2d0 100644
--- a/src/common-lib/startuptimer.h
+++ b/src/common-lib/startuptimer.h
@@ -5,11 +5,11 @@
 
 #pragma once
 
-#include <QObject>
-#include <QVector>
-#include <QPair>
-#include <QByteArray>
-#include <QElapsedTimer>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
+#include <QtCore/QPair>
+#include <QtCore/QByteArray>
+#include <QtCore/QElapsedTimer>
 #include <QtAppManCommon/global.h>
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/common-lib/unixsignalhandler.h b/src/common-lib/unixsignalhandler.h
index ed9caaa1..94d36f7f 100644
--- a/src/common-lib/unixsignalhandler.h
+++ b/src/common-lib/unixsignalhandler.h
@@ -6,8 +6,8 @@
 #pragma once
 
 #include <QtAppManCommon/global.h>
-#include <QObject>
-#include <QAtomicInteger>
+#include <QtCore/QObject>
+#include <QtCore/QAtomicInteger>
 
 #include <initializer_list>
 #include <list>
@@ -18,8 +18,8 @@
 #if defined(Q_OS_UNIX)
 #  include <unistd.h>
 #elif defined(Q_OS_WIN)
-#  include <QMutex>
-#  include <QWinEventNotifier>
+#  include <QtCore/QMutex>
+#  include <QtCore/QWinEventNotifier>
 #endif
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/common-lib/utilities.h b/src/common-lib/utilities.h
index c871f863..ed52ce4b 100644
--- a/src/common-lib/utilities.h
+++ b/src/common-lib/utilities.h
@@ -5,15 +5,15 @@
 
 #pragma once
 
-#include <QVector>
-#include <QPair>
-#include <QByteArray>
-#include <QVariant>
-#include <QString>
-#include <QUrl>
-#include <QDir>
-#include <QResource>
-#include <QLibrary>
+#include <QtCore/QVector>
+#include <QtCore/QPair>
+#include <QtCore/QByteArray>
+#include <QtCore/QVariant>
+#include <QtCore/QString>
+#include <QtCore/QUrl>
+#include <QtCore/QDir>
+#include <QtCore/QResource>
+#include <QtCore/QLibrary>
 
 #include <QtAppManCommon/global.h>
 
diff --git a/src/crypto-lib/cryptography.h b/src/crypto-lib/cryptography.h
index d7a0edf5..681754b1 100644
--- a/src/crypto-lib/cryptography.h
+++ b/src/crypto-lib/cryptography.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <QByteArray>
-#include <QString>
+#include <QtCore/QByteArray>
+#include <QtCore/QString>
 #include <QtAppManCommon/global.h>
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/crypto-lib/libcryptofunction.h b/src/crypto-lib/libcryptofunction.h
index 23883c03..d13bcd2a 100644
--- a/src/crypto-lib/libcryptofunction.h
+++ b/src/crypto-lib/libcryptofunction.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <qglobal.h>
+#include <QtCore/qglobal.h>
 #include <utility>
 #include <QtAppManCommon/global.h>
 
diff --git a/src/crypto-lib/signature.h b/src/crypto-lib/signature.h
index a2b92634..85614272 100644
--- a/src/crypto-lib/signature.h
+++ b/src/crypto-lib/signature.h
@@ -4,8 +4,8 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 #pragma once
 
-#include <QString>
-#include <QByteArray>
+#include <QtCore/QString>
+#include <QtCore/QByteArray>
 #include <QtAppManCommon/global.h>
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/dbus-lib/abstractdbuscontextadaptor.h b/src/dbus-lib/abstractdbuscontextadaptor.h
index 59254196..f38da0de 100644
--- a/src/dbus-lib/abstractdbuscontextadaptor.h
+++ b/src/dbus-lib/abstractdbuscontextadaptor.h
@@ -6,8 +6,8 @@
 #pragma once
 
 #include <QtAppManCommon/global.h>
-#include <QObject>
-#include <QDBusContext>
+#include <QtCore/QObject>
+#include <QtDBus/QDBusContext>
 
 QT_FORWARD_DECLARE_CLASS(QDBusAbstractAdaptor)
 
diff --git a/src/dbus-lib/dbusdaemon.h b/src/dbus-lib/dbusdaemon.h
index 3071d894..49b0913e 100644
--- a/src/dbus-lib/dbusdaemon.h
+++ b/src/dbus-lib/dbusdaemon.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #include <QtAppManCommon/global.h>
-#include <QProcess>
+#include <QtCore/QProcess>
 
 QT_BEGIN_NAMESPACE_AM
 
diff --git a/src/dbus-lib/dbuspolicy.h b/src/dbus-lib/dbuspolicy.h
index ecbc2394..36041093 100644
--- a/src/dbus-lib/dbuspolicy.h
+++ b/src/dbus-lib/dbuspolicy.h
@@ -6,8 +6,8 @@
 #pragma once
 
 #include <QtAppManCommon/global.h>
-#include <QVariantMap>
-#include <QByteArray>
+#include <QtCore/QVariantMap>
+#include <QtCore/QByteArray>
 
 QT_FORWARD_DECLARE_CLASS(QDBusAbstractAdaptor)
 
diff --git a/src/intent-client-lib/intentclient.h b/src/intent-client-lib/intentclient.h
index a405b8c3..7b2f14be 100644
--- a/src/intent-client-lib/intentclient.h
+++ b/src/intent-client-lib/intentclient.h
@@ -5,13 +5,13 @@
 
 #pragma once
 
-#include <QObject>
-#include <QString>
-#include <QVariantMap>
-#include <QList>
-#include <QMap>
-#include <QPair>
-#include <QElapsedTimer>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QVariantMap>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QPair>
+#include <QtCore/QElapsedTimer>
 
 #include <QtAppManCommon/global.h>
 
diff --git a/src/intent-client-lib/intentclientrequest.h b/src/intent-client-lib/intentclientrequest.h
index 016ab349..c8617d4a 100644
--- a/src/intent-client-lib/intentclientrequest.h
+++ b/src/intent-client-lib/intentclientrequest.h
@@ -5,11 +5,11 @@
 
 #pragma once
 
-#include <QObject>
-#include <QDir>
-#include <QUuid>
-#include <QString>
-#include <QVariantMap>
+#include <QtCore/QObject>
+#include <QtCore/QDir>
+#include <QtCore/QUuid>
+#include <QtCore/QString>
+#include <QtCore/QVariantMap>
 #include <QtAppManCommon/global.h>
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/intent-client-lib/intentclientsysteminterface.h b/src/intent-client-lib/intentclientsysteminterface.h
index 7b613fa4..be66381b 100644
--- a/src/intent-client-lib/intentclientsysteminterface.h
+++ b/src/intent-client-lib/intentclientsysteminterface.h
@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include <QObject>
-#include <QPointer>
-#include <QUuid>
-#include <QVariantMap>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
+#include <QtCore/QUuid>
+#include <QtCore/QVariantMap>
 #include <QtAppManCommon/global.h>
 
 
diff --git a/src/intent-client-lib/intenthandler.h b/src/intent-client-lib/intenthandler.h
index 45ef02ef..5c801991 100644
--- a/src/intent-client-lib/intenthandler.h
+++ b/src/intent-client-lib/intenthandler.h
@@ -5,12 +5,12 @@
 
 #pragma once
 
-#include <QObject>
-#include <QQmlParserStatus>
-#include <QUuid>
-#include <QString>
-#include <QStringList>
-#include <QVariantMap>
+#include <QtCore/QObject>
+#include <QtQml/QQmlParserStatus>
+#include <QtCore/QUuid>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariantMap>
 #include <QtAppManCommon/global.h>
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/intent-server-lib/intent.h b/src/intent-server-lib/intent.h
index dc9a7350..fd1d801a 100644
--- a/src/intent-server-lib/intent.h
+++ b/src/intent-server-lib/intent.h
@@ -5,11 +5,11 @@
 
 #pragma once
 
-#include <QObject>
-#include <QString>
-#include <QUrl>
-#include <QStringList>
-#include <QVariantMap>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QUrl>
+#include <QtCore/QStringList>
+#include <QtCore/QVariantMap>
 #include <QtAppManCommon/global.h>
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/intent-server-lib/intentmodel.h b/src/intent-server-lib/intentmodel.h
index 98c9f68b..d0046c10 100644
--- a/src/intent-server-lib/intentmodel.h
+++ b/src/intent-server-lib/intentmodel.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <QSortFilterProxyModel>
-#include <QJSValue>
+#include <QtCore/QSortFilterProxyModel>
+#include <QtQml/QJSValue>
 #include <QtAppManCommon/global.h>
 
 QT_FORWARD_DECLARE_CLASS(QJSEngine);
diff --git a/src/intent-server-lib/intentserver.h b/src/intent-server-lib/intentserver.h
index 5419f175..e243663f 100644
--- a/src/intent-server-lib/intentserver.h
+++ b/src/intent-server-lib/intentserver.h
@@ -5,11 +5,11 @@
 
 #pragma once
 
-#include <QAbstractListModel>
-#include <QVariantMap>
-#include <QVector>
-#include <QUuid>
-#include <QQueue>
+#include <QtCore/QAbstractListModel>
+#include <QtCore/QVariantMap>
+#include <QtCore/QVector>
+#include <QtCore/QUuid>
+#include <QtCore/QQueue>
 #include <QtAppManCommon/global.h>
 #include <QtAppManIntentServer/intent.h>
 
diff --git a/src/intent-server-lib/intentserverrequest.h b/src/intent-server-lib/intentserverrequest.h
index 2b2bd27b..8d767193 100644
--- a/src/intent-server-lib/intentserverrequest.h
+++ b/src/intent-server-lib/intentserverrequest.h
@@ -5,12 +5,12 @@
 
 #pragma once
 
-#include <QObject>
-#include <QString>
-#include <QVariantMap>
-#include <QUuid>
-#include <QVector>
-#include <QPointer>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QVariantMap>
+#include <QtCore/QUuid>
+#include <QtCore/QVector>
+#include <QtCore/QPointer>
 #include <QtAppManCommon/global.h>
 #include <QtAppManIntentServer/intent.h>
 
diff --git a/src/intent-server-lib/intentserversysteminterface.h b/src/intent-server-lib/intentserversysteminterface.h
index 8b2f299c..bc460748 100644
--- a/src/intent-server-lib/intentserversysteminterface.h
+++ b/src/intent-server-lib/intentserversysteminterface.h
@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include <QObject>
-#include <QVariantMap>
-#include <QString>
-#include <QStringList>
+#include <QtCore/QObject>
+#include <QtCore/QVariantMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
 #include <QtAppManCommon/global.h>
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/launcher-lib/dbusapplicationinterface.h b/src/launcher-lib/dbusapplicationinterface.h
index fad8a757..7df0cc22 100644
--- a/src/launcher-lib/dbusapplicationinterface.h
+++ b/src/launcher-lib/dbusapplicationinterface.h
@@ -5,9 +5,9 @@
 
 #pragma once
 
-#include <QPointer>
-#include <QVector>
-#include <QDBusConnection>
+#include <QtCore/QPointer>
+#include <QtCore/QVector>
+#include <QtDBus/QDBusConnection>
 
 #include <QtAppManCommon/global.h>
 #include <QtAppManApplication/applicationinterface.h>
diff --git a/src/launcher-lib/intentclientdbusimplementation.h b/src/launcher-lib/intentclientdbusimplementation.h
index 6a0fefea..d7428af2 100644
--- a/src/launcher-lib/intentclientdbusimplementation.h
+++ b/src/launcher-lib/intentclientdbusimplementation.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <QPointer>
+#include <QtCore/QPointer>
 #include <QtAppManIntentClient/intentclientsysteminterface.h>
 
 class IoQtApplicationManagerIntentInterfaceInterface;
diff --git a/src/main-lib/applicationinstaller.h b/src/main-lib/applicationinstaller.h
index e205e772..161e0528 100644
--- a/src/main-lib/applicationinstaller.h
+++ b/src/main-lib/applicationinstaller.h
@@ -5,12 +5,12 @@
 
 #pragma once
 
-#include <QObject>
-#include <QVariant>
-#include <QUrl>
-#include <QStringList>
-#include <QDir>
-#include <QDebug>
+#include <QtCore/QObject>
+#include <QtCore/QVariant>
+#include <QtCore/QUrl>
+#include <QtCore/QStringList>
+#include <QtCore/QDir>
+#include <QtCore/QDebug>
 #include <QtAppManCommon/error.h>
 #include <QtAppManCommon/logging.h>
 #include <QtAppManManager/applicationmanager.h>
diff --git a/src/main-lib/configuration.h b/src/main-lib/configuration.h
index e597fe09..dffce6c7 100644
--- a/src/main-lib/configuration.h
+++ b/src/main-lib/configuration.h
@@ -6,10 +6,10 @@
 #pragma once
 
 #include <QtAppManCommon/global.h>
-#include <QStringList>
-#include <QVariantMap>
-#include <QVector>
-#include <QCommandLineParser>
+#include <QtCore/QStringList>
+#include <QtCore/QVariantMap>
+#include <QtCore/QVector>
+#include <QtCore/QCommandLineParser>
 
 #include <memory>
 
diff --git a/src/main-lib/main.h b/src/main-lib/main.h
index afdb9ff4..6dc0e907 100644
--- a/src/main-lib/main.h
+++ b/src/main-lib/main.h
@@ -5,23 +5,23 @@
 
 #pragma once
 
-#include <QUrl>
+#include <QtCore/QUrl>
 #include <QtAppManCommon/global.h>
 #include <QtAppManWindow/qtappman_window-config.h>
 #include <functional>
 
 #if defined(AM_WIDGETS_SUPPORT)
-#  include <QApplication>
-#  include <QSurfaceFormat>
+#  include <QtWidgets/QApplication>
+#  include <QtGui/QSurfaceFormat>
 typedef QApplication MainBase;
 #else
-#  include <QGuiApplication>
-#  include <QSurfaceFormat>
+#  include <QtGui/QGuiApplication>
+#  include <QtGui/QSurfaceFormat>
 typedef QGuiApplication MainBase;
 #endif
 
 #include <QtAppManSharedMain/sharedmain.h>
-#include <QVector>
+#include <QtCore/QVector>
 
 QT_FORWARD_DECLARE_CLASS(QQmlApplicationEngine)
 QT_FORWARD_DECLARE_CLASS(QQuickView)
diff --git a/src/manager-lib/abstractcontainer.h b/src/manager-lib/abstractcontainer.h
index d5dca20d..d134313e 100644
--- a/src/manager-lib/abstractcontainer.h
+++ b/src/manager-lib/abstractcontainer.h
@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include <QObject>
-#include <QString>
-#include <QVariantMap>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QVariantMap>
+#include <QtCore/QVector>
 
 #include <QtAppManCommon/global.h>
 #include <QtAppManManager/amnamespace.h>
diff --git a/src/manager-lib/abstractruntime.h b/src/manager-lib/abstractruntime.h
index b86434fd..1551d69e 100644
--- a/src/manager-lib/abstractruntime.h
+++ b/src/manager-lib/abstractruntime.h
@@ -5,11 +5,11 @@
 
 #pragma once
 
-#include <QObject>
-#include <QString>
-#include <QPointer>
-#include <QSharedPointer>
-#include <QVariantMap>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QPointer>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QVariantMap>
 
 #include <QtAppManCommon/global.h>
 #include <QtAppManManager/amnamespace.h>
diff --git a/src/manager-lib/amnamespace.h b/src/manager-lib/amnamespace.h
index e51a4c4c..45e053e2 100644
--- a/src/manager-lib/amnamespace.h
+++ b/src/manager-lib/amnamespace.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtAppManCommon/global.h>
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/manager-lib/application.h b/src/manager-lib/application.h
index ed7dfa41..25a1b8ac 100644
--- a/src/manager-lib/application.h
+++ b/src/manager-lib/application.h
@@ -5,9 +5,9 @@
 
 #pragma once
 
-#include <QObject>
-#include <QVariantMap>
-#include <QUrl>
+#include <QtCore/QObject>
+#include <QtCore/QVariantMap>
+#include <QtCore/QUrl>
 #include <QtAppManApplication/applicationinfo.h>
 #include <QtAppManApplication/packageinfo.h>
 #include <QtAppManManager/amnamespace.h>
diff --git a/src/manager-lib/applicationmanager.h b/src/manager-lib/applicationmanager.h
index 20d49157..894cbc78 100644
--- a/src/manager-lib/applicationmanager.h
+++ b/src/manager-lib/applicationmanager.h
@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include <QAbstractListModel>
-#include <QStringList>
-#include <QVariantList>
-#include <QJSValue>
+#include <QtCore/QAbstractListModel>
+#include <QtCore/QStringList>
+#include <QtCore/QVariantList>
+#include <QtQml/QJSValue>
 #include <QtAppManCommon/global.h>
 #include <QtAppManManager/application.h>
 
diff --git a/src/manager-lib/applicationmodel.h b/src/manager-lib/applicationmodel.h
index 3885e94e..ff0a0de3 100644
--- a/src/manager-lib/applicationmodel.h
+++ b/src/manager-lib/applicationmodel.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <QSortFilterProxyModel>
-#include <QJSValue>
+#include <QtCore/QSortFilterProxyModel>
+#include <QtQml/QJSValue>
 #include <QtAppManCommon/global.h>
 
 QT_FORWARD_DECLARE_CLASS(QJSEngine);
diff --git a/src/manager-lib/asynchronoustask.h b/src/manager-lib/asynchronoustask.h
index 7a2dd435..97c9690a 100644
--- a/src/manager-lib/asynchronoustask.h
+++ b/src/manager-lib/asynchronoustask.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <QThread>
-#include <QMutex>
+#include <QtCore/QThread>
+#include <QtCore/QMutex>
 
 #include <QtAppManCommon/error.h>
 
diff --git a/src/manager-lib/containerfactory.h b/src/manager-lib/containerfactory.h
index 0e8fcf63..f78b93d3 100644
--- a/src/manager-lib/containerfactory.h
+++ b/src/manager-lib/containerfactory.h
@@ -5,9 +5,9 @@
 
 #pragma once
 
-#include <QMap>
-#include <QObject>
-#include <QVector>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 #include <QtAppManCommon/global.h>
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/manager-lib/debugwrapper.h b/src/manager-lib/debugwrapper.h
index fe4f0e52..4a80bf3b 100644
--- a/src/manager-lib/debugwrapper.h
+++ b/src/manager-lib/debugwrapper.h
@@ -7,8 +7,8 @@
 
 #include <QtAppManCommon/global.h>
 
-#include <QStringList>
-#include <QMap>
+#include <QtCore/QStringList>
+#include <QtCore/QMap>
 
 QT_BEGIN_NAMESPACE_AM
 
diff --git a/src/manager-lib/installationtask.h b/src/manager-lib/installationtask.h
index ffce832c..93397a2f 100644
--- a/src/manager-lib/installationtask.h
+++ b/src/manager-lib/installationtask.h
@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include <QUrl>
-#include <QStringList>
-#include <QWaitCondition>
-#include <QMutex>
+#include <QtCore/QUrl>
+#include <QtCore/QStringList>
+#include <QtCore/QWaitCondition>
+#include <QtCore/QMutex>
 
 #include <QtAppManApplication/installationreport.h>
 #include <QtAppManManager/asynchronoustask.h>
diff --git a/src/manager-lib/intentaminterface.h b/src/manager-lib/intentaminterface.h
index f72418b3..17507243 100644
--- a/src/manager-lib/intentaminterface.h
+++ b/src/manager-lib/intentaminterface.h
@@ -5,17 +5,17 @@
 
 #pragma once
 
-#include <QObject>
-#include <QVector>
-#include <QString>
-#include <QVariantMap>
-#include <QList>
-#include <QUrl>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
+#include <QtCore/QString>
+#include <QtCore/QVariantMap>
+#include <QtCore/QList>
+#include <QtCore/QUrl>
 #include <QtAppManCommon/global.h>
 
 #if defined(AM_MULTI_PROCESS)
-#  include <QDBusConnection>
-#  include <QDBusContext>
+#  include <QtDBus/QDBusConnection>
+#  include <QtDBus/QDBusContext>
 #endif
 #include <QtAppManIntentServer/intentserversysteminterface.h>
 #include <QtAppManIntentServer/intent.h>
diff --git a/src/manager-lib/nativeruntime.h b/src/manager-lib/nativeruntime.h
index a71ff178..24baab1b 100644
--- a/src/manager-lib/nativeruntime.h
+++ b/src/manager-lib/nativeruntime.h
@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include <qglobal.h>
+#include <QtCore/qglobal.h>
 
-#include <QtPlugin>
-#include <QVector>
+#include <QtCore/QtPlugin>
+#include <QtCore/QVector>
 
 #include <QtAppManManager/abstractruntime.h>
 #include <QtAppManManager/abstractcontainer.h>
diff --git a/src/manager-lib/notificationmanager.h b/src/manager-lib/notificationmanager.h
index aac80180..d319d72e 100644
--- a/src/manager-lib/notificationmanager.h
+++ b/src/manager-lib/notificationmanager.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QAbstractListModel>
+#include <QtCore/QObject>
+#include <QtCore/QAbstractListModel>
 #include <QtAppManCommon/global.h>
 
 QT_FORWARD_DECLARE_CLASS(QQmlEngine)
diff --git a/src/manager-lib/package.h b/src/manager-lib/package.h
index 73cb5506..f236e55c 100644
--- a/src/manager-lib/package.h
+++ b/src/manager-lib/package.h
@@ -7,10 +7,10 @@
 
 #include <QtAppManCommon/global.h>
 #include <QtAppManApplication/packageinfo.h>
-#include <QUrl>
-#include <QString>
-#include <QAtomicInt>
-#include <QObject>
+#include <QtCore/QUrl>
+#include <QtCore/QString>
+#include <QtCore/QAtomicInt>
+#include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE_AM
 
diff --git a/src/manager-lib/packagemanager.h b/src/manager-lib/packagemanager.h
index 21c8dc9e..9b48a2ee 100644
--- a/src/manager-lib/packagemanager.h
+++ b/src/manager-lib/packagemanager.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QAbstractListModel>
+#include <QtCore/QObject>
+#include <QtCore/QAbstractListModel>
 #include <QtAppManCommon/global.h>
 #include <QtAppManApplication/packageinfo.h>
 #include <QtAppManManager/asynchronoustask.h>
diff --git a/src/manager-lib/processstatus.h b/src/manager-lib/processstatus.h
index 93a1cf4d..82641cda 100644
--- a/src/manager-lib/processstatus.h
+++ b/src/manager-lib/processstatus.h
@@ -5,11 +5,11 @@
 
 #pragma once
 
-#include <QAtomicInteger>
-#include <QObject>
-#include <QPointer>
-#include <QThread>
-#include <QVariant>
+#include <QtCore/QAtomicInteger>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
+#include <QtCore/QThread>
+#include <QtCore/QVariant>
 
 #include <QtAppManCommon/global.h>
 #include <QtAppManManager/amnamespace.h>
diff --git a/src/manager-lib/qmlinprocessapplicationinterface.h b/src/manager-lib/qmlinprocessapplicationinterface.h
index 2ffe53c6..4c4341e6 100644
--- a/src/manager-lib/qmlinprocessapplicationinterface.h
+++ b/src/manager-lib/qmlinprocessapplicationinterface.h
@@ -5,9 +5,9 @@
 
 #pragma once
 
-#include <QVector>
-#include <QPointer>
-#include <QQmlParserStatus>
+#include <QtCore/QVector>
+#include <QtCore/QPointer>
+#include <QtQml/QQmlParserStatus>
 
 #include <QtAppManApplication/applicationinterface.h>
 #include <QtAppManNotification/notification.h>
diff --git a/src/manager-lib/qmlinprocessapplicationmanagerwindow.h b/src/manager-lib/qmlinprocessapplicationmanagerwindow.h
index a40cec96..bfe1e4f3 100644
--- a/src/manager-lib/qmlinprocessapplicationmanagerwindow.h
+++ b/src/manager-lib/qmlinprocessapplicationmanagerwindow.h
@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include <QQmlParserStatus>
-#include <QSharedPointer>
-#include <QColor>
-#include <QQuickItem>
+#include <QtQml/QQmlParserStatus>
+#include <QtCore/QSharedPointer>
+#include <QtGui/QColor>
+#include <QtQuick/QQuickItem>
 #include <QtAppManCommon/global.h>
 
 QT_FORWARD_DECLARE_CLASS(QQmlComponentAttached)
diff --git a/src/manager-lib/qmlinprocessruntime.h b/src/manager-lib/qmlinprocessruntime.h
index 9d9fbded..824f5ec6 100644
--- a/src/manager-lib/qmlinprocessruntime.h
+++ b/src/manager-lib/qmlinprocessruntime.h
@@ -7,7 +7,7 @@
 
 #include <QtAppManManager/abstractruntime.h>
 
-#include <QSharedPointer>
+#include <QtCore/QSharedPointer>
 
 QT_BEGIN_NAMESPACE_AM
 
diff --git a/src/manager-lib/quicklauncher.h b/src/manager-lib/quicklauncher.h
index 30c20251..b797c0f9 100644
--- a/src/manager-lib/quicklauncher.h
+++ b/src/manager-lib/quicklauncher.h
@@ -5,9 +5,9 @@
 
 #pragma once
 
-#include <QObject>
-#include <QPair>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QPair>
+#include <QtCore/QVector>
 #include <QtAppManCommon/global.h>
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/manager-lib/runtimefactory.h b/src/manager-lib/runtimefactory.h
index 8a15d0a1..2bef2dab 100644
--- a/src/manager-lib/runtimefactory.h
+++ b/src/manager-lib/runtimefactory.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <QHash>
-#include <QObject>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
 
 #include <QtAppManCommon/global.h>
 
diff --git a/src/manager-lib/scopeutilities.h b/src/manager-lib/scopeutilities.h
index 1bba1b9e..4d298864 100644
--- a/src/manager-lib/scopeutilities.h
+++ b/src/manager-lib/scopeutilities.h
@@ -5,9 +5,9 @@
 
 #pragma once
 
-#include <QString>
-#include <QDir>
-#include <QFile>
+#include <QtCore/QString>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
 
 #include <QtAppManCommon/global.h>
 
diff --git a/src/manager-lib/sudo.h b/src/manager-lib/sudo.h
index 93b3f490..9052bd9f 100644
--- a/src/manager-lib/sudo.h
+++ b/src/manager-lib/sudo.h
@@ -5,9 +5,9 @@
 
 #pragma once
 
-#include <QString>
-#include <QByteArray>
-#include <QMutex>
+#include <QtCore/QString>
+#include <QtCore/QByteArray>
+#include <QtCore/QMutex>
 #include <qplatformdefs.h>
 
 #ifdef Q_OS_UNIX
diff --git a/src/monitor-lib/processreader.h b/src/monitor-lib/processreader.h
index 1239ec78..87cbc67a 100644
--- a/src/monitor-lib/processreader.h
+++ b/src/monitor-lib/processreader.h
@@ -5,9 +5,9 @@
 
 #pragma once
 
-#include <QMutex>
-#include <QElapsedTimer>
-#include <QObject>
+#include <QtCore/QMutex>
+#include <QtCore/QElapsedTimer>
+#include <QtCore/QObject>
 
 #include <QtAppManCommon/global.h>
 
diff --git a/src/monitor-lib/sysfsreader.h b/src/monitor-lib/sysfsreader.h
index 47190b57..fe94bae2 100644
--- a/src/monitor-lib/sysfsreader.h
+++ b/src/monitor-lib/sysfsreader.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <QByteArray>
-#include <QFile>
+#include <QtCore/QByteArray>
+#include <QtCore/QFile>
 #include <QtAppManCommon/global.h>
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/monitor-lib/systemreader.h b/src/monitor-lib/systemreader.h
index 1d89e39e..6b41e89c 100644
--- a/src/monitor-lib/systemreader.h
+++ b/src/monitor-lib/systemreader.h
@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include <QByteArray>
-#include <QPair>
-#include <QElapsedTimer>
-#include <QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QPair>
+#include <QtCore/QElapsedTimer>
+#include <QtCore/QObject>
 #include <QtAppManCommon/global.h>
 
 #include <memory>
diff --git a/src/notification-lib/notification.h b/src/notification-lib/notification.h
index b0f034d8..59ae7c8a 100644
--- a/src/notification-lib/notification.h
+++ b/src/notification-lib/notification.h
@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include <QObject>
-#include <QUrl>
-#include <QVariantMap>
-#include <QQmlParserStatus>
+#include <QtCore/QObject>
+#include <QtCore/QUrl>
+#include <QtCore/QVariantMap>
+#include <QtQml/QQmlParserStatus>
 #include <QtAppManCommon/global.h>
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/package-lib/packagecreator.h b/src/package-lib/packagecreator.h
index 4484af41..9f543964 100644
--- a/src/package-lib/packagecreator.h
+++ b/src/package-lib/packagecreator.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <QtAppManCommon/error.h>
 
diff --git a/src/package-lib/packageextractor.h b/src/package-lib/packageextractor.h
index 1bc61382..cad7f969 100644
--- a/src/package-lib/packageextractor.h
+++ b/src/package-lib/packageextractor.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <functional>
 
diff --git a/src/plugin-interfaces/containerinterface.h b/src/plugin-interfaces/containerinterface.h
index 8e054f94..b7fa81cb 100644
--- a/src/plugin-interfaces/containerinterface.h
+++ b/src/plugin-interfaces/containerinterface.h
@@ -5,11 +5,11 @@
 
 #pragma once
 
-#include <QObject>
-#include <QtPlugin>
-#include <QStringList>
-#include <QVariantMap>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QtPlugin>
+#include <QtCore/QStringList>
+#include <QtCore/QVariantMap>
+#include <QtCore/QVector>
 
 class ContainerInterface : public QObject
 {
diff --git a/src/plugin-interfaces/startupinterface.h b/src/plugin-interfaces/startupinterface.h
index 6cd90508..078605d4 100644
--- a/src/plugin-interfaces/startupinterface.h
+++ b/src/plugin-interfaces/startupinterface.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QtPlugin>
+#include <QtCore/QObject>
+#include <QtCore/QtPlugin>
 
 QT_FORWARD_DECLARE_CLASS(QQmlEngine)
 QT_FORWARD_DECLARE_CLASS(QWindow)
diff --git a/src/shared-main-lib/cpustatus.h b/src/shared-main-lib/cpustatus.h
index b598a584..82c8a601 100644
--- a/src/shared-main-lib/cpustatus.h
+++ b/src/shared-main-lib/cpustatus.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <QtAppManCommon/global.h>
 #include <QtAppManMonitor/systemreader.h>
diff --git a/src/shared-main-lib/frametimer.h b/src/shared-main-lib/frametimer.h
index 5ef0c752..41e7988b 100644
--- a/src/shared-main-lib/frametimer.h
+++ b/src/shared-main-lib/frametimer.h
@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include <QElapsedTimer>
-#include <QObject>
-#include <QPointer>
-#include <QTimer>
+#include <QtCore/QElapsedTimer>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
+#include <QtCore/QTimer>
 #include <QtAppManCommon/global.h>
 #include <limits>
 
diff --git a/src/shared-main-lib/gpustatus.h b/src/shared-main-lib/gpustatus.h
index 607f7c96..d36c6741 100644
--- a/src/shared-main-lib/gpustatus.h
+++ b/src/shared-main-lib/gpustatus.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <QtAppManCommon/global.h>
 #include <QtAppManMonitor/systemreader.h>
diff --git a/src/shared-main-lib/iostatus.h b/src/shared-main-lib/iostatus.h
index 4ca70a95..05d8a0c3 100644
--- a/src/shared-main-lib/iostatus.h
+++ b/src/shared-main-lib/iostatus.h
@@ -7,10 +7,10 @@
 
 #include <QtAppManCommon/global.h>
 
-#include <QHash>
-#include <QObject>
-#include <QStringList>
-#include <QVariant>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
 
 #include <QtAppManMonitor/systemreader.h>
 
diff --git a/src/shared-main-lib/memorystatus.h b/src/shared-main-lib/memorystatus.h
index 921fdff2..952fb0f2 100644
--- a/src/shared-main-lib/memorystatus.h
+++ b/src/shared-main-lib/memorystatus.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <QtAppManCommon/global.h>
 #include <QtAppManMonitor/systemreader.h>
diff --git a/src/shared-main-lib/monitormodel.h b/src/shared-main-lib/monitormodel.h
index dd2b7f81..608aa44e 100644
--- a/src/shared-main-lib/monitormodel.h
+++ b/src/shared-main-lib/monitormodel.h
@@ -5,12 +5,12 @@
 
 #pragma once
 
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 #include <QtAppManCommon/global.h>
 #include <QtQml/qqmllist.h>
-#include <QList>
-#include <QStringList>
-#include <QTimer>
+#include <QtCore/QList>
+#include <QtCore/QStringList>
+#include <QtCore/QTimer>
 
 QT_BEGIN_NAMESPACE_AM
 
diff --git a/src/shared-main-lib/qmllogger.h b/src/shared-main-lib/qmllogger.h
index c4355de2..372c2c1b 100644
--- a/src/shared-main-lib/qmllogger.h
+++ b/src/shared-main-lib/qmllogger.h
@@ -6,8 +6,8 @@
 #pragma once
 
 #include <QtAppManCommon/global.h>
-#include <QObject>
-#include <QQmlEngine>
+#include <QtCore/QObject>
+#include <QtQml/QQmlEngine>
 
 QT_BEGIN_NAMESPACE_AM
 
diff --git a/src/shared-main-lib/sharedmain.h b/src/shared-main-lib/sharedmain.h
index fa425d05..2cd9c912 100644
--- a/src/shared-main-lib/sharedmain.h
+++ b/src/shared-main-lib/sharedmain.h
@@ -6,9 +6,9 @@
 #pragma once
 
 #include <QtAppManCommon/global.h>
-#include <QVariantMap>
-#include <QStringList>
-#include <QSurfaceFormat>
+#include <QtCore/QVariantMap>
+#include <QtCore/QStringList>
+#include <QtGui/QSurfaceFormat>
 
 QT_FORWARD_DECLARE_STRUCT(QQmlDebuggingEnabler)
 
diff --git a/src/window-lib/inprocesswindow.h b/src/window-lib/inprocesswindow.h
index 63e82082..c8d9a5d3 100644
--- a/src/window-lib/inprocesswindow.h
+++ b/src/window-lib/inprocesswindow.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QSharedPointer>
+#include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 
 #include <QtAppManWindow/window.h>
 #include <QtAppManManager/inprocesssurfaceitem.h>
diff --git a/src/window-lib/waylandcompositor.h b/src/window-lib/waylandcompositor.h
index a800d1c7..1d0b39c3 100644
--- a/src/window-lib/waylandcompositor.h
+++ b/src/window-lib/waylandcompositor.h
@@ -10,13 +10,13 @@
 
 #if defined(AM_MULTI_PROCESS)
 
-#include <QWaylandQuickCompositor>
+#include <QtWaylandCompositor/QWaylandQuickCompositor>
 
-#include <QWaylandQuickSurface>
-#include <QWaylandQuickItem>
+#include <QtWaylandCompositor/QWaylandQuickSurface>
+#include <QtWaylandCompositor/QWaylandQuickItem>
 
-#include <QMap>
-#include <QPointer>
+#include <QtCore/QMap>
+#include <QtCore/QPointer>
 
 QT_FORWARD_DECLARE_CLASS(QWaylandResource)
 QT_FORWARD_DECLARE_CLASS(QWaylandWlShell)
diff --git a/src/window-lib/waylandwindow.h b/src/window-lib/waylandwindow.h
index 28e21a1d..6969b799 100644
--- a/src/window-lib/waylandwindow.h
+++ b/src/window-lib/waylandwindow.h
@@ -9,9 +9,9 @@
 
 #if defined(AM_MULTI_PROCESS)
 
-#include <QWaylandQuickSurface>
-#include <QWaylandXdgShell>
-#include <QTimer>
+#include <QtWaylandCompositor/QWaylandQuickSurface>
+#include <QtWaylandCompositor/QWaylandXdgShell>
+#include <QtCore/QTimer>
 
 QT_BEGIN_NAMESPACE_AM
 
diff --git a/src/window-lib/window.h b/src/window-lib/window.h
index 5c8ebf95..bb954e8e 100644
--- a/src/window-lib/window.h
+++ b/src/window-lib/window.h
@@ -5,11 +5,11 @@
 
 #pragma once
 
-#include <QObject>
-#include <QVariantMap>
-#include <QPointer>
-#include <QQuickItem>
-#include <QSet>
+#include <QtCore/QObject>
+#include <QtCore/QVariantMap>
+#include <QtCore/QPointer>
+#include <QtQuick/QQuickItem>
+#include <QtCore/QSet>
 #include <QtAppManCommon/global.h>
 #include <QtAppManManager/application.h>
 
diff --git a/src/window-lib/windowitem.h b/src/window-lib/windowitem.h
index 33f51258..a23b3b5e 100644
--- a/src/window-lib/windowitem.h
+++ b/src/window-lib/windowitem.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <QQuickItem>
+#include <QtQuick/QQuickItem>
 #include <QtAppManCommon/global.h>
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/window-lib/windowmanager.h b/src/window-lib/windowmanager.h
index b0a0cd69..678ac700 100644
--- a/src/window-lib/windowmanager.h
+++ b/src/window-lib/windowmanager.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #include <functional>
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 #include <QtAppManCommon/global.h>
 
 #if defined(AM_MULTI_PROCESS)