diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CppTopicGeneratorGrantlee.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CppTopicGeneratorGrantlee.cpp
index 4a18de39f..0cf9e1b85 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CppTopicGeneratorGrantlee.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CppTopicGeneratorGrantlee.cpp
@@ -5,7 +5,7 @@
 #include "StructBuilder.h"
 
 #include <NGLLogger/INGLLogger.h>
-#include <QCryptographicHash>
+#include <QtCore/QCryptographicHash>
 #include <grantlee/context.h>
 
 #ifdef RTI_HEADER_AVAILABLE
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CppTopicGeneratorGrantlee.h b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CppTopicGeneratorGrantlee.h
index 5f5f44d83..59ea13e39 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CppTopicGeneratorGrantlee.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CppTopicGeneratorGrantlee.h
@@ -5,7 +5,7 @@
 #include "GrantleeWrappers.h"
 #include "StructBuilder.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace CodeGen
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/DaoGeneratorGrantlee.h b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/DaoGeneratorGrantlee.h
index 1ab45436d..e3dfae941 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/DaoGeneratorGrantlee.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/DaoGeneratorGrantlee.h
@@ -5,7 +5,7 @@
 #include "GrantleeWrappers.h"
 #include "StructBuilder.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace CodeGen
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/DatabaseGeneratorGrantlee.h b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/DatabaseGeneratorGrantlee.h
index 16903ea4b..d6f244f94 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/DatabaseGeneratorGrantlee.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/DatabaseGeneratorGrantlee.h
@@ -5,7 +5,7 @@
 #include "GrantleeWrappers.h"
 #include "StructBuilder.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace CodeGen
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.cpp
index 96b05d384..a5f53ca23 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.cpp
@@ -6,8 +6,8 @@
 #include "XmlReader.h"
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QFile>
-#include <QRegularExpression>
+#include <QtCore/QFile>
+#include <QtCore/QRegularExpression>
 #include <grantlee/context.h>
 #include <grantlee/engine.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.h b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.h
index 345a893d9..667e5b962 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.h
@@ -4,8 +4,8 @@
 
 #include "XmlReader.h"
 
-#include <QObject>
-#include <QSharedPointer>
+#include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GrantleeWrappers.h b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GrantleeWrappers.h
index 84cd8f3ce..33982b7ea 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GrantleeWrappers.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GrantleeWrappers.h
@@ -4,9 +4,9 @@
 
 #include "StructBuilder.h"
 
-#include <QObject>
-#include <QString>
-#include <QVariant>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QVariant>
 #include <utility>
 
 #ifdef RTI_HEADER_AVAILABLE
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.cpp
index 54aa22478..7bb9b1622 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.cpp
@@ -6,7 +6,7 @@
 #include "XmlReader.h"
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QStringList>
+#include <QtCore/QStringList>
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.h b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.h
index 37214fd47..d06b8b559 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.h
@@ -5,8 +5,8 @@
 #include "StructBuilder.h"
 #include "codegen_base_export.h"
 
-#include <QSharedPointer>
-#include <QStringList>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QStringList>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.cpp
index 6f3c0fdde..845a34eeb 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.cpp
@@ -3,7 +3,7 @@
 #include "StructBuilder.h"
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <utility>
 
 using namespace CodeGen;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp
index 3bcac2fec..21eb7c47a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp
@@ -4,9 +4,9 @@
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <QDirIterator>
-#include <QDomDocument>
-#include <QFile>
-#include <QXmlStreamReader>
+#include <QtXml/QDomDocument>
+#include <QtCore/QFile>
+#include <QtCore/QXmlStreamReader>
 #include <ngltools/ngltools_filesystem.h>
 #include <utility>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/main_grantlee.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/main_grantlee.cpp
index dd97c4cc9..c9c3f3cfc 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/main_grantlee.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/main_grantlee.cpp
@@ -9,7 +9,7 @@
 
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
 #include <NGLLogger/INGLLogger.h>
-#include <QDir>
+#include <QtCore/QDir>
 #include <nglapplication/nglcoreapplication.h>
 
 class CmdLineParser : public LtsCommandLineParser::LtsCommandLineParser
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/main_grantlee_gui.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/main_grantlee_gui.cpp
index 1c25f8fc2..bf6a9013a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/main_grantlee_gui.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/main_grantlee_gui.cpp
@@ -9,8 +9,8 @@
 #include "ui_main_grantlee_gui.h"
 
 #include <NGLLogger/INGLLogger.h>
-#include <QFileDialog>
-#include <QMessageBox>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMessageBox>
 #include <grantlee/engine.h>
 #include <nglapplication/nglapplication.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/main_grantlee_gui.h b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/main_grantlee_gui.h
index d16f98d89..7d8e07ae6 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/main_grantlee_gui.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/main_grantlee_gui.h
@@ -1,8 +1,8 @@
 
 
 #pragma once
-#include <QMainWindow>
-#include <QObject>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QObject>
 
 namespace CodeGen
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/tests/GrantleeParserSmoke.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/tests/GrantleeParserSmoke.cpp
index 6fc9dedad..f4e0315e8 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/tests/GrantleeParserSmoke.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/tests/GrantleeParserSmoke.cpp
@@ -1,6 +1,6 @@
-#include <QCoreApplication>
-#include <QDebug>
-#include <QDir>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+#include <QtCore/QDir>
 #include <grantlee/engine.h>
 #include <grantlee/templateloader.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CommonUnitTestsPlaceholder/mocks/MockCoordTrans.h b/qt6-after/qt6-migrated-legatus/Lts/Common/CommonUnitTestsPlaceholder/mocks/MockCoordTrans.h
index ee443a9c9..5ceaa3b4c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CommonUnitTestsPlaceholder/mocks/MockCoordTrans.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CommonUnitTestsPlaceholder/mocks/MockCoordTrans.h
@@ -4,8 +4,8 @@
 #ifndef MOCK_COORD_TRANS_H
 #define MOCK_COORD_TRANS_H
 
-#include <QString>
-#include <QPointF>
+#include <QtCore/QString>
+#include <QtCore/QPointF>
 
 // Minimal stub to satisfy linker requirements
 namespace LtsCoordTrans {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/checker/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/checker/main.cpp
index 53c08a15e..bf3d02b6e 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/checker/main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/checker/main.cpp
@@ -1,11 +1,11 @@
 #include <LtsAppDescriptor/lts_app_descriptor.h>
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QDirIterator>
-#include <QFile>
+#include <QtCore/QFile>
 #include <QFileInfoList>
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QTextStream>
+#include <QtCore/QRegularExpression>
+#include <QtCore/QRegularExpressionMatch>
+#include <QtCore/QTextStream>
 #include <cstdio>
 #include <utility>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor.cpp
index 6d2674735..0c5bf7463 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor.cpp
@@ -2,12 +2,12 @@
 
 #include "lts_app_descriptor.h"
 
-#include <QCoreApplication>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QJsonValue>
+#include <QtCore/QJsonValue>
 
 namespace LtsAppDescriptor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor.h
index ab15a3ed8..4cff6758b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <QStringList>
-#include <QVector>
+#include <QtCore/QStringList>
+#include <QtCore/QVector>
 
 #ifndef LTSAPPDESCRIPTOR_EXPORT
 #ifdef BUILD_STATIC_LIBRARIES
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor_editor.cpp
index 0e6a4a841..5023c3328 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor_editor.cpp
@@ -2,13 +2,13 @@
 
 #include "ui_lts_app_descriptor_editor.h"
 
-#include <QDebug>
-#include <QFile>
-#include <QFileDialog>
-#include <QJsonDocument>
-#include <QMessageBox>
+#include <QtCore/QDebug>
+#include <QtCore/QFile>
+#include <QtWidgets/QFileDialog>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QMessageBox>
 #include <QStringListModel>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 LtsAppDescriptorEditor::LtsAppDescriptorEditor(QWidget* parent) : QWidget(parent), m_ui(new Ui_LtsAppDescriptionEditor)
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor_editor.h
index f85ddd98c..3a416014b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor_editor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor_editor.h
@@ -1,8 +1,8 @@
 #pragma once
 #include "lts_app_descriptor.h"
 
-#include <QModelIndex>
-#include <QObject>
+#include <QtCore/QModelIndex>
+#include <QtCore/QObject>
 #include <QtWidgets/QWidget>
 
 #ifndef LTSAPPDESCRIPTOREDITOR_EXPORT
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/main.cpp
index 339f7b4f0..7f86c565a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/main.cpp
@@ -2,10 +2,10 @@
 
 #include "lts_app_descriptor_editor.h"
 
-#include <QAction>
-#include <QApplication>
-#include <QMainWindow>
-#include <QMenuBar>
+#include <QtGui/QAction>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QMenuBar>
 
 int main(int argc, char* argv[])
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/AppChooser/CustomViews/app.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/AppChooser/CustomViews/app.h
index bd54968eb..089cb5f22 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/AppChooser/CustomViews/app.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/AppChooser/CustomViews/app.h
@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include <QObject>
+#include <QtCore/QObject>
 #include <Viewer/LtsDataView/abstract_display_widget.h>
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/AppChooser/app_chooser.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/AppChooser/app_chooser.cpp
index a7b776246..5888476fc 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/AppChooser/app_chooser.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/AppChooser/app_chooser.cpp
@@ -7,8 +7,8 @@
 #include "lts_app_manager.h"
 #include "ui_app_chooser.h"
 
-#include <QCloseEvent>
-#include <QDebug>
+#include <QtGui/QCloseEvent>
+#include <QtCore/QDebug>
 
 namespace LtsAppManager
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/AppChooser/app_chooser.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/AppChooser/app_chooser.h
index fc950d201..e89a33b50 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/AppChooser/app_chooser.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/AppChooser/app_chooser.h
@@ -1,8 +1,8 @@
 
 #pragma once
 #include <LtsAppDescriptor/lts_app_descriptor.h>
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/AppChooser/app_chooser_model.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/AppChooser/app_chooser_model.h
index 5f903c4b8..bb43784d1 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/AppChooser/app_chooser_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/AppChooser/app_chooser_model.h
@@ -2,7 +2,7 @@
 #pragma once
 #include <LtsAppDescriptor/lts_app_descriptor.h>
 #include <LtsWidgets/lts_abstract_table_model.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace LtsAppManager
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/lts_app_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/lts_app_manager.cpp
index 6721e9e0e..6739a7e46 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/lts_app_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/lts_app_manager.cpp
@@ -13,16 +13,16 @@
 #include <LtsWidgets/lts_global_wait_dialog.h>
 #include <OperatorManagement/opm_settings_gui_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QCoreApplication>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QMessageBox>
-#include <QTcpServer>
-#include <QTcpSocket>
-#include <QTimer>
-#include <QUuid>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonValue>
+#include <QtWidgets/QMessageBox>
+#include <QtNetwork/QTcpServer>
+#include <QtNetwork/QTcpSocket>
+#include <QtCore/QTimer>
+#include <QtCore/QUuid>
 #include <utility>
 
 #ifndef LTS_VERSION_MAJOR
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/lts_app_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/lts_app_manager.h
index 358f13301..d4f657e66 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/lts_app_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/lts_app_manager.h
@@ -5,8 +5,8 @@
 #include <LtsSession/lts_session.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
 #include <LtsWidgets/lts_dialog.h>
-#include <QObject>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 #include <memory>
 
 #ifndef LTSAPPMANAGER_EXPORT
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCommandLineParser/LtsCommandLineParser.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCommandLineParser/LtsCommandLineParser.cpp
index 476efdac7..6f12713a7 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCommandLineParser/LtsCommandLineParser.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCommandLineParser/LtsCommandLineParser.cpp
@@ -2,10 +2,10 @@
 
 #include "LtsCommandLineParser.h"
 
-#include <QFlags>
+#include <QtCore/QFlags>
 #include <QNetworkInterface>
-#include <QSettings>
-#include <QUrl>
+#include <QtCore/QSettings>
+#include <QtCore/QUrl>
 #include <ngltools/ngltools_filesystem.h>
 
 namespace LtsCommandLineParser
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_trans.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_trans.cpp
index fe81b2768..419335571 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_trans.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_trans.cpp
@@ -5,10 +5,10 @@
 #include <GeographicLib/Geocentric.hpp>
 #include <GeographicLib/MGRS.hpp>
 #include <GeographicLib/UTMUPS.hpp>
-#include <QPointF>
-#include <QRectF>
-#include <QString>
-#include <QStringList>
+#include <QtCore/QPointF>
+#include <QtCore/QRectF>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
 #include <iomanip>
 #include <utility>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_trans.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_trans.h
index 9febecd42..2ddc0f58a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_trans.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_trans.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QVector>
+#include <QtCore/QVector>
 #include <cmath>
 #include "ltscoordtrans_export.h"
 #include <string>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_trans_unit_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_trans_unit_test.cpp
index 683e72550..5c7a7b163 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_trans_unit_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_trans_unit_test.cpp
@@ -5,8 +5,8 @@
 #include "lts_coord_trans.h"
 
 #include <GeographicLib/Math.hpp>
-#include <QDebug>
-#include <QTest>
+#include <QtCore/QDebug>
+#include <QtTest/QTest>
 #include <utility>
 
 QTEST_MAIN(coordtrans_test)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_trans_unit_test.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_trans_unit_test.h
index bc2208f83..3e42c9eba 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_trans_unit_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_trans_unit_test.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QStringList>
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
 
 class coordtrans_test : public QObject
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget.cpp
index 668c564a1..801000c50 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget.cpp
@@ -5,7 +5,7 @@
 #include "lts_coord_widget_p.h"
 
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QToolButton>
+#include <QtWidgets/QToolButton>
 
 namespace LtsCoordWidget
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget.h
index 51b3803f5..d402cd4bc 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget.h
@@ -3,8 +3,8 @@
 #pragma once
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <LtsCoordTrans/ltscoordwidget_export.h>
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>
 
 class QToolButton;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget_p.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget_p.h
index 57f6f090c..2ba810b0b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget_p.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget_p.h
@@ -6,10 +6,10 @@
 #include "ui_lts_coord_widget_wgs84.h"
 
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QComboBox>
-#include <QObject>
-#include <QVBoxLayout>
-#include <QWidget>
+#include <QtWidgets/QComboBox>
+#include <QtCore/QObject>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QWidget>
 
 namespace LtsCoordWidget
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget_test.cpp
index 8aea4c88f..e9c4b4a4d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget_test.cpp
@@ -3,11 +3,11 @@
 #include "lts_coord_widget.h"
 
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QApplication>
-#include <QDialog>
-#include <QLabel>
-#include <QPushButton>
-#include <QVBoxLayout>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QVBoxLayout>
 
 static void updateLabel(const QPointF& coord, QLabel* lbl, int prec)
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/UnitTest_Coordinate/lts_coordinate_unit_test.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/UnitTest_Coordinate/lts_coordinate_unit_test.h
index fc587132b..3e8a238e1 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/UnitTest_Coordinate/lts_coordinate_unit_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/UnitTest_Coordinate/lts_coordinate_unit_test.h
@@ -4,8 +4,8 @@
 #include <ElevationMap/elevation_map_manager.h>
 #include <LtsElevation/lts_elevation_manager.h>
 #include <NGLLogger/INGLLogger.h>
-#include <QCoreApplication>
-#include <QObject>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QObject>
 #include <QtTest/QTest>
 
 using LOGGER_T = NGL::INGLLogger&;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coord_vector.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coord_vector.h
index 8ddba4d3e..7e2753c2b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coord_vector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coord_vector.h
@@ -6,9 +6,9 @@
 
 #include <Core/core.hpp>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QDebug>
-#include <QPointF>
-#include <QVector>
+#include <QtCore/QDebug>
+#include <QtCore/QPointF>
+#include <QtCore/QVector>
 #include <iosfwd>
 #include <unordered_map>
 #include <utility>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coordinate.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coordinate.cpp
index 64b5344d7..566a6082f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coordinate.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coordinate.cpp
@@ -2,7 +2,8 @@
 
 #include "lts_coordinate.h"
 
-#include <QLineF>
+#include <QtCore/QLineF>
+#include <iomanip>
 
 namespace LtsCoordTrans
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coordinate.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coordinate.h
index 1089e897e..d79314f70 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coordinate.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coordinate.h
@@ -7,8 +7,8 @@
 #include <Core/core.hpp>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
-#include <QDebug>
-#include <QPointF>
+#include <QtCore/QDebug>
+#include <QtCore/QPointF>
 #include <functional>
 #include <iosfwd>
 #include <type_traits>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/UnitTest_Elevation/elevation_unit_test.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/UnitTest_Elevation/elevation_unit_test.h
index 7d6e5aef2..3cec0a272 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/UnitTest_Elevation/elevation_unit_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/UnitTest_Elevation/elevation_unit_test.h
@@ -5,8 +5,8 @@
 #include <ElevationMap/elevation_map_manager.h>
 #include <LtsElevation/lts_elevation_manager.h>
 #include <NGLLogger/INGLLogger.h>
-#include <QCoreApplication>
-#include <QObject>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QObject>
 #include <QtTest/QTest>
 
 using LOGGER_T = NGL::INGLLogger&;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.h
index 7701a4b3c..0e8748c98 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.h
@@ -6,11 +6,11 @@
 #include "ltselevation_export.h"
 
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
-#include <QCoreApplication>
-#include <QMap>
-#include <QObject>
-#include <QPointer>
-#include <QStringList>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
+#include <QtCore/QStringList>
 #include <iosfwd>
 #include <memory>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/aes_crypt_test.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/aes_crypt_test.h
index 253615c7e..20f113ce2 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/aes_crypt_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/aes_crypt_test.h
@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtCore/QObject>
 
 class aes_crypt_test : public QObject
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/lts_licence.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/lts_licence.cpp
index 2e01bde21..de85cc92f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/lts_licence.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/lts_licence.cpp
@@ -3,8 +3,8 @@
 #include "lts_licence.h"
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QDomDocument>
-#include <QObject>
+#include <QtXml/QDomDocument>
+#include <QtCore/QObject>
 
 namespace LtsLicence
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/lts_licence.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/lts_licence.h
index 311ac537a..119656c18 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/lts_licence.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/lts_licence.h
@@ -4,9 +4,9 @@
 
 #include "ltslicence_export.h"
 
-#include <QDateTime>
-#include <QString>
-#include <QVector>
+#include <QtCore/QDateTime>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 
 namespace LtsLicence
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/logout_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/logout_info_dialog.cpp
index 128d91574..da081cbb0 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/logout_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/logout_info_dialog.cpp
@@ -4,7 +4,7 @@
 
 #include "ui_logout_info_dialog.h"
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace LtsLogin
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/logout_info_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/logout_info_dialog.h
index e763e525f..3adb732e5 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/logout_info_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/logout_info_dialog.h
@@ -3,7 +3,7 @@
 #pragma once
 #include <AssetManagement/asm.hpp>
 #include <LtsWidgets/lts_frameless_dialog.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 class QTimer;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.cpp
index 02acdf03b..cc0f7320c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.cpp
@@ -12,11 +12,11 @@
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <LtsUtilsSettings/settings.h>
 #include <LtsWidgets/lts_wait_dialog.h>
-#include <QCoreApplication>
-#include <QDebug>
-#include <QDir>
-#include <QMessageBox>
-#include <QProcess>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+#include <QtCore/QDir>
+#include <QtWidgets/QMessageBox>
+#include <QtCore/QProcess>
 
 namespace LtsLogin
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.h
index c214269bd..cad12cd98 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.h
@@ -3,7 +3,7 @@
 #include <Plugins/AssetManagement/asm_data_plugin_interface.h>
 #include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
 #include <Plugins/SituationReplayManagement/srm_data_plugin_interface.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <ltslogin_export.h>
 
 namespace LtsPluginManager
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_dummy_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_dummy_widget.cpp
index 548560f29..b1b22e485 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_dummy_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_dummy_widget.cpp
@@ -1,9 +1,9 @@
 #include "lts_dummy_widget.h"
 
 #include <LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h>
-#include <QDebug>
-#include <QEvent>
-#include <QIcon>
+#include <QtCore/QDebug>
+#include <QtCore/QEvent>
+#include <QtGui/QIcon>
 
 namespace LtsMultiMonitor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_dummy_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_dummy_widget.h
index b3ea24bb4..46ffc05a9 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_dummy_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_dummy_widget.h
@@ -1,8 +1,8 @@
 #pragma once
 #include "ltsmultimonitor_export.h"
 
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>
 
 class QEvent;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_magic_corner.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_magic_corner.cpp
index ba267bbed..6000d371a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_magic_corner.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_magic_corner.cpp
@@ -1,12 +1,12 @@
 #include "lts_magic_corner.h"
 
 #include <LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h>
-#include <QDebug>
-#include <QHBoxLayout>
-#include <QIcon>
-#include <QLabel>
-#include <QMouseEvent>
-#include <QTimer>
+#include <QtCore/QDebug>
+#include <QtWidgets/QHBoxLayout>
+#include <QtGui/QIcon>
+#include <QtWidgets/QLabel>
+#include <QtGui/QMouseEvent>
+#include <QtCore/QTimer>
 #include <chrono>
 
 #define SMOL 48
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_magic_corner.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_magic_corner.h
index 7c466e729..2a69212de 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_magic_corner.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_magic_corner.h
@@ -1,9 +1,9 @@
 #pragma once
 #include "lts_screen_base.h"
 
-#include <QDialog>
-#include <QObject>
-#include <QPixmap>
+#include <QtWidgets/QDialog>
+#include <QtCore/QObject>
+#include <QtGui/QPixmap>
 
 class QMouseEvent;
 class QPaintEvent;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor.cpp
index bdf63bfaa..0502b57fb 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor.cpp
@@ -12,13 +12,13 @@
 #include <LtsSession/lts_session_data.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QDebug>
-#include <QGuiApplication>
-#include <QMessageBox>
-#include <QPointer>
-#include <QRect>
-#include <QScreen>
-#include <QWidget>
+#include <QtCore/QDebug>
+#include <QtGui/QGuiApplication>
+#include <QtWidgets/QMessageBox>
+#include <QtCore/QPointer>
+#include <QtCore/QRect>
+#include <QtGui/QScreen>
+#include <QtWidgets/QWidget>
 #include <utility>
 #ifdef Q_OS_WIN
 #include <QtPlatformHeaders/qwindowswindowfunctions.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor.h
index ee85e035e..aaeee6a79 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor.h
@@ -2,8 +2,8 @@
 
 #include "ltsmultimonitor_export.h"
 
-#include <QObject>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 #include <memory>
 
 namespace LtsMultiMonitor
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_base.cpp
index d02f583a6..27c29c39b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_base.cpp
@@ -8,15 +8,15 @@
 
 #include <LtsUtils/LtsUtilsCore/promise.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
-#include <QCloseEvent>
-#include <QColor>
-#include <QDebug>
-#include <QPaintEvent>
-#include <QPainter>
-#include <QPen>
-#include <QRect>
-#include <QSize>
-#include <QStyle>
+#include <QtGui/QCloseEvent>
+#include <QtGui/QColor>
+#include <QtCore/QDebug>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
+#include <QtCore/QRect>
+#include <QtCore/QSize>
+#include <QtWidgets/QStyle>
 
 namespace LtsMultiMonitor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_base.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_base.h
index f3fdbb362..3d632097c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_base.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <QDialog>
-#include <QMap>
-#include <QObject>
+#include <QtWidgets/QDialog>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
 
 class QScreen;
 class QPainter;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_normal.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_normal.cpp
index 4b383a5a7..5d0483b99 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_normal.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_normal.cpp
@@ -8,14 +8,14 @@
 #include "lts_screen_normal.h"
 
 #include <LtsWidgets/lts_base_layout_widget.h>
-#include <QColor>
-#include <QDebug>
-#include <QPaintEvent>
-#include <QPainter>
-#include <QPen>
-#include <QRect>
-#include <QSize>
-#include <QStyle>
+#include <QtGui/QColor>
+#include <QtCore/QDebug>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
+#include <QtCore/QRect>
+#include <QtCore/QSize>
+#include <QtWidgets/QStyle>
 
 namespace LtsMultiMonitor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_normal.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_normal.h
index d1bafeccd..fbbc69731 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_normal.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_normal.h
@@ -1,9 +1,9 @@
 #pragma once
 #include "lts_multi_monitor_selector_base.h"
 
-#include <QDialog>
-#include <QMap>
-#include <QObject>
+#include <QtWidgets/QDialog>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
 
 class QScreen;
 class QPaintEvent;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_wide.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_wide.cpp
index 72ded42c4..5c72e6de5 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_wide.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_wide.cpp
@@ -6,13 +6,13 @@
 #include "lts_screen_container.h"
 #include "lts_screen_wide.h"
 
-#include <QColor>
-#include <QPaintEvent>
-#include <QPainter>
-#include <QPen>
-#include <QRect>
-#include <QSize>
-#include <QStyle>
+#include <QtGui/QColor>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
+#include <QtCore/QRect>
+#include <QtCore/QSize>
+#include <QtWidgets/QStyle>
 
 namespace LtsMultiMonitor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_wide.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_wide.h
index b7b16c95f..7159bb004 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_wide.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_wide.h
@@ -1,9 +1,9 @@
 #pragma once
 #include "LtsMultiMonitor/lts_multi_monitor_selector_base.h"
 
-#include <QDialog>
-#include <QMap>
-#include <QObject>
+#include <QtWidgets/QDialog>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
 
 class QScreen;
 class QPaintEvent;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_base.cpp
index 449827ae2..11f7b4532 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_base.cpp
@@ -4,10 +4,10 @@
 
 #include <LtsUtils/LtsUtilsCore/promise.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
-#include <QCloseEvent>
-#include <QDebug>
-#include <QHBoxLayout>
-#include <QSplitter>
+#include <QtGui/QCloseEvent>
+#include <QtCore/QDebug>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QSplitter>
 #ifdef Q_OS_WIN
 #include <QtPlatformHeaders/qwindowswindowfunctions.h>
 #endif
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_base.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_base.h
index 250c72a69..2a249b988 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_base.h
@@ -1,9 +1,9 @@
 #pragma once
 #include "ltsmultimonitor_export.h"
 
-#include <QObject>
-#include <QRect>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtCore/QRect>
+#include <QtWidgets/QWidget>
 
 class QSplitter;
 class QHBoxLayout;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_container.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_container.cpp
index f4d86d284..3c686a52f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_container.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_container.cpp
@@ -3,11 +3,11 @@
 #include "lts_dummy_widget.h"
 
 #include <LtsWidgets/lts_base_layout_widget.h>
-#include <QDebug>
-#include <QHBoxLayout>
-#include <QRect>
-#include <QResizeEvent>
-#include <QTimer>
+#include <QtCore/QDebug>
+#include <QtWidgets/QHBoxLayout>
+#include <QtCore/QRect>
+#include <QtGui/QResizeEvent>
+#include <QtCore/QTimer>
 
 namespace LtsMultiMonitor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_container.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_container.h
index c5532c3c0..41682f201 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_container.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_container.h
@@ -2,9 +2,9 @@
 #include "lts_screen_base.h"
 #include "ltsmultimonitor_export.h"
 
-#include <QObject>
-#include <QRect>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtCore/QRect>
+#include <QtWidgets/QWidget>
 
 class QHBoxLayout;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_normal.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_normal.cpp
index 5d5791a66..e98ab4134 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_normal.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_normal.cpp
@@ -5,9 +5,9 @@
 #include "lts_screen_container.h"
 
 #include <LtsWidgets/lts_base_layout_widget.h>
-#include <QDebug>
-#include <QHBoxLayout>
-#include <QSplitter>
+#include <QtCore/QDebug>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QSplitter>
 
 #ifdef Q_OS_WIN
 #include <QtPlatformHeaders/qwindowswindowfunctions.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_normal.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_normal.h
index 7d61788de..8f75efba2 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_normal.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_normal.h
@@ -2,9 +2,9 @@
 #include "lts_screen_base.h"
 #include "ltsmultimonitor_export.h"
 
-#include <QObject>
-#include <QRect>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtCore/QRect>
+#include <QtWidgets/QWidget>
 
 class QSplitter;
 class QHBoxLayout;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_wide.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_wide.cpp
index 6ad1e419b..107a6442d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_wide.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_wide.cpp
@@ -4,10 +4,10 @@
 #include "lts_screen_container.h"
 
 #include <LtsWidgets/lts_base_layout_widget.h>
-#include <QDebug>
-#include <QHBoxLayout>
-#include <QSplitter>
-#include <QTimer>
+#include <QtCore/QDebug>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QSplitter>
+#include <QtCore/QTimer>
 #ifdef Q_OS_WIN
 #include <QtPlatformHeaders/qwindowswindowfunctions.h>
 #endif
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_wide.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_wide.h
index ac37732d1..e4e411487 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_wide.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_wide.h
@@ -2,9 +2,9 @@
 #include "lts_screen_base.h"
 #include "ltsmultimonitor_export.h"
 
-#include <QObject>
-#include <QRect>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtCore/QRect>
+#include <QtWidgets/QWidget>
 
 class QSplitter;
 class QHBoxLayout;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification.cpp
index 995b87780..d231c8bec 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification.cpp
@@ -4,7 +4,7 @@
 
 #include "lts_notification_ctl.h"
 
-#include <QIcon>
+#include <QtGui/QIcon>
 
 namespace LtsNotification
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification.h
index 22d0f50f2..7d35b43a0 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification.h
@@ -4,8 +4,8 @@
 
 #include "lts_notification_export.h"
 
-#include <QList>
-#include <QObject>
+#include <QtCore/QList>
+#include <QtCore/QObject>
 #include <functional>
 #include <memory>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification_ctl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification_ctl.cpp
index 5c57270bc..775e42f3c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification_ctl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification_ctl.cpp
@@ -2,12 +2,12 @@
 
 #include "lts_notification_ctl.h"
 
-#include <QColor>
-#include <QDebug>
-#include <QIcon>
-#include <QImage>
-#include <QPainter>
-#include <QToolButton>
+#include <QtGui/QColor>
+#include <QtCore/QDebug>
+#include <QtGui/QIcon>
+#include <QtGui/QImage>
+#include <QtGui/QPainter>
+#include <QtWidgets/QToolButton>
 #include <utility>
 
 namespace LtsNotification
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification_ctl.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification_ctl.h
index 92c618de3..a8727fc54 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification_ctl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification_ctl.h
@@ -4,9 +4,9 @@
 
 #include "lts_notification_export.h"
 
-#include <QIcon>
-#include <QList>
-#include <QObject>
+#include <QtGui/QIcon>
+#include <QtCore/QList>
+#include <QtCore/QObject>
 #include <functional>
 #include <memory>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/Ui/lts_plugin_manager_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/Ui/lts_plugin_manager_dialog.cpp
index f98191136..37e2bc9ba 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/Ui/lts_plugin_manager_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/Ui/lts_plugin_manager_dialog.cpp
@@ -6,9 +6,9 @@
 #include "lts_plugin_manager_widget.h"
 #include "ui_lts_plugin_manager_dialog.h"
 
-#include <QCoreApplication>
-#include <QDebug>
-#include <QString>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+#include <QtCore/QString>
 
 namespace LtsPluginManager
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/Ui/lts_plugin_manager_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/Ui/lts_plugin_manager_dialog.h
index e1b75a5fc..be03b9690 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/Ui/lts_plugin_manager_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/Ui/lts_plugin_manager_dialog.h
@@ -4,8 +4,8 @@
 #include "lts_plugin_manager_widget.h"
 #include "ltspluginmanager_export.h"
 
-#include <QDialog>
-#include <QObject>
+#include <QtWidgets/QDialog>
+#include <QtCore/QObject>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/Ui/lts_plugin_manager_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/Ui/lts_plugin_manager_widget.h
index 4ea3ad682..49ff4c8d0 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/Ui/lts_plugin_manager_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/Ui/lts_plugin_manager_widget.h
@@ -1,8 +1,8 @@
 
 
 #pragma once
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>
 #include <lts_plugin_manager.h>
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.cpp
index a2c41c5e0..6965030c3 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.cpp
@@ -4,13 +4,13 @@
 
 #include <LtsAppDescriptor/lts_app_descriptor.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QCoreApplication>
-#include <QDebug>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
 #include <QDirIterator>
-#include <QFileInfo>
-#include <QJsonObject>
+#include <QtCore/QFileInfo>
+#include <QtCore/QJsonObject>
 #include <QMutableListIterator>
-#include <QPluginLoader>
+#include <QtCore/QPluginLoader>
 #include <utility>
 
 namespace LtsPluginManager
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.h
index acb23157a..394a36566 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.h
@@ -4,8 +4,8 @@
 
 #define PLUGIN_LOADER_VERSION 3
 
-#include <QMap>
-#include <QPair>
+#include <QtCore/QMap>
+#include <QtCore/QPair>
 #include <functional>
 #include <qglobal.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.cpp
index d8dd05505..51f7060fd 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.cpp
@@ -12,8 +12,8 @@
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <PluginInterfaces/data_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QDebug>
-#include <QTimer>
+#include <QtCore/QDebug>
+#include <QtCore/QTimer>
 #include <utility>
 
 namespace LtsPluginManager
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.h
index 1608cc1dc..847335579 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.h
@@ -7,11 +7,11 @@
 #include <LtsAppDescriptor/lts_app_descriptor.h>
 #include <LtsPluginManager/lts_plugin_loader.h>
 #include <ProjectConfig/project_defines.h>
-#include <QFlags>
-#include <QMap>
-#include <QObject>
-#include <QString>
-#include <QVector>
+#include <QtCore/QFlags>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing.cpp
index 815b7cb16..45d5d77f0 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing.cpp
@@ -8,22 +8,22 @@
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
-#include <QAbstractItemModel>
-#include <QDebug>
-#include <QImage>
-#include <QLabel>
-#include <QListView>
-#include <QPainter>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QDebug>
+#include <QtGui/QImage>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QListView>
+#include <QtGui/QPainter>
 #include <QPrintDialog>
 #include <QPrinter>
-#include <QString>
-#include <QTableView>
-#include <QTableWidget>
-#include <QTextCursor>
-#include <QTextDocument>
-#include <QTextEdit>
+#include <QtCore/QString>
+#include <QtWidgets/QTableView>
+#include <QtWidgets/QTableWidget>
+#include <QtGui/QTextCursor>
+#include <QtGui/QTextDocument>
+#include <QtWidgets/QTextEdit>
 #include <QTextTable>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace LtsPrinting
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.cpp
index 75a1b5e0f..813f93452 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.cpp
@@ -5,22 +5,22 @@
 #include <KDReports/KDReports.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <QAbstractTextDocumentLayout>
-#include <QDateTime>
-#include <QFile>
-#include <QListView>
-#include <QPainter>
-#include <QPair>
+#include <QtCore/QDateTime>
+#include <QtCore/QFile>
+#include <QtWidgets/QListView>
+#include <QtGui/QPainter>
+#include <QtCore/QPair>
 #include <QPrintDialog>
 #include <QPrinter>
 #include <QPrinterInfo>
-#include <QTableView>
-#include <QTemporaryFile>
+#include <QtWidgets/QTableView>
+#include <QtCore/QTemporaryFile>
 #include <QTextBlock>
-#include <QTextDocument>
+#include <QtGui/QTextDocument>
 #include <QTextFrame>
 #include <QTextFrameFormat>
-#include <QTreeView>
-#include <QUrl>
+#include <QtWidgets/QTreeView>
+#include <QtCore/QUrl>
 #include <nglsettings/nglsettings_settings.h>
 #include <ngltools/ngltools_dtg.h>
 #include <ngltools/ngltools_filesystem.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/json_keys.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/json_keys.h
index 12da29188..4c74b7952 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/json_keys.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/json_keys.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace LtsProjectionWorkstation::JsonKeys
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/message_factory.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/message_factory.cpp
index e24ffc172..a217724f8 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/message_factory.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/message_factory.cpp
@@ -5,7 +5,7 @@
 
 #include <LtsWebSocket/client_message.h>
 #include <LtsWebSocket/json_keys.h>
-#include <QUuid>
+#include <QtCore/QUuid>
 
 namespace LtsProjectionWorkstation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.cpp
index 1f7e3d4ba..7312809af 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.cpp
@@ -2,8 +2,8 @@
 
 #include "messages.h"
 
-#include <QDebug>
-#include <QJsonArray>
+#include <QtCore/QDebug>
+#include <QtCore/QJsonArray>
 
 namespace LtsProjectionWorkstation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.h
index 62c448564..62de2dcfd 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.h
@@ -8,7 +8,7 @@
 #include <LtsProjectionWorkstation/vnc_server_manager.h>
 #include <LtsWebSocket/client_message.h>
 #include <LtsWebSocket/json_keys.h>
-#include <QVector>
+#include <QtCore/QVector>
 
 namespace LtsWebSocket
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.cpp
index b0f62d174..1b8e693c6 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.cpp
@@ -7,9 +7,9 @@
 
 #include <LtsSession/lts_session_data.h>
 #include <LtsWebSocket/lts_web_socket_server.h>
-#include <QGuiApplication>
-#include <QTimer>
-#include <QUuid>
+#include <QtGui/QGuiApplication>
+#include <QtCore/QTimer>
+#include <QtCore/QUuid>
 #include <QtWebSockets/QWebSocket>
 #include <nglsettings/nglsettings_connections.h>
 #include <utility>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.h
index fc7072eb3..262e43285 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.h
@@ -8,8 +8,8 @@
 #include "vnc_server_manager.h"
 
 #include <LtsWebSocket/client_connection.h>
-#include <QObject>
-#include <QPair>
+#include <QtCore/QObject>
+#include <QtCore/QPair>
 
 namespace LtsWebSocket
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/vnc_server_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/vnc_server_manager.cpp
index d9995644a..f8e172a0d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/vnc_server_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/vnc_server_manager.cpp
@@ -2,9 +2,9 @@
 
 #include "vnc_server_manager.h"
 
-#include <QDir>
-#include <QRegularExpression>
-#include <QScreen>
+#include <QtCore/QDir>
+#include <QtCore/QRegularExpression>
+#include <QtGui/QScreen>
 #include <utility>
 
 namespace LtsProjectionWorkstation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/vnc_server_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/vnc_server_manager.h
index 5b45b7581..e7800e6ab 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/vnc_server_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/vnc_server_manager.h
@@ -4,11 +4,11 @@
 
 #include "logger.h"
 
-#include <QObject>
-#include <QProcess>
-#include <QRect>
-#include <QString>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QProcess>
+#include <QtCore/QRect>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 
 class QScreen;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/Test/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/Test/main.cpp
index b3ae2de25..c3fbc3ce1 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/Test/main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/Test/main.cpp
@@ -1,6 +1,6 @@
 #include "mainwindow.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 int main(int argc, char* argv[])
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/Test/mainwindow.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/Test/mainwindow.cpp
index 3f3a25b9f..ed9fd0a5d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/Test/mainwindow.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/Test/mainwindow.cpp
@@ -3,8 +3,8 @@
 #include "ui_mainwindow.h"
 
 #include <LtsScriptTimeline/track_entry.h>
-#include <QDialog>
-#include <QLabel>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QLabel>
 
 MainWindow::MainWindow(QWidget* parent)
     : QMainWindow(parent), ui(new Ui::MainWindow), m_selectedTe(nullptr), m_currentNewTopicEditor(nullptr),
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/Test/mainwindow.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/Test/mainwindow.h
index b5f8facf7..e78d7490f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/Test/mainwindow.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/Test/mainwindow.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <QMainWindow>
-#include <QObject>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QObject>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/filter_background_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/filter_background_widget.cpp
index 7dec09903..48f1f4942 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/filter_background_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/filter_background_widget.cpp
@@ -5,7 +5,7 @@
 #include "track_content_widget.h"
 #include "track_entry.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 
 namespace LtsScriptTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/filter_background_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/filter_background_widget.h
index 437802726..b904dc48e 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/filter_background_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/filter_background_widget.h
@@ -1,9 +1,9 @@
 #pragma once
 #include "track_content_widget.h"
 
-#include <QMap>
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>
 
 namespace LtsScriptTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/filter_track_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/filter_track_widget.cpp
index b46230842..c359d181d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/filter_track_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/filter_track_widget.cpp
@@ -4,10 +4,10 @@
 #include "track_entry.h"
 #include "ui_filter_track_widget.h"
 
-#include <QBrush>
-#include <QColor>
-#include <QPainter>
-#include <QPen>
+#include <QtGui/QBrush>
+#include <QtGui/QColor>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
 
 namespace LtsScriptTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/filter_track_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/filter_track_widget.h
index 960c7fd7e..b8b2656c9 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/filter_track_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/filter_track_widget.h
@@ -2,8 +2,8 @@
 #include "ltsscripttimeline_export.h"
 #include "track_entry_painters.h"
 
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/indicator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/indicator.cpp
index 35ac5afdc..c03102759 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/indicator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/indicator.cpp
@@ -2,7 +2,7 @@
 
 #include "ui_indicator.h"
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace LtsScriptTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/indicator.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/indicator.h
index fa3e61da1..b5271a05f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/indicator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/indicator.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/script_timeline.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/script_timeline.cpp
index 9f64a29e9..2dfb73a3c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/script_timeline.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/script_timeline.cpp
@@ -11,12 +11,12 @@
 
 #include <LtsWidgets/lts_message_dialog.h>
 #include <QCursor>
-#include <QDebug>
-#include <QMessageBox>
-#include <QPixmap>
-#include <QRubberBand>
-#include <QTime>
-#include <QTimer>
+#include <QtCore/QDebug>
+#include <QtWidgets/QMessageBox>
+#include <QtGui/QPixmap>
+#include <QtWidgets/QRubberBand>
+#include <QtCore/QTime>
+#include <QtCore/QTimer>
 #include <utility>
 
 namespace LtsScriptTimeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/script_timeline.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/script_timeline.h
index 56f9b9ef2..5cf389968 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/script_timeline.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/script_timeline.h
@@ -2,10 +2,10 @@
 #include "ltsscripttimeline_export.h"
 #include "track_entry_painters.h"
 
-#include <QKeyEvent>
-#include <QObject>
-#include <QPointer>
-#include <QWidget>
+#include <QtGui/QKeyEvent>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
+#include <QtWidgets/QWidget>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/temporary_pointer_vector.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/temporary_pointer_vector.h
index bdcc88429..b65c76375 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/temporary_pointer_vector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/temporary_pointer_vector.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <QDebug>
-#include <QVector>
+#include <QtCore/QDebug>
+#include <QtCore/QVector>
 
 namespace LtsScriptTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/tools.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/tools.h
index 77c07062b..a7ab4f8c1 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/tools.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/tools.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace LtsScriptTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_content_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_content_widget.cpp
index b4dbf4a0c..8ba470bbd 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_content_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_content_widget.cpp
@@ -12,19 +12,19 @@
 #include "track_widget.h"
 
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QApplication>
-#include <QBrush>
-#include <QByteArray>
-#include <QColor>
-#include <QDataStream>
-#include <QGuiApplication>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtWidgets/QApplication>
+#include <QtGui/QBrush>
+#include <QtCore/QByteArray>
+#include <QtGui/QColor>
+#include <QtCore/QDataStream>
+#include <QtGui/QGuiApplication>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QJsonValue>
-#include <QKeyEvent>
-#include <QPainter>
+#include <QtCore/QJsonValue>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QPainter>
 #include <QtCore/qglobal.h>
 #include <cassert>
 #include <utility>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_content_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_content_widget.h
index d2363e214..d32766951 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_content_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_content_widget.h
@@ -1,8 +1,8 @@
 #pragma once
 #include "ltsscripttimeline_export.h"
 
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>
 
 namespace LtsScriptTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_drag_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_drag_handler.cpp
index 31af881d0..095cb58e3 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_drag_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_drag_handler.cpp
@@ -7,12 +7,12 @@
 #include "track_widget.h"
 
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QApplication>
-#include <QDebug>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDebug>
 #include <QDrag>
-#include <QDragEnterEvent>
-#include <QDropEvent>
-#include <QGuiApplication>
+#include <QtGui/QDragEnterEvent>
+#include <QtGui/QDropEvent>
+#include <QtGui/QGuiApplication>
 #include <QMimeData>
 #include <utility>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_drag_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_drag_handler.h
index c077b22bf..6501784e9 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_drag_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_drag_handler.h
@@ -2,7 +2,7 @@
 
 #include "ltsscripttimeline_export.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 namespace LtsScriptTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry.h
index 475fd5ed3..e2c783931 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry.h
@@ -3,8 +3,8 @@
 #include "ltsscripttimeline_export.h"
 #include "track_entry_painters.h"
 
-#include <QJsonObject>
-#include <QObject>
+#include <QtCore/QJsonObject>
+#include <QtCore/QObject>
 
 namespace LtsScriptTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_painters.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_painters.cpp
index f425e1d08..470422669 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_painters.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_painters.cpp
@@ -4,8 +4,8 @@
 
 #include "track_entry.h"
 
-#include <QDebug>
-#include <QObject>
+#include <QtCore/QDebug>
+#include <QtCore/QObject>
 
 namespace LtsScriptTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_painters.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_painters.h
index 537ce03aa..2abc1bef4 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_painters.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_painters.h
@@ -4,11 +4,11 @@
 
 #include "ltsscripttimeline_export.h"
 
-#include <QColor>
-#include <QIcon>
-#include <QPainter>
-#include <QPen>
-#include <QRect>
+#include <QtGui/QColor>
+#include <QtGui/QIcon>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
+#include <QtCore/QRect>
 
 namespace LtsScriptTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_preview_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_preview_widget.cpp
index a6719e48f..0e8257fd0 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_preview_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_preview_widget.cpp
@@ -5,10 +5,10 @@
 
 #include <LtsSession/lts_session_data.h>
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QContextMenuEvent>
-#include <QJsonDocument>
-#include <QMenu>
-#include <QTextEdit>
+#include <QtGui/QContextMenuEvent>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QTextEdit>
 
 namespace LtsScriptTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_preview_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_preview_widget.h
index 9a5c35efc..ab19cc62e 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_preview_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_preview_widget.h
@@ -1,8 +1,8 @@
 #pragma once
 #include "ltsscripttimeline_export.h"
 
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_previewer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_previewer.cpp
index ecd9fbbba..40413984c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_previewer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_previewer.cpp
@@ -6,8 +6,8 @@
 
 #include <QDrag>
 #include <QMimeData>
-#include <QMouseEvent>
-#include <QPainter>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
 
 namespace LtsScriptTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_previewer.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_previewer.h
index 3835c3eab..c97e5f815 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_previewer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_previewer.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>
 
 namespace LtsScriptTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_header.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_header.cpp
index f9c46f1b5..82b837e9b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_header.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_header.cpp
@@ -2,17 +2,17 @@
 
 #include "tools.h"
 
-#include <QApplication>
-#include <QBrush>
-#include <QColor>
+#include <QtWidgets/QApplication>
+#include <QtGui/QBrush>
+#include <QtGui/QColor>
 #include <QCursor>
-#include <QDebug>
-#include <QFont>
+#include <QtCore/QDebug>
+#include <QtGui/QFont>
 #include <QFontMetrics>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QPen>
-#include <QTime>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
+#include <QtCore/QTime>
 
 namespace LtsScriptTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_header.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_header.h
index a1133e99a..3aaf02d6a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_header.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_header.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>
 
 namespace LtsScriptTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_resize_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_resize_handler.cpp
index cc3231a06..04715dd3a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_resize_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_resize_handler.cpp
@@ -8,8 +8,8 @@
 #include "track_widget.h"
 
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QDebug>
-#include <QMouseEvent>
+#include <QtCore/QDebug>
+#include <QtGui/QMouseEvent>
 #include <utility>
 
 namespace LtsScriptTimeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_select_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_select_handler.cpp
index dfd4ac07e..387a3cc96 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_select_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_select_handler.cpp
@@ -4,13 +4,13 @@
 #include "track_content_widget.h"
 #include "track_entry.h"
 
-#include <QCoreApplication>
-#include <QDebug>
-#include <QGuiApplication>
-#include <QInputDialog>
-#include <QKeyEvent>
-#include <QMenu>
-#include <QMouseEvent>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+#include <QtGui/QGuiApplication>
+#include <QtWidgets/QInputDialog>
+#include <QtGui/QKeyEvent>
+#include <QtWidgets/QMenu>
+#include <QtGui/QMouseEvent>
 
 namespace LtsScriptTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_select_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_select_handler.h
index 31c904e32..6249d5aab 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_select_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_select_handler.h
@@ -2,7 +2,7 @@
 
 #include "ltsscripttimeline_export.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class QMouseEvent;
 class QKeyEvent;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_widget.cpp
index a878ba650..f48673549 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_widget.cpp
@@ -7,14 +7,14 @@
 #include "track_entry.h"
 #include "ui_track_widget.h"
 
-#include <QBrush>
-#include <QColor>
-#include <QDebug>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QPainter>
-#include <QPen>
+#include <QtGui/QBrush>
+#include <QtGui/QColor>
+#include <QtCore/QDebug>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonValue>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
 #include <utility>
 
 namespace LtsScriptTimeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_widget.h
index f3ad49204..afbb795ce 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_widget.h
@@ -2,9 +2,9 @@
 #include "ltsscripttimeline_export.h"
 #include "track_entry_painters.h"
 
-#include <QMap>
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>
 #include <functional>
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_comport_querry.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_comport_querry.h
index e31057379..2670e4d86 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_comport_querry.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_comport_querry.h
@@ -3,7 +3,7 @@
 #include "lts_seri"
 #include "ltsserialportquerry_export.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtSerialPort/QSerialPortInfo>
 #include <QtSerialPort/QtSerialPort>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_serial_port_querry.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_serial_port_querry.h
index 9b6a8ce07..9eb2d0a8d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_serial_port_querry.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_serial_port_querry.h
@@ -3,7 +3,7 @@
 #include "logger.h"
 #include "ltsserialportquerry_export.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtSerialPort/QSerialPortInfo>
 #include <QtSerialPort/QtSerialPort>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.cpp
index 8eaf798c0..a1507dd21 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.cpp
@@ -43,18 +43,18 @@
 #ifdef BUILD_FILTERMANAGEMENT
 #include <Lts/Plugins/OnlineHelp/ohp_online_help_viewer_gui_plugin_interface.h> // XXX: grrr..
 #endif
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QHostInfo>
-#include <QLabel>
-#include <QMessageBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QMessageBox>
 #include <QNetworkInterface>
-#include <QPainter>
-#include <QScreen>
+#include <QtGui/QPainter>
+#include <QtGui/QScreen>
 #include <QSvgRenderer>
-#include <QTimer>
-#include <QUuid>
-#include <QWidget>
-// #include <QDebug>
+#include <QtCore/QTimer>
+#include <QtCore/QUuid>
+#include <QtWidgets/QWidget>
+// #include <QtCore/QDebug>
 
 using namespace LtsWidgets;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.h
index 1b97e0f8f..606218d98 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.h
@@ -18,12 +18,12 @@
 #include <LtsAppDescriptor/lts_app_descriptor.h>
 #include <LtsSession/ltssession_export.h>
 #include <LtsWidgets/lts_base.h>
-#include <QDebug>
-#include <QJsonObject>
-#include <QMap>
-#include <QObject>
-#include <QPointer>
-#include <QVector>
+#include <QtCore/QDebug>
+#include <QtCore/QJsonObject>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
+#include <QtCore/QVector>
 #include <memory>
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data.h
index cdf676a12..90646a3df 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data.h
@@ -3,12 +3,12 @@
 #include <Lts/Common/ProjectConfig/project_defines.h>
 #include <LtsAppDescriptor/lts_app_descriptor.h>
 #include <LtsSession/ltssessiondata_export.h>
-#include <QMap>
-#include <QObject>
-#include <QPixmap>
-#include <QSet>
-#include <QUrl>
-#include <QVariant>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtGui/QPixmap>
+#include <QtCore/QSet>
+#include <QtCore/QUrl>
+#include <QtCore/QVariant>
 #include <QtCore/qglobal.h>
 
 namespace LtsSessionData
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.cpp
index 0ed2ae194..b89868c4e 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.cpp
@@ -15,9 +15,9 @@
 #include <DDS/DTC/generic_dtc_impl.h>
 #include <DDS/QosProfile/DDS_DefaultQos>
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QDebug>
-#include <QSet>
-#include <QVector>
+#include <QtCore/QDebug>
+#include <QtCore/QSet>
+#include <QtCore/QVector>
 
 namespace LtsSession
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.h
index cb8cbccb7..6d6132b7a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.h
@@ -10,12 +10,12 @@
 
 #pragma once
 
-#include <QObject>
-#include <QStringList>
-#include <QUrl>
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
+#include <QtCore/QUrl>
 #include <memory>
 
-#include <QMap>
+#include <QtCore/QMap>
 
 // Export macro for shared library
 #include "ltssessiondatadds_export.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.cpp
index 845e4613e..e6e9e8dc9 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.cpp
@@ -1,6 +1,6 @@
 #include "lts_session_lock_handler.h"
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 namespace LtsSession
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.h
index 9fb1ddd02..04594f4d2 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.h
@@ -4,8 +4,8 @@
 // This stub provides minimal functionality for building without RTI Connext DDS
 
 #include <LtsSession/ltssession_export.h>
-#include <QObject>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 #include <memory>
 
 // Forward declaration - actual type from LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_manager.cpp
index 2e3ec409a..43d1b61ee 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_manager.cpp
@@ -24,7 +24,7 @@
 #include <DDS/DDSConnector/dds_connector.h>
 #endif
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 namespace LtsSession
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_manager.h
index 7eccf97f0..b1397fe32 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_manager.h
@@ -16,10 +16,10 @@
 #include <LtsPluginManager/lts_plugin_loader.h>
 #include <LtsPluginManager/lts_plugin_manager.h>
 #include <LtsSession/ltssession_export.h>
-#include <QMap>
-#include <QObject>
-#include <QString>
-#include <QVector>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 #include <memory>
 
 namespace NGL
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item.cpp
index 180efdeba..6639bcea5 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item.cpp
@@ -2,11 +2,11 @@
 
 #include "item.h"
 
-#include <QBrush>
-#include <QDebug>
-#include <QModelIndex>
-#include <QPainter>
-#include <QPen>
+#include <QtGui/QBrush>
+#include <QtCore/QDebug>
+#include <QtCore/QModelIndex>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
 #include <QStyleOptionViewItem>
 
 namespace LtsTimeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item.h
index 497840f81..eae58560a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item.h
@@ -4,7 +4,7 @@
 
 #include "ltstimeline_export.h"
 
-#include <QColor>
+#include <QtGui/QColor>
 #include <functional>
 #include <memory>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item_delegate.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item_delegate.cpp
index c60835039..66140e9e5 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item_delegate.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item_delegate.cpp
@@ -6,11 +6,11 @@
 #include "timeline_view.h"
 #include "track.h"
 
-#include <QDebug>
-#include <QGuiApplication>
-#include <QModelIndex>
-#include <QPainter>
-#include <QRect>
+#include <QtCore/QDebug>
+#include <QtGui/QGuiApplication>
+#include <QtCore/QModelIndex>
+#include <QtGui/QPainter>
+#include <QtCore/QRect>
 
 namespace LtsTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item_delegate.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item_delegate.h
index dc59281da..597d1742e 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item_delegate.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item_delegate.h
@@ -3,9 +3,9 @@
 #pragma once
 #include "ltstimeline_export.h"
 
-#include <QObject>
-#include <QPushButton>
-#include <QStyledItemDelegate>
+#include <QtCore/QObject>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QStyledItemDelegate>
 
 namespace LtsTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/main.cpp
index aba30c1d2..f560cf3ce 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/main.cpp
@@ -1,6 +1,6 @@
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QDateTime>
-#include <QDebug>
+#include <QtCore/QDateTime>
+#include <QtCore/QDebug>
 #include <item.h>
 #include <nglapplication/nglapplication.h>
 #include <timeline_model.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view.cpp
index a3d37fd62..d9246bc9c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view.cpp
@@ -2,18 +2,18 @@
 
 #include "timeline_view.h"
 
-#include <QBrush>
-#include <QDebug>
-#include <QFont>
-#include <QGuiApplication>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QPen>
-#include <QPoint>
-#include <QPolygon>
-#include <QRect>
-#include <QTime>
-#include <QTimer>
+#include <QtGui/QBrush>
+#include <QtCore/QDebug>
+#include <QtGui/QFont>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
+#include <QtCore/QPoint>
+#include <QtGui/QPolygon>
+#include <QtCore/QRect>
+#include <QtCore/QTime>
+#include <QtCore/QTimer>
 #include <utility>
 
 namespace LtsTimeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view.h
index 509cb5cef..0960162fa 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view.h
@@ -3,8 +3,8 @@
 #include "timeline_header_view_mouse_handler.h"
 #include "timeline_utils.h"
 
-#include <QHeaderView>
-#include <QObject>
+#include <QtWidgets/QHeaderView>
+#include <QtCore/QObject>
 
 class QMouseEvent;
 class QPainter;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view_mouse_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view_mouse_handler.cpp
index 6a6dc4560..8892bfa40 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view_mouse_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view_mouse_handler.cpp
@@ -3,10 +3,10 @@
 #include "timeline_header_view.h"
 #include "timeline_view.h"
 
-#include <QApplication>
-#include <QDebug>
-#include <QMouseEvent>
-#include <QWheelEvent>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDebug>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QWheelEvent>
 
 namespace LtsTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view_mouse_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view_mouse_handler.h
index 9ca3c0c77..377e525eb 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view_mouse_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view_mouse_handler.h
@@ -2,7 +2,7 @@
 
 #include "ltstimeline_export.h"
 
-#include <QPoint>
+#include <QtCore/QPoint>
 
 class QMouseEvent;
 class QWheelEvent;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.cpp
index 50862fc64..488033851 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.cpp
@@ -6,7 +6,7 @@
 #include "track.h"
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QDebug>
+#include <QtCore/QDebug>
 #include <utility>
 
 namespace LtsTimeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.h
index 2342bed6d..733dc97e2 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.h
@@ -6,8 +6,8 @@
 #include "track.h"
 
 #include <NGLLogger/INGLLogger.h>
-#include <QAbstractItemModel>
-#include <QObject>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QObject>
 #include <type_traits>
 
 namespace LtsTimeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_utils.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_utils.cpp
index adf175b28..2f7c654c4 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_utils.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_utils.cpp
@@ -1,7 +1,7 @@
 #include "timeline_utils.h"
 
-#include <QApplication>
-#include <QDateTime>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDateTime>
 #include <ltstimeline_export.h>
 #include <ngltools/ngltools_dtg.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_utils.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_utils.h
index f95fa3a84..0dd019e9d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_utils.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_utils.h
@@ -2,7 +2,7 @@
 
 #include "ltstimeline_export.h"
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace LtsTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.cpp
index 0e51618fa..69e509ba9 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.cpp
@@ -6,16 +6,16 @@
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <QAbstractProxyModel>
-#include <QApplication>
-#include <QBrush>
-#include <QDebug>
-#include <QGuiApplication>
-#include <QHeaderView>
+#include <QtWidgets/QApplication>
+#include <QtGui/QBrush>
+#include <QtCore/QDebug>
+#include <QtGui/QGuiApplication>
+#include <QtWidgets/QHeaderView>
 #include <QHelpEvent>
-#include <QModelIndex>
-#include <QPainter>
-#include <QPen>
-#include <QRect>
+#include <QtCore/QModelIndex>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
+#include <QtCore/QRect>
 #include <utility>
 
 namespace LtsTimeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.h
index edb4c4511..fcfedea26 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.h
@@ -9,9 +9,9 @@
 #include "timeline_view_selection_handler.h"
 #include "timeline_view_track_handler.h"
 
-#include <QLabel>
-#include <QObject>
-#include <QTreeView>
+#include <QtWidgets/QLabel>
+#include <QtCore/QObject>
+#include <QtWidgets/QTreeView>
 #include <functional>
 
 class QAbstractProxyModel;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_drag_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_drag_handler.cpp
index 82d494b13..37cfbda03 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_drag_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_drag_handler.cpp
@@ -3,11 +3,11 @@
 #include "item.h"
 #include "track.h"
 
-#include <QApplication>
-#include <QDebug>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDebug>
 #include <QDrag>
 #include <QMimeData>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 #include <utility>
 
 namespace LtsTimeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_drag_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_drag_handler.h
index 831c07020..224bed8d1 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_drag_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_drag_handler.h
@@ -3,9 +3,9 @@
 #include "ltstimeline_export.h"
 #include "timeline_view.h"
 
-#include <QModelIndex>
-#include <QPoint>
-#include <QVector>
+#include <QtCore/QModelIndex>
+#include <QtCore/QPoint>
+#include <QtCore/QVector>
 
 class QDragEnterEvent;
 class QDragMoveEvent;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_resize_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_resize_handler.cpp
index 3e94c3942..a6f41a9cf 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_resize_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_resize_handler.cpp
@@ -5,9 +5,9 @@
 #include "timeline_view.h"
 #include "track.h"
 
-#include <QApplication>
-#include <QDebug>
-#include <QMouseEvent>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDebug>
+#include <QtGui/QMouseEvent>
 
 namespace LtsTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_resize_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_resize_handler.h
index 1a84c0598..7fc200414 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_resize_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_resize_handler.h
@@ -2,7 +2,7 @@
 
 #include "ltstimeline_export.h"
 
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 
 namespace LtsTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_selection_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_selection_handler.cpp
index 03cfccab4..bdb80c0e2 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_selection_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_selection_handler.cpp
@@ -2,12 +2,12 @@
 
 #include "item_delegate.h"
 
-#include <QApplication>
-#include <QDebug>
-#include <QKeyEvent>
-#include <QModelIndex>
-#include <QMouseEvent>
-#include <QSize>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDebug>
+#include <QtGui/QKeyEvent>
+#include <QtCore/QModelIndex>
+#include <QtGui/QMouseEvent>
+#include <QtCore/QSize>
 #include <utility>
 
 namespace LtsTimeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_selection_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_selection_handler.h
index 493c34975..e9519da4c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_selection_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_selection_handler.h
@@ -3,7 +3,7 @@
 #include "ltstimeline_export.h"
 #include "timeline_view.h"
 
-#include <QRect>
+#include <QtCore/QRect>
 
 class QMouseEvent;
 class QKeyEvent;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_track_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_track_handler.cpp
index c40de768a..118a39052 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_track_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_track_handler.cpp
@@ -5,9 +5,9 @@
 #include "track.h"
 
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QApplication>
-#include <QDebug>
-#include <QMouseEvent>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDebug>
+#include <QtGui/QMouseEvent>
 
 namespace LtsTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_track_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_track_handler.h
index d72ec2b9b..5d84316d4 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_track_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_track_handler.h
@@ -2,8 +2,8 @@
 
 #include "ltstimeline_export.h"
 
-#include <QModelIndex>
-#include <QMouseEvent>
+#include <QtCore/QModelIndex>
+#include <QtGui/QMouseEvent>
 
 namespace LtsTimeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.cpp
index 6c7a30e90..f4077200c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.cpp
@@ -9,11 +9,11 @@
 #include "ui_timeline_widget.h"
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QDateTime>
-#include <QPoint>
-#include <QRect>
-#include <QSize>
-#include <QStandardItemModel>
+#include <QtCore/QDateTime>
+#include <QtCore/QPoint>
+#include <QtCore/QRect>
+#include <QtCore/QSize>
+#include <QtGui/QStandardItemModel>
 #include <QtGlobal>
 #include <utility>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.h
index d42b64736..aa9f9905f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.h
@@ -5,8 +5,8 @@
 #include "timeline_utils.h"
 
 #include <NGLLogger/INGLLogger.h>
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>
 
 class QScrollBar;
 class QAbstractItemModel;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/track.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/track.h
index b00cc550d..c7c78facb 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/track.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/track.h
@@ -5,9 +5,9 @@
 #include "item.h"
 #include "ltstimeline_export.h"
 
-#include <QObject>
-#include <QSet>
-#include <QVariant>
+#include <QtCore/QObject>
+#include <QtCore/QSet>
+#include <QtCore/QVariant>
 #include <memory>
 
 namespace LtsTimeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/AbstractTimelineModel.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/AbstractTimelineModel.h
index 78d954c0a..07afb036b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/AbstractTimelineModel.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/AbstractTimelineModel.h
@@ -6,8 +6,8 @@
 #include "ltstimelineclassic_export.h"
 
 #include <NGLLogger/INGLLogger.h>
-#include <QAbstractItemModel>
-#include <QObject>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QObject>
 
 namespace LtsTimelineClassic
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.cpp
index 39aa59ba5..6f2593ff3 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.cpp
@@ -3,9 +3,9 @@
 #include "Event.h"
 
 #include <LtsSession/lts_session.h>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QPainterPath>
-#include <QRect>
+#include <QtCore/QRect>
 #include <time.h>
 
 namespace LtsTimelineClassic
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.h
index c694145df..1bfa9d2a6 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.h
@@ -7,9 +7,9 @@
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 #include <NGLLogger/INGLLogger.h>
 #include <NGLLoggerBootstrap.h>
-#include <QColor>
-#include <QJsonObject>
-#include <QStringList>
+#include <QtGui/QColor>
+#include <QtCore/QJsonObject>
+#include <QtCore/QStringList>
 
 class QPainter;
 class QRect;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventDelegate.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventDelegate.cpp
index 63baa8f64..069096f36 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventDelegate.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventDelegate.cpp
@@ -4,8 +4,8 @@
 
 #include "PassiveEventContainer.h"
 
-#include <QDebug>
-#include <QModelIndex>
+#include <QtCore/QDebug>
+#include <QtCore/QModelIndex>
 
 namespace LtsTimelineClassic
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventDelegate.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventDelegate.h
index ea52c56d5..8fe2607ad 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventDelegate.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventDelegate.h
@@ -4,8 +4,8 @@
 #include "AbstractTimelineModel.h"
 #include "Range.h"
 
-#include <QObject>
-#include <QStyledItemDelegate>
+#include <QtCore/QObject>
+#include <QtWidgets/QStyledItemDelegate>
 
 namespace LtsTimelineClassic
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventGraphic.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventGraphic.cpp
index 696e589c5..07e6ac7dd 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventGraphic.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventGraphic.cpp
@@ -2,13 +2,13 @@
 
 #include "EventGraphic.h"
 
-#include <QBrush>
-#include <QDebug>
-#include <QGuiApplication>
-#include <QPainter>
+#include <QtGui/QBrush>
+#include <QtCore/QDebug>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QPainter>
 #include <QPalette>
-#include <QPen>
-#include <QPoint>
+#include <QtGui/QPen>
+#include <QtCore/QPoint>
 #include <utility>
 
 namespace LtsTimelineClassic
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventList.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventList.h
index 492be33e1..39a8dcf09 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventList.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventList.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QVector>
+#include <QtCore/QVector>
 
 namespace LtsTimelineClassic
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventTools.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventTools.cpp
index aa13cb8ab..3b9c0b670 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventTools.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventTools.cpp
@@ -6,8 +6,8 @@
 #include "EventGraphic.h"
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QDebug>
-#include <QPainter>
+#include <QtCore/QDebug>
+#include <QtGui/QPainter>
 #include <math.h>
 
 namespace LtsTimelineClassic
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventTools.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventTools.h
index 70234be98..0a50787f7 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventTools.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventTools.h
@@ -5,7 +5,7 @@
 #include "EventList.h"
 #include "ltstimelineclassic_export.h"
 
-#include <QRect>
+#include <QtCore/QRect>
 #include <time.h>
 
 class QPainter;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Item.cpp
index f4ff0c41e..6e1d0b552 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Item.cpp
@@ -5,7 +5,7 @@
 #include "EventGraphic.h"
 #include "EventTools.h"
 
-#include <QDebug>
+#include <QtCore/QDebug>
 #include <utility>
 
 #ifdef LTS_DEBUG
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/LineMap.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/LineMap.h
index 3e724a01b..824200d5e 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/LineMap.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/LineMap.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 namespace LtsTimelineClassic
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/PassiveEventContainer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/PassiveEventContainer.cpp
index ce37f2aa1..798ad09d0 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/PassiveEventContainer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/PassiveEventContainer.cpp
@@ -5,11 +5,11 @@
 #include "EventGraphic.h"
 #include "EventTools.h"
 
-#include <QBrush>
-#include <QDebug>
-#include <QGuiApplication>
-#include <QPainter>
-#include <QPen>
+#include <QtGui/QBrush>
+#include <QtCore/QDebug>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
 #include <QStyleOptionViewItem>
 #include <math.h>
 #include <time.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/PassiveEventContainer.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/PassiveEventContainer.h
index 8ce3973e4..9d670e96b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/PassiveEventContainer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/PassiveEventContainer.h
@@ -6,7 +6,7 @@
 #include "LineMap.h"
 #include "Range.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class QPainter;
 class QStyleOptionViewItem;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TestTimelineModel.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TestTimelineModel.cpp
index 3af1abb88..314475ef7 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TestTimelineModel.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TestTimelineModel.cpp
@@ -4,7 +4,7 @@
 
 #include "EventGraphic.h"
 
-#include <QDebug>
+#include <QtCore/QDebug>
 #include <QToolTip>
 
 namespace LtsTimelineClassic
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TestTimelineModel.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TestTimelineModel.h
index fa99f4afb..2f7a600dc 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TestTimelineModel.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TestTimelineModel.h
@@ -3,7 +3,7 @@
 #pragma once
 #include "AbstractTimelineModel.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace LtsTimelineClassic
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineHeaderView.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineHeaderView.cpp
index fa2393dad..fd5a873cc 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineHeaderView.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineHeaderView.cpp
@@ -4,12 +4,12 @@
 
 #include "TimelineWidget.h"
 
-#include <QGuiApplication>
-#include <QPainter>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QPainter>
 #include <QPainterPath>
-#include <QPen>
-#include <QPoint>
-#include <QRect>
+#include <QtGui/QPen>
+#include <QtCore/QPoint>
+#include <QtCore/QRect>
 
 namespace LtsTimelineClassic
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineHeaderView.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineHeaderView.h
index 1c8e8cdc7..c5ac1fbc9 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineHeaderView.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineHeaderView.h
@@ -3,8 +3,8 @@
 #pragma once
 #include "EventTools.h"
 
-#include <QHeaderView>
-#include <QObject>
+#include <QtWidgets/QHeaderView>
+#include <QtCore/QObject>
 
 class QPainter;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.cpp
index 835a36d2f..65f72aa52 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.cpp
@@ -6,20 +6,20 @@
 #include "TimelineWidget.h"
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QApplication>
-#include <QComboBox>
-#include <QDateTime>
-#include <QDebug>
-#include <QFont>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QComboBox>
+#include <QtCore/QDateTime>
+#include <QtCore/QDebug>
+#include <QtGui/QFont>
 #include <QFontMetrics>
-#include <QGuiApplication>
-#include <QHBoxLayout>
-#include <QHeaderView>
-#include <QLabel>
-#include <QPainter>
+#include <QtGui/QGuiApplication>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QLabel>
+#include <QtGui/QPainter>
 #include <QPalette>
-#include <QPoint>
-#include <QPushButton>
+#include <QtCore/QPoint>
+#include <QtWidgets/QPushButton>
 #include <ngltools/ngltools_dtg.h>
 
 #ifdef LTS_DEBUG
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.h
index f7dd6c333..b99c072e1 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.h
@@ -4,11 +4,11 @@
 #include "EventTools.h"
 #include "LineMap.h"
 
-#include <QComboBox>
-#include <QObject>
-#include <QPair>
-#include <QPoint>
-#include <QWidget>
+#include <QtWidgets/QComboBox>
+#include <QtCore/QObject>
+#include <QtCore/QPair>
+#include <QtCore/QPoint>
+#include <QtWidgets/QWidget>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineView.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineView.cpp
index f9dc607c6..2186d7050 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineView.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineView.cpp
@@ -7,15 +7,15 @@
 #include "TimelineHeaderView.h"
 #include "TimelineWidget.h"
 
-#include <QBrush>
-#include <QDebug>
-#include <QGuiApplication>
-#include <QHeaderView>
+#include <QtGui/QBrush>
+#include <QtCore/QDebug>
+#include <QtGui/QGuiApplication>
+#include <QtWidgets/QHeaderView>
 #include <QHelpEvent>
-#include <QModelIndex>
-#include <QPainter>
-#include <QPen>
-#include <QRect>
+#include <QtCore/QModelIndex>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
+#include <QtCore/QRect>
 #include <utility>
 
 namespace LtsTimelineClassic
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineView.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineView.h
index 7cd01873d..2959b8863 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineView.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineView.h
@@ -7,8 +7,8 @@
 #include "TimelineHeaderView.h"
 #include "TimelineIndicator.h"
 
-#include <QObject>
-#include <QTreeView>
+#include <QtCore/QObject>
+#include <QtWidgets/QTreeView>
 
 namespace LtsTimelineClassic
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineWidget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineWidget.cpp
index a088d5d6b..280fc5333 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineWidget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineWidget.cpp
@@ -8,11 +8,11 @@
 #include "ui_TimelineWidgetUi.h"
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QDateTime>
-#include <QDebug>
-#include <QPoint>
-#include <QRect>
-#include <QSize>
+#include <QtCore/QDateTime>
+#include <QtCore/QDebug>
+#include <QtCore/QPoint>
+#include <QtCore/QRect>
+#include <QtCore/QSize>
 
 namespace LtsTimelineClassic
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineWidget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineWidget.h
index 0f2db920b..68551934b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineWidget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineWidget.h
@@ -5,8 +5,8 @@
 #include "ltstimelineclassic_export.h"
 
 #include <NGLLogger/INGLLogger.h>
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/main.cpp
index 05dd4bca0..49cbbd6ee 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/main.cpp
@@ -4,9 +4,9 @@
 #include "TimelineWidget.h"
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QDebug>
-#include <QPushButton>
-#include <QVBoxLayout>
+#include <QtCore/QDebug>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QVBoxLayout>
 #include <Services/ProjectDataManagement/pdm_enums.hpp>
 #include <Services/ProjectDataManagement/pdm_translation.h>
 #include <nglapplication/nglapplication.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/UnitTests/utils_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/UnitTests/utils_test.cpp
index fc55d9a24..4cc727c6b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/UnitTests/utils_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/UnitTests/utils_test.cpp
@@ -12,14 +12,14 @@
 #include "qpoint3d.h"
 #include "sfm_bytemessage_converter.h"
 
-#include <QCoreApplication>
-#include <QDebug>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QMap>
-#include <QString>
-#include <QTest>
-#include <QVector>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtTest/QTest>
+#include <QtCore/QVector>
 
 #define SUPPORT_QBITARRAY
 #include "dds_bitarray.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/UnitTests/utils_test.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/UnitTests/utils_test.h
index e0a247862..bac3ffac8 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/UnitTests/utils_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/UnitTests/utils_test.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class LtsUtilsTest : public QObject
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/await.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/await.h
index 5bd2136fe..f10d64e0f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/await.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/await.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <QEventLoop>
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 #include <memory>
 
 namespace LtsUtils
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/connection.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/connection.h
index 5787cb8f3..537457118 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/connection.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/connection.h
@@ -2,9 +2,9 @@
 
 #pragma once
 
-#include <QMetaObject>
-#include <QObject>
-#include <QPointer>
+#include <QtCore/QMetaObject>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
 #include <QtGlobal>
 #include <type_traits>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/dds_vector.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/dds_vector.h
index 7c2ecfa1d..83ada7a98 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/dds_vector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/dds_vector.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <QByteArray>
-#include <QString>
+#include <QtCore/QByteArray>
+#include <QtCore/QString>
 
 namespace LtsUtils
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/json_object.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/json_object.h
index 300bc9cee..ecb7d4c0e 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/json_object.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/json_object.h
@@ -2,14 +2,14 @@
 
 #pragma once
 
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QJsonValue>
-#include <QMap>
-#include <QString>
-#include <QVector>
+#include <QtCore/QJsonValue>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 #include <cstdint>
 #include <exception>
 #include <limits>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/lts_portrange.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/lts_portrange.h
index 681d1360f..e0f209e46 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/lts_portrange.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/lts_portrange.h
@@ -2,8 +2,8 @@
 
 #include "ltsutilscore_export.h"
 
-#include <QPair>
-#include <QPoint>
+#include <QtCore/QPair>
+#include <QtCore/QPoint>
 
 namespace LtsUtils
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/lts_translatable_identifier.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/lts_translatable_identifier.cpp
index 042b7caf4..2878e4114 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/lts_translatable_identifier.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/lts_translatable_identifier.cpp
@@ -2,7 +2,7 @@
 
 #include "lts_translatable_identifier.h"
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 namespace LtsUtils
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/lts_translatable_identifier.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/lts_translatable_identifier.h
index 7ba3064b4..d32833e11 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/lts_translatable_identifier.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/lts_translatable_identifier.h
@@ -2,8 +2,8 @@
 
 #include "ltsutilscore_export.h"
 
-#include <QObject>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 
 namespace LtsUtils
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/pgarray.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/pgarray.cpp
index 71f01f649..334d46098 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/pgarray.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/pgarray.cpp
@@ -2,9 +2,9 @@
 
 #include "pgarray.h"
 
-#include <QDebug>
+#include <QtCore/QDebug>
 #include <QStringView>
-#include <QVector>
+#include <QtCore/QVector>
 #include <functional>
 #include <ltsutilscore_export.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/pgarray.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/pgarray.h
index c4549553d..42823273b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/pgarray.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/pgarray.h
@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 #include <cstdint>
 #include <map>
 #include <vector>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/promise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/promise.cpp
index 9a3cebc10..c9b5b98d1 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/promise.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/promise.cpp
@@ -2,7 +2,7 @@
 
 #include "promise.h"
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace LtsUtils
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/promise.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/promise.h
index 23d24a982..389b9afc6 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/promise.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/promise.h
@@ -2,8 +2,8 @@
 
 #include "ltsutilscore_export.h"
 
-#include <QObject>
-#include <QVariant>
+#include <QtCore/QObject>
+#include <QtCore/QVariant>
 #include <functional>
 
 class QTimer;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/promise_examples.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/promise_examples.cpp
index f83f98b70..7787c019c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/promise_examples.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/promise_examples.cpp
@@ -2,9 +2,9 @@
 
 #include "promise.h"
 
-#include <QDebug>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QDebug>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>
 
 namespace LtsUtils
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/promise_examples.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/promise_examples.h
index f5a8978f2..5aacc7468 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/promise_examples.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/promise_examples.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace LtsUtils
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qplane3d.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qplane3d.h
index cc5127362..651559a7b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qplane3d.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qplane3d.h
@@ -5,8 +5,8 @@
 #include "ltsutilscore_export.h"
 #include "qpoint3d.h"
 
-#include <QPointF>
-#include <QVector>
+#include <QtCore/QPointF>
+#include <QtCore/QVector>
 
 namespace LtsUtils
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qpoint3d.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qpoint3d.cpp
index 6b875508b..b27ebb0fa 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qpoint3d.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qpoint3d.cpp
@@ -2,7 +2,7 @@
 
 #include "qpoint3d.h"
 
-#include <QDataStream>
+#include <QtCore/QDataStream>
 
 using namespace LtsUtils;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h
index 541202fb2..b9de5c896 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h
@@ -4,7 +4,7 @@
 
 #include "ltsutilscore_export.h"
 
-#include <QByteArray>
+#include <QtCore/QByteArray>
 
 namespace LtsUtils
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/variant_operators.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/variant_operators.h
index 24dbc221b..9ca5e4d9c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/variant_operators.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/variant_operators.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <QDateTime>
-#include <QVariant>
+#include <QtCore/QDateTime>
+#include <QtCore/QVariant>
 #include <ngltools/ngltools_dtg.h>
 
 namespace LtsUtils
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog/connect_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog/connect_dialog.h
index f888519f7..f629ee383 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog/connect_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog/connect_dialog.h
@@ -4,9 +4,9 @@
 #include "ltsutilsguiconnectdialog_export.h"
 
 #include <LtsWidgets/lts_frameless_dialog.h>
-#include <QObject>
-#include <QTimer>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+#include <QtWidgets/QWidget>
 #include <functional>
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog/connect_dialog_nt.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog/connect_dialog_nt.h
index f3785c373..a9200b6ca 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog/connect_dialog_nt.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog/connect_dialog_nt.h
@@ -4,7 +4,7 @@
 #include "ltsutilsguiconnectdialog_export.h"
 
 #include <LtsWidgets/lts_frameless_dialog.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <functional>
 
 class QTimer;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.cpp
index e62072bd7..36be661cb 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.cpp
@@ -2,12 +2,12 @@
 
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
-#include <QBuffer>
-#include <QFile>
-#include <QIcon>
-#include <QImage>
-#include <QPainter>
-#include <QPixmap>
+#include <QtCore/QBuffer>
+#include <QtCore/QFile>
+#include <QtGui/QIcon>
+#include <QtGui/QImage>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
 #include <QSvgRenderer>
 
 namespace LtsUtils
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h
index 66c151b21..04028956a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h
@@ -4,8 +4,8 @@
 
 #include <LtsUtils/LtsUtilsCore/ltsutilscore_export.h>
 
-#include <QSize>
-#include <QString>
+#include <QtCore/QSize>
+#include <QtCore/QString>
 #include <cstdint>
 #include <vector>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.cpp
index f0cd0fd3f..01fe46cb7 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.cpp
@@ -5,13 +5,13 @@
 #ifdef REQUEST_HELPER_WITH_GUI
 #include <LtsWidgets/lts_global_wait_dialog.h>
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #endif
 
 #include <QEventLoop>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QTimer>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QTimer>
 #include <memory>
 
 #define DEBUG
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h
index 50af55da7..ee39992e8 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h
@@ -11,9 +11,9 @@
 #endif
 
 #include <Core/core_types.h>
-#include <QObject>
-#include <QPair>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QPair>
+#include <QtCore/QVector>
 #include <functional>
 #include <optional>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/StyleManager/style_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/StyleManager/style_manager.cpp
index 1d5e184fe..8ff5eafa2 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/StyleManager/style_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/StyleManager/style_manager.cpp
@@ -4,8 +4,8 @@
 
 #include <LtsPluginManager/lts_plugin_loader.h>
 #include <PluginInterfaces/style_plugin_interface.h>
-#include <QDebug>
-#include <QPluginLoader>
+#include <QtCore/QDebug>
+#include <QtCore/QPluginLoader>
 
 namespace LtsUtils
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/StyleManager/style_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/StyleManager/style_manager.h
index c75342cb6..20e34f67f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/StyleManager/style_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/StyleManager/style_manager.h
@@ -4,7 +4,7 @@
 
 #include "ltsutilsguistylemanager_export.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class QPluginLoader;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsSettings/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsSettings/settings.cpp
index a0ca9f005..62e4d6829 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsSettings/settings.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsSettings/settings.cpp
@@ -2,16 +2,16 @@
 
 #include "settings.h"
 
-#include <QByteArray>
-#include <QCoreApplication>
-#include <QDataStream>
-#include <QDebug>
-#include <QFile>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QRegularExpression>
-#include <QVector>
+#include <QtCore/QByteArray>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDataStream>
+#include <QtCore/QDebug>
+#include <QtCore/QFile>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QRegularExpression>
+#include <QtCore/QVector>
 
 namespace LtsUtils
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsSettings/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsSettings/settings.h
index dc5d27f7b..d52cad490 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsSettings/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsSettings/settings.h
@@ -3,9 +3,9 @@
 
 #include <ltsutilssettings_export.h>
 
-#include <QMap>
-#include <QObject>
-#include <QVariant>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QVariant>
 
 class QJsonObject;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsKeyPushButton.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsKeyPushButton.cpp
index a043e71b5..8f51557f3 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsKeyPushButton.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsKeyPushButton.cpp
@@ -4,10 +4,10 @@
 
 #include "LtsVirtualKeyboard.h"
 
-#include <QApplication>
-#include <QCoreApplication>
-#include <QKeyEvent>
-#include <QLabel>
+#include <QtWidgets/QApplication>
+#include <QtCore/QCoreApplication>
+#include <QtGui/QKeyEvent>
+#include <QtWidgets/QLabel>
 
 namespace LtsVirtualKeyboard
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsKeyPushButton.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsKeyPushButton.h
index bfa868393..d051f0fe4 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsKeyPushButton.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsKeyPushButton.h
@@ -3,8 +3,8 @@
 #pragma once
 #include "ltsvirtualkeyboard_export.h"
 
-#include <QObject>
-#include <QToolButton>
+#include <QtCore/QObject>
+#include <QtWidgets/QToolButton>
 
 #define DEFAULT_BACKGROUND_BUTTON                                                                                      \
     "background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #8C8F8C, stop: 1 #333831);"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsVirtualKeyboard.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsVirtualKeyboard.cpp
index d857a8ea5..5ac1c8536 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsVirtualKeyboard.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsVirtualKeyboard.cpp
@@ -3,18 +3,18 @@
 #include "LtsVirtualKeyboard.h"
 
 #include <LtsAppManager/lts_app_manager.h>
-#include <QApplication>
-#include <QClipboard>
+#include <QtWidgets/QApplication>
+#include <QtGui/QClipboard>
 #include <QDoubleSpinBox>
-#include <QHBoxLayout>
-#include <QKeyEvent>
-#include <QLineEdit>
-#include <QPlainTextEdit>
-#include <QScreen>
-#include <QScrollArea>
-#include <QSpinBox>
-#include <QTextCursor>
-#include <QTimer>
+#include <QtWidgets/QHBoxLayout>
+#include <QtGui/QKeyEvent>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QPlainTextEdit>
+#include <QtGui/QScreen>
+#include <QtWidgets/QScrollArea>
+#include <QtWidgets/QSpinBox>
+#include <QtGui/QTextCursor>
+#include <QtCore/QTimer>
 #include <QWindow>
 
 namespace LtsVirtualKeyboard
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsVirtualKeyboard.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsVirtualKeyboard.h
index 4b6a49924..67daed822 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsVirtualKeyboard.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsVirtualKeyboard.h
@@ -5,7 +5,7 @@
 #include "ltsvirtualkeyboard_export.h"
 
 #include <LtsSession/lts_session.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 class QClipboard;
 class QLabel;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.h
index fa84e7b5f..cc0b2c76e 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.h
@@ -5,7 +5,7 @@
 #include "ltswebsocketserver_export.h"
 #include "reply_message.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtCore/QQueue>
 #include <QtCore/QThread>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message.cpp
index 174041202..993af8a2b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message.cpp
@@ -4,7 +4,7 @@
 
 #include "json_keys.h"
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 
 namespace LtsWebSocket
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message.h
index 9f4371f0f..fb73396ed 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message.h
@@ -5,8 +5,8 @@
 #include "ltswebsocketcommon_export.h"
 #include "reply_message.h"
 
-#include <QJsonValue>
-#include <QString>
+#include <QtCore/QJsonValue>
+#include <QtCore/QString>
 
 namespace LtsWebSocket
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message_factory.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message_factory.cpp
index 949a92596..e6aecf65d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message_factory.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message_factory.cpp
@@ -5,7 +5,7 @@
 #include "client_connection.h"
 #include "json_keys.h"
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 
 namespace LtsWebSocket
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message_factory.h
index 1d778ac55..a843e5964 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message_factory.h
@@ -7,7 +7,7 @@
 #include "reply_message.h"
 
 #include <QJsonParseError>
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.h
index f51198864..3f1905ef9 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.h
@@ -3,7 +3,7 @@
 #pragma once
 #include "logger.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtNetwork/QHostAddress>
 #include <QtWebSockets/QWebSocketServer>
 #include <QtWebSockets/qwebsocketprotocol.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.cpp
index b61483bc1..fdb804fe5 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.cpp
@@ -4,8 +4,8 @@
 
 #include "client_connection.h"
 
-#include <QThread>
-#include <QUrl>
+#include <QtCore/QThread>
+#include <QtCore/QUrl>
 #include <QtWebSockets/QWebSocket>
 
 namespace LtsWebSocket
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.h
index 5597ce95b..edbcf4896 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.h
@@ -7,7 +7,7 @@
 #include "ltswebsocketclient_export.h"
 
 #include <QAbstractSocket>
-#include <QObject>
+#include <QtCore/QObject>
 
 class QThread;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.cpp
index 864fb72a0..51d70cae7 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.cpp
@@ -5,7 +5,7 @@
 #include "client_connection.h"
 #include "connection_handler.h"
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace LtsWebSocket
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.h
index cda8f2e88..ae6c4ba9a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.h
@@ -5,7 +5,7 @@
 #include "logger.h"
 #include "ltswebsocketserver_export.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QQueue>
 #include <QtCore/QObject>
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/reply_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/reply_message.cpp
index 57908fc9a..d1ab498af 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/reply_message.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/reply_message.cpp
@@ -4,7 +4,7 @@
 
 #include "json_keys.h"
 
-#include <QUuid>
+#include <QtCore/QUuid>
 
 namespace LtsWebSocket
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/reply_message.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/reply_message.h
index 6b6f4354a..2a6edc5f0 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/reply_message.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/reply_message.h
@@ -4,9 +4,9 @@
 
 #include "ltswebsocketcommon_export.h"
 
-#include <QJsonObject>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QString>
+#include <QtCore/QString>
 
 namespace LtsWebSocket
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/LtsImageCropper/lts_image_cropper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/LtsImageCropper/lts_image_cropper.cpp
index a11104eb6..6df03c7de 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/LtsImageCropper/lts_image_cropper.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/LtsImageCropper/lts_image_cropper.cpp
@@ -8,9 +8,9 @@
  */
 
 #include "lts_image_cropper.h"
-#include <QGraphicsItem>
-#include <QMouseEvent>
-#include <QApplication>
+#include <QtWidgets/QGraphicsItem>
+#include <QtGui/QMouseEvent>
+#include <QtWidgets/QApplication>
 
 namespace LtsWidgets
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/LtsImageCropper/lts_image_cropper.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/LtsImageCropper/lts_image_cropper.h
index 29a31b9b4..60d1669d9 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/LtsImageCropper/lts_image_cropper.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/LtsImageCropper/lts_image_cropper.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "lts_widgets_export.h"
-#include <QGraphicsView>
+#include <QtWidgets/QGraphicsView>
 
 namespace LtsWidgets
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_sequence_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_sequence_widget.cpp
index b11aed1cc..38fe2ca54 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_sequence_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_sequence_widget.cpp
@@ -8,9 +8,9 @@
   */
 #include "lts_abstract_sequence_widget.h"
 
-#include <QRegularExpression>
+#include <QtCore/QRegularExpression>
 
-#include <QToolButton>
+#include <QtWidgets/QToolButton>
 
 namespace LtsWidgets
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_sequence_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_sequence_widget.h
index a2067d60e..b4e6b9454 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_sequence_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_sequence_widget.h
@@ -13,8 +13,8 @@
 #pragma once
 
 
-#include <QGroupBox>
-#include <QList>
+#include <QtWidgets/QGroupBox>
+#include <QtCore/QList>
 #include "lts_widgets_export.h"
 
 class QToolButton;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_table_model.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_table_model.h
index 1aa3ac085..652e7e847 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_table_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_table_model.h
@@ -13,8 +13,8 @@
 
 #include <LtsUtilsCore/data_modification_enum.h>
 
-#include <QVector>
-#include <QAbstractTableModel>
+#include <QtCore/QVector>
+#include <QtCore/QAbstractTableModel>
 
 #include <memory>
 #include <algorithm>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_angle_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_angle_edit.h
index 9a745bf44..e44429d67 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_angle_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_angle_edit.h
@@ -9,9 +9,9 @@
 
 #pragma once
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <QDoubleSpinBox>
-#include <QSet>
+#include <QtCore/QSet>
 #include <LtsWidgets/lts_widgets_export.h>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_background_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_background_widget.cpp
index 6f99bd44f..36369cd14 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_background_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_background_widget.cpp
@@ -9,10 +9,10 @@
 
 #include "lts_background_widget.h"
 
-#include <QPaintEvent>
-#include <QPainter>
-#include <QDebug>
-#include <QFile>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QPainter>
+#include <QtCore/QDebug>
+#include <QtCore/QFile>
 
 #ifdef Q_OS_WIN
 #include <QtPlatformHeaders/qwindowswindowfunctions.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_background_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_background_widget.h
index cb078126f..6e3947348 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_background_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_background_widget.h
@@ -11,7 +11,7 @@
 
 #include "lts_widgets_export.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 
 class QPixmap;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base.h
index 4567291d0..764fdff9d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base.h
@@ -12,12 +12,12 @@
 
 #include <LtsUtils/LtsUtilsCore/lts_translatable_identifier.h>
 
-#include <QString>
-#include <QString>
-#include <QIcon>
-#include <QScrollArea>
+#include <QtCore/QString>
+#include <QtCore/QString>
+#include <QtGui/QIcon>
+#include <QtWidgets/QScrollArea>
 #include <QScroller>
-#include <QAbstractItemView>
+#include <QtWidgets/QAbstractItemView>
 
 #include <functional>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base_layout_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base_layout_widget.cpp
index 1966a0e6e..08a6b2f15 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base_layout_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base_layout_widget.cpp
@@ -24,26 +24,26 @@
 #include <Lts/Common/ProjectConfig/project_defines.h>
 #include <ngltools/ngltools_dtg.h>
 
-#include <QAbstractItemView>
-#include <QButtonGroup>
-#include <QClipboard>
-#include <QCloseEvent>
-#include <QDebug>
-#include <QImage>
-#include <QMenu>
-#include <QMessageBox>
+#include <QtWidgets/QAbstractItemView>
+#include <QtWidgets/QButtonGroup>
+#include <QtGui/QClipboard>
+#include <QtGui/QCloseEvent>
+#include <QtCore/QDebug>
+#include <QtGui/QImage>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMessageBox>
 #include <QMetaMethod>
-#include <QPainter>
-#include <QPixmap>
-#include <QPropertyAnimation>
-#include <QPushButton>
-#include <QScrollArea>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
+#include <QtCore/QPropertyAnimation>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QScrollArea>
 #include <QScroller>
 #include <QSvgRenderer>
-#include <QTimer>
-#include <QToolButton>
-#include <QPropertyAnimation>
-#include <QInputDialog>
+#include <QtCore/QTimer>
+#include <QtWidgets/QToolButton>
+#include <QtCore/QPropertyAnimation>
+#include <QtWidgets/QInputDialog>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base_layout_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base_layout_widget.h
index 78faf69a3..22eac510b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base_layout_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base_layout_widget.h
@@ -14,9 +14,9 @@
 #include "qevent.h"
 
 #include <memory>
-#include <QMap>
-#include <QPointer>
-#include <QWidget>
+#include <QtCore/QMap>
+#include <QtCore/QPointer>
+#include <QtWidgets/QWidget>
 
 
 class QButtonGroup;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_bitfield_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_bitfield_widget.cpp
index 9ab7cf1bd..c3d7eafe9 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_bitfield_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_bitfield_widget.cpp
@@ -9,7 +9,7 @@
 
 #include "lts_bitfield_widget.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 
 namespace LtsWidgets
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_bitfield_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_bitfield_widget.h
index a1ea8d814..62b9db483 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_bitfield_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_bitfield_widget.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <QWidget>
-#include <QMouseEvent>
+#include <QtWidgets/QWidget>
+#include <QtGui/QMouseEvent>
 
 #include "lts_widgets_export.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.cpp
index 2ea273ed7..a047bbc10 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.cpp
@@ -11,7 +11,7 @@
 
 #include <LtsUtilsCore/variant_operators.h>
 
-#include <QRegularExpression>
+#include <QtCore/QRegularExpression>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.h
index 0a12cd8c8..21daf8521 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.h
@@ -12,12 +12,12 @@
 #include <LtsWidgets/lts_widgets_export.h>
 #include <LtsUtilsCore/variant_operators.h>
 
-#include <QDataStream>
-#include <QIcon>
-#include <QIODevice>
-#include <QRegularExpression>
-#include <QSortFilterProxyModel>
-#include <QVector>
+#include <QtCore/QDataStream>
+#include <QtGui/QIcon>
+#include <QtCore/QIODevice>
+#include <QtCore/QRegularExpression>
+#include <QtCore/QSortFilterProxyModel>
+#include <QtCore/QVector>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_combo_box.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_combo_box.cpp
index fed7e2de6..a779cb982 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_combo_box.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_combo_box.cpp
@@ -12,8 +12,8 @@
 #include "lts_selection_popup.h"
 #include "lts_message_dialog.h"
 
-#include <QGuiApplication>
-#include <QShowEvent>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QShowEvent>
 
 //#define NEVER
 #ifdef NEVER
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_combo_box.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_combo_box.h
index 570979fcd..285a68c78 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_combo_box.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_combo_box.h
@@ -12,7 +12,7 @@
 
 #include "lts_widgets_export.h"
 
-#include <QComboBox>
+#include <QtWidgets/QComboBox>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit.cpp
index 3dc323ac2..f65f73db5 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit.cpp
@@ -18,19 +18,19 @@
 
 #include <ngltools/ngltools_dtg.h>
 
-#include <QApplication>
-#include <QCheckBox>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QCheckBox>
 #include <QCompleter>
-#include <QDateTime>
-#include <QGridLayout>
-#include <QHBoxLayout>
-#include <QKeyEvent>
-#include <QLineEdit>
-#include <QPushButton>
+#include <QtCore/QDateTime>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtGui/QKeyEvent>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QPushButton>
 #include <QRegularExpressionValidator>
-#include <QShortcut>
-#include <QSlider>
-#include <QToolButton>
+#include <QtGui/QShortcut>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QToolButton>
 
 static constexpr qint64 s_oneSecondMSec = 1000LL;
 static constexpr qint64 s_oneMinuteMSec = 60 * s_oneSecondMSec;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit.h
index 96ec9c77d..65dca4889 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit.h
@@ -15,7 +15,7 @@
 #include "qcheckbox.h"
 #include "qpushbutton.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <functional>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_p.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_p.cpp
index c0193fd49..1298bbeab 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_p.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_p.cpp
@@ -1,9 +1,9 @@
 #include "lts_date_time_edit_p.h"
 
-#include <QApplication>
-#include <QRegularExpression>
-#include <QValidator>
-#include <QKeyEvent>
+#include <QtWidgets/QApplication>
+#include <QtCore/QRegularExpression>
+#include <QtGui/QValidator>
+#include <QtGui/QKeyEvent>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_p.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_p.h
index 5477276f1..47e8f06c6 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_p.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_p.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QLineEdit>
+#include <QtWidgets/QLineEdit>
 
 namespace LtsWidgets
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_rc.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_rc.cpp
index 571d2f6e7..a588dabc2 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_rc.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_rc.cpp
@@ -18,19 +18,19 @@
 
 #include <ngltools/ngltools_dtg.h>
 
-#include <QApplication>
-#include <QCheckBox>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QCheckBox>
 #include <QCompleter>
-#include <QDateTime>
-#include <QGridLayout>
-#include <QHBoxLayout>
-#include <QKeyEvent>
-#include <QLineEdit>
-#include <QPushButton>
+#include <QtCore/QDateTime>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtGui/QKeyEvent>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QPushButton>
 #include <QRegularExpressionValidator>
-#include <QShortcut>
-#include <QSlider>
-#include <QToolButton>
+#include <QtGui/QShortcut>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QToolButton>
 
 static constexpr qint64 s_oneSecondMSec = 1000LL;
 static constexpr qint64 s_oneMinuteMSec = 60 * s_oneSecondMSec;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_rc.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_rc.h
index 58f76e608..569efb33c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_rc.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_rc.h
@@ -13,7 +13,7 @@
 //#include "lts_date_time_edit_touch.h"
 #include "lts_widgets_export.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <functional>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_touch.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_touch.cpp
index 3ad49a890..f1afdd3bf 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_touch.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_touch.cpp
@@ -14,7 +14,7 @@
 #include <ngltools/ngltools_dtg.h>
 #include <LtsSession/lts_session_data.h>
 #include <LtsUtilsSettings/settings.h>
-#include <QShortcut>
+#include <QtGui/QShortcut>
 
 namespace LtsWidgets
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_touch.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_touch.h
index 333b8b7fb..9d4f23422 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_touch.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_touch.h
@@ -12,8 +12,8 @@
 
 #include "lts_widgets_export.h"
 
-#include <QDate>
-#include <QWidget>
+#include <QtCore/QDate>
+#include <QtWidgets/QWidget>
 #include <functional>
 
 class QDateTime;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.cpp
index ab055b27e..2605ae850 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.cpp
@@ -15,33 +15,33 @@
 #include "lts_date_time_edit.h"
 #include "ui_requirement.h"
 
-#include <QHBoxLayout>
-#include <QProgressBar>
-#include <QLineEdit>
-#include <QComboBox>
-#include <QCheckBox>
-#include <QSpinBox>
-#include <QDateTimeEdit>
-#include <QSlider>
-#include <QPlainTextEdit>
-#include <QTextEdit>
-#include <QWidget>
-#include <QRadioButton>
-#include <QTableView>
-#include <QTableWidget>
-#include <QListView>
-#include <QListWidget>
-#include <QSlider>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QProgressBar>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QDateTimeEdit>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QPlainTextEdit>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QTableView>
+#include <QtWidgets/QTableWidget>
+#include <QtWidgets/QListView>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QSlider>
 #include <QScroller>
-#include <QScrollArea>
-#include <QMenu>
-#include <QInputDialog>
-#include <QHBoxLayout>
+#include <QtWidgets/QScrollArea>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QHBoxLayout>
 //#include <QGraphicsBlurEffect>
-#include <QPainter>
-#include <QColor>
+#include <QtGui/QPainter>
+#include <QtGui/QColor>
 #include <QMetaMethod>
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #include <LtsSession/lts_session_data.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.h
index ad912d032..e129f9a53 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.h
@@ -14,20 +14,20 @@
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
-#include <QPushButton>
-#include <QLineEdit>
-#include <QComboBox>
-#include <QCheckBox>
-#include <QSpinBox>
-#include <QDateTimeEdit>
-#include <QSlider>
-#include <QPlainTextEdit>
-#include <QTextEdit>
-#include <QWidget>
-#include <QRadioButton>
-#include <QPointer>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QDateTimeEdit>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QPlainTextEdit>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QRadioButton>
+#include <QtCore/QPointer>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 // Forward declaration - ui_requirement.h is not a UI file but regular C++ code
 // Include is in cpp file to avoid AutoUIC issues
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog_button_box.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog_button_box.cpp
index fc9d4c691..f19e6bf92 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog_button_box.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog_button_box.cpp
@@ -13,7 +13,7 @@
 
 #include "lts_message_dialog.h"
 #include <LtsSession/lts_session_data.h>
-#include <QMenu>
+#include <QtWidgets/QMenu>
 
 namespace LtsWidgets
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog_button_box.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog_button_box.h
index d280795ba..bd34863e6 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog_button_box.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog_button_box.h
@@ -13,8 +13,8 @@
 #include "lts_widgets_export.h"
 #include "lts_message_dialog.h"
 
-#include <QWidget>
-#include <QPushButton>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QPushButton>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog_helper.cpp
index a21c85b41..ed035a63d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog_helper.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog_helper.cpp
@@ -13,9 +13,9 @@
 #include "lts_dialog.h"
 #include "ui_lts_dialog_helper.h"
 
-#include <QScrollArea>
-#include <QScrollBar>
-#include <QDebug>
+#include <QtWidgets/QScrollArea>
+#include <QtWidgets/QScrollBar>
+#include <QtCore/QDebug>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog_helper.h
index 80ec9dcfe..bb614fb76 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog_helper.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog_helper.h
@@ -11,8 +11,8 @@
 
 #pragma once
 
-#include <QWidget>
-#include <QSize>
+#include <QtWidgets/QWidget>
+#include <QtCore/QSize>
 
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_drag_icon.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_drag_icon.cpp
index ff4859fdc..d4d4b2199 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_drag_icon.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_drag_icon.cpp
@@ -9,17 +9,17 @@
 #include "lts_drag_icon.h"
 
 #include <QDrag>
-#include <QDragEnterEvent>
-#include <QDragLeaveEvent>
-#include <QDropEvent>
+#include <QtGui/QDragEnterEvent>
+#include <QtGui/QDragLeaveEvent>
+#include <QtGui/QDropEvent>
 #include <QMimeData>
-#include <QAction>
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QPixmap>
-#include <QToolButton>
-#include <QButtonGroup>
-#include <QPainter>
+#include <QtGui/QAction>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtGui/QPixmap>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QButtonGroup>
+#include <QtGui/QPainter>
 
 namespace LtsWidgets
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_drag_icon.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_drag_icon.h
index c155551d8..7a8bd3cb0 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_drag_icon.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_drag_icon.h
@@ -12,9 +12,9 @@
 #include "lts_drop_handler.h"
 #include "lts_widgets_export.h"
 
-#include <QString>
-#include <QIcon>
-#include <QWidget>
+#include <QtCore/QString>
+#include <QtGui/QIcon>
+#include <QtWidgets/QWidget>
 
 
 class QButtonGroup;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_elided_label.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_elided_label.cpp
index 98eda69db..08576ede3 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_elided_label.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_elided_label.cpp
@@ -9,8 +9,8 @@
 
 #include "lts_elided_label.h"
 
-#include <QPaintEvent>
-#include <QResizeEvent>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QResizeEvent>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_elided_label.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_elided_label.h
index 3424a914a..4dbd3201b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_elided_label.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_elided_label.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QLabel>
+#include <QtWidgets/QLabel>
 #include <LtsWidgets/lts_widgets_export.h>
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_events.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_events.h
index d4c05a960..06e06e44d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_events.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_events.h
@@ -10,11 +10,11 @@
 
 #include "lts_widgets_export.h"
 
-#include <QEvent>
-#include <QPixmap>
-#include <QPointer>
-#include <QWidget>
-#include <QUrl>
+#include <QtCore/QEvent>
+#include <QtGui/QPixmap>
+#include <QtCore/QPointer>
+#include <QtWidgets/QWidget>
+#include <QtCore/QUrl>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_frameless_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_frameless_dialog.cpp
index b383d66df..05679276b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_frameless_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_frameless_dialog.cpp
@@ -10,15 +10,15 @@
 
 #include "lts_frameless_dialog.h"
 
-#include <QApplication>
-#include <QRect>
-#include <QStyle>
-#include <QSize>
-#include <QScreen>
+#include <QtWidgets/QApplication>
+#include <QtCore/QRect>
+#include <QtWidgets/QStyle>
+#include <QtCore/QSize>
+#include <QtGui/QScreen>
 #include <QScroller>
-#include <QScrollArea>
-#include <QShowEvent>
-#include <QTimer>
+#include <QtWidgets/QScrollArea>
+#include <QtGui/QShowEvent>
+#include <QtCore/QTimer>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_frameless_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_frameless_dialog.h
index 34815d78d..4505e9bd2 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_frameless_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_frameless_dialog.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 #include "lts_base.h"
 #include "lts_widgets_export.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_global_wait_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_global_wait_dialog.cpp
index 91b5c8eff..e69094c5a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_global_wait_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_global_wait_dialog.cpp
@@ -6,9 +6,9 @@
 #include "lts_dialog.h"
 #include "lts_frameless_dialog.h"
 
-#include <QCoreApplication>
-#include <QTimer>
-//#include <QDebug>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QTimer>
+//#include <QtCore/QDebug>
 
 #ifdef Q_OS_UNIX
 #include <execinfo.h> // backtrace(..)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_global_wait_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_global_wait_dialog.h
index 0cbf40ca6..db1bc62f5 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_global_wait_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_global_wait_dialog.h
@@ -12,7 +12,7 @@
 
 #include "lts_widgets_export.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 class QTimer;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_grid_layout.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_grid_layout.cpp
index 5c24749fb..4cc3163c1 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_grid_layout.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_grid_layout.cpp
@@ -9,7 +9,7 @@
 */
 
 #include "lts_grid_layout.h"
-#include <QResizeEvent>
+#include <QtGui/QResizeEvent>
 
 namespace LtsWidgets
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_grid_layout.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_grid_layout.h
index e2c1ad9ef..4620eee63 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_grid_layout.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_grid_layout.h
@@ -9,8 +9,8 @@
 */
 
 #pragma once
-#include <QGridLayout>
-#include <QVector>
+#include <QtWidgets/QGridLayout>
+#include <QtCore/QVector>
 
 #include "lts_widgets_export.h"
 #include "lts_base.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_height_plot_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_height_plot_widget.cpp
index bfd0d6220..07cbcac91 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_height_plot_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_height_plot_widget.cpp
@@ -9,11 +9,11 @@
 
 #include "lts_height_plot_widget.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QPainterPath>
-#include <QPen>
+#include <QtGui/QPen>
 #include <QTransform>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 
 #include <cmath>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_height_plot_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_height_plot_widget.h
index 96c5fb1f9..e4d83f1eb 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_height_plot_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_height_plot_widget.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <QtCore/QVector>
 #include <QtCore/QPointF>
 #include <QtCore/QPair>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_image_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_image_editor.cpp
index 99e587223..398eae7af 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_image_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_image_editor.cpp
@@ -10,12 +10,12 @@
 
 #include "lts_image_editor.h"
 
-#include <QPainter>
-#include <QPaintEvent>
-#include <QBrush>
-#include <QPen>
-#include <QRect>
-#include <QEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QBrush>
+#include <QtGui/QPen>
+#include <QtCore/QRect>
+#include <QtCore/QEvent>
 
 using namespace LtsWidgets;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_image_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_image_editor.h
index b0ae42b9b..32284f424 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_image_editor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_image_editor.h
@@ -12,7 +12,7 @@
 
 #include "lts_widgets_export.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_info_dialog.cpp
index 57b6efb46..d6a150c58 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_info_dialog.cpp
@@ -11,9 +11,9 @@
 #include "lts_info_dialog.h"
 #include "ui_lts_info_dialog.h"
 
-#include <QPixmap>
-#include <QFile>
-#include <QDebug>
+#include <QtGui/QPixmap>
+#include <QtCore/QFile>
+#include <QtCore/QDebug>
 
 
 #ifndef LTS_VERSION_MAJOR
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_led_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_led_widget.cpp
index a7c9b3cb8..d22bc6623 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_led_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_led_widget.cpp
@@ -7,9 +7,9 @@
   */
 
 #include "lts_led_widget.h"
-#include <QPainter>
-#include <QPropertyAnimation>
-#include <QResizeEvent>
+#include <QtGui/QPainter>
+#include <QtCore/QPropertyAnimation>
+#include <QtGui/QResizeEvent>
 namespace LtsWidgets
 {
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_led_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_led_widget.h
index 18e86154e..55c54d61b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_led_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_led_widget.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include "lts_widgets_export.h"
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_message_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_message_dialog.cpp
index d889bf054..d002b89b0 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_message_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_message_dialog.cpp
@@ -1,11 +1,11 @@
 #include "lts_message_dialog.h"
 #include "lts_message_dialog_helper.h"
 
-#include <QCoreApplication>
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QDebug>
+#include <QtCore/QCoreApplication>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtCore/QDebug>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_message_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_message_dialog.h
index 4d1b4ac81..e39986c9a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_message_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_message_dialog.h
@@ -3,8 +3,8 @@
 #include "lts_widgets_export.h"
 #include "lts_frameless_dialog.h"
 
-#include <QString>
-#include <QHash>
+#include <QtCore/QString>
+#include <QtCore/QHash>
 
 
 class QWidget;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_message_dialog_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_message_dialog_helper.cpp
index 94c5874b8..2a10e0126 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_message_dialog_helper.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_message_dialog_helper.cpp
@@ -1,9 +1,9 @@
 #include "lts_message_dialog_helper.h"
 
-#include <QPushButton>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
 #include <QEventLoop>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_message_dialog_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_message_dialog_helper.h
index 0560e8f06..e92ed91b5 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_message_dialog_helper.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_message_dialog_helper.h
@@ -3,9 +3,9 @@
 #include "lts_frameless_dialog.h"
 #include "lts_message_dialog.h"
 
-#include <QHash>
-#include <QObject>
-#include <QString>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 
 
 class QPushButton;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_msec_date_time_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_msec_date_time_edit.h
index 3d656312b..7a8c5630d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_msec_date_time_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_msec_date_time_edit.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QDateTimeEdit>
+#include <QtWidgets/QDateTimeEdit>
 
 #include "lts_widgets_export.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_multi_range_spinbox.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_multi_range_spinbox.cpp
index cd0c2a046..d32772d07 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_multi_range_spinbox.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_multi_range_spinbox.cpp
@@ -10,8 +10,8 @@
 
 #include "lts_multi_range_spinbox.h"
 
-#include <QEvent>
-#include <QWheelEvent>
+#include <QtCore/QEvent>
+#include <QtGui/QWheelEvent>
 #include <cmath>
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_multi_range_spinbox.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_multi_range_spinbox.h
index 621d873d3..4276bbdc2 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_multi_range_spinbox.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_multi_range_spinbox.h
@@ -11,9 +11,9 @@
 #pragma once
 
 #include "lts_widgets_export.h"
-#include <QSet>
-#include <QSpinBox>
-#include <QRegularExpression>
+#include <QtCore/QSet>
+#include <QtWidgets/QSpinBox>
+#include <QtCore/QRegularExpression>
 
 namespace LtsWidgets
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_notification_box.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_notification_box.cpp
index ab5fdd1e3..4085a5ce1 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_notification_box.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_notification_box.cpp
@@ -1,14 +1,14 @@
 #include "lts_notification_box.h"
 #include "ui_lts_notification_box.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QLinearGradient>
-#include <QColor>
+#include <QtGui/QColor>
 #include <QGraphicsDropShadowEffect>
 #include <QStyleOption>
-#include <QStyle>
+#include <QtWidgets/QStyle>
 #ifdef NOTIBOX_DEBUG
-#include <QDebug>
+#include <QtCore/QDebug>
 #endif
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_notification_box.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_notification_box.h
index a4192e993..71d6873c6 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_notification_box.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_notification_box.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "lts_widgets_export.h"
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <QPainterPath>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_operator_menu.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_operator_menu.cpp
index 9680dc13a..db5f4c332 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_operator_menu.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_operator_menu.cpp
@@ -13,8 +13,8 @@
 #include "lts_info_dialog.h"
 #include <ngltranslator/ngltranslator.h>
 
-#include <QPushButton>
-#include <QProcess>
+#include <QtWidgets/QPushButton>
+#include <QtCore/QProcess>
 #include <QHostInfo>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_overlay_loading.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_overlay_loading.cpp
index 65a951bb0..db860dd1b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_overlay_loading.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_overlay_loading.cpp
@@ -13,10 +13,10 @@
 #include "lts_overlay_loading.h"
 #include "ui_lts_overlay_loading.h"
 
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QProgressBar>
-#include <QPushButton>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QProgressBar>
+#include <QtWidgets/QPushButton>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_overlay_loading.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_overlay_loading.h
index 5ce4b529e..7a7b9dc8c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_overlay_loading.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_overlay_loading.h
@@ -14,7 +14,7 @@
 
 #include "lts_widgets_export.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 
 namespace Ui { class LtsOverlayLoading; }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_picture_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_picture_view.cpp
index 2cc3c7a88..491ee6710 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_picture_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_picture_view.cpp
@@ -8,10 +8,10 @@
   */
 
 #include "lts_picture_view.h"
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 #include <QGraphicsPixmapItem>
 #include <QGraphicsColorizeEffect>
-#include <QRubberBand>
+#include <QtWidgets/QRubberBand>
 
 
 using namespace LtsWidgets;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_picture_view.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_picture_view.h
index 03e4069f1..e5b76fe99 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_picture_view.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_picture_view.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "lts_widgets_export.h"
-#include <QGraphicsView>
+#include <QtWidgets/QGraphicsView>
 
 class QRubberBand;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_profile_button.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_profile_button.cpp
index 6d17e1745..d78b226e6 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_profile_button.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_profile_button.cpp
@@ -10,13 +10,13 @@
 
 #include "lts_profile_button.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QPainterPath>
-#include <QPaintEvent>
-#include <QBrush>
-#include <QPen>
-#include <QRect>
-#include <QEvent>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QBrush>
+#include <QtGui/QPen>
+#include <QtCore/QRect>
+#include <QtCore/QEvent>
 
 using namespace LtsWidgets;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_profile_button.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_profile_button.h
index 470afd300..ac13ac800 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_profile_button.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_profile_button.h
@@ -12,7 +12,7 @@
 
 #include "lts_widgets_export.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_progress_dialog_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_progress_dialog_helper.cpp
index 8324b3f16..faa7e9ca7 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_progress_dialog_helper.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_progress_dialog_helper.cpp
@@ -12,12 +12,12 @@
 
 #include "lts_frameless_dialog.h"
 
-#include <QCoreApplication>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QProgressBar>
-#include <QPushButton>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QProgressBar>
+#include <QtWidgets/QPushButton>
+#include <QtCore/QTimer>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_progress_dialog_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_progress_dialog_helper.h
index 2dbc0a312..b172e6e67 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_progress_dialog_helper.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_progress_dialog_helper.h
@@ -12,8 +12,8 @@
 
 #include "lts_widgets_export.h"
 
-#include <QObject>
-#include <QPointer>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
 
 class QLabel;
 class QWidget;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_range_slider.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_range_slider.cpp
index aad9b92e0..1f5ac3109 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_range_slider.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_range_slider.cpp
@@ -32,12 +32,12 @@
 #include "lts_range_slider.h"
 
 // Qt includes
-#include <QDebug>
-#include <QMouseEvent>
-#include <QKeyEvent>
+#include <QtCore/QDebug>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QKeyEvent>
 #include <QStyleOptionSlider>
 #include <QStylePainter>
-#include <QStyle>
+#include <QtWidgets/QStyle>
 #include <QToolTip>
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_range_slider.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_range_slider.h
index 9827d481b..c3a1f4f6b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_range_slider.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_range_slider.h
@@ -33,7 +33,7 @@
 #include "lts_widgets_export.h"
 
 // Qt includes
-#include <QSlider>
+#include <QtWidgets/QSlider>
 
 namespace LtsWidgets
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_selection_popup.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_selection_popup.cpp
index 82bcbd281..06617449a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_selection_popup.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_selection_popup.cpp
@@ -12,10 +12,10 @@
 #include "ui_lts_selection_popup.h"
 #include "lts_base.h"
 
-#include <QSortFilterProxyModel>
-#include <QAbstractItemModel>
-#include <QRadioButton>
-#include <QScrollBar>
+#include <QtCore/QSortFilterProxyModel>
+#include <QtCore/QAbstractItemModel>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QScrollBar>
 
 //#define NEVER
 #ifdef NEVER
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_spinbox.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_spinbox.h
index 5ee3beb48..1ef11239c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_spinbox.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_spinbox.h
@@ -12,7 +12,7 @@
 
 #include "lts_widgets_export.h"
 
-#include <QSpinBox>
+#include <QtWidgets/QSpinBox>
 
 namespace LtsWidgets
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splash.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splash.cpp
index 7d909d9c1..f78fd98ec 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splash.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splash.cpp
@@ -2,9 +2,9 @@
 
 #include <LtsWidgets/lts_global_wait_dialog.h>
 
-#include <QCoreApplication>
-#include <QFile>
-#include <QEvent>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QFile>
+#include <QtCore/QEvent>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splash.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splash.h
index f5cf1d224..b8cbbd0c7 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splash.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splash.h
@@ -2,8 +2,8 @@
 
 #include <LtsWidgets/lts_widgets_export.h>
 
-#include <QSplashScreen>
-#include <QObject>
+#include <QtWidgets/QSplashScreen>
+#include <QtCore/QObject>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splitter.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splitter.h
index f68d41619..5e63e2c6a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splitter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splitter.h
@@ -11,8 +11,8 @@
 #include "lts_base.h"
 #include "lts_widgets_export.h"
 
-#include <QSplitter>
-#include <QList>
+#include <QtWidgets/QSplitter>
+#include <QtCore/QList>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splitter_handle.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splitter_handle.cpp
index 213469a48..b11a50abf 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splitter_handle.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splitter_handle.cpp
@@ -7,12 +7,12 @@
 */
 
 #include "lts_splitter_handle.h"
-#include <QPainter>
-#include <QPaintEvent>
-#include <QBrush>
-#include <QEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QBrush>
+#include <QtCore/QEvent>
 #include <QLinearGradient>
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splitter_handle.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splitter_handle.h
index d05f9edc2..7811e1b70 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splitter_handle.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splitter_handle.h
@@ -12,8 +12,8 @@
 #include "lts_widgets_export.h"
 
 #include <QSplitterHandle>
-#include <QList>
-#include <QPropertyAnimation>
+#include <QtCore/QList>
+#include <QtCore/QPropertyAnimation>
 
 namespace LtsWidgets
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_bar.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_bar.cpp
index db442b705..ab0b31044 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_bar.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_bar.cpp
@@ -14,8 +14,8 @@
 #include "lts_tab_widget.h"
 
 #include <TabBarTabStyle/tab_bar_tab_style.h>
-#include <QCoreApplication>
-#include <QMenu>
+#include <QtCore/QCoreApplication>
+#include <QtWidgets/QMenu>
 
 namespace LtsWidgets
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_sequence_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_sequence_widget.cpp
index 601403212..5c205c0e4 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_sequence_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_sequence_widget.cpp
@@ -9,9 +9,9 @@
 #include "lts_tab_sequence_widget.h"
 
 #include <QTabBar>
-#include <QTabWidget>
-#include <QToolButton>
-#include <QHBoxLayout>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QHBoxLayout>
 
 namespace LtsWidgets
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_widget.cpp
index a45ae02ff..3f5ac705a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_widget.cpp
@@ -12,23 +12,23 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsWidgets/lts_dialog_helper.h>
 #include <LtsWidgets/lts_splitter.h>
-#include <QAbstractButton>
-#include <QDialog>
-#include <QDebug>
-#include <QSize>
-#include <QPaintEvent>
-#include <QPainter>
-#include <QBrush>
-#include <QApplication>
-#include <QColor>
-#include <QPen>
+#include <QtWidgets/QAbstractButton>
+#include <QtWidgets/QDialog>
+#include <QtCore/QDebug>
+#include <QtCore/QSize>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QBrush>
+#include <QtWidgets/QApplication>
+#include <QtGui/QColor>
+#include <QtGui/QPen>
 #include <QFontMetrics>
-#include <QRectF>
-#include <QLineF>
-#include <QPointF>
+#include <QtCore/QRectF>
+#include <QtCore/QLineF>
+#include <QtCore/QPointF>
 #include <math.h>
-#include <QTimer>
-#include <QLabel>
+#include <QtCore/QTimer>
+#include <QtWidgets/QLabel>
 #include <QRandomGenerator>
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_widget.h
index b0d2e7304..3c378d917 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_widget.h
@@ -11,9 +11,9 @@
 #include "lts_base.h"
 #include "lts_widgets_export.h"
 
-#include <QTabWidget>
-#include <QMap>
-#include <QAbstractButton>
+#include <QtWidgets/QTabWidget>
+#include <QtCore/QMap>
+#include <QtWidgets/QAbstractButton>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_edit_dialog.cpp
index cfc206e85..2bcb5f7d3 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_edit_dialog.cpp
@@ -10,7 +10,7 @@
 #include "lts_text_edit_dialog.h"
 #include "lts_text_editor.h"
 
-#include <QHBoxLayout>
+#include <QtWidgets/QHBoxLayout>
 
 #if 1
 #define USE_TEXT_EDITOR_2
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor.cpp
index 1243e805b..1f523bf92 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor.cpp
@@ -2,16 +2,16 @@
 
 #include "ui_lts_text_editor.h"
 
-#include <QColorDialog>
-#include <QTextCursor>
-#include <QApplication>
-#include <QClipboard>
+#include <QtWidgets/QColorDialog>
+#include <QtGui/QTextCursor>
+#include <QtWidgets/QApplication>
+#include <QtGui/QClipboard>
 #include <QTextCharFormat>
 #include <QMimeData>
 #include <QTextList>
-#include <QLineEdit>
+#include <QtWidgets/QLineEdit>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 namespace LtsWidgets
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor.h
index 43a2bc805..3fb87d2f1 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor.h
@@ -2,7 +2,7 @@
 
 #include <LtsWidgets/lts_widgets_export.h>
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.cpp
index 41db759cb..c61bfc82b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.cpp
@@ -9,28 +9,28 @@
 
 #include "lts_text_editor2.h"
 
-#include <QAction>
-#include <QActionGroup>
-#include <QApplication>
-#include <QClipboard>
-#include <QColorDialog>
-#include <QComboBox>
-#include <QFontComboBox>
-#include <QFile>
-#include <QFileDialog>
-#include <QFileInfo>
-#include <QFontDatabase>
-#include <QMenu>
-#include <QMenuBar>
-#include <QTextEdit>
-#include <QStatusBar>
-#include <QToolBar>
-#include <QTextCursor>
+#include <QtGui/QAction>
+#include <QtGui/QActionGroup>
+#include <QtWidgets/QApplication>
+#include <QtGui/QClipboard>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QFontComboBox>
+#include <QtCore/QFile>
+#include <QtWidgets/QFileDialog>
+#include <QtCore/QFileInfo>
+#include <QtGui/QFontDatabase>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QStatusBar>
+#include <QtWidgets/QToolBar>
+#include <QtGui/QTextCursor>
 #include <QTextDocumentWriter>
 #include <QTextList>
 #include <QtDebug>
-#include <QCloseEvent>
-#include <QMessageBox>
+#include <QtGui/QCloseEvent>
+#include <QtWidgets/QMessageBox>
 #include <QMimeData>
 #include <QMimeDatabase>
 #if defined(QT_PRINTSUPPORT_LIB)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.h
index 6f92ae82b..510f3f2c7 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.h
@@ -10,11 +10,11 @@
 
 #include <LtsWidgets/lts_widgets_export.h>
 
-#include <QMainWindow>
-#include <QMap>
-#include <QPointer>
-#include <QHBoxLayout>
-#include <QGridLayout>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QMap>
+#include <QtCore/QPointer>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QGridLayout>
 #include <QtPrintSupport/QPrinter>
 #include <QtPrintSupport/QPrintPreviewDialog>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_bar.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_bar.h
index 9c0f366e1..5d785b021 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_bar.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_bar.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QToolBar>
+#include <QtWidgets/QToolBar>
 #include "lts_widgets_export.h"
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_bar_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_bar_area.cpp
index 6016c97b8..f15ca7d7d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_bar_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_bar_area.cpp
@@ -11,13 +11,13 @@
 #include "lts_drag_icon.h"
 
 #include <LtsUtilsSettings/settings.h>
-#include <QDragEnterEvent>
-#include <QDropEvent>
-#include <QLabel>
-#include <QDebug>
-#include <QMenu>
-#include <QShortcut>
-#include <QPointer>
+#include <QtGui/QDragEnterEvent>
+#include <QtGui/QDropEvent>
+#include <QtWidgets/QLabel>
+#include <QtCore/QDebug>
+#include <QtWidgets/QMenu>
+#include <QtGui/QShortcut>
+#include <QtCore/QPointer>
 #include <utility>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_bar_area.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_bar_area.h
index 47a067420..74a0c4beb 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_bar_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_bar_area.h
@@ -10,10 +10,10 @@
 
 #include "lts_widgets_export.h"
 
-#include <QWidget>
-#include <QVector>
-#include <QShortcut>
-#include <QMap>
+#include <QtWidgets/QWidget>
+#include <QtCore/QVector>
+#include <QtGui/QShortcut>
+#include <QtCore/QMap>
 
 
 class QMenu;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_box.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_box.cpp
index c7249b5a6..87f9acad4 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_box.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_box.cpp
@@ -11,9 +11,9 @@
 #include "lts_drag_icon.h"
 #include "lts_grid_layout.h"
 
-#include <QMenu>
+#include <QtWidgets/QMenu>
 #include <QScroller>
-#include <QScrollArea>
+#include <QtWidgets/QScrollArea>
 
 using namespace LtsWidgets;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_box.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_box.h
index b37cc7582..fa8f73184 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_box.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_box.h
@@ -11,7 +11,7 @@
 #include "lts_base.h"
 #include "lts_widgets_export.h"
 
-#include <QToolBox>
+#include <QtWidgets/QToolBox>
 
 namespace LtsWidgets
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_wait_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_wait_dialog.h
index bf12ee359..2572ca3a4 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_wait_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_wait_dialog.h
@@ -2,7 +2,7 @@
 
 #include "lts_widgets_export.h"
 
-#include <QString>
+#include <QtCore/QString>
 
 #include <memory>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/requirement_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/requirement_widget.cpp
index 35045e010..7419a0905 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/requirement_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/requirement_widget.cpp
@@ -3,8 +3,8 @@
 #include "requirement_widget.h"
 
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QApplication>
-#include <QLabel>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QLabel>
 
 namespace LtsWidgets
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/requirement_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/requirement_widget.h
index af6f13c8d..26259bf3f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/requirement_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/requirement_widget.h
@@ -4,8 +4,8 @@
 
 #include "lts_widgets_export.h"
 
-#include <QVector>
-#include <QWidget>
+#include <QtCore/QVector>
+#include <QtWidgets/QWidget>
 #include <functional>
 
 class QLabel;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/lts_picture_editing.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/lts_picture_editing.cpp
index 2cb882380..72d11fa1d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/lts_picture_editing.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/lts_picture_editing.cpp
@@ -11,14 +11,14 @@
 #include "ui_lts_picture_editing.h"
 #include "lts_picture_view.h"
 
-#include <QFileDialog>
-#include <QPixmap>
-#include <QMessageBox>
-#include <QImage>
+#include <QtWidgets/QFileDialog>
+#include <QtGui/QPixmap>
+#include <QtWidgets/QMessageBox>
+#include <QtGui/QImage>
 #include <QGraphicsPixmapItem>
 
-#include <QDebug>
-#include <QTimer>
+#include <QtCore/QDebug>
+#include <QtCore/QTimer>
 
 LtsPictureEditing::LtsPictureEditing(QWidget *parent)
   : QMainWindow(parent)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/lts_picture_editing.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/lts_picture_editing.h
index 4db933dcd..2e944d866 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/lts_picture_editing.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/lts_picture_editing.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QMainWindow>
+#include <QtWidgets/QMainWindow>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/lts_picture_editing_main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/lts_picture_editing_main.cpp
index b338e73c7..6c278cb4a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/lts_picture_editing_main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/lts_picture_editing_main.cpp
@@ -8,7 +8,7 @@
   */
 
 #include "lts_picture_editing.h"
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <iostream>
 
 static void qtMsgHandler(QtMsgType type, const QMessageLogContext &, const QString &msg)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/main.cpp
index 87fe42596..5ac1c5a3d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/main.cpp
@@ -1,4 +1,4 @@
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 #include "window.h"
 #include <LtsWidgets/lts_date_time_edit.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/window.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/window.cpp
index 125718cdf..5a5a16f29 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/window.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/window.cpp
@@ -2,8 +2,8 @@
 
 #include <LtsWidgets/lts_notification_box.h>
 
-#include <QApplication>
-#include <QHBoxLayout>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QHBoxLayout>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/window.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/window.h
index 61f798447..5a831e806 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/window.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/tests/window.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/ui_requirement.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/ui_requirement.cpp
index 6c030dfc6..fa51ac2b1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/ui_requirement.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/ui_requirement.cpp
@@ -12,8 +12,8 @@
 
 #include <LtsWidgets/lts_message_dialog.h>
 
-#include <QApplication>
-#include <QLabel>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QLabel>
 
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/ui_requirement.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/ui_requirement.h
index 320e0b37c..697a676e6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/ui_requirement.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/ui_requirement.h
@@ -12,8 +12,8 @@
 
 #include "lts_widgets_export.h"
 
-#include <QWidget>
-#include <QVector>
+#include <QtWidgets/QWidget>
+#include <QtCore/QVector>
 #include <functional>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/data_plugin_interface.h
index c9eefee88..050a4757c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/data_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/data_plugin_interface.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <ProjectConfig/project_defines.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 
 namespace NGL
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h
index 9b4e647d6..11aa95a6b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h
@@ -6,9 +6,9 @@
 #include <LtsUtils/LtsUtilsCore/lts_translatable_identifier.h>
 #include <LtsWidgets/lts_base.h>
 #include <ProjectConfig/project_defines.h>
-#include <QFlags>
-#include <QObject>
-#include <QVector>
+#include <QtCore/QFlags>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 #include <memory>
 
 namespace NGL
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/project_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/project_plugin_interface.h
index 40536c355..20926137a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/project_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/project_plugin_interface.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace ProjectPlugin
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/record_replay_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/record_replay_plugin.h
index ed05c37e0..951cb6f99 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/record_replay_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/record_replay_plugin.h
@@ -2,9 +2,9 @@
 
 #pragma once
 
-#include <QHash>
-#include <QObject>
-#include <QString>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 #include <map>
 #include <memory>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/style_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/style_plugin_interface.h
index 1ef779022..736b7423b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/style_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/style_plugin_interface.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace StylePlugin
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/topic_replay_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/topic_replay_interface.h
index 2767bed0b..414142726 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/topic_replay_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/topic_replay_interface.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <QJsonObject>
-#include <QVector>
+#include <QtCore/QJsonObject>
+#include <QtCore/QVector>
 #include <TopicEditorBase/topic_editor_utils.h>
 
 class QWidget;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.cpp
index 39c4abd86..d7e92a706 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.cpp
@@ -5,8 +5,8 @@
 #include "topic_preview_widget.h"
 
 #include <LtsWidgets/lts_dialog.h>
-#include <QDebug>
-#include <QMessageBox>
+#include <QtCore/QDebug>
+#include <QtWidgets/QMessageBox>
 
 namespace TopicEditorBase
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.h b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.h
index 38351c2bf..b94a27893 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.h
@@ -6,9 +6,9 @@
 
 #include <LtsUtils/LtsUtilsCore/promise.h>
 #include <LtsWidgets/lts_dialog.h>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QObject>
 
 namespace LtsUtils
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.cpp
index 8e30cc87c..e31396e37 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.cpp
@@ -1,12 +1,12 @@
 #include "topic_editor_utils.h"
 
-#include <QColor>
-#include <QHash>
-#include <QIcon>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QLabel>
-#include <QString>
+#include <QtGui/QColor>
+#include <QtCore/QHash>
+#include <QtGui/QIcon>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtWidgets/QLabel>
+#include <QtCore/QString>
 
 namespace TopicEditorBase
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.h b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.h
index ff0f8b958..47a6f4368 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.h
@@ -3,7 +3,7 @@
 #include "topiceditorbase_export.h"
 
 #include <LtsScriptTimeline/track_entry.h>
-#include <QVector>
+#include <QtCore/QVector>
 
 class QColor;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_preview_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_preview_widget.cpp
index 72d88a6af..fddedf8f0 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_preview_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_preview_widget.cpp
@@ -5,10 +5,10 @@
 
 #include <LtsSession/lts_session_data.h>
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QContextMenuEvent>
-#include <QJsonDocument>
-#include <QMenu>
-#include <QTextEdit>
+#include <QtGui/QContextMenuEvent>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QTextEdit>
 
 namespace TopicEditorBase
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_preview_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_preview_widget.h
index 53c98fbb3..650cf9a4f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_preview_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_preview_widget.h
@@ -2,8 +2,8 @@
 #include "topic_editor_utils.h"
 #include "topiceditorbase_export.h"
 
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_previewer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_previewer.cpp
index e0869c8dd..fd9b806d7 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_previewer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_previewer.cpp
@@ -1,10 +1,10 @@
 #include "topic_previewer.h"
 
-#include <QDebug>
+#include <QtCore/QDebug>
 #include <QDrag>
 #include <QMimeData>
-#include <QMouseEvent>
-#include <QPainter>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
 
 namespace TopicEditorBase
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_previewer.h b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_previewer.h
index 77e54061c..1e2a10b79 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_previewer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_previewer.h
@@ -2,8 +2,8 @@
 #include "topic_editor_utils.h"
 #include "topiceditorbase_export.h"
 
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>
 
 namespace TopicEditorBase
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/AbstractServer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/AbstractServer.cpp
index 1095dbf3f..fc6168f78 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/AbstractServer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/AbstractServer.cpp
@@ -1,5 +1,5 @@
-#include <QTcpServer>
-#include <QTcpSocket>
+#include <QtNetwork/QTcpServer>
+#include <QtNetwork/QTcpSocket>
 #include <QtWebSockets/QWebSocketServer>
 #include <httq/AbstractServer.h>
 #include <httq/HttpRequest.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/DataStream.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/DataStream.cpp
index 2029d751a..5ddb4cc6a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/DataStream.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/DataStream.cpp
@@ -1,9 +1,9 @@
-#include <QDataStream>
-#include <QFile>
-#include <QIODevice>
-#include <QTcpSocket>
-#include <QTemporaryFile>
-#include <QTimer>
+#include <QtCore/QDataStream>
+#include <QtCore/QFile>
+#include <QtCore/QIODevice>
+#include <QtNetwork/QTcpSocket>
+#include <QtCore/QTemporaryFile>
+#include <QtCore/QTimer>
 #include <httq/DataStream.h>
 #include <httq/HttpRequest.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/HttpRequest.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/HttpRequest.cpp
index 1767a70b3..3aae18fe3 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/HttpRequest.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/HttpRequest.cpp
@@ -1,10 +1,10 @@
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QTcpSocket>
-#include <QUrl>
-#include <QUrlQuery>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonValue>
+#include <QtNetwork/QTcpSocket>
+#include <QtCore/QUrl>
+#include <QtCore/QUrlQuery>
 #include <http_parser.h>
 #include <httq/AbstractServer.h>
 #include <httq/DataStream.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/Logger.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/Logger.cpp
index 34868a923..ba1f1ae46 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/Logger.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/Logger.cpp
@@ -1,5 +1,5 @@
-#include <QCoreApplication>
-#include <QDebug>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
 #include <httq/Logger.h>
 
 namespace httq
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/AbstractServer.h b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/AbstractServer.h
index 96ad858b6..8ca53066b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/AbstractServer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/AbstractServer.h
@@ -2,8 +2,8 @@
 
 #include "httq_export.h"
 
-#include <QHostAddress>
-#include <QObject>
+#include <QtNetwork/QHostAddress>
+#include <QtCore/QObject>
 
 class QTcpServer;
 class QWebSocketServer;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/DataStream.h b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/DataStream.h
index 28e46d5dc..044bd0473 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/DataStream.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/DataStream.h
@@ -2,8 +2,8 @@
 
 #include "httq_export.h"
 
-#include <QObject>
-#include <QScopedPointer>
+#include <QtCore/QObject>
+#include <QtCore/QScopedPointer>
 #include <httq/Logger.h>
 
 class QIODevice;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/HttpRequest.h b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/HttpRequest.h
index 9a7a90054..47bf1ec43 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/HttpRequest.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/HttpRequest.h
@@ -2,12 +2,12 @@
 
 #include "httq_export.h"
 
-#include <QByteArray>
-#include <QMap>
-#include <QObject>
-#include <QString>
-#include <QUrl>
-#include <QUrlQuery>
+#include <QtCore/QByteArray>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QUrl>
+#include <QtCore/QUrlQuery>
 #include <http_parser.h>
 
 class QTcpSocket;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/Logger.h b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/Logger.h
index 22712d0ba..1ed8bb377 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/Logger.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/Logger.h
@@ -2,9 +2,9 @@
 
 #include "httq_export.h"
 
-#include <QObject>
-#include <QPointer>
-#include <QScopedPointer>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
+#include <QtCore/QScopedPointer>
 
 namespace httq
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.cpp
index 5e61f53f9..b041d9bc6 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.cpp
@@ -6,9 +6,9 @@
 #include <DDS/DTS/generic_dts.h>
 #include <DDS/DTS/generic_dts_impl.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QCoreApplication>
-#include <QThread>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QThread>
+#include <QtCore/QTimer>
 
 namespace Core
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/topic_lock_master.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/topic_lock_master.h
index 41d2ce14c..42495ee42 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/topic_lock_master.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/topic_lock_master.h
@@ -2,8 +2,8 @@
 
 #include <Core/core_dtc.h>
 
-#include <QSet>
-#include <QString>
+#include <QtCore/QSet>
+#include <QtCore/QString>
 
 
 namespace DDSConnector
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.cpp
index 54f49e99b..9a52e2d4f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.cpp
@@ -10,7 +10,7 @@
 #include <DDS/Generic/wait_set_handler.h>
 #include <DDS/QosProfile/DDS_DefaultQos.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 namespace DDSConnector
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.h
index fb85bac0e..fd1ac0df3 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.h
@@ -4,7 +4,7 @@
 
 #include <DDS/Generic/generic_base.h>
 #include <Lts/Common/ProjectConfig/project_defines.h>
-#include <QUrl>
+#include <QtCore/QUrl>
 #include <QtCore/QStringList>
 #include <ddsconnector_export.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DTC/generic_dtc_impl.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DTC/generic_dtc_impl.h
index af6a6c6d1..7cac03ea6 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DTC/generic_dtc_impl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DTC/generic_dtc_impl.h
@@ -6,7 +6,7 @@
 
 #include <DDS/Generic/generic_data_reader.h>
 #include <DDS/Generic/subscriber_listener.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <dds/core/cond/StatusCondition.hpp>
 #include <dds/core/cond/WaitSet.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.cpp
index 89135f1e3..d7587b7f5 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.cpp
@@ -7,8 +7,8 @@
 #include <DDS/QosProfile/DDS_DefaultQos.h>
 #include <Lts/Common/ProjectConfig/project_defines.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QThread>
-#include <QVariant>
+#include <QtCore/QThread>
+#include <QtCore/QVariant>
 #include <QtTest/QTest>
 
 DataTopicTests::DataTopicTests() : m_domainParticipantPub(nullptr)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.h
index 466d3c480..8463b21c3 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.h
@@ -5,7 +5,7 @@
 #include <DDS/Generic/subscriber_listener.h>
 #include <DdsUnitTests/ddsut_dtc_types.h>
 #include <DdsUnitTests/ddsut_dts_types.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests_main.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests_main.h
index bf1b90650..137cbc3eb 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests_main.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests_main.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <DdsUnitTests/ddsut_dtc_types.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <QSignalSpy>
 
 namespace NGL
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.h
index b5f21670e..5151bd313 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.h
@@ -8,9 +8,9 @@
 #include <DdsUnitTests/ddsut.hpp>
 #include <DdsUnitTests/ddsut_ftc_types.h>
 #include <DdsUnitTests/ddsut_fts_types.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <QSignalSpy>
-#include <QThread>
+#include <QtCore/QThread>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.h
index 1e4de14a3..ecf77bb4f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.h
@@ -8,7 +8,7 @@
 #include <DdsUnitTests/ddsut_dtc_types.h>
 #include <DdsUnitTests/ddsut_dts_types.h>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTestsPlaceholder/ddsDataTopicTests_smoke.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTestsPlaceholder/ddsDataTopicTests_smoke.cpp
index 619718571..79c58c222 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTestsPlaceholder/ddsDataTopicTests_smoke.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTestsPlaceholder/ddsDataTopicTests_smoke.cpp
@@ -1,5 +1,5 @@
-#include <QObject>
-#include <QtTest>
+#include <QtCore/QObject>
+#include <QtTest/QtTest>
 
 class DataTopicSmokeTest : public QObject {
   Q_OBJECT
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTestsPlaceholder/ddsFunctionTopicTests_smoke.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTestsPlaceholder/ddsFunctionTopicTests_smoke.cpp
index a836b1c5a..0dedd1480 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTestsPlaceholder/ddsFunctionTopicTests_smoke.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTestsPlaceholder/ddsFunctionTopicTests_smoke.cpp
@@ -1,5 +1,5 @@
-#include <QObject>
-#include <QtTest>
+#include <QtCore/QObject>
+#include <QtTest/QtTest>
 
 class FunctionTopicSmokeTest : public QObject {
   Q_OBJECT
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTestsPlaceholder/ddsGenericDataTests_smoke.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTestsPlaceholder/ddsGenericDataTests_smoke.cpp
index fc9479a24..7a15a94eb 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTestsPlaceholder/ddsGenericDataTests_smoke.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTestsPlaceholder/ddsGenericDataTests_smoke.cpp
@@ -1,5 +1,5 @@
-#include <QObject>
-#include <QtTest>
+#include <QtCore/QObject>
+#include <QtTest/QtTest>
 
 class GenericSmokeTest : public QObject {
   Q_OBJECT
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/abstract_requester.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/abstract_requester.h
index ed9e2732a..15c61633f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/abstract_requester.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/abstract_requester.h
@@ -2,7 +2,7 @@
 
 #include <ddsftccore_export.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 class DDSFTCCORE_EXPORT Request2 : public QObject
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_impl.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_impl.h
index 57877c85d..510c62367 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_impl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_impl.h
@@ -10,8 +10,8 @@
 #include <DDS/Generic/generic_logger.h>
 #include <DDS/QosProfile/DDS_DefaultQos.h>
 #include <QMetaMethod>
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 #include <future>
 #include <queue>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_threading.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_threading.cpp
index b4e300aec..9f507dd43 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_threading.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_threading.cpp
@@ -1,9 +1,9 @@
 #include "generic_ftc_threading.h"
 
-#include <QAtomicInt>
-#include <QTimer>
+#include <QtCore/QAtomicInt>
+#include <QtCore/QTimer>
 
-#include <QRegularExpression>
+#include <QtCore/QRegularExpression>
 
 #include <chrono>
 #include <future>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_threading.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_threading.h
index 5348d140d..ea1001620 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_threading.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_threading.h
@@ -2,9 +2,9 @@
 
 
 
-#include <QObject>
-#include <QAtomicInt>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QAtomicInt>
+#include <QtCore/QTimer>
 
 #include <thread>
 #include <exception>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts.h
index 9cfe51d98..ff172a00d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts.h
@@ -6,7 +6,7 @@
 #if BUILD_RTI
 #include <rti/core/SampleIdentity.hpp>
 #endif
-#include <QVector>
+#include <QtCore/QVector>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_internal.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_internal.h
index 92401f19a..db3470d86 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_internal.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_internal.h
@@ -12,7 +12,7 @@
 #include <dds/pub/qos/DataWriterQos.hpp>
 #endif
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace FTS
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_base.cpp
index caa6e7229..03fc82a73 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_base.cpp
@@ -4,7 +4,7 @@
 #include "generic_base.h"
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QStringList>
+#include <QtCore/QStringList>
 #include <QMetaMethod>
 
 namespace DDS
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.h
index 3613111a4..ec5e7a7d2 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.h
@@ -3,8 +3,8 @@
 #pragma once
 
 #include <QMetaMethod>
-#include <QObject>
-#include <QReadWriteLock>
+#include <QtCore/QObject>
+#include <QtCore/QReadWriteLock>
 #include <dds/sub/AnyDataReader.hpp>
 #include <dds/sub/SubscriberListener.hpp>
 #include <dds/topic/Topic.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/topic_type_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/topic_type_plugin.h
index 4620eb168..b178f9288 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/topic_type_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/topic_type_plugin.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <QObject>
-#include <QMap>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+#include <QtCore/QString>
 
 #include <DDS/Generic/topic_description.h>
 #include <Lts/Common/ProjectConfig/project_defines.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/QosProfile/DDS_DefaultQos.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/QosProfile/DDS_DefaultQos.cpp
index cf34ab66d..854da2e0e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/QosProfile/DDS_DefaultQos.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/QosProfile/DDS_DefaultQos.cpp
@@ -3,7 +3,7 @@
 
 #include "DDS_DefaultQos.h"
 
-#include <QUrl>
+#include <QtCore/QUrl>
 
 #include <ngltools/ngltools_filesystem.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/QosProfile/DDS_DefaultQos.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/QosProfile/DDS_DefaultQos.h
index f1417a37d..0c955c6ee 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/QosProfile/DDS_DefaultQos.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/QosProfile/DDS_DefaultQos.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QStringList>
-#include <QUrl>
+#include <QtCore/QStringList>
+#include <QtCore/QUrl>
 #include <dds/core/QosProvider.hpp>
 #include "ddsqos_export.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_select_text_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_select_text_dialog.h
index 0395dce60..8c62bed75 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_select_text_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_select_text_dialog.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <LtsWidgets/lts_frameless_dialog.h>
-#include <QVariant>
+#include <QtCore/QVariant>
 
 class Ui_SelectTextDialog;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_edit_scene.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_edit_scene.cpp
index 00c6460e5..e1087126b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_edit_scene.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_edit_scene.cpp
@@ -5,14 +5,14 @@
 
 #include <QGraphicsLineItem>
 #include <QGraphicsSceneMouseEvent>
-#include <QKeyEvent>
-#include <QLabel>
-#include <QList>
+#include <QtGui/QKeyEvent>
+#include <QtWidgets/QLabel>
+#include <QtCore/QList>
 #include <QLocale>
 #include <QPolygonF>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QPainterPath>
-#include <QString>
+#include <QtCore/QString>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "asb_symbol_edit_scene.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_edit_scene.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_edit_scene.h
index bc3608408..d3fd3b750 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_edit_scene.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_edit_scene.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QGraphicsScene>
-#include <QPen>
+#include <QtWidgets/QGraphicsScene>
+#include <QtGui/QPen>
 
 #include <SymbologyXML/primitive.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.cpp
index 1f17d9f10..af6abd01d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.cpp
@@ -15,15 +15,15 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <ParticipantManagement/ppm_translation.h>
-#include <QButtonGroup>
-#include <QColorDialog>
-#include <QDateTime>
-#include <QGraphicsItem>
+#include <QtWidgets/QButtonGroup>
+#include <QtWidgets/QColorDialog>
+#include <QtCore/QDateTime>
+#include <QtWidgets/QGraphicsItem>
 #include <QGraphicsPixmapItem>
-#include <QJsonDocument>
-#include <QKeyEvent>
-#include <QScrollBar>
-#include <QStandardItemModel>
+#include <QtCore/QJsonDocument>
+#include <QtGui/QKeyEvent>
+#include <QtWidgets/QScrollBar>
+#include <QtGui/QStandardItemModel>
 #include <SymbologyXML/attribute_data.h>
 #include <SymbologyXML/symbol.h>
 #include <SymbologyXML/symbol_exporter.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor_gui_plugin.cpp
index c101c7671..d760ac37a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor_gui_plugin.cpp
@@ -9,7 +9,7 @@
 #include <LtsSession/lts_session.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace AdvancedSymbology
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/main.cpp
index 736e2ad7e..845df54a5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/main.cpp
@@ -5,8 +5,8 @@
 #include <getopt.h>
 #include <string>
 #include <nglapplication/nglapplication.h>
-#include <QString>
-#include <QDir>
+#include <QtCore/QString>
+#include <QtCore/QDir>
 
 #include "symboleditor.h"
 #include "nglsettings.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.cpp
index d1bccc4c8..6091d2f8b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.cpp
@@ -8,15 +8,15 @@
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
-#include <QDomDocument>
-#include <QImage>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QPainter>
-#include <QPointer>
-#include <QSet>
+#include <QtXml/QDomDocument>
+#include <QtGui/QImage>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtGui/QPainter>
+#include <QtCore/QPointer>
+#include <QtCore/QSet>
 #include <QSvgRenderer>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <Symbology/sidc_codec.h>
 #include <Symbology/symbol_dictionary.h>
 #include <utility>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/flm_symbol_proxy.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/flm_symbol_proxy.h
index 3fe43e37e..3adbfcfc6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/flm_symbol_proxy.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/flm_symbol_proxy.h
@@ -6,9 +6,9 @@
 
 
 
-#include <QHash>
-#include <QString>
-#include <QImage>
+#include <QtCore/QHash>
+#include <QtCore/QString>
+#include <QtGui/QImage>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Helper/table_model_symbol_renderer_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Helper/table_model_symbol_renderer_base.cpp
index 5e71194a1..0d8efb3fe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Helper/table_model_symbol_renderer_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Helper/table_model_symbol_renderer_base.cpp
@@ -6,8 +6,8 @@
 
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
 #include <NGLLogger/INGLLogger.h>
-#include <QAbstractItemModel>
-#include <QPointer>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QPointer>
 
 namespace AdvancedSymbology
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Helper/table_model_symbol_renderer_base.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Helper/table_model_symbol_renderer_base.h
index 31dc9ebbc..e0cc5b8fc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Helper/table_model_symbol_renderer_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Helper/table_model_symbol_renderer_base.h
@@ -4,10 +4,10 @@
 #pragma once
 
 #include <memory>
-#include <QColor>
-#include <QHash>
-#include <QIcon>
-#include <QSharedPointer>
+#include <QtGui/QColor>
+#include <QtCore/QHash>
+#include <QtGui/QIcon>
+#include <QtCore/QSharedPointer>
 
 class QAbstractItemModel;
 class QModelIndex;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/asb_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/asb_data_plugin_interface.h
index 6ffb02972..7fe8e109b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/asb_data_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/asb_data_plugin_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QColor>
+#include <QtGui/QColor>
 #include <Symbology/symbol_dictionary.h>
 #include <PluginInterfaces/data_plugin_interface.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/asb_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/asb_gui_plugin_interface.h
index fd67e1463..65f1c4f87 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/asb_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/asb_gui_plugin_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace AdvancedSymbology
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/asb_symbol_proxy_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/asb_symbol_proxy_gui_plugin_interface.h
index abbf8391b..2044d7d89 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/asb_symbol_proxy_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/asb_symbol_proxy_gui_plugin_interface.h
@@ -5,7 +5,7 @@
 
 #include <Symbology/symbol_dictionary_types.h>
 
-#include <QString>
+#include <QtCore/QString>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp
index 33423104a..5aec2afc7 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp
@@ -8,8 +8,8 @@
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
 #include <ParticipantManagement/ppm_translation.h>
 #include <ProjectDataManagement/pdm_translation.h>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
 #include <ngltools/ngltools_dtg.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_config_alarm_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_config_alarm_gui_plugin.cpp
index 1d3b95f6f..ddf7a97b4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_config_alarm_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_config_alarm_gui_plugin.cpp
@@ -9,8 +9,8 @@
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ngltools/ngltools_dtg.h>
 #include <LtsAppManager/lts_app_manager.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.cpp
index 929e861ee..94e1b3755 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.cpp
@@ -7,7 +7,7 @@
 #include <LtsPrinting/printing.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace AlarmManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.cpp
index 72eed83f5..20ea1afaa 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.cpp
@@ -10,7 +10,7 @@
 #include <LtsPrinting/printing.h>
 #include <ParticipantManagement/Gui/Common/participant_edit_model.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace ParticipantAlarms
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.cpp
index 67f34f2b6..46128d2cf 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.cpp
@@ -6,7 +6,7 @@
 
 #include <LtsPrinting/printing.h>
 #include <LtsSession/lts_session_data.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace ParticipantAlarms
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_dialog.cpp
index 183494fca..fff9e8f36 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_dialog.cpp
@@ -8,9 +8,9 @@
 #include <ExerciseManagement/exm_data_plugin_interface.h>
 #include <LtsSession/lts_session_data.h>
 #include <LtsWidgets/lts_abstract_table_model.h>
-#include <QDateTime>
-#include <QLabel>
-#include <QLineEdit>
+#include <QtCore/QDateTime>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
 #include <Services/AlarmManagement/alm_operator_rights.h>
 
 namespace AlarmManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_dialog.h
index 4b1b9a67c..e40d752a8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_dialog.h
@@ -13,8 +13,8 @@
 #include <LtsSession/lts_session_data.h>
 #include <LtsSession/lts_session.h>
 
-#include <QWidget>
-#include <QDebug>
+#include <QtWidgets/QWidget>
+#include <QtCore/QDebug>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_gui_plugin.cpp
index dd7ae9170..b466952e2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_gui_plugin.cpp
@@ -6,14 +6,14 @@
 #include <Services/AlarmManagement/alm_operator_rights.h>
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ngltools/ngltools_dtg.h>
 #include <LtsAppManager/lts_app_manager.h>
 #include "alm_emergency_call_info_dialog.h"
 
-#include <QDebug>
+#include <QtCore/QDebug>
 namespace AlarmManagement
 {
 std::shared_ptr<GuiPluginBase::Interface> GuiPlugin::createGuiInterface(LtsSession::LtsSession *session)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_info_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_info_dialog.h
index ffbc278b7..87eafdcca 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_info_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_info_dialog.h
@@ -13,7 +13,7 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 namespace Ui {
 class EmergencyCallInfoDialog;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.cpp
index a7695e7a6..9d8bc69c4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.cpp
@@ -4,8 +4,8 @@
 #include "alm_emergency_call_model.h"
 #include <LtsCoordTrans/lts_coord_trans.h>
 
-#include <QDateTime>
-#include <QDebug>
+#include <QtCore/QDateTime>
+#include <QtCore/QDebug>
 
 namespace AlarmManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.h
index 1ba9cd9bc..4a15088bf 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.h
@@ -7,7 +7,7 @@
 #include <LtsWidgets/lts_abstract_table_model.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 #include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace AlarmManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/alm_info_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/alm_info_gui_plugin_interface.h
index 9ecbd5a62..3a875e45e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/alm_info_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/alm_info_gui_plugin_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QVector>
+#include <QtCore/QVector>
 
 namespace AlarmManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AppStarter/Gui/AppStart/app_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AppStarter/Gui/AppStart/app_gui_plugin.cpp
index 4f91d8e60..f900f5a22 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AppStarter/Gui/AppStart/app_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AppStarter/Gui/AppStart/app_gui_plugin.cpp
@@ -13,7 +13,7 @@
 #include <LtsUtilsSettings/settings.h>
 #include <Services/InfrastructureManagement/ism_operator_rights.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 namespace AppStarter
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AppStarter/Gui/AppStart/app_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AppStarter/Gui/AppStart/app_gui_plugin.h
index a47f4bf94..ace86e7a3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AppStarter/Gui/AppStart/app_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AppStarter/Gui/AppStart/app_gui_plugin.h
@@ -5,7 +5,7 @@
 
 #include <Plugins/AppStarter/app_gui_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QProcess>
+#include <QtCore/QProcess>
 
 namespace AppStarter
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AppStarter/app_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AppStarter/app_gui_plugin_interface.h
index 8fd8d741f..330ca0d1a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AppStarter/app_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AppStarter/app_gui_plugin_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace AppStarter
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_charge_effect_item_info.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_charge_effect_item_info.h
index 8deb756bc..5d69af6eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_charge_effect_item_info.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_charge_effect_item_info.h
@@ -9,7 +9,7 @@
 #include <AreaEffectSimulation/aes.hpp>
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 namespace Ui {
 class AesChargeEffectItemInfo;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_danger_area_aes_item_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_danger_area_aes_item_info.cpp
index 706002147..82ace45f1 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_danger_area_aes_item_info.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_danger_area_aes_item_info.cpp
@@ -9,7 +9,7 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <memory>
 #include <utility>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_model.h
index 337ac19d0..d149abd6f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_model.h
@@ -8,7 +8,7 @@
 #include <GuezNasat/gna_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
 #include <LtsSession/lts_session.h>
-#include <QSortFilterProxyModel>
+#include <QtCore/QSortFilterProxyModel>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/InfoView/aes_bccontamination_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/InfoView/aes_bccontamination_info.cpp
index a76f592be..1d2c5a5da 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/InfoView/aes_bccontamination_info.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/InfoView/aes_bccontamination_info.cpp
@@ -7,7 +7,7 @@
 #include <Plugins/AreaEffectSimulation/Gui/Base/InfoView/aes_base_info.h>
 #include <LtsSession/lts_session.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontaminations_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontaminations_model.h
index 285462ee7..aa5d55fbf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontaminations_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontaminations_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QSet>
+#include <QtCore/QSet>
 #include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 #include <ProjectDataManagement/pdm_enums.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/InfoView/aes_base_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/InfoView/aes_base_info.cpp
index 352502aa6..f1d58cf03 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/InfoView/aes_base_info.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/InfoView/aes_base_info.cpp
@@ -4,7 +4,7 @@
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 #include <LtsSession/lts_session.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <AreaEffectSimulation/aes_translation.h>
 #include <ParticipantManagement/ppm_translation.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.cpp
index 99c3b30bc..f76ac5bae 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.cpp
@@ -10,8 +10,8 @@
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
 #include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
-#include <QJsonDocument>
-#include <QSpinBox>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QSpinBox>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h
index 268d55250..24df80cc3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h
@@ -13,8 +13,8 @@
 #include <AreaEffectSimulation/logger.h>
 #include <ProjectDataManagement/pdm_translation.h>
 
-#include <QSet>
-#include <QVector>
+#include <QtCore/QSet>
+#include <QtCore/QVector>
 
 #include <LtsWidgets/lts_abstract_table_model.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.cpp
index 48119b295..2ad301158 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.cpp
@@ -11,10 +11,10 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
-#include <QCheckBox>
-#include <QJsonDocument>
-#include <QKeyEvent>
-#include <QTreeView>
+#include <QtWidgets/QCheckBox>
+#include <QtCore/QJsonDocument>
+#include <QtGui/QKeyEvent>
+#include <QtWidgets/QTreeView>
 #include <Viewer/LtsDataView/lts_data_view.h>
 
 static const auto ADLER_BTN = LtsWidgets::DialogButton::Export;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_pixmap_label.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_pixmap_label.h
index c4c2e41e1..4ac4c8884 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_pixmap_label.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_pixmap_label.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QLabel>
+#include <QtWidgets/QLabel>
 #include <QPolygonF>
 #include "aes_base_exports.h"
 #include <AreaEffectSimulation/aes_enums.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_edit.cpp
index fd74d813c..712460d7a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_edit.cpp
@@ -12,9 +12,9 @@
 #include <LtsWidgets/lts_message_dialog.h>
 #include <FileManagement/flm_translation.h>
 
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderlines_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderlines_model.cpp
index e48e5e788..4d5afe627 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderlines_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderlines_model.cpp
@@ -7,9 +7,9 @@
 #include <LtsSession/lts_session_data.h>
 #include <FileManagement/flm_translation.h>
 
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/CustomView/aes_charge_administration.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/CustomView/aes_charge_administration.cpp
index db47ccfcc..8e07df3f2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/CustomView/aes_charge_administration.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/CustomView/aes_charge_administration.cpp
@@ -6,7 +6,7 @@
 
 #include "aes_charge_administration_model.h"
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/CustomView/aes_charge_administration.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/CustomView/aes_charge_administration.h
index a7d01f964..034b305ff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/CustomView/aes_charge_administration.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/CustomView/aes_charge_administration.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 #include <Viewer/LtsDataView/abstract_display_widget.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_list.cpp
index 9198252cc..d36b7a769 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_list.cpp
@@ -13,8 +13,8 @@
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
-#include <QInputDialog>
-#include <QTreeView>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QTreeView>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_list.cpp
index 6bbda4640..73b5afa24 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_list.cpp
@@ -15,8 +15,8 @@
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
-#include <QInputDialog>
-#include <QTreeView>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QTreeView>
 #include <utility>
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/aes_charge_effect_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/aes_charge_effect_edit.cpp
index f4ef293b8..2892da70f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/aes_charge_effect_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/aes_charge_effect_edit.cpp
@@ -20,7 +20,7 @@
 
 #include "aes_charge_effect_edit.h"
 #include "ui_aes_charge_effect_edit.h"
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effector.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effector.h
index 0131fd73b..dd88f1369 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effector.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <AreaEffectSimulation/aes_enums.hpp>
 
 namespace Ui {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_edit.cpp
index f69e4193d..3c0156bb7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_edit.cpp
@@ -12,13 +12,13 @@
 #include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Services/AreaEffectSimulation/Utils/polygons.h>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <LtsUtilsSettings/settings.h>
 
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
 #include <ParticipantManagement/Gui/ParticipantSelection/participant_selection.h>
 
-#include <QSpinBox>
+#include <QtWidgets/QSpinBox>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin.cpp
index 38362daa5..8704546d5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin.cpp
@@ -7,7 +7,7 @@
 #include "aes_explosions_edit.h"
 #include "aes_explosions_edit_adler.h"
 #include "aes_explosions_edit_adler_standalone.h"
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <AreaEffectSimulation/aes_operator_rights.h>
 #include <LtsSession/lts_session.h>
 #include <LtsUtilsSettings/settings.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.cpp
index 0c7a4732a..874870ba0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.cpp
@@ -32,13 +32,13 @@
 
 #include <MathUtils/simple_helper.h>
 
-#include <QButtonGroup>
-#include <QDateTime>
-#include <QHash>
-#include <QJsonDocument>
-#include <QSpinBox>
-#include <QStandardItem>
-#include <QTimer>
+#include <QtWidgets/QButtonGroup>
+#include <QtCore/QDateTime>
+#include <QtCore/QHash>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QSpinBox>
+#include <QtGui/QStandardItem>
+#include <QtCore/QTimer>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler.cpp
index 5ac331eb7..59a0932e1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler.cpp
@@ -33,12 +33,12 @@
 #include <ExerciseManagement/exm_data_plugin_interface.h>
 #include <LtsElevation/lts_elevation_manager.h>
 
-#include <QButtonGroup>
-#include <QDateTime>
-#include <QHash>
-#include <QJsonDocument>
-#include <QSpinBox>
-#include <QTimer>
+#include <QtWidgets/QButtonGroup>
+#include <QtCore/QDateTime>
+#include <QtCore/QHash>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QSpinBox>
+#include <QtCore/QTimer>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.cpp
index 488d0109a..a5b30fd60 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.cpp
@@ -33,12 +33,12 @@
 
 #include <MathUtils/simple_helper.h>
 
-#include <QButtonGroup>
-#include <QDateTime>
-#include <QHash>
-#include <QJsonDocument>
-#include <QSpinBox>
-#include <QTimer>
+#include <QtWidgets/QButtonGroup>
+#include <QtCore/QDateTime>
+#include <QtCore/QHash>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QSpinBox>
+#include <QtCore/QTimer>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_rocket_utility.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_rocket_utility.cpp
index 48618c399..46c86bd86 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_rocket_utility.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_rocket_utility.cpp
@@ -3,10 +3,10 @@
 
 #include "aes_rocket_utility.h"
 
-#include <QComboBox>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QStandardItemModel>
+#include <QtWidgets/QComboBox>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtGui/QStandardItemModel>
 
 #include <AreaEffectSimulation/aes.hpp>
 #include <AreaEffectSimulation/Trajectory/trajectory_generator.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_areas_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_areas_model.cpp
index e0fb17288..273da0a9e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_areas_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_areas_model.cpp
@@ -4,7 +4,7 @@
 #include "aes_functional_areas_model.h"
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
 #include <QLocale>
-#include <QSet>
+#include <QtCore/QSet>
 #include <AreaEffectSimulation/aes_translation.h>
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_edit.cpp
index 6161f2362..759b5ab63 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_edit.cpp
@@ -17,8 +17,8 @@
 #include <LtsCoordTrans/lts_coord_widget.h>
 #include <LtsUtilsSettings/settings.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/InfoView/aes_booby_trap_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/InfoView/aes_booby_trap_info.cpp
index e88fd92d9..5cfc2c901 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/InfoView/aes_booby_trap_info.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/InfoView/aes_booby_trap_info.cpp
@@ -7,7 +7,7 @@
 #include <Plugins/AreaEffectSimulation/Gui/Base/InfoView/aes_base_info.h>
 #include <LtsSession/lts_session.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/InfoView/aes_off_route_mine_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/InfoView/aes_off_route_mine_info.cpp
index aaeb32d59..1964ad17c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/InfoView/aes_off_route_mine_info.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/InfoView/aes_off_route_mine_info.cpp
@@ -7,7 +7,7 @@
 #include <Plugins/AreaEffectSimulation/Gui/Base/InfoView/aes_base_info.h>
 #include <LtsSession/lts_session.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_model.h
index 9fa0b12f4..5ac005716 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QSet>
+#include <QtCore/QSet>
 #include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 #include <ProjectDataManagement/pdm_enums.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_edit.cpp
index ddd8b9ad6..9b70770de 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_edit.cpp
@@ -19,7 +19,7 @@
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_model.h
index 6ca518336..e81c5a5df 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QSet>
+#include <QtCore/QSet>
 #include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 #include <ProjectDataManagement/pdm_enums.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_areas_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_areas_model.cpp
index 89d09a9a7..a5d0aafd0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_areas_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_areas_model.cpp
@@ -4,7 +4,7 @@
 #include "aes_technical_areas_model.h"
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
 #include <QLocale>
-#include <QSet>
+#include <QtCore/QSet>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/aes_info_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/aes_info_gui_plugin_interface.h
index d9640e6f5..52cdd501b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/aes_info_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/aes_info_gui_plugin_interface.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QSet>
-#include <QVector>
+#include <QtCore/QSet>
+#include <QtCore/QVector>
 #include <AreaEffectSimulation/aes_enums.hpp>
 
 namespace LtsWidgets
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avm_data_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avm_data_plugin.cpp
index d339e14de..afc594745 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avm_data_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avm_data_plugin.cpp
@@ -15,8 +15,8 @@
 #include <AudioVideoManagement/Shared/avs_app.h>
 #include <AudioVideoManagement/stream_name_mapping.h>
 #include <OperatorManagement/opm.hpp>
-#include <QMap>
-#include <QPair>
+#include <QtCore/QMap>
+#include <QtCore/QPair>
 #include <QtGlobal>
 #include <LtsSession/lts_session_data_dds.h>
 #include <LtsSession/lts_session.h>
@@ -28,7 +28,7 @@
 
 
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avm_exercise_context.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avm_exercise_context.cpp
index 4392a5da2..f9ffd0ab6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avm_exercise_context.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avm_exercise_context.cpp
@@ -10,7 +10,7 @@
 #include <InfrastructureManagement/ism_dtc.h>
 #include <LtsSession/lts_session_data_dds.h>
 #include <ConnectDialog/connect_dialog_nt.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtGlobal>
 #include <utility>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avs_session_context.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avs_session_context.cpp
index 467ec6f3c..5fa7c103d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avs_session_context.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avs_session_context.cpp
@@ -25,7 +25,7 @@
 
 #include <nglsettings/nglsettings_connections.h>
 #include <LtsUtilsSettings/settings.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtGlobal>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avs_session_context.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avs_session_context.h
index 84e3f80a4..a9d9f2fe8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avs_session_context.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avs_session_context.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <AudioVideoManagement/ava_types.h>
-#include <QString>
+#include <QtCore/QString>
 #include <memory>
 #include <functional>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/operator_settings_observer.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/operator_settings_observer.h
index 932471749..d3dfc2e44 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/operator_settings_observer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/operator_settings_observer.h
@@ -5,8 +5,8 @@
 
 #include <AudioVideoManagement/ava_types.h>
 #include <boost/optional.hpp>
-#include <QChar>
-#include <QObject>
+#include <QtCore/QChar>
+#include <QtCore/QObject>
 #include <memory>
 
 namespace OperatorManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/rt_profile_observer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/rt_profile_observer.cpp
index 98d8c7564..c4553b4c8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/rt_profile_observer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/rt_profile_observer.cpp
@@ -6,7 +6,7 @@
 #include <AudioVideoManagement/ava_control.h>
 #include <AudioVideoManagement/avm_dtc.h>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
-#include <QMap>
+#include <QtCore/QMap>
 
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/rt_profile_observer.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/rt_profile_observer.h
index c715cd21f..fd57eb69e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/rt_profile_observer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/rt_profile_observer.h
@@ -6,8 +6,8 @@
 #include <AudioVideoManagement/ava_types.h>
 #include <AudioVideoManagement/rt_state.h>
 #include <AudioVideoManagement/avm.hpp>
-#include <QObject>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 #include <boost/optional.hpp>
 
 enum class DataModification;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.cpp
index e75e271f5..5b659a648 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.cpp
@@ -2,7 +2,7 @@
 
 #include "audio_settings_avail_streams_model.h"
 
-#include <QFont>
+#include <QtGui/QFont>
 #include <nglwidgets/ngltreeitem.h>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.h
index d7cdb554e..e08059e1c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.h
@@ -5,8 +5,8 @@
 
 #include <AudioVideoManagement/avm_dtc.h>
 #include <AudioVideoManagement/logger.h>
-#include <QSortFilterProxyModel>
-#include <QVector>
+#include <QtCore/QSortFilterProxyModel>
+#include <QtCore/QVector>
 #include <nglwidgets/ngltreemodel.h>
 #include <set>
 #include <utility>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_dialog.h
index a34193411..cbabc7b5a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_dialog.h
@@ -9,9 +9,9 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <AudioVideoManagement/avm_ftc.h>
-#include <QVector>
-#include <QMap>
-#include <QString>
+#include <QtCore/QVector>
+#include <QtCore/QMap>
+#include <QtCore/QString>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.cpp
index 5c8818195..e54189453 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.cpp
@@ -2,7 +2,7 @@
 
 #include "audio_settings_used_streams_model.h"
 
-#include <QFont>
+#include <QtGui/QFont>
 #include <QMimeData>
 #include <nglwidgets/ngltreeitem.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_stream_type.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_stream_type.h
index c25188039..e2b92f707 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_stream_type.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_stream_type.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #include <AudioVideoManagement/avm.hpp>
-#include <QString>
-#include <QObject>
+#include <QtCore/QString>
+#include <QtCore/QObject>
 #include <boost/operators.hpp>
 #include <utility>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.cpp
index 80a45a13e..d333a3d43 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.cpp
@@ -4,8 +4,8 @@
 #include "avm_sequence_model.h"
 #include <utility>
 
-#include <QJsonObject>
-#include <QColor>
+#include <QtCore/QJsonObject>
+#include <QtGui/QColor>
 #include <chrono>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.h
index de3b1fdf7..dc450a7e6 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.h
@@ -6,7 +6,7 @@
 #include <AudioVideoManagement/logger.h>
 #include <LtsWidgets/lts_abstract_table_model.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
-#include <QJsonArray>
+#include <QtCore/QJsonArray>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.cpp
index 9edb6a5de..a1c69def4 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.cpp
@@ -10,7 +10,7 @@
 #include <AudioVideoManagement/ava_session.h>
 #include <AudioVideoManagement/avs_dialog.h>
 #include <LtsSession/lts_session_data.h>
-#include <QJsonArray>
+#include <QtCore/QJsonArray>
 #include <TopicEditorBase/topic_previewer.h>
 #include <boost/optional.hpp>
 #include <cmath>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.cpp
index 9d76d6632..fe27bdb2d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.cpp
@@ -6,7 +6,7 @@
 #include <InfrastructureManagement/ism.hpp>
 #include <QCollator>
 #include <QMimeData>
-#include <QSet>
+#include <QtCore/QSet>
 #include <nglwidgets/ngltreeitem.h>
 
 namespace
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.h
index 1ced322df..570e3bd50 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.h
@@ -7,7 +7,7 @@
 #include <AudioVideoManagement/logger.h>
 #include <InfrastructureManagement/ism_dtc.h>
 #include <LtsSession/lts_session.h>
-#include <QDataStream>
+#include <QtCore/QDataStream>
 #include <nglwidgets/ngltreemodel.h>
 
 class NGLTreeItem;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_gui_plugin.cpp
index 5459ae0c1..c402a2f49 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_gui_plugin.cpp
@@ -25,7 +25,7 @@
 #include <Services/AudioVideoManagement/avs_dialog.h>
 #include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
 
-#include <QFileDialog>
+#include <QtWidgets/QFileDialog>
 
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.cpp
index 1e5c8d52b..0a824a25d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.cpp
@@ -10,7 +10,7 @@
 #include <LtsPrinting/printing.h>
 #include <LtsSession/lts_session_manager.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.cpp
index 11d178bca..67c2d5006 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.cpp
@@ -3,9 +3,9 @@
 #include "avm_menu_view_model.h"
 
 #include <FileManagement/flm_translation.h>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.cpp
index 195340a48..790d3450d 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.cpp
@@ -18,14 +18,14 @@
 #include <MarkerManagement/mrk_data_plugin_interface.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QAction>
-#include <QIcon>
-#include <QInputDialog>
-#include <QMenu>
-#include <QModelIndex>
+#include <QtGui/QAction>
+#include <QtGui/QIcon>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QMenu>
+#include <QtCore/QModelIndex>
 #include <QSignalBlocker>
-#include <QStringList>
-#include <QVector>
+#include <QtCore/QStringList>
+#include <QtCore/QVector>
 #include <QtGlobal>
 #include <ngltools/ngltools_dtg.h>
 #include <utility>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.h
index d54dba320..203a8e03a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.h
@@ -10,7 +10,7 @@
 #include <AudioVideoManagement/logger.h>
 #include <LtsSession/lts_session.h>
 #include <MarkerManagement/mrk_ftc.h>
-#include <QString>
+#include <QtCore/QString>
 #include <boost/optional.hpp>
 #include <memory>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.cpp
index db31b58d4..06dc8e2f1 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.cpp
@@ -6,7 +6,7 @@
 
 #include <AudioVideoManagement/stream_name_mapping.h>
 #include <QMimeData>
-#include <QSet>
+#include <QtCore/QSet>
 #include <nglwidgets/ngltreeitem.h>
 #include <utility>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/interval_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/interval_model.cpp
index d8ed4fad2..7da83cc86 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/interval_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/interval_model.cpp
@@ -3,11 +3,11 @@
 
 #include "interval_model.h"
 #include <AudioVideoManagement/av_helper.h>
-#include <QVariant>
-#include <QString>
-#include <QColor>
-#include <QModelIndex>
-#include <QDateTime>
+#include <QtCore/QVariant>
+#include <QtCore/QString>
+#include <QtGui/QColor>
+#include <QtCore/QModelIndex>
+#include <QtCore/QDateTime>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/topic_replay.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/topic_replay.cpp
index 8f774e3be..29f94da4a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/topic_replay.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/topic_replay.cpp
@@ -9,12 +9,12 @@
 #include <AudioVideoManagement/vd_control.h>
 #include <AudioVideoManagement/vd_session.h>
 #include <LtsUtilsCore/json_object.h>
-#include <QDebug>
-#include <QDir>
-#include <QFileInfo>
-#include <QJsonDocument>
-#include <QRect>
-#include <QWidget>
+#include <QtCore/QDebug>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QRect>
+#include <QtWidgets/QWidget>
 #include <QtGlobal>
 #include <TopicEditorBase/topic_editor_base.h>
 #include <chrono>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/topic_replay.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/topic_replay.h
index eaa172f69..dc8794478 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/topic_replay.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/topic_replay.h
@@ -7,10 +7,10 @@
 #include <AudioVideoManagement/Shared/playback_app.h>
 #include <PluginInterfaces/topic_replay_interface.h>
 
-#include <QString>
-#include <QRect>
-#include <QVector>
-#include <QWidget>
+#include <QtCore/QString>
+#include <QtCore/QRect>
+#include <QtCore/QVector>
+#include <QtWidgets/QWidget>
 #include <boost/optional.hpp>
 #include <memory>
 #include <AudioVideoManagement/ava_control.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_cnr_json_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_cnr_json_helper.cpp
index d63d8f9c7..2f67144a2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_cnr_json_helper.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_cnr_json_helper.cpp
@@ -6,9 +6,9 @@
 
 #include <AudioVideoManagement/avm_dtc.h>
 
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 #include <FileManagement/flm_translation.h>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.cpp
index 20cb36f0c..ec69a8532 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.cpp
@@ -13,7 +13,7 @@
 #include <LtsSession/lts_session.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.cpp
index 336db5be5..ceb1fcc2b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.cpp
@@ -7,9 +7,9 @@
 #include <AudioVideoManagement/avm_ftc.h>
 #include <LtsSession/lts_session_data.h>
 #include <ParticipantManagement/ppm_translation.h>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <utility>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp
index 4f3363409..35e3f2ae0 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp
@@ -11,10 +11,10 @@
 #include <LtsSession/lts_session_data.h>
 #include <ParticipantManagement/ppm_translation.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QStandardItemModel>
-#include <QTimer>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtGui/QStandardItemModel>
+#include <QtCore/QTimer>
 #include <utility>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.h
index 1e62f277b..33b0a83cd 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.h
@@ -10,8 +10,8 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <ParticipantManagement/ppm.hpp>
 #include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
-#include <QString>
-#include <QVector>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 #include <boost/optional.hpp>
 #include <memory>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.cpp
index 6df9f8e9f..1242d4648 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.cpp
@@ -12,9 +12,9 @@
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>
 #include <ParticipantManagement/ppm_translation.h>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_dialog.cpp
index 495b88eda..bcb17fdd2 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_dialog.cpp
@@ -18,7 +18,7 @@
 #include <ParticipantManagement/ppm.hpp>
 #include <ParticipantManagement/ppm_translation.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 #include <ngltools/ngltools_dtg.h>
 #include <utility>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.cpp
index 946061715..1a26b9f24 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.cpp
@@ -9,10 +9,10 @@
 #include <ParticipantManagement/ppm.hpp>
 #include <ParticipantManagement/ppm_translation.h>
 #include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QPainter>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtGui/QPainter>
 #include <nglwidgets/ngltreeitem.h>
 #include <utility>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.h
index 3a77d2b84..b5b16e4a5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.h
@@ -7,7 +7,7 @@
 #include <AudioVideoManagement/logger.h>
 #include "avm_frequency_planning_helper.h"
 #include <nglwidgets/ngltreemodel.h>
-#include <QStyledItemDelegate>
+#include <QtWidgets/QStyledItemDelegate>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_dialog.cpp
index 3adddd68b..39a09bf0a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_dialog.cpp
@@ -24,8 +24,8 @@
 #include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
 
 #include <LtsSession/lts_session.h>
-#include <QTreeView>
-#include <QJsonArray>
+#include <QtWidgets/QTreeView>
+#include <QtCore/QJsonArray>
 
 namespace
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.cpp
index ea8d65b1b..04195635c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.cpp
@@ -16,8 +16,8 @@
 #include <LtsWidgets/lts_base_layout_widget.h>
 #include <ParticipantManagement/ppm.hpp>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QMessageBox>
-#include <QTreeView>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QTreeView>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.cpp
index 71cf585ab..975a7cb6e 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.cpp
@@ -3,9 +3,9 @@
 #include "avm_frequency_planning_dialog_model.h"
 
 #include <FileManagement/flm_translation.h>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <ngltools/ngltools_dtg.h>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_helper.cpp
index 3ea944d72..8eb0f4f49 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_helper.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_helper.cpp
@@ -2,7 +2,7 @@
 
 
 #include "avm_frequency_planning_helper.h"
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp
index 3d392c5e4..367564bdc 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp
@@ -11,7 +11,7 @@
 #include <AudioVideoManagement/avm_translation.h>
 #include <InfrastructureManagement/Gui/IsmComboBox/ism_combobox_gui_plugin.h>
 #include <LtsWidgets/lts_spinbox.h>
-#include <QJsonArray>
+#include <QtCore/QJsonArray>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.h
index 26e63bc82..2117c848d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.h
@@ -2,7 +2,7 @@
 
 
 #pragma once
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <AudioVideoManagement/avm.hpp>
 #include <AudioVideoManagement/avm_dtc.h>
 #include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.cpp
index 661b52473..5a1b444fb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.cpp
@@ -5,7 +5,7 @@
 #include "ui_avm_load_frequency_planning_dialog.h"
 
 #include "avm_load_frequency_planning_dialog_model.h"
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.cpp
index 93c49e8be..26ac7a03a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.cpp
@@ -8,10 +8,10 @@
 #include <LtsUtilsCore/json_object.h>
 #include <ParticipantManagement/ppm_translation.h>
 #include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QPainter>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtGui/QPainter>
 #include <nglwidgets/ngltreeitem.h>
 #include <utility>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.h
index d06f08a30..ce4835227 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.h
@@ -7,7 +7,7 @@
 #include <AudioVideoManagement/logger.h>
 #include "avm_frequency_planning_helper.h"
 #include <nglwidgets/ngltreemodel.h>
-#include <QStyledItemDelegate>
+#include <QtWidgets/QStyledItemDelegate>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_hf_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_hf_widget.cpp
index c10f8eebc..6ea550354 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_hf_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_hf_widget.cpp
@@ -9,7 +9,7 @@
 
 
 #include <LtsUtilsSettings/settings.h>
-#include <QJsonArray>
+#include <QtCore/QJsonArray>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_hf_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_hf_widget.h
index a12a69628..cbd561fa5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_hf_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_hf_widget.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 #include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
 #include "avm_radio_specifica_widget.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_uhf_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_uhf_widget.cpp
index 5244ea23a..a196c34d0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_uhf_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_uhf_widget.cpp
@@ -8,7 +8,7 @@
 #include <AudioVideoManagement/avm_translation.h>
 
 #include <LtsUtilsSettings/settings.h>
-#include <QButtonGroup>
+#include <QtWidgets/QButtonGroup>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_uhf_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_uhf_widget.h
index 724e9154f..46df724e6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_uhf_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_uhf_widget.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
 #include "avm_radio_specifica_widget.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_vhf_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_vhf_widget.cpp
index cca99e0d2..e41a34cd8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_vhf_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_vhf_widget.cpp
@@ -8,7 +8,7 @@
 #include <AudioVideoManagement/avm_enums.hpp>
 #include <AudioVideoManagement/avm_translation.h>
 #include <AudioVideoManagement/avm_dtc.h>
-#include <QButtonGroup>
+#include <QtWidgets/QButtonGroup>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_vhf_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_vhf_widget.h
index 4cc4bb106..15c1161d4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_vhf_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_vhf_widget.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
 #include "avm_radio_specifica_widget.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_widget.cpp
index 172be9639..538998260 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_widget.cpp
@@ -1,7 +1,7 @@
 #include "avm_radio_specifica_widget.h"
 
-#include <QSpinBox>
-#include <QJsonArray>
+#include <QtWidgets/QSpinBox>
+#include <QtCore/QJsonArray>
 namespace AudioVideoManagement {
 
 RadioSpecificaWidget::RadioSpecificaWidget(QWidget *parent)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_widget.h
index fcb68c22d..927212e33 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_widget.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <QWidget>
-#include <QJsonObject>
+#include <QtWidgets/QWidget>
+#include <QtCore/QJsonObject>
 #include <functional>
 
 class QLabel;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_dialog.cpp
index 91422d22b..c8d418932 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_dialog.cpp
@@ -10,7 +10,7 @@
 #include <AudioVideoManagement/stream_name_mapping.h>
 #include <LtsPrinting/printing.h>
 #include <LtsSession/lts_session_data.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 #include <avm_eloka_edit_dialog.h>
 #include <utility>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_model.cpp
index 3e408912d..99b89b71e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_model.cpp
@@ -6,7 +6,7 @@
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 #include <ParticipantManagement/ppm_translation.h>
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.cpp
index 775e38187..5bdb6a8d9 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.cpp
@@ -10,7 +10,7 @@
 #include <LtsSession/lts_session.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_model.cpp
index 52a52ba6e..7980d3698 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_model.cpp
@@ -3,9 +3,9 @@
 #include "avm_mvs_dialog.h"
 
 #include <FileManagement/flm_translation.h>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_dialog.cpp
index 22ee9eaaf..92cfbcd96 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_dialog.cpp
@@ -8,7 +8,7 @@
 #include <AudioVideoManagement/avm_dtc.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/AudioVideoManagement/avm_mvs_video_team_gui_plugin_interface.h>
-#include <QButtonGroup>
+#include <QtWidgets/QButtonGroup>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_gui_plugin.cpp
index a08aa3d49..3c47ccf01 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_gui_plugin.cpp
@@ -9,10 +9,10 @@
 #include <LtsSession/lts_session.h>
 #include <Services/AudioVideoManagement/avm_operator_rights.h>
 #include <LtsUtilsSettings/settings.h>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QDesktopWidget>
-#include <QProcess>
-#include <QScreen>
+#include <QtCore/QProcess>
+#include <QtGui/QScreen>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/receiverelement.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/receiverelement.cpp
index 3889e3064..361cebf8a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/receiverelement.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/receiverelement.cpp
@@ -1,9 +1,9 @@
 #include "receiverelement.h"
 #include "ui_receiverelement.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOption>
-#include <QStyle>
+#include <QtWidgets/QStyle>
 
 ReceiverElement::ReceiverElement(QWidget *parent)
   : QWidget(parent)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/receiverelement.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/receiverelement.h
index 415ffcdea..f90660b55 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/receiverelement.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/receiverelement.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QRadioButton>
+#include <QtWidgets/QRadioButton>
 #include <AudioVideoManagement/avm.hpp>
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/receiveritem.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/receiveritem.h
index 4ffe9c55f..11ff60584 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/receiveritem.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/receiveritem.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <QGroupBox>
-#include <QTimer>
+#include <QtWidgets/QGroupBox>
+#include <QtCore/QTimer>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_edit_training_voice_communication_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_edit_training_voice_communication_dialog.h
index e9537cf11..e052183ce 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_edit_training_voice_communication_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_edit_training_voice_communication_dialog.h
@@ -6,8 +6,8 @@
 #include <AudioVideoManagement/avm_ftc.h>
 #include <AudioVideoManagement/logger.h>
 #include <LtsWidgets/lts_dialog.h>
-#include <QString>
-#include <QVector>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 
 class QCheckBox;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog.cpp
index aab31a9d9..1d299f6bd 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog.cpp
@@ -11,7 +11,7 @@
 #include <LtsSession/lts_session.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog_model.cpp
index 488776076..6b90dd5a9 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog_model.cpp
@@ -3,9 +3,9 @@
 #include "avm_training_voice_communication_dialog_model.h"
 
 #include <FileManagement/flm_translation.h>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/avs_app.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/avs_app.cpp
index 8927af1f5..be3c4f035 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/avs_app.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/avs_app.cpp
@@ -5,16 +5,16 @@
 #include <AudioVideoManagement/ava_control.h>
 #include <LtsMultiMonitor/lts_dummy_widget.h>
 #include <LtsMultiMonitor/lts_multi_monitor.h>
-#include <QGuiApplication>
-#include <QScreen>
-#include <QPoint>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QScreen>
+#include <QtCore/QPoint>
 #include <QtGlobal>
 
 
 
 
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/avs_app.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/avs_app.h
index 2db95e8ff..5d16f6116 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/avs_app.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/avs_app.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #include <avmshared_export.h>
-#include <QObject>
-#include <QRect>
+#include <QtCore/QObject>
+#include <QtCore/QRect>
 #include <boost/optional.hpp>
 
 namespace LtsMultiMonitor
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/playback_app.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/playback_app.h
index e0fd5c348..01d16f136 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/playback_app.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/playback_app.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #include <avmshared_export.h>
-#include <QString>
-#include <QObject>
+#include <QtCore/QString>
+#include <QtCore/QObject>
 #include <memory>
 #include <functional>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/plugin_settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/plugin_settings.cpp
index edc04599e..80751815d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/plugin_settings.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/plugin_settings.cpp
@@ -6,7 +6,7 @@
 #include <nglsettings/nglsettings_connections.h>
 #include <ngltools/ngltools_filesystem.h>
 #include <QtGlobal>
-#include <QSettings>
+#include <QtCore/QSettings>
 
 
 namespace
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/plugin_settings.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/plugin_settings.h
index 35b10aad0..f9211b47a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/plugin_settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/plugin_settings.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <avmshared_export.h>
-#include <QString>
+#include <QtCore/QString>
 #include <memory>
 #include <chrono>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/project_settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/project_settings.cpp
index b50685f05..cd6145bf6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/project_settings.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/project_settings.cpp
@@ -3,8 +3,8 @@
 
 #include "project_settings.h"
 #include <LtsUtilsSettings/settings.h>
-#include <QString>
-#include <QVariant>
+#include <QtCore/QString>
+#include <QtCore/QVariant>
 
 namespace
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/stream_list_result.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/stream_list_result.cpp
index b6c4aafe8..6669694a4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/stream_list_result.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/stream_list_result.cpp
@@ -1,6 +1,6 @@
 #include "stream_list_result.h"
 
-#include <QMap>
+#include <QtCore/QMap>
 
 namespace AudioVideoManagement {
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/stream_list_result.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/stream_list_result.h
index d220a9082..e1c51b0e4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/stream_list_result.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/stream_list_result.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <AudioVideoManagement/ava_types.h>
 #include <avmshared_export.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Battery/Gui/bat_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Battery/Gui/bat_gui_plugin.cpp
index 2e1f80843..2e0e19fb4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Battery/Gui/bat_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Battery/Gui/bat_gui_plugin.cpp
@@ -13,7 +13,7 @@
 #include <Windows.h> 
 #include <wlanapi.h>
 #endif
-#include <QProcess>
+#include <QtCore/QProcess>
 #include <math.h>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Battery/Gui/bat_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Battery/Gui/bat_gui_plugin.h
index 30132873a..0840e5c62 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Battery/Gui/bat_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Battery/Gui/bat_gui_plugin.h
@@ -6,7 +6,7 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/Battery/bat_gui_plugin_interface.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace LtsNotification { class LtsNotification; }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterface.h
index 8dc7e3d21..6926cbf8a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterface.h
@@ -6,9 +6,9 @@
 #include <vector>
 #include <map>
 #include <string>
-#include <QJsonValue>
-#include <QList>
-#include <QString>
+#include <QtCore/QJsonValue>
+#include <QtCore/QList>
+#include <QtCore/QString>
 #include <exccommands.h>
 
 class QWidget;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterfaceimpl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterfaceimpl.cpp
index 87f060910..4f9214181 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterfaceimpl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterfaceimpl.cpp
@@ -28,15 +28,15 @@
 #include <osgViewer/CompositeViewer>
 #include <osgQt/GraphicsWindowQt>
 #include <QDesktopWidget>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 #include "buildingmanager.h"
 #include "viewwidget.h"
 
-#include <QJsonArray>
-#include <QMessageBox>
+#include <QtCore/QJsonArray>
+#include <QtWidgets/QMessageBox>
 #include <QDirIterator>
-#include <QScreen>
+#include <QtGui/QScreen>
 
 #ifdef BUILD_WITH_GSTREAMER
 #include "videocomponent.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterfaceimpl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterfaceimpl.h
index 36adc8094..265e42dc2 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterfaceimpl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterfaceimpl.h
@@ -7,8 +7,8 @@
 #include "viewwidgetcontainer.h"
 #include "viewwidgetstate.h"
 
-#include <QPointer>
-#include <QWidget>
+#include <QtCore/QPointer>
+#include <QtWidgets/QWidget>
 #include <algorithm>
 #include <dtEntity/commandmessages.h>
 #include <dtEntity/core.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewermainwindow.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewermainwindow.cpp
index fa51629c9..1149d22d9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewermainwindow.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewermainwindow.cpp
@@ -2,9 +2,9 @@
 #include "viewwidget.h"
 #include "viewerinterfaceimpl.h"
 
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
 
 
 namespace VCtrl
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewermainwindow.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewermainwindow.h
index 76b4464e8..e29601d86 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewermainwindow.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewermainwindow.h
@@ -2,10 +2,10 @@
 #define VCTRL_CTRLMAINWINDOW_H
 
 
-#include <QDialog>
-#include <QSlider>
-#include <QTimer>
-#include <QHash>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QSlider>
+#include <QtCore/QTimer>
+#include <QtCore/QHash>
 
 #include "viewerinterface.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewwidget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewwidget.cpp
index c233266be..55dfdb7e6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewwidget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewwidget.cpp
@@ -1,8 +1,8 @@
 #include "viewwidget.h"
 #include "viewwidgetstate.h"
-#include <QApplication>
-#include <QVBoxLayout>
-#include <QEvent>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QVBoxLayout>
+#include <QtCore/QEvent>
 #include <QGLWidget>
 #include <QWindow>
 #include <dtEntity/log.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewwidget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewwidget.h
index 23b57005e..c3391f5a4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewwidget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewwidget.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <QFrame>
-#include <QColor>
-#include <QWidget>
-#include <QDockWidget>
+#include <QtWidgets/QFrame>
+#include <QtGui/QColor>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QDockWidget>
 #include "ui_viewwidget.h"
 #include "viewerinterface.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewwidgetstate.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewwidgetstate.h
index de04d7925..7d0fefe99 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewwidgetstate.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewwidgetstate.h
@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include <QString>
-#include <QJsonObject>
+#include <QtCore/QString>
+#include <QtCore/QJsonObject>
 
 #include "cameraviewposition.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/visitors.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/visitors.cpp
index 13553577e..ed9cc8db5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/visitors.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/visitors.cpp
@@ -5,7 +5,7 @@
 #include <osg/BlendFunc>
 #include <osg/BlendColor>
 #include <QStringRef>
-#include <QVector>
+#include <QtCore/QVector>
 
 namespace VCtrl
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_bgviewer_widget_container.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_bgviewer_widget_container.cpp
index 10eec7ded..0b7066a06 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_bgviewer_widget_container.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_bgviewer_widget_container.cpp
@@ -1,7 +1,7 @@
 
 
 #include "bdv_bgviewer_widget_container.h"
-#include <QGridLayout>
+#include <QtWidgets/QGridLayout>
 
 namespace BuildingViewer
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_bgviewer_widget_container.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_bgviewer_widget_container.h
index 7a733d384..2ca78ce90 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_bgviewer_widget_container.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_bgviewer_widget_container.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QPointer>
-#include <QWidget>
+#include <QtCore/QPointer>
+#include <QtWidgets/QWidget>
 
 namespace BuildingViewer
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.cpp
index 20a7d9e87..ffc061fa1 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.cpp
@@ -3,7 +3,7 @@
 #include "bdv_communication_interface_internal.h"
 
 #include <ParticipantManagement/ppm_translation.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <cassert>
 #include <utility>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.h
index 4e1c57454..7ac70f7ed 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.h
@@ -11,14 +11,14 @@
 #include <InfrastructureManagement/Shared/ism_mounting_point.h>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
-#include <QByteArray>
-#include <QHash>
-#include <QList>
-#include <QMap>
-#include <QObject>
-#include <QString>
+#include <QtCore/QByteArray>
+#include <QtCore/QHash>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 #include <QVector3D>
-#include <QVector>
+#include <QtCore/QVector>
 #include <string>
 
 namespace VCtrl
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.cpp
index 9e856c4a6..1e645a2ba 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.cpp
@@ -10,8 +10,8 @@
 #include <LtsAppManager/lts_app_manager.h>
 #include <LtsPluginManager/lts_plugin_manager.h>
 #include <LtsSession/lts_session.h>
-#include <QDir>
-#include <QMessageBox>
+#include <QtCore/QDir>
+#include <QtWidgets/QMessageBox>
 #include <ngltools/ngltools_filesystem.h>
 #include <utility>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.h
index c9f2f7deb..99640a485 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.h
@@ -10,9 +10,9 @@
 #include <BuildingViewer/share/exccommands.h>
 #include <LtsSession/lts_session_data_dds.h>
 #include <LtsWidgets/lts_dialog.h>
-#include <QObject>
-#include <QString>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QTimer>
 #include <memory>
 
 class QWidget;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp
index 953628ae8..296df5846 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp
@@ -14,16 +14,16 @@
 #include <LtsUtilsSettings/settings.h>
 #include <LtsWidgets/lts_message_dialog.h>
 #include <Plugins/InfrastructureManagement/Shared/ism_mounting_point.h>
-#include <QDateTime>
-#include <QDir>
-#include <QFile>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QDateTime>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QPixmap>
-#include <QTimer>
-#include <QXmlStreamWriter>
+#include <QtGui/QPixmap>
+#include <QtCore/QTimer>
+#include <QtCore/QXmlStreamWriter>
 #include <ngltools/ngltools_filesystem.h>
 #include <utility>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.h
index 6dc127d3f..2740a2c7f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.h
@@ -19,10 +19,10 @@
 #include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
 #include <Plugins/SituationReplay/srp_data_plugin_interface.h>
-#include <QHash>
-#include <QObject>
-#include <QTimer>
-#include <QVector>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+#include <QtCore/QVector>
 #include <functional>
 #include <viewerinterface.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_helper.h
index ab5cccc91..840cd2dee 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_helper.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_helper.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QString>
-#include <QJsonObject>
+#include <QtCore/QString>
+#include <QtCore/QJsonObject>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 #include "buildingviewercommon_export.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_plugin_provider.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_plugin_provider.h
index 3bb62e9be..1afc7ce21 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_plugin_provider.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_plugin_provider.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <memory>
-#include <QObject>
+#include <QtCore/QObject>
 #include "buildingviewercommon_export.h"
 
 namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.cpp
index 006b82551..fe6817136 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.cpp
@@ -3,9 +3,9 @@
 #include "bdv_edit_model.h"
 
 #include <Common/logger.h>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QPalette>
-#include <QTableWidget>
+#include <QtWidgets/QTableWidget>
 #include <QtCore/QDebug>
 #include <Services/InfrastructureManagement/ism.hpp>
 #include <nglwidgets/ngltreeitem.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.h
index 23c3f5c5a..eeb726d04 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.h
@@ -7,8 +7,8 @@
 #include <Common/logger.h>
 #include <Plugins/Buildings/bld_data_plugin_interface.h>
 #include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
-#include <QMap>
-#include <QSortFilterProxyModel>
+#include <QtCore/QMap>
+#include <QtCore/QSortFilterProxyModel>
 #include <functional>
 #include <nglwidgets/ngltreemodel.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_treemodel_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_treemodel_item.h
index c389c499d..743b4f6ab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_treemodel_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_treemodel_item.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 #include <Services/InfrastructureManagement/ism.hpp>
 
 namespace BuildingViewer
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/TopicEditor/topic_editor.cpp
index 9c049b202..67fce3071 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/TopicEditor/topic_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/TopicEditor/topic_editor.cpp
@@ -8,7 +8,7 @@
 #include <LtsWidgets/lts_base_layout_widget.h>
 #include <LtsAppManager/lts_app_manager.h>
 #include <LtsPluginManager/lts_plugin_manager.h>
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace BuildingViewer
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_replay_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_replay_handler.h
index cc5f3a300..6e103c8c0 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_replay_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_replay_handler.h
@@ -5,7 +5,7 @@
 #include <Plugins/BuildingViewer/Common/logger.h>
 #include <Plugins/BuildingViewer/bdv_viewer_gui_plugin_interface.h>
 #include <Plugins/SituationReplay/srp_gui_plugin_interface.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace BuildingViewer
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.cpp
index 02d807530..545a0ede9 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.cpp
@@ -6,7 +6,7 @@
 
 #include <Common/TopicEditorBase/topic_editor_base.h>
 #include <QElapsedTimer>
-#include <QThread>
+#include <QtCore/QThread>
 #include <utility>
 
 namespace BuildingViewer
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.h
index 86ee6a544..896f7c4da 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.h
@@ -4,7 +4,7 @@
 
 #include <BuildingViewer/bdv_viewer_gui_plugin_interface.h>
 #include <Common/logger.h>
-#include <QSharedPointer>
+#include <QtCore/QSharedPointer>
 #include <SituationReplay/srp_gui_plugin_interface.h>
 
 namespace BuildingViewer
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.cpp
index b8d4fd0b7..629eb8807 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.cpp
@@ -8,8 +8,8 @@
 
 #include <Common/bdv_controller.h>
 #include <LtsSession/lts_session.h>
-#include <QDir>
-#include <QJsonDocument>
+#include <QtCore/QDir>
+#include <QtCore/QJsonDocument>
 #include <ngltools/ngltools_filesystem.h>
 #include <utility>
 
@@ -17,9 +17,9 @@
 #include <Common/BgViewer/viewerCtrl/viewwidgetstate.h>
 #include <Common/bdv_helper.h>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
-#include <QFile>
+#include <QtCore/QFile>
 #else
-#include <QThread>
+#include <QtCore/QThread>
 #endif
 
 namespace BuildingViewer
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.h
index 2eba9d94c..ee8185d05 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.h
@@ -4,8 +4,8 @@
 
 #include <Plugins/BuildingViewer/bdv_viewer_gui_plugin_interface.h>
 #include <Plugins/SituationReplay/srp_gui_plugin_interface.h>
-#include <QObject>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 #include <memory>
 
 namespace NGL
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_model.cpp
index 646c707f0..b8c426992 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_model.cpp
@@ -3,9 +3,9 @@
 
 #include "bdv_viewer_data_model.h"
 
-#include <QColor>
+#include <QtGui/QColor>
 #include <QPalette>
-#include <QGuiApplication>
+#include <QtGui/QGuiApplication>
 
 
 namespace BuildingViewer
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.cpp
index 338a9e61d..bce0e7755 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.cpp
@@ -7,7 +7,7 @@
 
 #include <Common/bdv_controller.h>
 
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 
 namespace BuildingViewer
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.h
index 65d413808..f313a1edf 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.h
@@ -4,7 +4,7 @@
 
 #include <Common/logger.h>
 #include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_gui_plugin.cpp
index dcdd23632..5845199bc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_gui_plugin.cpp
@@ -12,8 +12,8 @@
 #include <LtsWidgets/lts_base_layout_widget.h>
 #include <LtsAppManager/lts_app_manager.h>
 
-#include <QTimer>
-#include <QVBoxLayout>
+#include <QtCore/QTimer>
+#include <QtWidgets/QVBoxLayout>
 
 #include "bdv_viewer_data_dialog.h"
 #include "bdv_viewer_data_view.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_gui_plugin.h
index 134d39a72..93548fb1d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_gui_plugin.h
@@ -10,7 +10,7 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <Common/logger.h>
 #include "TopicEditor/topic_editor.h"
-#include <QTimer>
+#include <QtCore/QTimer>
 
 
 class QVBoxLayout;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_state.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_state.cpp
index 138ae649f..2d70f6e3e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_state.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_state.cpp
@@ -7,9 +7,9 @@
 #include <LtsSession/lts_session_manager.h>
 #include <PluginInterfaces/data_plugin_interface.h>
 
-#include <QJsonArray>
-#include <QKeyEvent>
-#include <QFileDialog>
+#include <QtCore/QJsonArray>
+#include <QtGui/QKeyEvent>
+#include <QtWidgets/QFileDialog>
 
 #include "bdv_viewer_state_model.h"
 #include <BuildingViewer/share/exccommands.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_state_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_state_model.h
index 87bdaaf3b..1bacb39e5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_state_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_state_model.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <LtsWidgets/lts_abstract_table_model.h>
-#include <QJsonValue>
+#include <QtCore/QJsonValue>
 
 namespace BuildingViewer
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_config_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_config_dialog.cpp
index 31d93ea60..b1a871509 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_config_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_config_dialog.cpp
@@ -7,7 +7,7 @@
 #include <LtsSession/lts_session.h>
 #include <LtsUtilsSettings/settings.h>
 #include <ProjectDataManagement/pdm_to_string.h>
-#include <QComboBox>
+#include <QtWidgets/QComboBox>
 
 namespace Buildings
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.cpp
index f002b7c5e..14c737fd1 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.cpp
@@ -18,17 +18,17 @@
 #include <ParticipantManagement/ppm_translation.h>
 #include <ProjectDataManagement/pdm_data_plugin_interface.h>
 #include <ProjectDataManagement/pdm_translation.h>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QPainterPath>
-#include <QStyledItemDelegate>
-#include <QTextDocument>
-#include <QTimer>
+#include <QtWidgets/QStyledItemDelegate>
+#include <QtGui/QTextDocument>
+#include <QtCore/QTimer>
 #include <ServiceMonitor/smo_operator_rights.h>
 #include <utility>
 
 #ifdef PP_TEST
-#include <QDebug>
-#include <QMenu>
+#include <QtCore/QDebug>
+#include <QtWidgets/QMenu>
 #endif
 
 #include <algorithm>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.h
index c2c6dee88..c7386b3d5 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.h
@@ -9,8 +9,8 @@
 #include <InfrastructureManagement/ism.hpp>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
-#include <QMap>
-#include <QPair>
+#include <QtCore/QMap>
+#include <QtCore/QPair>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_gui_plugin.cpp
index 97cc671f1..5e61c8e72 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_gui_plugin.cpp
@@ -20,7 +20,7 @@
 #include <LtsUtilsSettings/settings.h>
 
 
-#include <QShortcut>
+#include <QtGui/QShortcut>
 
 
 namespace Buildings
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_gui_plugin.h
index a9876f3d1..93b05fac4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_gui_plugin.h
@@ -12,7 +12,7 @@
 
 #include <PluginInterfaces/gui_plugin_interface.h>
 
-#include <QPointer>
+#include <QtCore/QPointer>
 
 
 class QShortcut;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_search.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_search.h
index 2d17047b5..b91c35291 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_search.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_search.h
@@ -3,7 +3,7 @@
 
 #pragma once
 #include <LtsWidgets/lts_frameless_dialog.h>
-#include <QMap>
+#include <QtCore/QMap>
 #include <memory>
 
 enum class DataModification;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_info_dialog.cpp
index 2e53bf0f9..704ab1508 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_info_dialog.cpp
@@ -18,7 +18,7 @@
 #include <InfrastructureManagement/ism_dtc.h>
 #include <Buildings/bld_dtc.h>
 
-#include <QPainter>
+#include <QtGui/QPainter>
 
 namespace Buildings
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_info_dialog.cpp
index ed704b9d3..ea470d66d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_info_dialog.cpp
@@ -13,8 +13,8 @@
 #include <AssetManagement/asm_data_plugin_interface.h>
 #include <InfrastructureManagement/ism_dtc.h>
 
-#include <QJsonDocument>
-#include <QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
 
 namespace Buildings
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_operational.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_operational.cpp
index c8184179d..29ca9c244 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_operational.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_operational.cpp
@@ -13,12 +13,12 @@
 #include <InfrastructureManagement/ism_dtc.h>
 
 
-#include <QNetworkReply>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtNetwork/QNetworkReply>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QEventLoop>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace Buildings
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_operational.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_operational.h
index 6077f7f22..63b3f6153 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_operational.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_operational.h
@@ -11,7 +11,7 @@
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
 
 
-#include <QNetworkAccessManager>
+#include <QtNetwork/QNetworkAccessManager>
 
 class QTimer;
 class QUrl;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/info_dialog_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/info_dialog_base.cpp
index 0f22fc381..31b2a4f5f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/info_dialog_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/info_dialog_base.cpp
@@ -10,8 +10,8 @@
 #include <LtsSession/lts_session.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
-#include <QJsonArray>
-#include <QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
 #include <ServiceMonitor/smo_monitors_gui_plugin_interface.h>
 
 namespace Buildings
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/relay_info.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/relay_info.h
index 7e19b575f..fe2eb5a22 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/relay_info.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/relay_info.h
@@ -5,8 +5,8 @@
 #include <Buildings/bld_enums.hpp>
 #include <Buildings/logger.h>
 #include <InfrastructureManagement/ism_enums.hpp>
-#include <QDateTime>
-#include <QWidget>
+#include <QtCore/QDateTime>
+#include <QtWidgets/QWidget>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/bld_info_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/bld_info_gui_plugin_interface.h
index 84db1f680..9d0bf8501 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/bld_info_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/bld_info_gui_plugin_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QVector>
+#include <QtCore/QVector>
 
 namespace Buildings
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participant_move_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participant_move_dialog.cpp
index b93f7acd9..da8d128b6 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participant_move_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participant_move_dialog.cpp
@@ -15,9 +15,9 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/CentralEffectSimulation/ces_data_plugin_interface.h>
 #include <Plugins/ProjectDataManagement/pdm_gui_plugin_interface.h>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace CentralEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participant_move_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participant_move_dialog.h
index 7e4ea7780..72b572262 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participant_move_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participant_move_dialog.h
@@ -8,7 +8,7 @@
 #include <LtsWidgets/lts_frameless_dialog.h>
 #include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
 #include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
-#include <QStandardItemModel>
+#include <QtGui/QStandardItemModel>
 
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_dialog.cpp
index 2f133835d..c73f03608 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_dialog.cpp
@@ -19,11 +19,11 @@
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 #include <Plugins/AssetManagement/asm_data_plugin_interface.h>
 #include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
-#include <QDebug>
+#include <QtCore/QDebug>
 #include <QDialogButtonBox>
 #include <QDoubleSpinBox>
-#include <QInputDialog>
-#include <QLabel>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QLabel>
 #include <utility>
 
 namespace CentralEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_dialog.h
index c9adf90f2..553be2a76 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_dialog.h
@@ -26,8 +26,8 @@
 #include "logger.h"
 
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QVariantMap>
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_model.h
index 36c63c1c1..31f276770 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_model.h
@@ -6,8 +6,8 @@
 
 #include <ParticipantManagement/Gui/Common/participant_edit_model.h>
 #include <ParticipantManagement/ppm_dtc.h>
-#include <QObject>
-#include <QStringList>
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
 #include <nglwidgets/ngltreeitem.h>
 
 namespace CentralEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_dialog.h
index dfee75c1c..02715dd4b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_dialog.h
@@ -20,8 +20,8 @@
 #include "mission_plan_model.h"
 #include "mission_plan_edit.h"
 
-#include <QTimer>
-#include <QWidget>
+#include <QtCore/QTimer>
+#include <QtWidgets/QWidget>
 
 namespace Ui {
 class MissionPlanDialog;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_edit.cpp
index af6752882..e41089573 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_edit.cpp
@@ -16,9 +16,9 @@
 #include <Plugins/ProjectDataManagement/pdm_gui_plugin_interface.h>
 #include <ProjectDataManagement/pdm_to_string.h>
 #include <ProjectDataManagement/pdm_translation.h>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QTimer>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QTimer>
 #include <utility>
 
 namespace CentralEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_edit.h
index 0986b2f07..6c527440b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_edit.h
@@ -21,7 +21,7 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include "logger.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 namespace Ui {
 class MissionPlanEdit;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_model.h
index 6f95050c5..13285e515 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <LtsWidgets/lts_abstract_table_model.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_assign_codification_data_table.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_assign_codification_data_table.cpp
index f6c63bb21..47de5a6f8 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_assign_codification_data_table.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_assign_codification_data_table.cpp
@@ -6,7 +6,7 @@
 
 #include <LtsSession/lts_session_data.h>
 #include <ParticipantManagement/ppm_translation.h>
-#include <QLabel>
+#include <QtWidgets/QLabel>
 #include <utility>
 
 using namespace CodificationManagement;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_authentication_code_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_authentication_code_model.cpp
index 57b1c77d3..9ed9bad70 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_authentication_code_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_authentication_code_model.cpp
@@ -2,7 +2,7 @@
 
 #include "cod_authentication_code_model.h"
 
-#include <QGuiApplication>
+#include <QtGui/QGuiApplication>
 #include <QPalette>
 
 using namespace CodificationManagement;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_authentication_code_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_authentication_code_model.h
index 7ab9da217..3c6e23e69 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_authentication_code_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_authentication_code_model.h
@@ -4,7 +4,7 @@
 
 #include <CodificationManagement/cod_dtc.h>
 #include <CodificationManagement/logger.h>
-#include <QAbstractTableModel>
+#include <QtCore/QAbstractTableModel>
 
 namespace CodificationManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_code_table_edit_delegate.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_code_table_edit_delegate.h
index cce3e9e29..8f0133f2b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_code_table_edit_delegate.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_code_table_edit_delegate.h
@@ -3,8 +3,8 @@
 #pragma once
 
 #include <CodificationManagement/logger.h>
-#include <QItemDelegate>
-#include <QObject>
+#include <QtWidgets/QItemDelegate>
+#include <QtCore/QObject>
 
 namespace CodificationManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_model.cpp
index 7871b403f..77d2a7349 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_model.cpp
@@ -3,7 +3,7 @@
 #include "cod_codification_data_overview_model.h"
 
 #include <ParticipantManagement/ppm_translation.h>
-#include <QColor>
+#include <QtGui/QColor>
 #include <ngltools/ngltools_dtg.h>
 
 namespace CodificationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_view.cpp
index 493446899..0253bd8df 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_view.cpp
@@ -7,7 +7,7 @@
 #include "ui_cod_codification_data_overview_view.h"
 
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 using namespace CodificationManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_report.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_report.cpp
index 9c3d23119..c4aecbf39 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_report.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_report.cpp
@@ -8,8 +8,8 @@
 #include "cod_logistical_terms_model.h"
 #include "cod_phrase_table_model.h"
 
-#include <QWidget>
-#include <QAbstractTableModel>
+#include <QtWidgets/QWidget>
+#include <QtCore/QAbstractTableModel>
 
 #include <KDReports/KDReportsAutoTableElement>
 #include <KDReports/KDReportsCell>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_edit_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_edit_view.cpp
index 258fa3700..32b6a6a06 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_edit_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_edit_view.cpp
@@ -14,7 +14,7 @@
 
 #include <LtsWidgets/lts_message_dialog.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QBuffer>
+#include <QtCore/QBuffer>
 
 namespace CodificationManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_export.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_export.cpp
index 5a03966f6..b1c96f7d1 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_export.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_export.cpp
@@ -8,8 +8,8 @@
 #include "cod_phrase_table_model.h"
 
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QFile>
-#include <QFileDialog>
+#include <QtCore/QFile>
+#include <QtWidgets/QFileDialog>
 
 using namespace CodificationManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_export.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_export.h
index a2309de28..51c860f82 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_export.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_export.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <CodificationManagement/logger.h>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 namespace CodificationManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_import.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_import.cpp
index 281e15155..85706d67c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_import.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_import.cpp
@@ -8,9 +8,9 @@
 #include "cod_phrase_table_model.h"
 
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QBuffer>
-#include <QFile>
-#include <QFileDialog>
+#include <QtCore/QBuffer>
+#include <QtCore/QFile>
+#include <QtWidgets/QFileDialog>
 #include <utility>
 
 using namespace CodificationManagement;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_import.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_import.h
index 17d708562..bd9ffb60c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_import.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_import.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <CodificationManagement/logger.h>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 namespace CodificationManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_logistical_terms_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_logistical_terms_model.cpp
index a1028bd8f..ba22ba018 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_logistical_terms_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_logistical_terms_model.cpp
@@ -3,7 +3,7 @@
 #include "cod_logistical_terms_model.h"
 
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QGuiApplication>
+#include <QtGui/QGuiApplication>
 #include <QPalette>
 
 using namespace CodificationManagement;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_logistical_terms_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_logistical_terms_model.h
index f54954519..aa3519049 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_logistical_terms_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_logistical_terms_model.h
@@ -4,7 +4,7 @@
 
 #include <CodificationManagement/cod_dtc.h>
 #include <CodificationManagement/logger.h>
-#include <QAbstractTableModel>
+#include <QtCore/QAbstractTableModel>
 
 namespace CodificationManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_numeral_code_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_numeral_code_model.cpp
index cc37f3459..d67013c8b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_numeral_code_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_numeral_code_model.cpp
@@ -3,7 +3,7 @@
 #include "cod_numeral_code_model.h"
 
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QGuiApplication>
+#include <QtGui/QGuiApplication>
 #include <QPalette>
 
 using namespace CodificationManagement;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_numeral_code_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_numeral_code_model.h
index 9f80c2e28..4bb5b6b06 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_numeral_code_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_numeral_code_model.h
@@ -4,7 +4,7 @@
 
 #include <CodificationManagement/cod_dtc.h>
 #include <CodificationManagement/logger.h>
-#include <QAbstractTableModel>
+#include <QtCore/QAbstractTableModel>
 
 namespace CodificationManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_phrase_table_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_phrase_table_model.cpp
index 21fa4272a..04b9c182a 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_phrase_table_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_phrase_table_model.cpp
@@ -3,7 +3,7 @@
 #include "cod_phrase_table_model.h"
 
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QGuiApplication>
+#include <QtGui/QGuiApplication>
 #include <QPalette>
 
 using namespace CodificationManagement;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_phrase_table_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_phrase_table_model.h
index bc9c8c976..729b4037e 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_phrase_table_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_phrase_table_model.h
@@ -4,7 +4,7 @@
 
 #include <CodificationManagement/cod_dtc.h>
 #include <CodificationManagement/logger.h>
-#include <QAbstractTableModel>
+#include <QtCore/QAbstractTableModel>
 
 namespace CodificationManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/cod_numeral_code_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/cod_numeral_code_model.cpp
index 1129728d1..f8e288c7f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/cod_numeral_code_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/cod_numeral_code_model.cpp
@@ -3,7 +3,7 @@
 #include "cod_numeral_code_model.h"
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QTime>
+#include <QtCore/QTime>
 #include <QtCore/QDebug>
 #include <QtWidgets/QWidget>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/cod_numeral_code_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/cod_numeral_code_model.h
index f64cd45e5..83a2074ea 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/cod_numeral_code_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/cod_numeral_code_model.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QAbstractTableModel>
+#include <QtCore/QAbstractTableModel>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/maindialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/maindialog.cpp
index 9ef67975e..6c13d455c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/maindialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/maindialog.cpp
@@ -6,7 +6,7 @@
 #include "ui_maindialog.h"
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QVector>
+#include <QtCore/QVector>
 
 MainDialog::MainDialog(QWidget *parent) : QDialog(parent)
   , m_ui(new Ui::MainDialog)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/maindialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/maindialog.h
index dd65a2fbd..ce22e2391 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/maindialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/maindialog.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_calculations.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_calculations.cpp
index 0c329b9ce..aae1da7aa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_calculations.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_calculations.cpp
@@ -10,7 +10,7 @@
 #include <LtsCoordTrans/lts_coord_trans.h>
 
 #include <QPolygonF>
-#include <QLineF>
+#include <QtCore/QLineF>
 
 #include <MathUtils/simple_helper.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_calculations.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_calculations.h
index 0e3ecbe3d..175db9684 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_calculations.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_calculations.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <QVector>
-#include <QRectF>
+#include <QtCore/QVector>
+#include <QtCore/QRectF>
 #include <memory>
 
 namespace InfrastructureManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_create_simulation_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_create_simulation_dialog.cpp
index 1d62ba63a..7fda9152e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_create_simulation_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_create_simulation_dialog.cpp
@@ -18,10 +18,10 @@
 #include <ProjectDataManagement/Data/pdm_data_plugin.h>
 #include <ProjectDataManagement/pdm_translation.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonValue>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonValue>
 
 #include <AreaEffectSimulation/Utils/polygons.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_pdf_creator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_pdf_creator.cpp
index ac84fd4a1..6fae5fd7a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_pdf_creator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_pdf_creator.cpp
@@ -7,9 +7,9 @@
 #include <ParticipantManagement/ppm.hpp>
 #include <FileManagement/flm_ftc.h>
 
-#include <QDateTime>
-#include <QTemporaryFile>
-#include <QDateTime>
+#include <QtCore/QDateTime>
+#include <QtCore/QTemporaryFile>
+#include <QtCore/QDateTime>
 
 #include <LtsSession/lts_session_data.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_pdf_creator.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_pdf_creator.h
index 9789e83ed..c4dfb0a9e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_pdf_creator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_pdf_creator.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 
 namespace KDReports
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.cpp
index 8ea0af6da..395ecdad4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.cpp
@@ -12,8 +12,8 @@
 #include <FileManagement/flm_ftc.h>
 
 #include <QPolygonF>
-#include <QDateTime>
-#include <QGuiApplication>
+#include <QtCore/QDateTime>
+#include <QtGui/QGuiApplication>
 
 #include <LtsSession/lts_session_data.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.h
index 296ab80b1..31f4fd070 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.h
@@ -2,9 +2,9 @@
 
 #pragma once
 
-#include <QObject>
-#include <QVector>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
+#include <QtCore/QMap>
 #include <memory>
 #include <SymbologyXML/symbol_types.h>
 #include <ParticipantManagement/ppm_enums.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ComponentMonitor/cmo_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ComponentMonitor/cmo_data_plugin_interface.h
index 84dae3ba0..078742649 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ComponentMonitor/cmo_data_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ComponentMonitor/cmo_data_plugin_interface.h
@@ -7,7 +7,7 @@
 #include <ComponentMonitor/cmo_dtc.h>
 #include <ComponentMonitor/cmo_ftc.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace ComponentMonitor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_debug_flags_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_debug_flags_dialog.cpp
index cd4f7de47..0cb4739fe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_debug_flags_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_debug_flags_dialog.cpp
@@ -9,7 +9,7 @@
 #include <Viewer/LtsDataView/lts_data_view.h>
 #include <LtsSession/lts_session_data.h>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace DeveloperTools
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_dialog.cpp
index 94c122a6a..777c7267c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_dialog.cpp
@@ -17,15 +17,15 @@
 #include <LtsMultiMonitor/lts_dummy_widget.h>
 #include <LtsUtilsSettings/settings.h>
 
-#include <QTimer>
-#include <QFormLayout>
-#include <QGroupBox>
-#include <QColorDialog>
-#include <QClipboard>
-#include <QInputDialog>
+#include <QtCore/QTimer>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QColorDialog>
+#include <QtGui/QClipboard>
+#include <QtWidgets/QInputDialog>
 
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace DeveloperTools
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_dialog.h
index ea4d94c0d..a77246a4b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_dialog.h
@@ -3,11 +3,11 @@
 
 
 
-#include <QDialog>
-#include <QWidget>
-#include <QGroupBox>
-#include <QLabel>
-#include <QVBoxLayout>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QVBoxLayout>
 
 #include <LtsSession/lts_session_manager.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_ftcmock.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_ftcmock.cpp
index da6e27a4d..e0c216d50 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_ftcmock.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_ftcmock.cpp
@@ -3,11 +3,11 @@
 #include <LtsSession/lts_session.h>
 #include <LtsWidgets/lts_global_wait_dialog.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QRandomGenerator>
-#include <QLabel>
+#include <QtWidgets/QLabel>
 #include <QEventLoop>
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace DeveloperTools
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_ftcmock.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_ftcmock.h
index 8ca346cb2..b6fe2c4e6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_ftcmock.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_ftcmock.h
@@ -2,7 +2,7 @@
 
 #include <ExerciseManagement/exm_ftc.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <memory>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_gui_plugin.cpp
index aac551830..0760e146b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_gui_plugin.cpp
@@ -18,15 +18,15 @@
 #include <LtsWidgets/lts_base_layout_widget.h>
 #include <LtsWidgets/lts_notification_box.h>
 
-#include <QGuiApplication>
-#include <QInputDialog>
-#include <QMessageBox>
-#include <QTimer>
-#include <QTime>
-#include <QDebug>
-#include <QThread>
-#include <QShortcut>
-#include <QTcpSocket>
+#include <QtGui/QGuiApplication>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QMessageBox>
+#include <QtCore/QTimer>
+#include <QtCore/QTime>
+#include <QtCore/QDebug>
+#include <QtCore/QThread>
+#include <QtGui/QShortcut>
+#include <QtNetwork/QTcpSocket>
 
 
 namespace DeveloperTools
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_permissions_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_permissions_dialog.cpp
index ccbcf3cdb..71833cf86 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_permissions_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/dev_permissions_dialog.cpp
@@ -3,10 +3,10 @@
 
 #include <LtsSession/lts_session.h>
 
-#include <QHBoxLayout>
-#include <QPushButton>
-#include <QLabel>
-#include <QTimer>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QLabel>
+#include <QtCore/QTimer>
 
 
 namespace DeveloperTools
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area.h
index f1ebb8e0c..3abe801e0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area.h
@@ -7,8 +7,8 @@
 #include <utility>
 #include <SoundManagement/som.hpp>
 
-#include <QHash>
-#include <QVector>
+#include <QtCore/QHash>
+#include <QtCore/QVector>
 
 
 namespace EffectManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_playlist.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_playlist.cpp
index 07e6a6b64..a74a3e6b0 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_playlist.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_playlist.cpp
@@ -5,12 +5,12 @@
 #include "../logger.h"
 #include "efm_sound_area_helper.h"
 
-#include <QApplication>
-#include <QDebug>
-#include <QMouseEvent>
-#include <QSpinBox>
-#include <QTime>
-#include <QTimer>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDebug>
+#include <QtGui/QMouseEvent>
+#include <QtWidgets/QSpinBox>
+#include <QtCore/QTime>
+#include <QtCore/QTimer>
 #include <utility>
 
 namespace EffectManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_playlist.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_playlist.h
index ca073038a..0604603dc 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_playlist.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_playlist.h
@@ -5,7 +5,7 @@
 #include "efm_sound_state.h"
 
 #include <LtsWidgets/lts_abstract_table_model.h>
-#include <QStyledItemDelegate>
+#include <QtWidgets/QStyledItemDelegate>
 #include <SoundManagement/som_dtc.h>
 
 class QTimer;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_tree.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_tree.cpp
index efce7cfb2..93d1785db 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_tree.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_tree.cpp
@@ -6,9 +6,9 @@
 #include "efm_sound_area.h"
 #include "efm_sound_area_helper.h"
 
-#include <QApplication>
-#include <QDebug>
-#include <QSpinBox>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDebug>
+#include <QtWidgets/QSpinBox>
 #include <algorithm>
 #include <utility>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_tree.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_tree.h
index ff4128d11..2d6192c3c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_tree.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_model_tree.h
@@ -3,8 +3,8 @@
 #pragma once
 
 #include <LtsWidgets/lts_abstract_table_model.h>
-#include <QAbstractItemModel>
-#include <QStyledItemDelegate>
+#include <QtCore/QAbstractItemModel>
+#include <QtWidgets/QStyledItemDelegate>
 #include <SoundManagement/som_dtc.h>
 
 namespace NGL
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_helper.cpp
index e242c7ec3..2123e4cd8 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_helper.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_helper.cpp
@@ -4,8 +4,8 @@
 
 #include "../logger.h"
 
-#include <QColor>
-#include <QVector>
+#include <QtGui/QColor>
+#include <QtCore/QVector>
 #include <utility>
 
 namespace EffectManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_model.cpp
index 535d98b81..d142e952b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_model.cpp
@@ -5,8 +5,8 @@
 #include "../logger.h"
 #include "efm_sound_area_helper.h"
 
-#include <QApplication>
-#include <QTime>
+#include <QtWidgets/QApplication>
+#include <QtCore/QTime>
 #include <algorithm>
 
 namespace EffectManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_model.h
index 28ca7c763..bb927d916 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_model.h
@@ -7,7 +7,7 @@
 #include <InfrastructureManagement/ism_dtc.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <LtsWidgets/lts_abstract_table_model.h>
-#include <QItemDelegate>
+#include <QtWidgets/QItemDelegate>
 #include <SoundManagement/som_dtc.h>
 #include <SoundManagement/som_ftc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_state.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_state.h
index 7deb7100d..abeae6981 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_state.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_state.h
@@ -5,7 +5,7 @@
 
 #include <SoundManagement/som.hpp>
 
-#include <QString>
+#include <QtCore/QString>
 
 
 namespace EffectManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_switch_item_delegate.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_switch_item_delegate.cpp
index 102f0f38c..85eb88d21 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_switch_item_delegate.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_switch_item_delegate.cpp
@@ -4,7 +4,7 @@
 
 #include "../logger.h"
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 namespace EffectManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_switch_item_delegate.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_switch_item_delegate.h
index 14aecd258..b338fb0ff 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_switch_item_delegate.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_switch_item_delegate.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QStyledItemDelegate>
+#include <QtWidgets/QStyledItemDelegate>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_effect_show_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_effect_show_gui_plugin.cpp
index 00a4b7388..48f3f82d4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_effect_show_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_effect_show_gui_plugin.cpp
@@ -15,8 +15,8 @@
 
 #include <Services/EffectShowClient/esc_operator_rights.h>
 
-#include <QCoreApplication>
-#include <QUrlQuery>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QUrlQuery>
 
 namespace EffectShowClient
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_effect_show_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_effect_show_gui_plugin.h
index cbc889998..81b6981da 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_effect_show_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_effect_show_gui_plugin.h
@@ -13,7 +13,7 @@
 #include <EffectShowManagement/esm_data_plugin_interface.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace LtsNotification
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_explosion.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_explosion.h
index 74ff807ff..449da13be 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_explosion.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_explosion.h
@@ -7,7 +7,7 @@
 #include <LtsSession/lts_session.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <LtsWidgets/lts_dialog.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <Services/EffectShowClient/esc_dtc.h>
 #include <Services/EffectShowClient/esc_ftc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.cpp
index a566fdf35..122fe5bdb 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.cpp
@@ -7,7 +7,7 @@
 #include "esc_smoke_state.h"
 #include "ui_esc_firing_smoke.h"
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace EffectShowClient
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.h
index a247467af..613179eaf 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.h
@@ -7,7 +7,7 @@
 #include <LtsSession/lts_session.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <LtsWidgets/lts_dialog.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <Services/EffectShowClient/esc_dtc.h>
 #include <Services/EffectShowClient/esc_ftc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.cpp
index fce363d1d..5a991636b 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.cpp
@@ -7,8 +7,8 @@
 #include "esc_smoke_state.h"
 #include "ui_esc_operating_condition.h"
 
-#include <QStringList>
-#include <QTimer>
+#include <QtCore/QStringList>
+#include <QtCore/QTimer>
 #include <ngltools/ngltools_dtg.h>
 
 namespace EffectShowClient
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.h
index 10bd8e1df..f0bf7ef83 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.h
@@ -5,7 +5,7 @@
 #include <EffectShowClient/logger.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <LtsWidgets/lts_dialog.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <Services/EffectShowClient/esc_dtc.h>
 #include <Services/EffectShowClient/esc_ftc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_list.cpp
index c38121cd4..7d277f9a0 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_list.cpp
@@ -12,7 +12,7 @@
 #include <LtsPrinting/printing.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace EffectShowClient
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_safety_confirmation_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_safety_confirmation_widget.cpp
index 2122475ed..97fae7e67 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_safety_confirmation_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_safety_confirmation_widget.cpp
@@ -5,7 +5,7 @@
 #include "ui_esc_safety_confirmation_widget.h"
 #include "esc_smoke_state.h"
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace EffectShowClient
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_safety_confirmation_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_safety_confirmation_widget.h
index 2ded9c843..a6a28653a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_safety_confirmation_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_safety_confirmation_widget.h
@@ -2,7 +2,7 @@
 
 
 #pragma once
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 #include <Services/EffectShowClient/esc_ftc.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_smoke_state.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_smoke_state.h
index 453a6aafb..939782888 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_smoke_state.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_smoke_state.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 namespace Ui {
 class SmokeState;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox.cpp
index 84fb4839f..cf4a147af 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox.cpp
@@ -2,7 +2,7 @@
 
 
 #include "esm_combobox.h"
-#include <QComboBox>
+#include <QtWidgets/QComboBox>
 
 // esm_translation.h - external dependency, removed for build
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_list.cpp
index a05f835ef..e711c42e1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_list.cpp
@@ -7,7 +7,7 @@
 
 #include <LtsPrinting/printing.h>
 #include <LtsDataView/search_model.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace EffectShowManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_model.cpp
index 011fdf54f..1091bf9b3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_model.cpp
@@ -9,7 +9,7 @@
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ngltools/ngltools_dtg.h>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace EffectShowManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_list.cpp
index b6e7e560a..55ba6fdd2 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_list.cpp
@@ -7,7 +7,7 @@
 
 #include <EffectShowManagement/esm_data_plugin_interface.h>
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace EffectShowManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_edit.h
index baed9f396..240c50b2f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_edit.h
@@ -15,8 +15,8 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/EffectShowManagement/esm_gui_combobox_plugin_interface.h>
 #include <ProjectDataManagement/pdm_dtc.h>
-#include <QPair>
-#include <QVector>
+#include <QtCore/QPair>
+#include <QtCore/QVector>
 #include <Services/EffectShowManagement/esm_dtc.h>
 #include <Services/EffectShowManagement/esm_ftc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_list.cpp
index f6e8d551a..03ac7c7e4 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_list.cpp
@@ -11,7 +11,7 @@
 
 #include <EffectShowManagement/esm_data_plugin_interface.h>
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace EffectShowManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/evl_topic_editor_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/evl_topic_editor_model.cpp
index eee863980..334ddac01 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/evl_topic_editor_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/evl_topic_editor_model.cpp
@@ -3,7 +3,7 @@
 #include "evl_topic_editor_model.h"
 
 #include <Evaluations/evl_translation.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <ngltools/ngltools_dtg.h>
 #include <nglwidgets/ngltreeitem.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/evl_topic_editor_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/evl_topic_editor_model.h
index 4f31d5f0c..027209032 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/evl_topic_editor_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/evl_topic_editor_model.h
@@ -4,7 +4,7 @@
 
 #include <Evaluations/evl_dtc.h>
 #include <Evaluations/logger.h>
-#include <QSortFilterProxyModel>
+#include <QtCore/QSortFilterProxyModel>
 #include <nglwidgets/ngltreemodel.h>
 
 class QTableWidget;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/topic_editor.cpp
index a2dc611bc..0e5fe9b61 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/topic_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/topic_editor.cpp
@@ -9,8 +9,8 @@
 #include <LtsUtilsCore/json_object.h>
 #include <LtsWidgets/lts_combo_box.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
 #include <nglwidgets/ngltreeitem.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_dialog.cpp
index d09305b74..a09b4c6c6 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_dialog.cpp
@@ -10,7 +10,7 @@
 #include <LtsPrinting/printing.h>
 #include <LtsSession/lts_session.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace Evaluations
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_dialog.cpp
index a7f971e28..bb342db97 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_dialog.cpp
@@ -9,8 +9,8 @@
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace Evaluations
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_element_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_element_dialog.cpp
index 36e79caa8..35d0667db 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_element_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_element_dialog.cpp
@@ -14,9 +14,9 @@
 #include <LtsSession/lts_session_data.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QDateTime>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QDateTime>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
 #include <ngltools/ngltools_dtg.h>
 #include <utility>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_element_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_element_model.cpp
index 3251d7b01..70c34b239 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_element_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_element_model.cpp
@@ -4,7 +4,7 @@
 
 #include <AudioVideoManagement/stream_name_mapping.h>
 #include <LtsUtilsCore/json_object.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <ngltools/ngltools_dtg.h>
 
 namespace Evaluations
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_edit_dialog.cpp
index 08acf849f..ef5a1fb85 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_edit_dialog.cpp
@@ -11,8 +11,8 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/Evaluations/evl_data_plugin_interface.h>
 #include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
-#include <QIntValidator>
-#include <QJsonDocument>
+#include <QtGui/QIntValidator>
+#include <QtCore/QJsonDocument>
 #include <Services/Evaluations/san_category_line_json.h>
 #include <ngltools/ngltools_dtg.h>
 #include <ngltranslator/ngltranslator.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_comment_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_comment_model.cpp
index 1d29b20b2..231d3d898 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_comment_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_comment_model.cpp
@@ -3,8 +3,8 @@
 
 #include "evl_comment_model.h"
 
-#include <QDateTime>
-#include <QColor>
+#include <QtCore/QDateTime>
+#include <QtGui/QColor>
 #include <LtsSession/lts_session_manager.h>
 #include <ngltools/ngltools_dtg.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_comment_tuple.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_comment_tuple.h
index 7882bbac1..478c30ee3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_comment_tuple.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_comment_tuple.h
@@ -4,8 +4,8 @@
 #pragma once
 
 
-#include <QString>
-#include <QDateTime>
+#include <QtCore/QString>
+#include <QtCore/QDateTime>
 
 
 namespace Evaluations
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_comments.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_comments.cpp
index c539fe8a0..55d9f9c41 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_comments.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_comments.cpp
@@ -8,7 +8,7 @@
 #include <LtsSession/lts_session_data.h>
 #include <PluginInterfaces/data_plugin_interface.h>
 
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 
 namespace Evaluations
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_schema.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_schema.cpp
index 85e0d21ab..82cdc8de8 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_schema.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_schema.cpp
@@ -7,11 +7,11 @@
 
 #include <Evaluations/evl_translation.h>
 #include <LtsSession/lts_session_data.h>
-#include <QInputDialog>
-#include <QKeyEvent>
-#include <QMenu>
-#include <QTimer>
-#include <QTreeView>
+#include <QtWidgets/QInputDialog>
+#include <QtGui/QKeyEvent>
+#include <QtWidgets/QMenu>
+#include <QtCore/QTimer>
+#include <QtWidgets/QTreeView>
 
 namespace Evaluations
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_schema_element_data.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_schema_element_data.h
index 4ef8da07b..63c424168 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_schema_element_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_schema_element_data.h
@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <QIcon>
-#include <QString>
-#include <QDateTime>
-#include <QDataStream>
+#include <QtGui/QIcon>
+#include <QtCore/QString>
+#include <QtCore/QDateTime>
+#include <QtCore/QDataStream>
 
 namespace Evaluations
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_treemodel_schema.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_treemodel_schema.cpp
index f506fa248..e77155f2f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_treemodel_schema.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_treemodel_schema.cpp
@@ -2,8 +2,8 @@
 
 #include "evl_edit_treemodel_schema.h"
 
-#include <QJsonArray>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
 #include <ngltools/ngltools_dtg.h>
 
 namespace Evaluations
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_treemodel_schema.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_treemodel_schema.h
index 78f5886d7..f58895f95 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_treemodel_schema.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_treemodel_schema.h
@@ -6,7 +6,7 @@
 #include <Evaluations/logger.h>
 #include "evl_edit_treemodel_general.h"
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/evl_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/evl_gui_plugin_interface.h
index 0848385c1..b77ca04b6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/evl_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/evl_gui_plugin_interface.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <TopicEditorBase/topic_editor_interface.h>
-#include <QString>
+#include <QtCore/QString>
 
 namespace Evaluations
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/CustomViews/exm_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/CustomViews/exm_exercise.cpp
index 8de787589..335cb04eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/CustomViews/exm_exercise.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/CustomViews/exm_exercise.cpp
@@ -8,8 +8,8 @@
 #include <ngltools/ngltools_dtg.h>
 #include <LtsUtils/dds_vector_to_pixmap.h>
 
-#include <QFile>
-#include <QDebug>
+#include <QtCore/QFile>
+#include <QtCore/QDebug>
 
 
 namespace ExerciseManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/ExerciseChooser/exm_chooser.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/ExerciseChooser/exm_chooser.cpp
index 3917a0c86..7338326a2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/ExerciseChooser/exm_chooser.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/ExerciseChooser/exm_chooser.cpp
@@ -17,7 +17,7 @@
 #include <OperatorManagement/opm_operator_rights.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 
-#include <QCloseEvent>
+#include <QtGui/QCloseEvent>
 
 
 namespace ExerciseManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/ExerciseChooser/exm_chooser.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/ExerciseChooser/exm_chooser.h
index 84820be8b..bdbc1aab1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/ExerciseChooser/exm_chooser.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/ExerciseChooser/exm_chooser.h
@@ -3,7 +3,7 @@
 #pragma once
 
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include <memory>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog_model.cpp
index af0e8c5c5..1c4c0554f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog_model.cpp
@@ -4,7 +4,7 @@
 
 #include <ExerciseManagement/exm_translation.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <utility>
 
 namespace ExerciseManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_adler_visible_parties_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_adler_visible_parties_model.cpp
index 078164a49..d9943cdba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_adler_visible_parties_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_adler_visible_parties_model.cpp
@@ -5,9 +5,9 @@
 #include <ParticipantManagement/ppm_translation.h>
 #include <ParticipantManagement/ppm.hpp>
 
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
 namespace ExerciseManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_adler_visible_parties_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_adler_visible_parties_model.h
index 3b0352f5c..cb0e8e33d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_adler_visible_parties_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_adler_visible_parties_model.h
@@ -8,8 +8,8 @@
 
 #include <LtsSession/lts_session_data_dds.h>
 #include <LtsWidgets/lts_checkable_table_model.h>
-#include <QDebug>
-#include <QPair>
+#include <QtCore/QDebug>
+#include <QtCore/QPair>
 
 namespace ExerciseManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.cpp
index 5955f472f..7a005372e 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.cpp
@@ -17,11 +17,11 @@
 #include <LtsWidgets/lts_message_dialog.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
-#include <QFile>
-#include <QFileDialog>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QMenu>
+#include <QtCore/QFile>
+#include <QtWidgets/QFileDialog>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QMenu>
 #include <Services/FileManagement/flm_ftc.h>
 #include <utility>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_gui_plugin.cpp
index cad8fb84e..851eb4519 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_gui_plugin.cpp
@@ -24,8 +24,8 @@
 #include <ExerciseManagement/exm_operator_rights.h>
 #include <LtsUtilsSettings/settings.h>
 
-#include <QTimer>
-#include <QDebug>
+#include <QtCore/QTimer>
+#include <QtCore/QDebug>
 
 
 namespace ExerciseManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_party_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_party_dialog.cpp
index b35333414..6df0caf95 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_party_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_party_dialog.cpp
@@ -9,11 +9,11 @@
 #include <LtsWidgets/lts_message_dialog.h>
 #include <ParticipantManagement/Data/ppm_data_plugin.h>
 #include <Plugins/ExerciseManagement/Data/exm_data_plugin.h>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QListWidget>
-#include <QMenu>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QMenu>
 
 namespace ExerciseManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_visible_parties_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_visible_parties_model.h
index 0df848f42..1ff16e475 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_visible_parties_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_visible_parties_model.h
@@ -9,7 +9,7 @@
 #include <LtsSession/lts_session_data_dds.h>
 #include <LtsWidgets/lts_checkable_table_model.h>
 
-#include <QPair>
+#include <QtCore/QPair>
 
 namespace ExerciseManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_operator_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_operator_edit.cpp
index 98b1b90f5..09fbbe8e1 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_operator_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_operator_edit.cpp
@@ -5,7 +5,7 @@
 #include "ui_exm_operator_edit.h"
 
 #include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
-#include <QMenu>
+#include <QtWidgets/QMenu>
 
 namespace ExerciseManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_edit.cpp
index 9c4e6a987..b3223d888 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_edit.cpp
@@ -9,8 +9,8 @@
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/FileManagement/flm_data_plugin_interface.h>
-#include <QDateTime>
-#include <QInputDialog>
+#include <QtCore/QDateTime>
+#include <QtWidgets/QInputDialog>
 #include <SituationMap/GeometryModel/geometry_model.h>
 #include <SituationMap/GeometryModel/geometry_model_factory.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_json_parser.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_json_parser.h
index 004c69550..19647a9fa 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_json_parser.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_json_parser.h
@@ -5,12 +5,12 @@
 #include <GeometryModel/geometry_model.h>
 #include <GeometryModel/geometry_model_factory.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QHash>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QPointF>
-#include <QString>
+#include <QtCore/QHash>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QPointF>
+#include <QtCore/QString>
 #include <optional>
 #include <string>
 #include <vector>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_model.h
index d41904dc2..2bb02bb0c 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_model.h
@@ -4,13 +4,13 @@
 #include <FileManagement/flm_enums.hpp>
 #include <FileManagement/logger.h>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
-#include <QAbstractListModel>
-#include <QByteArray>
-#include <QDataStream>
-#include <QList>
+#include <QtCore/QAbstractListModel>
+#include <QtCore/QByteArray>
+#include <QtCore/QDataStream>
+#include <QtCore/QList>
 #include <QMimeData>
-#include <QObject>
-#include <QStandardItemModel>
+#include <QtCore/QObject>
+#include <QtGui/QStandardItemModel>
 
 namespace FileManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_symbol_concrete_creators.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_symbol_concrete_creators.h
index b14e82fa4..4c68c9bca 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_symbol_concrete_creators.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_symbol_concrete_creators.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 #include <LtsSession/lts_session_data.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_symbol_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_symbol_factory.h
index 42282321e..7626ac5d3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_symbol_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_symbol_factory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <QHash>
-#include <QString>
+#include <QtCore/QHash>
+#include <QtCore/QString>
 #include <memory>
 
 #include "flm_hq_report_symbol_creator.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/RatioAwareLabel.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/RatioAwareLabel.h
index ec662c9c4..b9d196724 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/RatioAwareLabel.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/RatioAwareLabel.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <QLabel>
-#include <QObject>
-#include <QPixmap>
+#include <QtWidgets/QLabel>
+#include <QtCore/QObject>
+#include <QtGui/QPixmap>
 
 
 class RatioAwareLabel : public QLabel
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.cpp
index 728aead2c..d41cfc200 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.cpp
@@ -11,9 +11,9 @@
 #include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <Plugins/PresentationManagement/Gui/Script/Common/topic_designer.h>
-#include <QInputDialog>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtWidgets/QInputDialog>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
 #include <TopicEditorBase/topic_previewer.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.h
index 6370c13b3..8db5d1978 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.h
@@ -7,7 +7,7 @@
 #include <Plugins/FileManagement/Gui/Explorer/flm_preview_playback.h>
 #include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
-#include <QPointer>
+#include <QtCore/QPointer>
 #include <TopicEditorBase/topic_editor_base.h>
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog.cpp
index 69c06dd87..eb46c0627 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog.cpp
@@ -24,9 +24,9 @@
 #include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
-#include <QFileDialog>
-#include <QFileInfo>
-#include <QMenu>
+#include <QtWidgets/QFileDialog>
+#include <QtCore/QFileInfo>
+#include <QtWidgets/QMenu>
 #include <ngltools/ngltools_filesystem.h>
 #include <nglwidgets/ngltreeitem.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_file.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_file.cpp
index f354efba7..86156bee2 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_file.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_file.cpp
@@ -7,8 +7,8 @@
 #include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
 #include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
-#include <QDateTime>
-#include <QGuiApplication>
+#include <QtCore/QDateTime>
+#include <QtGui/QGuiApplication>
 #include <QPalette>
 #include <ngltools/ngltools_dtg.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_folder.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_folder.cpp
index 5f95d3179..aa8c02ca6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_folder.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_folder.cpp
@@ -18,7 +18,7 @@
 #include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 
 namespace FileManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_folder.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_folder.h
index 85879e895..2f4b888a3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_folder.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_folder.h
@@ -12,7 +12,7 @@
 #include <ParticipantManagement/ppm_dtc.h>
 #include <LtsSession/lts_session.h>
 
-#include <QSortFilterProxyModel>
+#include <QtCore/QSortFilterProxyModel>
 #include <nglwidgets/ngltreemodel.h>
 
 class QTableWidget;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_file_content.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_file_content.cpp
index 6b7003361..e8ca47748 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_file_content.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_file_content.cpp
@@ -17,7 +17,7 @@
 #include <LtsSession/lts_session_data.h>
 #include <FileManagement/flm_translation.h>
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 namespace FileManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_file_content.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_file_content.h
index 38c162741..93752c0d3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_file_content.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_file_content.h
@@ -12,7 +12,7 @@
 #include <LtsSession/lts_session.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 #include <LtsWidgets/lts_frameless_dialog.h>
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_folder.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_folder.h
index 5befdecf4..3bf7a0e59 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_folder.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_folder.h
@@ -10,7 +10,7 @@
 #include <Services/FileManagement/flm_ftc.h>
 #include <Services/FileManagement/logger.h>
 
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.cpp
index 81dd6b74b..3747bfeac 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.cpp
@@ -29,14 +29,14 @@
 
 #include <TopicEditor/topic_editor.h>
 
-#include <QBuffer>
-#include <QCoreApplication>
-#include <QPointer>
-#include <QFileInfo>
-#include <QTextStream>
-#include <QJsonDocument>
-#include <QVector>
-#include <QUrlQuery>
+#include <QtCore/QBuffer>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QPointer>
+#include <QtCore/QFileInfo>
+#include <QtCore/QTextStream>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QVector>
+#include <QtCore/QUrlQuery>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_get_content.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_get_content.h
index 3cb5c21a5..98d6069f6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_get_content.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_get_content.h
@@ -7,7 +7,7 @@
 #include <FileManagement/logger.h>
 #include <Services/FileManagement/flm_ftc.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace FileManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_get_content_async.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_get_content_async.h
index cc9c1abf5..3162287e6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_get_content_async.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_get_content_async.h
@@ -5,7 +5,7 @@
 
 #include <FileManagement/flm_ftc.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace FileManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_office_integration.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_office_integration.cpp
index 53dafcf6f..a20bb2c02 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_office_integration.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_office_integration.cpp
@@ -8,9 +8,9 @@
 #include <ngltools/ngltools_filesystem.h>
 #include "settings.h"
 
-#include <QFileInfo>
-#include <QProcess>
-#include <QTemporaryFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QProcess>
+#include <QtCore/QTemporaryFile>
 
 namespace FileManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_office_integration.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_office_integration.h
index 8bc645c08..767a404d1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_office_integration.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_office_integration.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "flm_get_content.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_file_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_file_dialog.cpp
index 59d75ecf7..23b61f6f7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_file_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_file_dialog.cpp
@@ -10,7 +10,7 @@
 #include <nglsettings/nglsettings_settings.h>
 #include <settings.h>
 
-#include <QScreen>
+#include <QtGui/QScreen>
 
 #define PREVIEW_MIN_WIDTH 1200
 #define PREVIEW_MIN_HEIGHT 800
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_playback.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_playback.h
index 985ad6adb..334fdb58e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_playback.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_playback.h
@@ -8,7 +8,7 @@
 #include <LtsWidgets/lts_frameless_dialog.h>
 #include <FileManagement/logger.h>
 #include <Services/FileManagement/flm_ftc.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 
 #define ZOOM_MIN 0.5
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_set_properties_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_set_properties_dialog.h
index 1d722cf34..9599b7e5a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_set_properties_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_set_properties_dialog.h
@@ -5,7 +5,7 @@
 
 #include <LtsWidgets/lts_frameless_dialog.h>
 #include <FileManagement/logger.h>
-#include <QMap>
+#include <QtCore/QMap>
 
 class QLineEdit;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/settings.cpp
index 36cd0bca4..180f5edd1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/settings.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/settings.cpp
@@ -3,7 +3,7 @@
 
 #include "settings.h"
 
-#include <QSettings>
+#include <QtCore/QSettings>
 #include <nglsettings/nglsettings_settings.h>
 #include <ngltools/ngltools_filesystem.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/settings.h
index 28ff29529..b8eba55a4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/settings.h
@@ -2,7 +2,7 @@
 
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/FlmComboBox/flm_combobox_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/FlmComboBox/flm_combobox_gui_plugin.h
index a6533d734..b5e15ef73 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/FlmComboBox/flm_combobox_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/FlmComboBox/flm_combobox_gui_plugin.h
@@ -13,7 +13,7 @@
 #include <Plugins/FileManagement/flm_combobox_gui_plugin_interface.h>
 #include <Plugins/FileManagement/flm_data_plugin_interface.h>
 
-#include <QComboBox>
+#include <QtWidgets/QComboBox>
 
 namespace FileManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/flm_combobox_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/flm_combobox_gui_plugin_interface.h
index 187222117..d033f8cd2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/flm_combobox_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/flm_combobox_gui_plugin_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace LtsWidgets
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.cpp
index 79e374c42..10a7264f1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.cpp
@@ -4,9 +4,9 @@
 #include "aes_display_filter_impl.h"
 #include <utility>
 
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
 namespace FilterManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.h
index 4361cced9..f78b507cd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.h
@@ -7,8 +7,8 @@
 #include <Services/AreaEffectSimulation/aes.hpp>
 #include <FilterManagement/flt_data_plugin_aes_display_filter.h>
 #include <FilterManagement/logger.h>
-#include <QVector>
-#include <QMap>
+#include <QtCore/QVector>
+#include <QtCore/QMap>
 
 namespace FilterManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/building_cmpnt_settings_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/building_cmpnt_settings_impl.cpp
index da31b1264..9a1c94af9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/building_cmpnt_settings_impl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/building_cmpnt_settings_impl.cpp
@@ -4,9 +4,9 @@
 #include "building_cmpnt_settings_impl.h"
 #include <utility>
 #include "common.h"
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
 namespace FilterManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/building_cmpnt_settings_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/building_cmpnt_settings_impl.h
index 6cb2477a4..f94325db7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/building_cmpnt_settings_impl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/building_cmpnt_settings_impl.h
@@ -6,8 +6,8 @@
 #include <fltaesguicommon_export.h>
 #include <FilterManagement/flt_building_cmpnt_settings.h>
 #include <FilterManagement/logger.h>
-#include <QVector>
-#include <QJsonObject>
+#include <QtCore/QVector>
+#include <QtCore/QJsonObject>
 
 namespace FilterManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/common.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/common.h
index 454fc1e27..4a830b77e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/common.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/common.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <QSet>
-#include <QJsonArray>
+#include <QtCore/QSet>
+#include <QtCore/QJsonArray>
 
 namespace FilterManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/symbol_appearance_settings_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/symbol_appearance_settings_impl.cpp
index 99fb611c6..2d585a455 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/symbol_appearance_settings_impl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/symbol_appearance_settings_impl.cpp
@@ -4,12 +4,12 @@
 #include "symbol_appearance_settings_impl.h"
 #include <utility>
 #include "common.h"
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QTimer>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QTimer>
 
-#include <QMessageBox>
+#include <QtWidgets/QMessageBox>
 #include <NGLLogger/INGLLogger.h>
 
 namespace FilterManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/symbol_appearance_settings_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/symbol_appearance_settings_impl.h
index 80bf8ea80..c5428ef71 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/symbol_appearance_settings_impl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/symbol_appearance_settings_impl.h
@@ -9,9 +9,9 @@
 #include <ParticipantManagement/ppm.hpp>
 #include <Services/AreaEffectSimulation/aes.hpp>
 #include <FilterManagement/logger.h>
-#include <QObject>
-#include <QVector>
-#include <QHash>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
+#include <QtCore/QHash>
 
 class QTimer;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_dialog.cpp
index e37f261c2..442ff80dc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_dialog.cpp
@@ -9,8 +9,8 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <FilterManagement/Gui/FilterChange/flt_filter_change.h>
 
-#include <QGridLayout>
-#include <QTimer>
+#include <QtWidgets/QGridLayout>
+#include <QtCore/QTimer>
 
 namespace FilterManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_widget.h
index 803bc5a58..05ea725a4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_widget.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <Plugins/FilterManagement/flt_data_plugin_aes_display_filter.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <Plugins/ProjectDataManagement/pdm_gui_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_gui_plugin.cpp
index 6380d146c..40bec37a2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_gui_plugin.cpp
@@ -13,7 +13,7 @@
 #include <Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 namespace FilterManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_filter_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_filter_dialog.cpp
index c13f2e29c..66581b88d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_filter_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_filter_dialog.cpp
@@ -7,7 +7,7 @@
 #include <LtsWidgets/lts_message_dialog.h>
 #include <FilterManagement/flt_building_cmpnt_settings.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QGridLayout>
+#include <QtWidgets/QGridLayout>
 #include <FilterManagement/Gui/FilterChange/flt_filter_change.h>
 #include <InfrastructureManagement/ism_data_plugin_interface.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_settings_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_settings_widget.cpp
index 68647f41a..f16581fe8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_settings_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_settings_widget.cpp
@@ -8,9 +8,9 @@
 
 #include <ParticipantManagement/ppm.hpp>
 #include <ParticipantManagement/ppm_translation.h>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QMenu>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtWidgets/QMenu>
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsUtilsSettings/settings.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_settings_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_settings_widget.h
index 3298b2536..cf9110725 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_settings_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_settings_widget.h
@@ -7,9 +7,9 @@
 #include <FilterManagement/flt_building_cmpnt_plugin_interface.h>
 #include <FilterManagement/flt_building_cmpnt_settings.h>
 
-#include <QWidget>
-#include <QVector>
-#include <QCheckBox>
+#include <QtWidgets/QWidget>
+#include <QtCore/QVector>
+#include <QtWidgets/QCheckBox>
 
 class QComboBox;
 class QTimer;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_dialog.cpp
index 762686d21..e1933a694 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_dialog.cpp
@@ -8,8 +8,8 @@
 #include <LtsSession/lts_session_data.h>
 
 #include <LtsPrinting/printing.h>
-#include <QGridLayout>
-#include <QTreeView>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QTreeView>
 
 namespace FilterManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_widget.cpp
index bd87634c0..b9853c30a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_widget.cpp
@@ -10,11 +10,11 @@
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <nglwidgets/ngltreeitem.h>
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QMenu>
+#include <QtWidgets/QMenu>
 
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace FilterManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_widget.h
index 43bed7048..2a1d9099f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_widget.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <FilterManagement/logger.h>
 #include <FilterManagement/flt_symbol_appearance_settings.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_dialog.cpp
index a3f876a86..7ea214999 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_dialog.cpp
@@ -11,8 +11,8 @@
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 #include <FileManagement/flm_translation.h>
 
-#include <QGridLayout>
-#include <QJsonDocument>
+#include <QtWidgets/QGridLayout>
+#include <QtCore/QJsonDocument>
 
 namespace FilterManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_widget.cpp
index a8a53f225..8cdad0407 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_widget.cpp
@@ -8,9 +8,9 @@
 
 #include <ParticipantManagement/ppm.hpp>
 #include <ParticipantManagement/ppm_translation.h>
-#include <QTimer>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QTimer>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsUtilsSettings/settings.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_widget.h
index e606bbca8..6c8413e05 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_widget.h
@@ -7,8 +7,8 @@
 #include <FilterManagement/flt_aes_plugin_interface.h>
 #include <FilterManagement/flt_symbol_appearance_settings.h>
 
-#include <QWidget>
-#include <QVector>
+#include <QtWidgets/QWidget>
+#include <QtCore/QVector>
 
 class QComboBox;
 class QTimer;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_dialog.cpp
index ea894c723..7f2f571ee 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_dialog.cpp
@@ -6,10 +6,10 @@
 #include <LtsSession/lts_session_manager.h>
 #include <FileManagement/flm_translation.h>
 
-#include <QVBoxLayout>
-#include <QGroupBox>
-#include <QJsonDocument>
-#include <QCheckBox>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QCheckBox>
 
 namespace FilterManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_widget.cpp
index f5f83f7f0..dc913d223 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_widget.cpp
@@ -9,10 +9,10 @@
 #include <ProjectDataManagement/pdm_translation.h>
 #include <LtsWidgets/lts_message_dialog.h>
 
-#include <QCheckBox>
-#include <QGroupBox>
-#include <QPushButton>
-#include <QVBoxLayout>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QVBoxLayout>
 
 namespace FilterManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_widget.h
index 3cc749989..694b1d866 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_widget.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <FilterManagement/logger.h>
 #include <FilterManagement/flt_data_plugin_interface.h>
 #include <FilterManagement/flt_symbol_appearance_settings.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_building_cmpnt_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_building_cmpnt_helper.h
index 3bf9e6fff..dbc4d21ea 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_building_cmpnt_helper.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_building_cmpnt_helper.h
@@ -5,7 +5,7 @@
 
 #include <FilterManagement/flt_building_cmpnt_settings.h>
 #include <InfrastructureManagement/ism_enums.hpp>
-#include <QSet>
+#include <QtCore/QSet>
 
 namespace FilterManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_building_cmpnt_settings.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_building_cmpnt_settings.h
index dbe632b35..4a9da9100 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_building_cmpnt_settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_building_cmpnt_settings.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #include <functional>
-#include <QSet>
-#include <QJsonObject>
+#include <QtCore/QSet>
+#include <QtCore/QJsonObject>
 #include <FilterManagement/flt_ftc.h>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_data_plugin_aes_display_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_data_plugin_aes_display_filter.h
index cc75aa289..ec7462577 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_data_plugin_aes_display_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_data_plugin_aes_display_filter.h
@@ -7,7 +7,7 @@
 #include <Services/AreaEffectSimulation/aes.hpp>
 #include <Services/AreaEffectSimulation/aes_enums.hpp>
 #include <functional>
-#include <QSet>
+#include <QtCore/QSet>
 
 namespace FilterManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_symbol_appearance_settings.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_symbol_appearance_settings.h
index efe3ed686..069f89956 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_symbol_appearance_settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_symbol_appearance_settings.h
@@ -5,9 +5,9 @@
 
 #include <Services/AreaEffectSimulation/aes_enums.hpp>
 #include <functional>
-#include <QSet>
-#include <QMap>
-#include <QJsonObject>
+#include <QtCore/QSet>
+#include <QtCore/QMap>
+#include <QtCore/QJsonObject>
 
 
 namespace FilterManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FreeSpace/Gui/fsp_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FreeSpace/Gui/fsp_gui_plugin.cpp
index b1d9f71a3..efb5ef398 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FreeSpace/Gui/fsp_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FreeSpace/Gui/fsp_gui_plugin.cpp
@@ -14,14 +14,14 @@
 #include <iostream>
 #include <fstream>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QStorageInfo>
-#include <QCoreApplication>
-#include <QPainter>
-#include <QImage>
+#include <QtCore/QCoreApplication>
+#include <QtGui/QPainter>
+#include <QtGui/QImage>
 #include <QGradient>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace FreeSpace
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/PairingEdit/gim_pairing_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/PairingEdit/gim_pairing_edit_dialog.cpp
index 0a70792e2..e0aa77dc4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/PairingEdit/gim_pairing_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/PairingEdit/gim_pairing_edit_dialog.cpp
@@ -14,7 +14,7 @@
 
 #include <LtsSession/lts_session.h>
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace GuezIedManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/gim_info_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/gim_info_gui_plugin_interface.h
index a67747c8e..1810deb40 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/gim_info_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/gim_info_gui_plugin_interface.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QString>
-#include <QVector>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 
 
 namespace GuezIedManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Data/gna_data_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Data/gna_data_plugin.cpp
index 2ef346df7..d15e2c1e1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Data/gna_data_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Data/gna_data_plugin.cpp
@@ -6,7 +6,7 @@
 #include <DDS/DDSConnector/dds_connector.h>
 #include <LtsSession/lts_session_data_dds.h>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace GuezNasat
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/AssignNasat/gna_nasat_part_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/AssignNasat/gna_nasat_part_gui_plugin.cpp
index 25f4eff7b..29e7af151 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/AssignNasat/gna_nasat_part_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/AssignNasat/gna_nasat_part_gui_plugin.cpp
@@ -11,10 +11,10 @@
 #include <LtsUtilsSettings/settings.h>
 #include <Proxies/GuezNasat/gna_operator_rights.h>
 #include <Proxies/GuezNasat/logger.h>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QDesktopWidget>
-#include <QProcess>
-#include <QScreen>
+#include <QtCore/QProcess>
+#include <QtGui/QScreen>
 
 namespace GuezNasat
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/ConfigNasat/gna_nasat_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/ConfigNasat/gna_nasat_gui_plugin.cpp
index 7cf1c8e7e..f0b9be98f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/ConfigNasat/gna_nasat_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/ConfigNasat/gna_nasat_gui_plugin.cpp
@@ -9,8 +9,8 @@
 #include <LtsWidgets/lts_drag_icon.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
 #include <LtsWidgets/lts_global_wait_dialog.h>
-#include <QProcess>
-#include <QTimer>
+#include <QtCore/QProcess>
+#include <QtCore/QTimer>
 
 namespace GuezNasat
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.cpp
index 1d325edcc..07dd0356a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.cpp
@@ -7,12 +7,12 @@
 #include <Plugins/InfrastructureManagement/Shared/ism_mounting_point.h>
 #include <InfrastructureManagement/logger.h>
 #include <LtsUtilsCore/json_object.h>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QSet>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QSet>
 
 #include <QtConcurrent>
-#include <QMutexLocker>
+#include <QtCore/QMutexLocker>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.h
index 0feaf80f6..62d168061 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.h
@@ -4,9 +4,9 @@
 #pragma once
 
 #include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
-#include <QHash>
-#include <QSet>
-#include <QMutex>
+#include <QtCore/QHash>
+#include <QtCore/QSet>
+#include <QtCore/QMutex>
 
 
 namespace InfrastructureManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog.cpp
index c5011aba2..2b755da10 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog.cpp
@@ -10,10 +10,10 @@
 #include <LtsWidgets/lts_overlay_loading.h>
 #include "ism_set_recording_dialog_requester.h"
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QTreeView>
-#include <QTimer>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtWidgets/QTreeView>
+#include <QtCore/QTimer>
 
 namespace
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_model.cpp
index ca0f519da..a2dc6c2fc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_model.cpp
@@ -5,10 +5,10 @@
 
 #include <InfrastructureManagement/Shared/ism_mounting_point.h>
 #include <InfrastructureManagement/ism_translation.h>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QCheckBox>
+#include <QtWidgets/QCheckBox>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_model.h
index 92fdfcf43..4898a8de0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_model.h
@@ -8,7 +8,7 @@
 
 #include <nglwidgets/ngltreemodel.h>
 #include <nglwidgets/ngltreeitem.h>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_requester.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_requester.cpp
index 8511c1adb..4d471f205 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_requester.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_requester.cpp
@@ -2,9 +2,9 @@
 
 
 #include "ism_set_recording_dialog_requester.h"
-#include <QGuiApplication>
+#include <QtGui/QGuiApplication>
 #include <QMimeData>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_requester.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_requester.h
index c622f7317..383ce3aab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_requester.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_requester.h
@@ -4,9 +4,9 @@
 #include "ism_set_recording_dialog_model.h"
 #include <InfrastructureManagement/ism_ftc.h>
 
-#include <QObject>
-#include <QVector>
-#include <QPair>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
+#include <QtCore/QPair>
 namespace InfrastructureManagement
 {
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog.cpp
index f0f485596..938fb1fb3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog.cpp
@@ -10,11 +10,11 @@
 
 #include <LtsSession/lts_session.h>
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog_model.cpp
index 252be9324..ee7ef4be0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog_model.cpp
@@ -3,9 +3,9 @@
 
 #include "ism_exercise_assignment_dialog_model.h"
 #include <QtCore/QDateTime>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 
 using namespace InfrastructureManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/IsmComboBox/ism_combobox.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/IsmComboBox/ism_combobox.h
index 59cc44f8c..fb79e6c02 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/IsmComboBox/ism_combobox.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/IsmComboBox/ism_combobox.h
@@ -7,8 +7,8 @@
 #include <LtsWidgets/lts_combo_box.h>
 #include <InfrastructureManagement/logger.h>
 #include <InfrastructureManagement/ism_dtc.h>
-#include <QMap>
-#include <QString>
+#include <QtCore/QMap>
+#include <QtCore/QString>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/IsmComboBox/ism_combobox_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/IsmComboBox/ism_combobox_gui_plugin.h
index 3cef3c70a..81539b027 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/IsmComboBox/ism_combobox_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/IsmComboBox/ism_combobox_gui_plugin.h
@@ -13,7 +13,7 @@
 #include <Plugins/InfrastructureManagement/ism_combobox_gui_plugin_interface.h>
 #include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
 
-#include <QComboBox>
+#include <QtWidgets/QComboBox>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog.cpp
index 388fa6d27..1ef509267 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog.cpp
@@ -8,7 +8,7 @@
 
 #include <LtsSession/lts_session_data.h>
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog_model.cpp
index dd999c703..ce6e533f0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog_model.cpp
@@ -5,10 +5,10 @@
 #include <InfrastructureManagement/ism_data_plugin_interface.h>
 #include <InfrastructureManagement/ism_translation.h>
 #include <LtsSession/lts_session.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_edit_approaching_point_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_edit_approaching_point_dialog.cpp
index a5649cf8d..6f18cc57d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_edit_approaching_point_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_edit_approaching_point_dialog.cpp
@@ -10,7 +10,7 @@
 #include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog.cpp
index 50747e7ef..5aecbdf54 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog.cpp
@@ -11,14 +11,14 @@
 #include <LtsSession/lts_session_data.h>
 
 #include <LtsPrinting/printing.h>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QFileDialog>
-#include <QTreeView>
-#include <QTextStream>
-#include <QMenu>
-#include <QAction>
-#include <QTimer>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QTreeView>
+#include <QtCore/QTextStream>
+#include <QtWidgets/QMenu>
+#include <QtGui/QAction>
+#include <QtCore/QTimer>
 #include <vector>
 
 namespace InfrastructureManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog.h
index c428f7710..1c488707a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog.h
@@ -13,7 +13,7 @@
 
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include "ism_edit_asset_dialog.h"
-#include <QSet>
+#include <QtCore/QSet>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog_model.cpp
index 8647dd61a..fd5e25937 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog_model.cpp
@@ -7,11 +7,11 @@
 #include <InfrastructureManagement/Shared/ism_mounting_point.h>
 #include <ComponentMonitor/cmo_data_plugin_interface.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
-#include <QDateTime>
-#include <QBrush>
-#include <QSet>
-#include <QTimer>
-#include <QDebug>
+#include <QtCore/QDateTime>
+#include <QtGui/QBrush>
+#include <QtCore/QSet>
+#include <QtCore/QTimer>
+#include <QtCore/QDebug>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/CustomViews/ism_schedule.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/CustomViews/ism_schedule.cpp
index 57e106e02..983807168 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/CustomViews/ism_schedule.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/CustomViews/ism_schedule.cpp
@@ -6,7 +6,7 @@
 #include "ism_plan_dialog_model.h"
 
 #include <ngltools/ngltools_dtg.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog.cpp
index 6ce7c4923..15e74c083 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog.cpp
@@ -15,9 +15,9 @@
 #include <LtsWidgets/lts_overlay_loading.h>
 #include <LtsUtilsSettings/settings.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 
 using namespace LtsUtils;
 using namespace LtsWidgets;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_model.cpp
index 51e69eca6..d856cd47d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_model.cpp
@@ -4,11 +4,11 @@
 #include "ism_exercise_assignment_dialog_model.h"
 #include <utility>
 
-#include <QFont>
-#include <QGuiApplication>
+#include <QtGui/QFont>
+#include <QtGui/QGuiApplication>
 #include <InfrastructureManagement/ism_translation.h>
 #ifdef LTS_DEBUG
-#include <QTimer> 
+#include <QtCore/QTimer> 
 #endif
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_model.h
index 57fb08304..e0f4edb45 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_model.h
@@ -5,8 +5,8 @@
 
 #include <InfrastructureManagement/logger.h>
 #include <ExerciseManagement/exm.hpp>
-#include <QAbstractItemModel>
-#include <QSet>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QSet>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_proxy_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_proxy_model.h
index 457bc48dc..39749c80c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_proxy_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_proxy_model.h
@@ -5,7 +5,7 @@
 
 #include <InfrastructureManagement/logger.h>
 
-#include <QSortFilterProxyModel>
+#include <QtCore/QSortFilterProxyModel>
 #include <LtsUtilsCore/json_object.h>
 
 using namespace LtsUtils;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_requesters.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_requesters.cpp
index b29288544..8f9a8ea5f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_requesters.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_requesters.cpp
@@ -4,11 +4,11 @@
 #include "ism_exercise_assignment_dialog_requesters.h"
 #include "ism_exercise_assignment_dialog_model.h"
 
-#include <QFont>
-#include <QGuiApplication>
+#include <QtGui/QFont>
+#include <QtGui/QGuiApplication>
 #include <QMimeData>
 #ifdef LTS_DEBUG
-#include <QTimer> 
+#include <QtCore/QTimer> 
 #endif
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_requesters.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_requesters.h
index 7d9a4d13b..b58fa1192 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_requesters.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_requesters.h
@@ -7,9 +7,9 @@
 
 #include <InfrastructureManagement/ism_ftc.h>
 
-#include <QObject>
-#include <QVector>
-#include <QPair>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
+#include <QtCore/QPair>
 
 
 namespace InfrastructureManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointInfo/ism_mounting_point_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointInfo/ism_mounting_point_info_dialog.cpp
index 8adf91f4e..6998bbc06 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointInfo/ism_mounting_point_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointInfo/ism_mounting_point_info_dialog.cpp
@@ -11,9 +11,9 @@
 #include <AudioVideoManagement/ava_session.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.cpp
index ddca32c74..5ef90c6ea 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.cpp
@@ -20,13 +20,13 @@
 #include <LtsSession/lts_session_data.h>
 #include <LtsPrinting/printing.h>
 
-#include <QItemDelegate>
-#include <QTreeView>
-#include <QListWidget>
-#include <QMenu>
-#include <QHeaderView>
-#include <QScrollBar>
-#include <QTimer>
+#include <QtWidgets/QItemDelegate>
+#include <QtWidgets/QTreeView>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QScrollBar>
+#include <QtCore/QTimer>
 
 
 using namespace LtsWidgets;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.h
index eae213ca5..888664ce9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.h
@@ -17,7 +17,7 @@
 #include <LtsDataView/check_state_proxy_model.h>
 #include <LtsWidgets/lts_abstract_table_model.h>
 
-#include <QItemDelegate>
+#include <QtWidgets/QItemDelegate>
 
 
 class QCheckBox;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_checkbox_delegate.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_checkbox_delegate.cpp
index 7df05da9c..c37ef5bdf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_checkbox_delegate.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_checkbox_delegate.cpp
@@ -1,7 +1,7 @@
 #include "ism_mounting_point_list_dialog_checkbox_delegate.h"
 #include "ism_mounting_point_list_dialog_model.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 
 
 namespace InfrastructureManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_checkbox_delegate.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_checkbox_delegate.h
index 095b886f4..903ae820a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_checkbox_delegate.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_checkbox_delegate.h
@@ -2,7 +2,7 @@
 
 #include "ism_mounting_point_list_dialog_checkbox_delegate.h"
 
-#include <QItemDelegate>
+#include <QtWidgets/QItemDelegate>
 
 
 namespace InfrastructureManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_list_sort_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_list_sort_model.h
index 0a26ab5dd..6f9117deb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_list_sort_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_list_sort_model.h
@@ -4,7 +4,7 @@
 
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 
-#include <QSet>
+#include <QtCore/QSet>
 
 
 namespace InfrastructureManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_model.cpp
index 965eede92..d42dce166 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_model.cpp
@@ -8,7 +8,7 @@
 #include <InfrastructureManagement/ism_translation.h>
 #include <Plugins/InfrastructureManagement/Shared/ism_mounting_point.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_model.h
index ca1fe3a60..ed3fe8c68 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_model.h
@@ -6,7 +6,7 @@
 #include <InfrastructureManagement/ism_dtc.h>
 #include <InfrastructureManagement/logger.h>
 
-#include <QSet>
+#include <QtCore/QSet>
 
 #include <nglwidgets/ngltreemodel.h>
 #include <nglwidgets/ngltreeitem.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointMapSelection/ism_dds_selector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointMapSelection/ism_dds_selector.cpp
index 99f8a75b4..ac3a89212 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointMapSelection/ism_dds_selector.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointMapSelection/ism_dds_selector.cpp
@@ -6,7 +6,7 @@
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <Plugins/InfrastructureManagement/Shared/ism_mounting_point.h>
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 using namespace InfrastructureManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_dialog.cpp
index aa62b0c56..d3490846c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_dialog.cpp
@@ -7,11 +7,11 @@
 
 #include <InfrastructureManagement/ism_translation.h>
 #include <LtsPrinting/printing.h>
-#include <QMenu>
-#include <QAction>
-#include <QTreeView>
-#include <QHeaderView>
-#include <QScrollBar>
+#include <QtWidgets/QMenu>
+#include <QtGui/QAction>
+#include <QtWidgets/QTreeView>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QScrollBar>
 
 using namespace InfrastructureManagement;
 ConflictsDialog::ConflictsDialog(const QString &menuGroup, QWidget *parent)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_model.cpp
index fee08649c..55862f3bd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_model.cpp
@@ -4,7 +4,7 @@
 #include "ism_overview_conflicts_model.h"
 #include <InfrastructureManagement/ism_translation.h>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 #include <QElapsedTimer>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_model.h
index 7c6d4c5ee..6c22dd8e7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_model.h
@@ -11,10 +11,10 @@
 
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 
-#include <QSet>
-#include <QList>
-#include <QHash>
-#include <QTimer>
+#include <QtCore/QSet>
+#include <QtCore/QList>
+#include <QtCore/QHash>
+#include <QtCore/QTimer>
 
 namespace LtsSession
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog.cpp
index e4581f303..ce22775c6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog.cpp
@@ -13,10 +13,10 @@
 #include <LtsPrinting/printing.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
 
-#include <QTreeView>
-#include <QDateTime>
-#include <QComboBox>
-#include <QTimer>
+#include <QtWidgets/QTreeView>
+#include <QtCore/QDateTime>
+#include <QtWidgets/QComboBox>
+#include <QtCore/QTimer>
 namespace InfrastructureManagement
 {
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_dialog.cpp
index 4d9d4788c..a1b914d3d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_dialog.cpp
@@ -4,16 +4,16 @@
 #include "ism_overview_mounting_point_list_dialog.h"
 #include "ui_ism_overview_mounting_point_list_dialog.h"
 
-#include <QTreeView>
-#include <QListWidget>
-#include <QMenu>
+#include <QtWidgets/QTreeView>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QMenu>
 #include <qlabel.h>
 #include <InfrastructureManagement/ism_translation.h>
 #include <InfrastructureManagement/Shared/ism_mounting_point.h>
 #include <LtsPrinting/printing.h>
 #include <ngltools/ngltools_dtg.h>
-#include <QMessageBox>
-#include <QHeaderView>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QHeaderView>
 #include <qscrollbar.h>
 
 using namespace InfrastructureManagement;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_model.cpp
index a63df4dfe..c067d1476 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_model.cpp
@@ -8,8 +8,8 @@
 
 #include <Plugins/InfrastructureManagement/Shared/ism_mounting_point.h>
 
-#include <QDebug>
-#include <QTimer>
+#include <QtCore/QDebug>
+#include <QtCore/QTimer>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_model.h
index 0c42543ee..3221b616b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_model.h
@@ -6,7 +6,7 @@
 #include <InfrastructureManagement/ism_dtc.h>
 #include <InfrastructureManagement/logger.h>
 
-#include <QSet>
+#include <QtCore/QSet>
 
 #include <nglwidgets/ngltreemodel.h>
 #include <nglwidgets/ngltreeitem.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/new_plan_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/new_plan_dialog.cpp
index 6adc83f65..d26c72f81 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/new_plan_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/new_plan_dialog.cpp
@@ -4,7 +4,7 @@
 #include "new_plan_dialog.h"
 #include "ui_new_plan_dialog.h"
 #include <LtsSession/lts_session.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/new_plan_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/new_plan_dialog.h
index 494ff3552..5bdcc5052 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/new_plan_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/new_plan_dialog.h
@@ -6,7 +6,7 @@
 #include <InfrastructureManagement/ism_combobox_gui_plugin_interface.h>
 #include <Plugins/InfrastructureManagement/Data/ism_data_plugin.h>
 #include <Plugins/InfrastructureManagement/ism_resource_management_gui_plugin_interface.h>
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/plan_chooser.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/plan_chooser.cpp
index 267544bd1..0931df807 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/plan_chooser.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/plan_chooser.cpp
@@ -12,8 +12,8 @@
 #include <ConnectDialog/connect_dialog_nt.h>
 #include <LtsWidgets/lts_global_wait_dialog.h>
 
-#include <QCloseEvent>
-#include <QPushButton>
+#include <QtGui/QCloseEvent>
+#include <QtWidgets/QPushButton>
 
 #define DEVEL
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/plan_chooser.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/plan_chooser.h
index b61538e91..c2a9c81ad 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/plan_chooser.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/plan_chooser.h
@@ -5,7 +5,7 @@
 #include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
 #include <InfrastructureManagement/logger.h>
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ScheduleDifferences_old/ism_schedule_differences_list_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ScheduleDifferences_old/ism_schedule_differences_list_dialog.cpp
index 6ab316a7d..56010ea9a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ScheduleDifferences_old/ism_schedule_differences_list_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ScheduleDifferences_old/ism_schedule_differences_list_dialog.cpp
@@ -8,7 +8,7 @@
 #include <InfrastructureManagement/ism_translation.h>
 #include <LtsPrinting/printing.h>
 #include <ngltools/ngltools_dtg.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 using namespace InfrastructureManagement;
 ScheduleDifferencesListDialog::ScheduleDifferencesListDialog(const QString &menuGroup, QWidget *parent)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_delegate.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_delegate.cpp
index 84a4a69af..5f8da8913 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_delegate.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_delegate.cpp
@@ -2,9 +2,9 @@
 
 #include <LtsTimeline/timeline_header_view.h>
 
-#include <QGuiApplication>
-#include <QModelIndex>
-#include <QPainter>
+#include <QtGui/QGuiApplication>
+#include <QtCore/QModelIndex>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
 
 namespace InfrastructureManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_dialog.cpp
index bfbe386f5..1ac6cf48d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_dialog.cpp
@@ -15,7 +15,7 @@
 #include <InfrastructureManagement/ism_dtc.h>
 #include <InfrastructureManagement/ism_enums.hpp>
 #include <InfrastructureManagement/settings.h>
-#include <QScrollBar>
+#include <QtWidgets/QScrollBar>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_dialog.h
index 5b751dcf3..eca56313f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_dialog.h
@@ -17,7 +17,7 @@
 #include <Plugins/InfrastructureManagement/Data/ism_data_plugin.h>
 #include <Plugins/InfrastructureManagement/ism_resource_management_gui_plugin_interface.h>
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_model.cpp
index 0c4f57c71..27a8be076 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_model.cpp
@@ -4,7 +4,7 @@
 #include "ism_plan_tln_model.h"
 #include <utility>
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 
 using namespace LtsTimeline;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_dialog.cpp
index 136b64762..7ed62a6cb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_dialog.cpp
@@ -9,9 +9,9 @@
 #include <InfrastructureManagement/ism_operator_rights.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <LtsSession/lts_session_data.h>
-#include <QFileDialog>
-#include <QMenu>
-#include <QTextStream>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMenu>
+#include <QtCore/QTextStream>
 
 using namespace InfrastructureManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_dialog.h
index 66f309e7f..eaad1798c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_dialog.h
@@ -10,7 +10,7 @@
 #include <InfrastructureManagement/logger.h>
 #include <InfrastructureManagement/ism_resource_management_gui_plugin_interface.h>
 
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_model.cpp
index 6a8f0a016..ecbafcd51 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_model.cpp
@@ -3,8 +3,8 @@
 
 #include "ism_building_mount_point_model.h"
 #include <utility>
-#include <QDataStream>
-#include <QVector>
+#include <QtCore/QDataStream>
+#include <QtCore/QVector>
 #include <nglwidgets/ngltreeitem.h>
 #include <InfrastructureManagement/ism_translation.h>
 #include <InfrastructureManagement/Shared/ism_mounting_point.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_model.h
index 7ee01ab97..eb4616883 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_model.h
@@ -6,8 +6,8 @@
 #include <nglwidgets/ngltreeitem.h>
 #include <InfrastructureManagement/ism_dtc.h>
 #include <InfrastructureManagement/logger.h>
-#include <QSortFilterProxyModel>
-#include <QSet>
+#include <QtCore/QSortFilterProxyModel>
+#include <QtCore/QSet>
 namespace InfrastructureManagement
 {
 struct StructureElementTreeItem : public NGLTreeItem
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog.cpp
index fe6920ec9..57fc6e02c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog.cpp
@@ -16,7 +16,7 @@
 #include <LtsSession/lts_session_data.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 
 namespace InfrastructureManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Shared/ism_mounting_point.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Shared/ism_mounting_point.cpp
index 78ad0695d..3dffa486f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Shared/ism_mounting_point.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Shared/ism_mounting_point.cpp
@@ -1,13 +1,13 @@
 #include "ism_mounting_point.h"
-#include <QFile>
-#include <QPainter>
-#include <QFont>
+#include <QtCore/QFile>
+#include <QtGui/QPainter>
+#include <QtGui/QFont>
 #include <QFontMetrics>
 #include <QImageWriter>
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QMap>
-#include <QDebug>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QMap>
+#include <QtCore/QDebug>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Shared/ism_mounting_point.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Shared/ism_mounting_point.h
index fc081d89a..877589347 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Shared/ism_mounting_point.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Shared/ism_mounting_point.h
@@ -4,9 +4,9 @@
 #include <InfrastructureManagement/ism.hpp>
 #include <InfrastructureManagement/ism_enums.hpp>
 #include <QtGui/QImage>
-#include <QMap>
-#include <QGuiApplication>
-#include <QScreen>
+#include <QtCore/QMap>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QScreen>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_audio_video_config_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_audio_video_config_gui_plugin_interface.h
index 5f6b721a5..44dff825c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_audio_video_config_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_audio_video_config_gui_plugin_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_combobox_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_combobox_gui_plugin_interface.h
index 55d7791e1..e9609e4c1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_combobox_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_combobox_gui_plugin_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace LtsWidgets
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_data_plugin_interface.h
index 809cd1ad0..297923324 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_data_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_data_plugin_interface.h
@@ -9,8 +9,8 @@
 #include <ParticipantManagement/ppm.hpp>
 #include <Services/AreaEffectSimulation/aes.hpp>
 
-#include <QObject>
-#include <QSet>
+#include <QtCore/QObject>
+#include <QtCore/QSet>
 #include <PluginInterfaces/data_plugin_interface.h>
 
 #ifndef ISMDATAPLUGININTERFACE_EXPORT
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_exercise_assignment_classic_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_exercise_assignment_classic_gui_plugin_interface.h
index e364b8908..e86b4acfa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_exercise_assignment_classic_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_exercise_assignment_classic_gui_plugin_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_resource_management_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_resource_management_gui_plugin_interface.h
index 8620ef5f7..7625cafa9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_resource_management_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_resource_management_gui_plugin_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 #include <Services/InfrastructureManagement/ism_enums.hpp>
-#include <QString>
+#include <QtCore/QString>
 
 class QWidget;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.cpp
index 20ac177b5..0f699efdc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.cpp
@@ -1,7 +1,7 @@
 
 #include "mrk_apply_filter.h"
 #include <QJsonParseError>
-#include <QJsonObject>
+#include <QtCore/QJsonObject>
 
 #include <FilterManagement/flt_data_plugin_aes_display_filter.h>
 #include <FilterManagement/flt_symbol_appearance_settings.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.cpp
index 87f23390b..af4713bd9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.cpp
@@ -14,9 +14,9 @@
 #include <ngltools/ngltools_dtg.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <LtsProjectionWorkstation/lts_projection_workstation.h>
-#include <QBuffer>
-#include <QSet>
-#include <QTimer>
+#include <QtCore/QBuffer>
+#include <QtCore/QSet>
+#include <QtCore/QTimer>
 
 namespace MarkerManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/TopicEditor/topic_editor.cpp
index 4445e3bf5..543282d78 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/TopicEditor/topic_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/TopicEditor/topic_editor.cpp
@@ -10,9 +10,9 @@
 #include <Services/MarkerManagement/mrk.hpp>
 #include <TopicEditorBase/topic_previewer.h>
 
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 #include <QModelIndexList>
-#include <QSortFilterProxyModel>
+#include <QtCore/QSortFilterProxyModel>
 
 
 namespace MarkerManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_create_snapshot.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_create_snapshot.cpp
index 6a8760646..5d2b8da6e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_create_snapshot.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_create_snapshot.cpp
@@ -16,11 +16,11 @@
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <LtsUtils/dds_vector_to_pixmap.h>
 
-#include <QDateTime>
-#include <QImage>
-#include <QJsonDocument>
+#include <QtCore/QDateTime>
+#include <QtGui/QImage>
+#include <QtCore/QJsonDocument>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 namespace MarkerManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_dialog.cpp
index 3979a1a98..57bb828ef 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_dialog.cpp
@@ -10,7 +10,7 @@
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace MarkerManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_dialog.cpp
index 0c4192c49..61085943a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_dialog.cpp
@@ -4,7 +4,7 @@
 #include "mrk_edit_dialog.h"
 #include "ui_mrk_edit_dialog.h"
 #include <AudioVideoManagement/stream_name_mapping.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <QListWidgetItem>
 #include <LtsSession/lts_session_data.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_gui_plugin.cpp
index 59fe1df61..b85ab56a9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_gui_plugin.cpp
@@ -19,10 +19,10 @@
 #include <LtsAppManager/lts_app_manager.h>
 #include <Plugins/FileManagement/flm_data_plugin_interface.h>
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QJsonParseError>
-#include <QTimer>
-#include <QCoreApplication>
+#include <QtCore/QTimer>
+#include <QtCore/QCoreApplication>
 
 namespace MarkerManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_set_markers.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_set_markers.cpp
index 0bf8d33ea..fc2fd401d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_set_markers.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_set_markers.cpp
@@ -16,8 +16,8 @@
 #include <FilterManagement/flt_building_cmpnt_settings.h>
 #include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
 
-#include <QDateTime>
-#include <QJsonDocument>
+#include <QtCore/QDateTime>
+#include <QtCore/QJsonDocument>
 
 namespace
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.cpp
index 24b415b54..34334a9e2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.cpp
@@ -25,11 +25,11 @@
 #include <FilterManagement/flt_data_plugin_aes_display_filter.h>
 #include <Map/operator_map_settings.h>
 
-#include <QImage>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtGui/QImage>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #include <ngltools/ngltools_dtg.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.h
index 3e931eec1..aee05e5b7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.h
@@ -23,7 +23,7 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <LtsWidgets/lts_dialog.h>
 
-#include <QPointer>
+#include <QtCore/QPointer>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog_model.cpp
index b79c60f55..e2b82d274 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog_model.cpp
@@ -7,11 +7,11 @@
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <LtsUtils/dds_vector_to_pixmap.h>
 #include <ngltools/ngltools_dtg.h>
-#include <QSet>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QBuffer>
-#include <QTimer>
+#include <QtCore/QSet>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QBuffer>
+#include <QtCore/QTimer>
 
 namespace MarkerManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging.cpp
index 23ed324b4..e789eea5d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging.cpp
@@ -10,7 +10,7 @@
 #include <LtsSession/lts_session_data.h>
 
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace Messaging
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging_gui_plugin.cpp
index 29efbdc2e..e6e9ba5f0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging_gui_plugin.cpp
@@ -17,7 +17,7 @@
 #include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
 #include <Services/Messaging/msg_operator_rights.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 
 namespace Messaging
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_new_message_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_new_message_dialog.h
index 3e8c5abd6..a4fb3a8df 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_new_message_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_new_message_dialog.h
@@ -13,7 +13,7 @@
 
 #include <Plugins/OperatorManagement/opm_gui_combobox_plugin_interface.h>
 
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_show_message_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_show_message_dialog.cpp
index f85b18f2c..c117f1d9a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_show_message_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_show_message_dialog.cpp
@@ -10,9 +10,9 @@
 #include <LtsSession/lts_session_data.h>
 #include <LtsPrinting/printing.h>
 
-#include <QShowEvent>
-#include <QDateTime>
-#include <QTimer>
+#include <QtGui/QShowEvent>
+#include <QtCore/QDateTime>
+#include <QtCore/QTimer>
 
 
 namespace Messaging
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data.cpp
index adccc4085..b140fe871 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data.cpp
@@ -8,7 +8,7 @@
 #include <LtsSession/lts_session_manager.h>
 
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace MeteoDataManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data_model.cpp
index 938820225..656b40417 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data_model.cpp
@@ -2,8 +2,8 @@
 
 
 #include "mdm_meteo_data_model.h"
-#include <QCoreApplication>
-#include <QColor>
+#include <QtCore/QCoreApplication>
+#include <QtGui/QColor>
 
 namespace MeteoDataManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_battery_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_battery_info_dialog.cpp
index 52b19b3ea..894ba2cab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_battery_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_battery_info_dialog.cpp
@@ -10,10 +10,10 @@
 #include <LtsWidgets/lts_message_dialog.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
 
-#include <QCloseEvent>
-#include <QApplication>
-#include <QScreen>
-#include <QDebug>
+#include <QtGui/QCloseEvent>
+#include <QtWidgets/QApplication>
+#include <QtGui/QScreen>
+#include <QtCore/QDebug>
 
 namespace NmeaManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_battery_info_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_battery_info_dialog.h
index 87871db45..a0e366a4c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_battery_info_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_battery_info_dialog.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <PluginInterfaces/data_plugin_interface.h>
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include <QListWidgetItem>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <Proxies/TrainingAreaBase/tab_dtc.h>
 #include <Proxies/TrainingAreaBase/tab_ftc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_notification_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_notification_gui_plugin.cpp
index b92b9c40a..3bf8328ec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_notification_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_notification_gui_plugin.cpp
@@ -9,10 +9,10 @@
 #include <LtsSession/lts_session.h>
 #include <LtsNotification/lts_notification.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
-#include <QCoreApplication>
-#include <QMessageBox>
-#include <QPainter>
-#include <QPixmap>
+#include <QtCore/QCoreApplication>
+#include <QtWidgets/QMessageBox>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
 
 
 namespace NmeaManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_notification_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_notification_gui_plugin.h
index d06e8bb5a..cca535231 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_notification_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_notification_gui_plugin.h
@@ -9,7 +9,7 @@
 #include <Proxies/TrainingAreaBase/tab_dtc.h>
 #include <Proxies/TrainingAreaBase/tab_ftc.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace LtsNotification
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_shutdown_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_shutdown_dialog.cpp
index 70c70e612..f33e96839 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_shutdown_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_shutdown_dialog.cpp
@@ -11,11 +11,11 @@
 #include <LtsWidgets/lts_message_dialog.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
 
-#include <QCloseEvent>
-#include <QApplication>
+#include <QtGui/QCloseEvent>
+#include <QtWidgets/QApplication>
 #include <QDesktopWidget>
-#include <QScreen>
-#include <QDebug>
+#include <QtGui/QScreen>
+#include <QtCore/QDebug>
 
 
 NmeShutdownDialog::NmeShutdownDialog(const std::shared_ptr<TrainingAreaBase::Interface::Ftc> &tabFtc,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_shutdown_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_shutdown_dialog.h
index 567c9d6a0..765d2be75 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_shutdown_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_shutdown_dialog.h
@@ -5,7 +5,7 @@
 #include <Proxies/TrainingAreaBase/tab_ftc.h>
 
 #include <LtsWidgets/lts_frameless_dialog.h>
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include <QListWidgetItem>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog.cpp
index d57d41bf2..3c06fb087 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog.cpp
@@ -6,7 +6,7 @@
 
 #include "nom_dialog_model.h"
 
-#include <QLabel>
+#include <QtWidgets/QLabel>
 #include <QTextBrowser>
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog_model.cpp
index 0aaa3a2ae..84e5c6ebd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog_model.cpp
@@ -10,7 +10,7 @@
 #include <NotificationManagement/nom_translation.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 
 namespace NotificationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_edit_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_edit_gui_plugin.cpp
index 83a21b12b..a2ebeeadc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_edit_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_edit_gui_plugin.cpp
@@ -12,10 +12,10 @@
 #include <NotificationManagement/nom_dtc.h>
 #include <Services/AreaEffectSimulation/aes_operator_rights.h>
 
-#include <QApplication>
-#include <QDebug>
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDebug>
+#include <QtCore/QRegularExpression>
+#include <QtCore/QRegularExpressionMatch>
 
 namespace NotificationManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader.cpp
index 1e098da1b..f518797f8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader.cpp
@@ -9,10 +9,10 @@
 #include <LtsSession/lts_session_data.h>
 #include <nglsettings/nglsettings_connections.h>
 #include <LtsUtilsSettings/settings.h>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QTimer>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QTimer>
 #include <QtWebSockets/QWebSocket>
 
 namespace OcBaseDownload
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_ex_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_ex_model.cpp
index ddc027d10..18dbc4a36 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_ex_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_ex_model.cpp
@@ -5,7 +5,7 @@
 #include "obd_ex_model.h"
 
 #include <ngltools/ngltools_dtg.h>
-#include <QJsonObject>
+#include <QtCore/QJsonObject>
 
 namespace OcBaseDownload
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation.cpp
index 0b6173101..ae2a5af38 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation.cpp
@@ -8,7 +8,7 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <LtsUtilsSettings/settings.h>
 #include <Map/map.h> 
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace OcSituationClient
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation_filter.cpp
index 03ba00f7e..ed0b956b2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation_filter.cpp
@@ -6,10 +6,10 @@
 #include "ui_osc_demand_situation_filter.h"
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <LtsUtilsSettings/settings.h>
-#include <QVBoxLayout>
-#include <QLayout>
-#include <QCheckBox>
-#include <QLabel>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QLabel>
 
 namespace OcSituationClient
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation_filter.h
index 36be9148b..a7ecc9038 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation_filter.h
@@ -15,7 +15,7 @@
 #include <ParticipantManagement/ppm.hpp>
 #include <set>
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 namespace Ui {
 class DemandSituationFilter;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_edit_folder_content.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_edit_folder_content.cpp
index 9343be0eb..e7b96afde 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_edit_folder_content.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_edit_folder_content.cpp
@@ -5,8 +5,8 @@
 #include "osc_edit_folder_content.h"
 #include <utility>
 #include "ui_osc_edit_folder_content.h"
-#include <QDir>
-#include <QTableView>
+#include <QtCore/QDir>
+#include <QtWidgets/QTableView>
 #include <LtsUtilsSettings/settings.h>
 #include <LtsDataView/lts_data_view.h>
 #include <LtsSession/lts_session_data.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_edit_folder_content.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_edit_folder_content.h
index 767210605..c7d987dcb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_edit_folder_content.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_edit_folder_content.h
@@ -9,7 +9,7 @@
 #include <LtsSession/lts_session.h>
 #include <QFileSystemModel>
 #include <nglwidgets/nglpdfwidget.h>
-#include <QSortFilterProxyModel>
+#include <QtCore/QSortFilterProxyModel>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
 #include <Plugins/OcBaseDownload/obd_data_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_terminal_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_terminal_gui_plugin.cpp
index 0507bc4be..2390cd83c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_terminal_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_terminal_gui_plugin.cpp
@@ -16,11 +16,11 @@
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <Map/map.h> 
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <LtsWidgets/lts_base_layout_widget.h>
-#include <QPainter>
-#include <QImage>
-#include <QRect>
+#include <QtGui/QPainter>
+#include <QtGui/QImage>
+#include <QtCore/QRect>
 #include <QRadialGradient>
 
 namespace OcSituationClient
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_close_aes_list_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_close_aes_list_model.h
index ab5a209b5..1a64dac1c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_close_aes_list_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_close_aes_list_model.h
@@ -9,7 +9,7 @@
 
 #include <OcSituationClient/logger.h>
 
-#include <QSet>
+#include <QtCore/QSet>
 #include <LtsSession/lts_session.h>
 #include <LtsWidgets/lts_abstract_table_model.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_selftest.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_selftest.cpp
index 4e595f9b8..b42d4bce2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_selftest.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_selftest.cpp
@@ -4,7 +4,7 @@
 #include "osc_selftest.h"
 #include "ui_osc_selftest.h"
 
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QStorageInfo>
 
 #include <LtsUtilsSettings/settings.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_settings.cpp
index f7bbe83cf..f95dc200d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_settings.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_settings.cpp
@@ -8,7 +8,7 @@
 
 #include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QDebug>
+#include <QtCore/QDebug>
 
 namespace OcSituationClient
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_system_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_system_gui_plugin.cpp
index eca42bd1e..a1be6fa33 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_system_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_system_gui_plugin.cpp
@@ -18,7 +18,7 @@
 #include <QNetworkSession>
 #include <QNetworkConfigurationManager>
 #include <QNetworkConfiguration>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QPolygonF>
 #include <LtsCoordTrans/lts_coord_trans.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineHelp/Gui/OnlineHelpViewer/online_help_viewer_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineHelp/Gui/OnlineHelpViewer/online_help_viewer_dialog.cpp
index 388f765b7..083b8454d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineHelp/Gui/OnlineHelpViewer/online_help_viewer_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineHelp/Gui/OnlineHelpViewer/online_help_viewer_dialog.cpp
@@ -9,7 +9,7 @@
 
 #include <QWebEngineView>
 #include <QWebEngineHistory>
-#include <QMenu>
+#include <QtWidgets/QMenu>
 
 
 namespace OnlineHelp
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineHelp/ohp_online_help_viewer_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineHelp/ohp_online_help_viewer_gui_plugin_interface.h
index 9d15941a4..cb47625f4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineHelp/ohp_online_help_viewer_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineHelp/ohp_online_help_viewer_gui_plugin_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace OnlineHelp
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_abstract_chart_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_abstract_chart_model.h
index 697bd4e3f..e94e3d6b6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_abstract_chart_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_abstract_chart_model.h
@@ -3,13 +3,13 @@
 
 #pragma once
 
-#include <QSet>
-#include <QAbstractTableModel>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QSet>
+#include <QtCore/QAbstractTableModel>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 #include <QVariantList>
-#include <QBrush>
+#include <QtGui/QBrush>
 
 #include <ParticipantManagement/ppm.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Data/opm_data_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Data/opm_data_plugin.cpp
index 6ba802690..07556a9fe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Data/opm_data_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Data/opm_data_plugin.cpp
@@ -11,8 +11,8 @@
 #include <Plugins/OperatorManagement/opm_gui_plugin_interface.h>
 #include <Services/OperatorManagement/logger.h>
 
-#include <QDateTime>
-#include <QTimer>
+#include <QtCore/QDateTime>
+#include <QtCore/QTimer>
 
 
 namespace OperatorManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_dialog_model.cpp
index 555e70281..dd06d3264 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_dialog_model.cpp
@@ -12,7 +12,7 @@
 #include <ExerciseManagement/exm_data_plugin_interface.h>
 #include <LtsUtils/dds_vector_to_pixmap.h>
 
-#include <QIcon>
+#include <QtGui/QIcon>
 
 
 namespace OperatorManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog.cpp
index 77e2aaae5..2d263f260 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog.cpp
@@ -15,16 +15,16 @@
 #include <LtsUtilsSettings/settings.h>
 #include <LtsWidgets/lts_global_wait_dialog.h>
 
-#include <QDebug>
-#include <QMessageBox>
-#include <QGuiApplication>
-#include <QScreen>
-#include <QStyle>
+#include <QtCore/QDebug>
+#include <QtWidgets/QMessageBox>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QScreen>
+#include <QtWidgets/QStyle>
 #include <QGraphicsDropShadowEffect>
-#include <QProcess>
-#include <QMenu>
-#include <QFile>
-#include <QUdpSocket>
+#include <QtCore/QProcess>
+#include <QtWidgets/QMenu>
+#include <QtCore/QFile>
+#include <QtNetwork/QUdpSocket>
 
 #ifdef Q_OS_LINUX
 #include <X11/Xlib.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog.h
index a4dff7ed5..b0d44cb48 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <QDialog>
-#include <QTimer>
+#include <QtWidgets/QDialog>
+#include <QtCore/QTimer>
 #define DEVEL
 
 class QProcess;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.cpp
index a26bdbd7b..a221c6f43 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.cpp
@@ -36,20 +36,20 @@
 #include <Plugins/OperatorManagement/Data/opm_data_plugin.h>
 #include <Plugins/AssetManagement/Data/asm_data_plugin.h>
 
-#include <QApplication>
-#include <QProcess>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtWidgets/QApplication>
+#include <QtCore/QProcess>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 #include <QJsonParseError>
 #include <QHostInfo>
-#include <QRect>
-#include <QScreen>
+#include <QtCore/QRect>
+#include <QtGui/QScreen>
 
 
 
 
-#include <QMessageBox>
+#include <QtWidgets/QMessageBox>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.h
index 9dbdae28d..16be6bd6b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
 #include <Plugins/OperatorManagement/opm_gui_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_operator_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_operator_dialog.cpp
index 6de826b81..01fc3daff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_operator_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_operator_dialog.cpp
@@ -9,12 +9,12 @@
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>
 
-#include <QGuiApplication>
-#include <QScreen>
-#include <QStyle>
-#include <QDebug>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QScreen>
+#include <QtWidgets/QStyle>
+#include <QtCore/QDebug>
 #include <QGraphicsDropShadowEffect>
-#include <QPushButton>
+#include <QtWidgets/QPushButton>
 #include <vector>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_operator_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_operator_dialog.h
index d440ce0eb..fa5e95f06 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_operator_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_operator_dialog.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <QDialog>
-#include <QTimer>
+#include <QtWidgets/QDialog>
+#include <QtCore/QTimer>
 #include <QMoveEvent>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_remote_shutdown_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_remote_shutdown_dialog.cpp
index 2a865cde6..3f17afdc9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_remote_shutdown_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_remote_shutdown_dialog.cpp
@@ -8,7 +8,7 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <LtsSession/lts_session_data.h>
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 namespace OperatorManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_remote_shutdown_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_remote_shutdown_dialog.h
index fd5dd5604..eb83af269 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_remote_shutdown_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_remote_shutdown_dialog.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <LtsWidgets/lts_dialog.h>
 #include <OperatorManagement/logger.h>
 #include <Plugins/AssetManagement/Data/asm_data_plugin.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_workstation_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_workstation_model.h
index c0fa7bbc6..23010c486 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_workstation_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_workstation_model.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QAbstractItemModel>
+#include <QtCore/QAbstractItemModel>
 
 namespace OperatorManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/acl_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/acl_dialog.h
index 1035a3872..3f7590d0b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/acl_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/acl_dialog.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 #include "acl_dialog_model.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_dialog.cpp
index 5b1a47f95..55aa7efe4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_dialog.cpp
@@ -6,7 +6,7 @@
 
 #include "group_edit_member_of_model.h"
 
-#include <QMenu>
+#include <QtWidgets/QMenu>
 #include <LtsWidgets/lts_message_dialog.h>
 #include <OperatorManagement/opm_translation.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_dialog.h
index 48185bc93..efe8fb212 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_dialog.h
@@ -9,7 +9,7 @@
 #include <OperatorManagement/opm_dtc.h>
 #include <OperatorManagement/opm_ftc.h>
 
-#include <QVector>
+#include <QtCore/QVector>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_member_of_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_member_of_model.cpp
index b74928a01..5a0f50aac 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_member_of_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_member_of_model.cpp
@@ -5,9 +5,9 @@
 #include <nglwidgets/ngltreeitem.h>
 #include <LtsUtilsSettings/settings.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
-#include <QCoreApplication>
-#include <QSet>
-#include <QVector>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QSet>
+#include <QtCore/QVector>
 
 namespace OperatorManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_model.cpp
index 00b3bff01..1f1ef154c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_model.cpp
@@ -6,7 +6,7 @@
 
 #include <ngltools/ngltools_dtg.h>
 #include <OperatorManagement/opm_translation.h>
-#include <QIcon>
+#include <QtGui/QIcon>
 
 namespace OperatorManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_dialog.cpp
index 1ccf357cb..febf641bc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_dialog.cpp
@@ -12,7 +12,7 @@
 #include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
 
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace OperatorManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_dialog.h
index d6fa994c3..341876710 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_dialog.h
@@ -14,7 +14,7 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.cpp
index b38e5de84..b7d36ddec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.cpp
@@ -16,12 +16,12 @@
 #include <ParticipantManagement/Data/ppm_data_plugin.h>
 #include <Plugins/ExerciseManagement/Data/exm_data_plugin.h>
 
-#include <QListWidget>
-#include <QImage>
-#include <QFile>
-#include <QTimer>
-#include <QFileDialog>
-#include <QMenu>
+#include <QtWidgets/QListWidget>
+#include <QtGui/QImage>
+#include <QtCore/QFile>
+#include <QtCore/QTimer>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMenu>
 
 #include "group_edit_dialog.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_visible_parties_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_visible_parties_model.h
index b2226d5ae..8e5b5ef1a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_visible_parties_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_visible_parties_model.h
@@ -8,7 +8,7 @@
 
 #include <LtsWidgets/lts_checkable_table_model.h>
 
-#include <QPair>
+#include <QtCore/QPair>
 
 namespace OperatorManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/preset_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/preset_dialog.h
index 12044269d..78ae13e69 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/preset_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/preset_dialog.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 #include "group_model.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorOverview/operator_overview_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorOverview/operator_overview_dialog.cpp
index 8083d80ba..282d0bfff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorOverview/operator_overview_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorOverview/operator_overview_dialog.cpp
@@ -12,7 +12,7 @@
 #include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
 
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 namespace OperatorManagement
 {
 OperatorOverviewDialog::OperatorOverviewDialog(const QString &windowTitle, QWidget *parent)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/SettingsGroup/opm_settings_group.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/SettingsGroup/opm_settings_group.cpp
index b08529e73..a61357f8d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/SettingsGroup/opm_settings_group.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/SettingsGroup/opm_settings_group.cpp
@@ -3,7 +3,7 @@
 
 #include "opm_settings_group.h"
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QJsonParseError>
 
 #include <LtsUtilsSettings/settings.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/SettingsGroup/opm_settings_group.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/SettingsGroup/opm_settings_group.h
index 9c71bb7be..88faf9888 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/SettingsGroup/opm_settings_group.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/SettingsGroup/opm_settings_group.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QJsonObject>
-#include <QVector>
+#include <QtCore/QJsonObject>
+#include <QtCore/QVector>
 #include <OperatorManagement/logger.h>
 
 namespace LtsUtils { class OperatorSettings; }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_create_new_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_create_new_dialog.cpp
index 19a2b94f7..10dd3237c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_create_new_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_create_new_dialog.cpp
@@ -4,7 +4,7 @@
 #include "operator_settings_create_new_dialog.h"
 #include "ui_operator_settings_create_new_dialog.h"
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QComboBox>
+#include <QtWidgets/QComboBox>
 
 namespace OperatorManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.cpp
index 386c688c9..907327880 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.cpp
@@ -21,13 +21,13 @@
 #include <OperatorManagement/opm_operator_rights.h>
 #include <ngltools/ngltools_dtg.h>
 
-#include <QBrush>
-#include <QFileDialog>
-#include <QKeyEvent>
-#include <QPainter>
-#include <QPen>
-#include <QTimer>
-#include <QUuid>
+#include <QtGui/QBrush>
+#include <QtWidgets/QFileDialog>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
+#include <QtCore/QTimer>
+#include <QtCore/QUuid>
 
 
 static const char* DISABLE_FAST_CLICKS_PROPERTY = "DisableFastClicks";
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.h
index 772df8139..3fcdf252e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.h
@@ -12,8 +12,8 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
 #include <QBasicTimer>
-#include <QPointer>
-#include <QLabel>
+#include <QtCore/QPointer>
+#include <QtWidgets/QLabel>
 
 enum LtsDate
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/opm_settings_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/opm_settings_gui_plugin.cpp
index 759375de8..a93864462 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/opm_settings_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/opm_settings_gui_plugin.cpp
@@ -21,11 +21,11 @@
 
 #include <Common/LtsProjectionWorkstation/lts_projection_workstation.h>
 
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QUuid>
-#include <QTimer>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QUuid>
+#include <QtCore/QTimer>
 
 namespace OperatorManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/opm_gui_combobox_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/opm_gui_combobox_plugin_interface.h
index 28f55a653..d3600b654 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/opm_gui_combobox_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/opm_gui_combobox_plugin_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QSet>
+#include <QtCore/QSet>
 #include <functional>
 
 class QWidget;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/distype_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/distype_editor.h
index 556d1ed15..80360ecc5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/distype_editor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/distype_editor.h
@@ -5,7 +5,7 @@
 #include <LtsWidgets/lts_frameless_dialog.h>
 #include "ppmcommon_export.h"
 
-#include <QMap>
+#include <QtCore/QMap>
 #include <memory>
 #include <Common/participant_dis_type_edit.h>
 #include <ParticipantManagement/ppm.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_beautify_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_beautify_view.cpp
index 86f984afe..d09e4334f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_beautify_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_beautify_view.cpp
@@ -3,9 +3,9 @@
 
 #include <Common/participant_beautify_view.h>
 
-#include <QTreeView>
-#include <QHeaderView>
-#include <QModelIndex>
+#include <QtWidgets/QTreeView>
+#include <QtWidgets/QHeaderView>
+#include <QtCore/QModelIndex>
 
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_helper.h
index 980b5b06d..fca87511f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_helper.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_helper.h
@@ -4,8 +4,8 @@
 
 #include <ppmcommon_export.h>
 
-#include <QString>
-#include <QRegularExpression>
+#include <QtCore/QString>
+#include <QtCore/QRegularExpression>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_type_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_type_edit.cpp
index c42d2b39b..e1be4442e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_type_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_type_edit.cpp
@@ -9,7 +9,7 @@
 #include <ParticipantManagement/ppm_translation.h>
 #include <Common/participant_dis_helper.h>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_type_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_type_edit.h
index f652d6ace..00d5a8cfd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_type_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_dis_type_edit.h
@@ -9,9 +9,9 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
 #include <memory>
-#include <QSet>
-#include <QMap>
-#include <QWidget>
+#include <QtCore/QSet>
+#include <QtCore/QMap>
+#include <QtWidgets/QWidget>
 #include <QRegularExpressionValidator>
 
 class Ui_ParticipantDISTypeEdit;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_distype_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_distype_editor.h
index dde087783..a88878f98 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_distype_editor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_distype_editor.h
@@ -4,7 +4,7 @@
 
 #include <LtsWidgets/lts_frameless_dialog.h>
 
-#include <QMap>
+#include <QtCore/QMap>
 #include <memory>
 #include <Common/participant_dis_type_edit.h>
 #include <ParticipantManagement/ppm.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item.cpp
index f85bdff83..d5e9c0fe6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item.cpp
@@ -4,7 +4,7 @@
 #include "participant_edit_item.h"
 #include "ui_participant_edit_item_widget_base.h"
 #include <ParticipantManagement/ppm_translation.h>
-#include <QStandardItemModel>
+#include <QtGui/QStandardItemModel>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item_widget_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item_widget_base.cpp
index 41ff9b6f8..99379d448 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item_widget_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item_widget_base.cpp
@@ -11,7 +11,7 @@
 #include <SymbologyGui/symbol_modification_dialog.h>
 #include <Symbology/sidc_codec.h>
 #include <LtsUtilsSettings/settings.h>
-#include <QStandardItemModel>
+#include <QtGui/QStandardItemModel>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item_widget_base.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item_widget_base.h
index 2c990a906..d8fe452af 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item_widget_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item_widget_base.h
@@ -6,7 +6,7 @@
 #include <ParticipantManagement/ppm.hpp>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <LtsSession/lts_session.h>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 namespace AdvancedSymbology
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_model.cpp
index 75a032a72..acc5520bd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_model.cpp
@@ -12,9 +12,9 @@
 
 #include <algorithm>
 
-#include <QTreeView>
-#include <QHeaderView>
-#include <QTimer>
+#include <QtWidgets/QTreeView>
+#include <QtWidgets/QHeaderView>
+#include <QtCore/QTimer>
 #include <QToolTip>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_model.h
index 9cef36479..4847e83a4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_model.h
@@ -8,7 +8,7 @@
 #include <nglwidgets/ngltreeitem.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 
-#include <QSet>
+#include <QtCore/QSet>
 
 class QTreeView;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.cpp
index d2bd358d5..b6ab61e13 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.cpp
@@ -2,9 +2,9 @@
 
 #include "participant_firing_unit_validator.h"
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QVariant>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QVariant>
 #include <LtsUtilsSettings/settings.h>
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.h
index beac0736a..05ed3732b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include <ppmcommon_export.h>
 #include <ParticipantManagement/ppm.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_icon_model_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_icon_model_base.cpp
index 1d4334205..050c32875 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_icon_model_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_icon_model_base.cpp
@@ -4,10 +4,10 @@
 #include "participant_icon_model_base.h"
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
 #include <nglwidgets/ngltreeitem.h>
-#include <QHash>
-#include <QIcon>
-#include <QPointer>
-#include <QTimer>
+#include <QtCore/QHash>
+#include <QtGui/QIcon>
+#include <QtCore/QPointer>
+#include <QtCore/QTimer>
 
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_icon_model_base.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_icon_model_base.h
index cb14577c9..b2f91360a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_icon_model_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_icon_model_base.h
@@ -7,8 +7,8 @@
 #include <ParticipantManagement/ppm.hpp>
 #include <nglwidgets/ngltreemodel.h>
 
-#include <QColor>
-#include <QSharedPointer>
+#include <QtGui/QColor>
+#include <QtCore/QSharedPointer>
 
 
 namespace LtsSession
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_search_modal.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_search_modal.h
index 0eba6e68b..5804d983f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_search_modal.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_search_modal.h
@@ -4,7 +4,7 @@
 #pragma once
 #include <ppmcommon_export.h>
 #include <LtsWidgets/lts_frameless_dialog.h>
-#include <QMap>
+#include <QtCore/QMap>
 #include <memory>
 
 enum class DataModification;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_item.cpp
index 96c3f9dd7..8ace0f29a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_item.cpp
@@ -5,7 +5,7 @@
 #include "ui_participant_edit_item_widget_base.h"
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <ParticipantManagement/ppm_translation.h>
-#include <QStandardItemModel>
+#include <QtGui/QStandardItemModel>
 
 #include <LtsSession/lts_session_manager.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_item.h
index 0b1690f0c..139b001a3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_item.h
@@ -10,7 +10,7 @@
 #include <LtsWidgets/lts_frameless_dialog.h>
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsWidgets/lts_dialog_button_box.h>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_model.cpp
index e6b1ac532..b4830a2d8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_template_edit_model.cpp
@@ -6,7 +6,7 @@
 #include <ParticipantManagement/ppm_translation.h>
 #include "participant_firing_unit_validator.h"
 #include <nglwidgets/ngltreeitem.h>
-#include <QSet>
+#include <QtCore/QSet>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_time_point_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_time_point_model.cpp
index 42913c84f..ecead00e6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_time_point_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_time_point_model.cpp
@@ -3,8 +3,8 @@
 
 #include "participant_time_point_model.h"
 
-#include <QDateTime>
-#include <QTimer>
+#include <QtCore/QDateTime>
+#include <QtCore/QTimer>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_tree_edit_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_tree_edit_handler.cpp
index c906d032a..40dc14f18 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_tree_edit_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_tree_edit_handler.cpp
@@ -4,11 +4,11 @@
 #include "participant_tree_edit_handler.h"
 #include "participant_edit_model.h"
 
-#include <QAction>
-#include <QMenu>
-#include <QTreeView>
+#include <QtGui/QAction>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QTreeView>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_vulnerability_types.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_vulnerability_types.cpp
index 65148c87d..78a15763c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_vulnerability_types.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_vulnerability_types.cpp
@@ -4,8 +4,8 @@
 #include "participant_vulnerability_types.h"
 #include <ProjectDataManagement/pdm_to_string.h>
 #include <LtsUtilsSettings/settings.h>
-#include <QComboBox>
-#include <QDebug>
+#include <QtWidgets/QComboBox>
+#include <QtCore/QDebug>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_vulnerability_types.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_vulnerability_types.h
index 9aea72963..67b1c40a7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_vulnerability_types.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_vulnerability_types.h
@@ -6,7 +6,7 @@
 #include <ProjectDataManagement/pdm_enums.hpp>
 #include <ParticipantManagement/ppm_enums.hpp>
 #include <ppmcommon_export.h>
-#include <QVector>
+#include <QtCore/QVector>
 
 class QComboBox;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export.cpp
index 7776d6afb..e6a8a9427 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export.cpp
@@ -10,11 +10,11 @@
 #include <Common/participant_dis_helper.h>
 #include <ngltools/ngltools_filesystem.h>
 
-#include <QFileDialog>
-#include <QFileInfo>
-#include <QUrl>
-#include <QDate>
-#include <QUuid>
+#include <QtWidgets/QFileDialog>
+#include <QtCore/QFileInfo>
+#include <QtCore/QUrl>
+#include <QtCore/QDate>
+#include <QtCore/QUuid>
 
 #include <fstream>
 #include <LtsWidgets/lts_message_dialog.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import.cpp
index 23a52d18d..ce3c8d98f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import.cpp
@@ -12,15 +12,15 @@
 #include "msdl_import_show.h"
 #include "msdl_mapping_dialog.h"
 
-#include <QFileDialog>
-#include <QFile>
-#include <QUuid>
-#include <QTextStream>
-#include <QUrl>
+#include <QtWidgets/QFileDialog>
+#include <QtCore/QFile>
+#include <QtCore/QUuid>
+#include <QtCore/QTextStream>
+#include <QtCore/QUrl>
 #include <QAbstractMessageHandler>
-#include <QDomDocument>
+#include <QtXml/QDomDocument>
 #include <QMimeData>
-#include <QProcess>
+#include <QtCore/QProcess>
 #include <QtXmlPatterns/QXmlSchema>
 #include <QtXmlPatterns/QXmlSchemaValidator>
 
@@ -30,7 +30,7 @@
 #include <LtsSession/lts_session.h>
 #include <LtsUtilsSettings/settings.h>
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QDir>
+#include <QtCore/QDir>
 
 
 namespace msdl
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import.h
index 762153da2..15f9be69f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import.h
@@ -8,7 +8,7 @@
 #include "msdl_types.h"
 #include "zwmsmsdl_export.h"
 
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 #include <ParticipantManagement/Gui/Common/participant_edit_model.h>
 
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import_show.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import_show.cpp
index c3c53fa46..dc9fc8491 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import_show.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import_show.cpp
@@ -3,8 +3,8 @@
 
 #include "msdl_import_show.h"
 #include "ui_msdl_import_show.h"
-#include <QMenu>
-#include <QFile>
+#include <QtWidgets/QMenu>
+#include <QtCore/QFile>
 #include <LtsWidgets/lts_message_dialog.h>
 
 #include <nglwidgets/nglstandardbutton.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_types.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_types.cpp
index d4bef6176..ec9e41866 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_types.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_types.cpp
@@ -1,8 +1,8 @@
 
 
 #include "msdl_types.h"
-#include <QRegularExpression>
-#include <QStringList>
+#include <QtCore/QRegularExpression>
+#include <QtCore/QStringList>
 
 namespace msdl
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_types.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_types.h
index 64040a507..0838466ca 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_types.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_types.h
@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace msdl
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/ppm_msdl_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/ppm_msdl_edit.cpp
index 912151cef..409b38195 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/ppm_msdl_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/ppm_msdl_edit.cpp
@@ -5,14 +5,14 @@
 #include "msdl/msdl_import.h"
 #include "msdl_export.h"
 
-#include <QAction>
+#include <QtGui/QAction>
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
 #include <Common/participant_edit_model.h>
 #include <Common/participant_edit_item.h>
 #include <Common/participant_tree_edit_handler.h>
 #include <Common/participant_distype_editor.h>
 
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/participant_show.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/participant_show.cpp
index 1aafd8394..7c75885d0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/participant_show.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/participant_show.cpp
@@ -8,7 +8,7 @@
 #include <../Common/participant_tree_edit_handler.h>
 
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_view.cpp
index 7d5e4053b..9745e106a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_view.cpp
@@ -9,7 +9,7 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_planning_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_planning_model.h
index 09bb596ff..623e54bd2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_planning_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_planning_model.h
@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <nglwidgets/ngltreeitem.h>
 #include <ParticipantManagement/ppm_dtc.h>
-#include <QStringList>
+#include <QtCore/QStringList>
 
 
 #include <ParticipantManagement/Gui/Common/participant_edit_model.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_edit.cpp
index a4f35bbde..f31031508 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_edit.cpp
@@ -15,12 +15,12 @@
 #include <LtsSession/lts_session.h>
 #include <ParticipantManagement/logger.h>
 
-#include <QAction>
-#include <QHeaderView>
-#include <QJsonDocument>
-#include <QTableView>
-#include <QTimer>
-#include <QTreeView>
+#include <QtGui/QAction>
+#include <QtWidgets/QHeaderView>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QTableView>
+#include <QtCore/QTimer>
+#include <QtWidgets/QTreeView>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_orga_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_orga_model.h
index 94a35bae0..bc0bfd264 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_orga_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_orga_model.h
@@ -7,8 +7,8 @@
 #include <ParticipantManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
 
-#include <QSortFilterProxyModel>
-#include <QSet>
+#include <QtCore/QSortFilterProxyModel>
+#include <QtCore/QSet>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_organisation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_organisation.cpp
index 94b252ffb..fd5970904 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_organisation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_organisation.cpp
@@ -9,10 +9,10 @@
 #include <ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser_model.h>
 #include <ParticipantManagement/ppm_mime_datas.h>
 
-#include <QMenu>
-#include <QPainter>
-#include <QRect>
-#include <QMouseEvent>
+#include <QtWidgets/QMenu>
+#include <QtGui/QPainter>
+#include <QtCore/QRect>
+#include <QtGui/QMouseEvent>
 #include <LtsWidgets/lts_message_dialog.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_organisation.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_organisation.h
index 4a34687c7..1fcceb2d5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_organisation.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_organisation.h
@@ -19,7 +19,7 @@
 #include <LtsSession/lts_session.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
-#include <QItemDelegate>
+#include <QtWidgets/QItemDelegate>
 
 class QSortFilterProxyModel;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_pool_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_pool_model.cpp
index 9b41c84e7..a8ea40468 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_pool_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_pool_model.cpp
@@ -10,7 +10,7 @@
 #include <Symbology/symbol_data_to_render_role.h>
 
 #include <QMimeData>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/tactical_organisation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/tactical_organisation.cpp
index 9cdf199a5..cfd1eeb52 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/tactical_organisation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/tactical_organisation.cpp
@@ -10,8 +10,8 @@
 #include <ParticipantManagement/Gui/Common/participant_edit_model.h>
 #include <ParticipantManagement/Gui/Common/participant_search_modal.h>
 #include <LtsSession/lts_session.h>
-#include <QMenu>
-#include <QTreeView>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QTreeView>
 #include <Core/core_ftc.h>
 #include <LtsSession/lts_session_data.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_bite_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_bite_dialog.cpp
index a918518b7..52d74ed95 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_bite_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_bite_dialog.cpp
@@ -6,8 +6,8 @@
 #include "ui_participant_bite_dialog.h"
 #include <ngltools/ngltools_dtg.h>
 
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_bite_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_bite_dialog.h
index 7be85d07c..0003d0651 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_bite_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_bite_dialog.h
@@ -15,9 +15,9 @@
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
 
 
-#include <QJsonObject>
-#include <QVector>
-#include <QGridLayout>
+#include <QtCore/QJsonObject>
+#include <QtCore/QVector>
+#include <QtWidgets/QGridLayout>
 
 
 namespace Ui {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.cpp
index bbabb9994..1941b4bb8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.cpp
@@ -11,9 +11,9 @@
 
 #include <algorithm>
 
-#include <QTreeView>
-#include <QHeaderView>
-#include <QTimer>
+#include <QtWidgets/QTreeView>
+#include <QtWidgets/QHeaderView>
+#include <QtCore/QTimer>
 #include <QToolTip>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.h
index 65e32bd36..ac28e86b1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.h
@@ -8,7 +8,7 @@
 #include <nglwidgets/ngltreeitem.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 
-#include <QSet>
+#include <QtCore/QSet>
 
 
 class QTreeView;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_follow_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_follow_dialog.cpp
index 72de80ab3..3590bd729 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_follow_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_follow_dialog.cpp
@@ -4,7 +4,7 @@
 #include "participant_follow_dialog.h"
 #include "ui_participant_follow_dialog.h"
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_gear_restock_charge.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_gear_restock_charge.h
index 66bc15ad1..65e55d268 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_gear_restock_charge.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_gear_restock_charge.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 namespace Ui {
 class ParticipantGearRestockCharge;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog.cpp
index ef1372995..c0f14a03f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog.cpp
@@ -3,7 +3,7 @@
 #include <LtsUtilsSettings/settings.h>
 #include "participant_history_dialog.h"
 #include "ui_participant_history_dialog.h"
-#include <QDebug>
+#include <QtCore/QDebug>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp
index 72e6403b5..7883114b2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp
@@ -30,13 +30,13 @@
 
 #include <Services/AreaEffectSimulation/Utils/polygons.h>
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QTableWidgetItem>
-#include <QToolButton>
+#include <QtWidgets/QToolButton>
 #include <QTransform>
-#include <QMenu>
-#include <QColor>
-#include <QLabel>
+#include <QtWidgets/QMenu>
+#include <QtGui/QColor>
+#include <QtWidgets/QLabel>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_gui_plugin.cpp
index 8f4f21e8d..b3dd00382 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_gui_plugin.cpp
@@ -20,9 +20,9 @@
 #include <LtsUtilsSettings/settings.h>
 #include <LtsNotification/lts_notification.h>
 
-#include <QShortcut>
-#include <QApplication>
-#include <QDebug>
+#include <QtGui/QShortcut>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDebug>
 
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_ltd_gear_component.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_ltd_gear_component.cpp
index 0e059c786..5828528ac 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_ltd_gear_component.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_ltd_gear_component.cpp
@@ -3,7 +3,7 @@
 
 #include "participant_info_ltd_gear_component.h"
 
-#include <QTableWidget>
+#include <QtWidgets/QTableWidget>
 #include <ParticipantManagement/ppm.hpp>
 
 #include <LtsWidgets/lts_led_widget.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_ltd_gear_component.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_ltd_gear_component.h
index c4256f443..ada3e9612 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_ltd_gear_component.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_ltd_gear_component.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <ParticipantManagement/logger.h>
-#include <QMap>
+#include <QtCore/QMap>
 
 
 class QTableWidget;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_dialog.cpp
index 9f2d347de..e1aea0257 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_dialog.cpp
@@ -6,8 +6,8 @@
 
 #include "participant_info_table_add_dialog.h"
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QSortFilterProxyModel>
-#include <QMenu>
+#include <QtCore/QSortFilterProxyModel>
+#include <QtWidgets/QMenu>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_model.cpp
index f9d6be51a..c79d00b5e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_model.cpp
@@ -9,8 +9,8 @@
 #include <ProjectDataManagement/pdm_to_string.h>
 #include <ParticipantManagement/logger.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <QSet>
-#include <QTimer>
+#include <QtCore/QSet>
+#include <QtCore/QTimer>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_dialog.cpp
index 843226b3d..9db8f9615 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_dialog.cpp
@@ -4,7 +4,7 @@
 #include "participant_search_dialog.h"
 #include "ui_participant_search_dialog.h"
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_widget.h
index 5493a0497..f1346c3ff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_search_widget.h
@@ -2,8 +2,8 @@
 #define FORM1_H
 
 #include <LtsSession/lts_session.h>
-#include <QWidget>
-#include <QMap>
+#include <QtWidgets/QWidget>
+#include <QtCore/QMap>
 
 #include <ParticipantManagement/ppm.hpp>
 #include <ParticipantManagement/ppm_ftc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_injury_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_injury_dialog.h
index ed72f2ac6..050da6fb5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_injury_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_injury_dialog.h
@@ -20,8 +20,8 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
 
-#include <QWidget>
-#include <QButtonGroup>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QButtonGroup>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_shootback_area_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_shootback_area_model.cpp
index f850bb561..068d61d59 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_shootback_area_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_shootback_area_model.cpp
@@ -8,8 +8,8 @@
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ParticipantManagement/ppm_translation.h>
 
-#include <QApplication> 
-#include <QBuffer>
+#include <QtWidgets/QApplication> 
+#include <QtCore/QBuffer>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_target_config_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_target_config_dialog.cpp
index 2d24c0ff8..39a047863 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_target_config_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_target_config_dialog.cpp
@@ -4,8 +4,8 @@
 #include <utility>
 #include "ui_participant_target_config_dialog.h"
 #include <LtsSession/lts_session_data.h>
-#include <QTreeView>
-#include <QDebug>
+#include <QtWidgets/QTreeView>
+#include <QtCore/QDebug>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_target_config_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_target_config_dialog.h
index 94b10c923..a911fa0f3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_target_config_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_target_config_dialog.h
@@ -16,7 +16,7 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include "participant_shootback_area_model.h"
 
-#include <QItemDelegate>
+#include <QtWidgets/QItemDelegate>
 
 namespace Ui {
 class ParticipantTargetConfigurationDialog;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.cpp
index 2af91b86f..e9decb908 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.cpp
@@ -4,14 +4,14 @@
 #include "org_chart_main.h"
 #include <utility>
 #include "ui_org_chart_main.h"
-#include <QBuffer>
+#include <QtCore/QBuffer>
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
 #include <ParticipantManagement/ppm_translation.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <LtsWidgets/lts_drag_icon.h>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 #include <ParticipantManagement/Gui/Common/participant_edit_item.h>
 #include <Symbology/symbol_data_to_render_role.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.h
index caa217238..c2853220f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.h
@@ -22,7 +22,7 @@
 #endif
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
-#include <QPointer>
+#include <QtCore/QPointer>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main_helper.cpp
index a39cfadf1..979f2896d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main_helper.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main_helper.cpp
@@ -3,7 +3,7 @@
 
 #include "org_chart_main_helper.h"
 
-#include <QBuffer>
+#include <QtCore/QBuffer>
 
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main_helper.h
index f72ebf57b..89e6701c3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main_helper.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main_helper.h
@@ -12,9 +12,9 @@
 
 #include <LtsWidgets/lts_drag_icon.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.cpp
index f2509b318..8366f704f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.cpp
@@ -6,10 +6,10 @@
 
 #include <Symbology/symbol_data_to_render_role.h>
 
-#include <QFile>
+#include <QtCore/QFile>
 #include <QtWebEngine/QtWebEngine>
 #include <QtWebEngineWidgets/QWebEnginePage>
-#include <QJsonArray>
+#include <QtCore/QJsonArray>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.h
index ad59c624a..3dd5f2f0c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.h
@@ -3,7 +3,7 @@
 
 #pragma once
 #include <participant_org_chart_helper.h>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <QtWebChannel/QWebChannel>
 
 #include <ppmcommon_export.h>
@@ -14,7 +14,7 @@
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
 
 
-#include <QPointer>
+#include <QtCore/QPointer>
 
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart_helper.cpp
index 88ebe381b..b3b8ec67a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart_helper.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart_helper.cpp
@@ -3,9 +3,9 @@
 
 #include "participant_org_chart_helper.h"
 
-#include <QBuffer>
-#include <QJsonArray>
-#include <QJsonDocument>
+#include <QtCore/QBuffer>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart_helper.h
index 93b2d9c33..ec0924806 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart_helper.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart_helper.h
@@ -10,7 +10,7 @@
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
 #include <Symbology/bulk_renderer.h>
 
-#include <QJsonObject>
+#include <QtCore/QJsonObject>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection.cpp
index fc12bf293..49c6ee286 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection.cpp
@@ -23,11 +23,11 @@
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 
 
-#include <QTreeView>
-#include <QTableView>
-#include <QAction>
-#include <QHeaderView>
-#include <QTimer>
+#include <QtWidgets/QTreeView>
+#include <QtWidgets/QTableView>
+#include <QtGui/QAction>
+#include <QtWidgets/QHeaderView>
+#include <QtCore/QTimer>
 
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection_model.cpp
index 4ea57ba86..44c185e91 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection_model.cpp
@@ -11,9 +11,9 @@
 
 #include <algorithm>
 
-#include <QTreeView>
-#include <QHeaderView>
-#include <QTimer>
+#include <QtWidgets/QTreeView>
+#include <QtWidgets/QHeaderView>
+#include <QtCore/QTimer>
 #include <QToolTip>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection_model.h
index 7a0b67895..9e5765951 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection_model.h
@@ -9,7 +9,7 @@
 #include <nglwidgets/ngltreeitem.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 
-#include <QSet>
+#include <QtCore/QSet>
 
 
 class QTreeView;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser.cpp
index 1f875c09c..e0cd454a5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser.cpp
@@ -17,7 +17,7 @@
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
 
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_edit.cpp
index 5e792cfef..c0b04491d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_edit.cpp
@@ -9,11 +9,11 @@
 #include "participant_template_chooser_frameless.h"
 #include <ParticipantManagement/Gui/Common/participant_firing_unit_validator.h>
 
-#include <QMenu>
+#include <QtWidgets/QMenu>
 
 #include <nglwidgets/ngltreeitem.h>
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_templates_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_templates_gui_plugin.cpp
index 2d0e4fda3..df31d5df4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_templates_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_templates_gui_plugin.cpp
@@ -10,7 +10,7 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsSession/lts_session.h>
 
-#include <QGridLayout>
+#include <QtWidgets/QGridLayout>
 
 #include <ParticipantManagement/ppm_operator_rights.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_templates_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_templates_gui_plugin.h
index f026dfc9f..c56f08c55 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_templates_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_templates_gui_plugin.h
@@ -12,7 +12,7 @@
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <ParticipantManagement/ppm_org_chart_gui_plugin.h>
 
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment.cpp
index 3d0605c6f..3ed2146ab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment.cpp
@@ -6,10 +6,10 @@
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 #include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
 #include <LtsSession/lts_session_data.h>
-#include <QHeaderView>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtWidgets/QHeaderView>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 
 QString s_partyOpAssignStr = QStringLiteral("PartyIdsAssignedOperator");
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment.h
index 4de2e271d..2dfd3f1c1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment.h
@@ -14,7 +14,7 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include "operator_party_assignment_model.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment_model.cpp
index d21852822..c10cde99a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment_model.cpp
@@ -1,10 +1,10 @@
 #include "operator_party_assignment_model.h"
 
 #include <ParticipantManagement/ppm_translation.h>
-#include <QColor>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtGui/QColor>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment_model.h
index a1430c43d..966e58455 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment_model.h
@@ -6,8 +6,8 @@
 #include <ParticipantManagement/ppm.hpp>
 #include <ParticipantManagement/logger.h>
 
-#include <QSortFilterProxyModel>
-#include <QSet>
+#include <QtCore/QSortFilterProxyModel>
+#include <QtCore/QSet>
 
 #include <LtsWidgets/lts_abstract_table_model.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_edit.cpp
index 2dddaf083..cee4a442a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_edit.cpp
@@ -5,10 +5,10 @@
 #include "NGLLogger/INGLLogger.h"
 #include "ui_ppm_party_edit.h"
 
-#include <QColorDialog>
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QMessageBox>
+#include <QtWidgets/QColorDialog>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtWidgets/QMessageBox>
 #include <ParticipantManagement/ppm_translation.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_model.cpp
index d35aa05ac..1dd5846d7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_model.cpp
@@ -6,9 +6,9 @@
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 #include <LtsSession/lts_session_data.h>
 #include <ParticipantManagement/ppm_translation.h>
-#include <QColor>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtGui/QColor>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_view.cpp
index 64f4389e8..2380f4de0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_view.cpp
@@ -9,7 +9,7 @@
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox.cpp
index 14307d028..19b44f477 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox.cpp
@@ -2,7 +2,7 @@
 
 
 #include "ppm_combobox.h"
-#include <QComboBox>
+#include <QtWidgets/QComboBox>
 #include <ParticipantManagement/ppm_translation.h>
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox_foreign_gui_interface_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox_foreign_gui_interface_impl.cpp
index d4b5e62f4..e89a7baff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox_foreign_gui_interface_impl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_combobox_foreign_gui_interface_impl.cpp
@@ -7,7 +7,7 @@
 #include "ppm_party_selector.h"
 #include <ParticipantManagement/ppm_translation.h>
 #include <LtsWidgets/lts_combo_box.h>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QPainterPath>
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_party_selector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_party_selector.cpp
index 743fa1ee7..a421f5956 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_party_selector.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_party_selector.cpp
@@ -4,9 +4,9 @@
 
 #include "ppm_party_selector.h"
 #include <utility>
-#include <QCheckBox>
-#include <QHBoxLayout>
-#include <QPushButton>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QPushButton>
 #include <ParticipantManagement/ppm_translation.h>
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_party_selector.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_party_selector.h
index de01cee7e..b0a6791c0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_party_selector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PpmComboBox/ppm_party_selector.h
@@ -5,7 +5,7 @@
 
 #include <LtsWidgets/lts_frameless_dialog.h>
 #include <ParticipantManagement/ppm.hpp>
-#include <QSet>
+#include <QtCore/QSet>
 #include "ui_ppm_party_selector.h"
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/ppm_saab_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/ppm_saab_edit.cpp
index cdb2961fa..56fabd209 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/ppm_saab_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/ppm_saab_edit.cpp
@@ -5,14 +5,14 @@
 #include "saab/saab_import.h"
 #include "saab_export.h"
 
-#include <QAction>
+#include <QtGui/QAction>
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
 #include <Common/participant_edit_model.h>
 #include <Common/participant_edit_item.h>
 #include <Common/participant_tree_edit_handler.h>
 #include <Common/participant_distype_editor.h>
 
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.cpp
index 7128a9325..8911f7fd0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.cpp
@@ -8,11 +8,11 @@
 #include "saab_map_type.h"
 #include "saab_map_party.h"
 
-#include <QFileDialog>
-#include <QXmlStreamWriter>
-#include <QXmlStreamReader>
-#include <QDateTime>
-#include <QUuid>
+#include <QtWidgets/QFileDialog>
+#include <QtCore/QXmlStreamWriter>
+#include <QtCore/QXmlStreamReader>
+#include <QtCore/QDateTime>
+#include <QtCore/QUuid>
 
 #include <LtsSession/lts_session.h>
 #include <LtsUtils/LtsUtilsSettings/settings.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.h
index b3c9e75c1..79d26e5b4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.h
@@ -11,7 +11,7 @@
 #include <ExerciseManagement/exm.hpp>
 #include <ParticipantManagement/ppm.hpp>
 
-#include <QFile>
+#include <QtCore/QFile>
 
 class QXmlStreamWriter;
 class QXmlStreamReader;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.cpp
index 089fdda07..6b76b800a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.cpp
@@ -7,7 +7,7 @@
 #include "saab_logging.h"
 #include "saab_import_show.h"
 
-#include <QFileDialog>
+#include <QtWidgets/QFileDialog>
 
 #include <ngltools/ngltools_filesystem.h>
 #include <Common/participant_dis_helper.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.h
index 19bb7a0b7..eb605794c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.h
@@ -9,7 +9,7 @@
 #include "saab_types.h"
 #include "zwmssaab_export.h"
 
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 #include <ParticipantManagement/Gui/Common/participant_edit_model.h>
 
 #include <memory>
@@ -23,8 +23,8 @@
 #include <ParticipantManagement/ppm_templates_gui_plugin_interface.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 
-#include <QXmlStreamReader>
-#include <QFile>
+#include <QtCore/QXmlStreamReader>
+#include <QtCore/QFile>
 #include "saab_xml_strings.h"
 
 class QXmlStreamReader;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import_show.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import_show.cpp
index a340e22fc..0805d3433 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import_show.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import_show.cpp
@@ -3,8 +3,8 @@
 
 #include "saab_import_show.h"
 #include "ui_saab_import_show.h"
-#include <QMenu>
-#include <QFile>
+#include <QtWidgets/QMenu>
+#include <QtCore/QFile>
 #include <LtsWidgets/lts_message_dialog.h>
 
 #include <nglwidgets/nglstandardbutton.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_types.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_types.cpp
index 64b57bf79..66496eb4d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_types.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_types.cpp
@@ -2,9 +2,9 @@
 
 #include "saab_types.h"
 #include <utility>
-#include <QRegularExpression>
-#include <QStringList>
-#include <QXmlStreamWriter>
+#include <QtCore/QRegularExpression>
+#include <QtCore/QStringList>
+#include <QtCore/QXmlStreamWriter>
 #include "saab_xml_strings.h"
 
 namespace saab
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_types.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_types.h
index b2c5097e4..72c441881 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_types.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_types.h
@@ -1,9 +1,9 @@
 
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 #include <ParticipantManagement/ppm.hpp>
-#include <QVector>
+#include <QtCore/QVector>
 
 class QXmlStreamWriter;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_xml_strings.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_xml_strings.h
index bb3cce559..e0f785ff1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_xml_strings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_xml_strings.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace saab
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_model.cpp
index 07ed7c55a..9d1f87464 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_model.cpp
@@ -9,7 +9,7 @@
 #include <ParticipantManagement/Gui/Common/participant_dis_helper.h>
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
 
-#include <QBuffer>
+#include <QtCore/QBuffer>
 
 
 namespace dds
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_view.cpp
index d82d246d3..5aa8dc8c3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_view.cpp
@@ -7,7 +7,7 @@
 #include "ppm_type_edit.h"
 
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_edit_dialog.cpp
index e470b647a..6b409ad10 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_edit_dialog.cpp
@@ -17,8 +17,8 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <LtsSession/lts_session.h>
 
-#include <QInputDialog>
-#include <QMessageBox>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QMessageBox>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_list_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_list_model.cpp
index 19c6a1412..216236019 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_list_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_list_model.cpp
@@ -11,10 +11,10 @@
 #include <ExerciseManagement/exm_data_plugin_interface.h>
 #include <ExerciseManagement/exm_dtc.h>
 #include <ngltools/ngltools_dtg.h>
-#include <QBuffer>
+#include <QtCore/QBuffer>
 #include <QMimeData>
-#include <QSet>
-#include <QTimer>
+#include <QtCore/QSet>
+#include <QtCore/QTimer>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/ppm_gui_combobox_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/ppm_gui_combobox_plugin_interface.h
index 99a785e97..e4c77edb0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/ppm_gui_combobox_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/ppm_gui_combobox_plugin_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QSet>
+#include <QtCore/QSet>
 #include <functional>
 #include <ParticipantManagement/ppm_enums.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/ppm_participant_info_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/ppm_participant_info_gui_plugin_interface.h
index 2843d08c7..6e49a29a7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/ppm_participant_info_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/ppm_participant_info_gui_plugin_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QVector>
+#include <QtCore/QVector>
 class QJsonObject;
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/lookup_symbol_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/lookup_symbol_manager.cpp
index 0ff725bba..be57dda12 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/lookup_symbol_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/lookup_symbol_manager.cpp
@@ -17,7 +17,7 @@
 
 #include <QtCore/QPointer>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace PlanEditor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor_internal.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor_internal.h
index 450a4b17e..f12fdd914 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor_internal.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor_internal.h
@@ -64,7 +64,7 @@
 #include <QtWidgets/QToolButton>
 #include <QtWebEngineWidgets/QWebEngineView>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 
 #include <QtWidgets/QTableView>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor_session.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor_session.h
index ca230b82b..9cbfb8c9d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor_session.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor_session.h
@@ -13,7 +13,7 @@
 #include <LtsSession/lts_session.h>
 
 #include <QtWidgets/QWidget>
-#include <QPointer>
+#include <QtCore/QPointer>
 
 
 namespace PlanEditor
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/TopicEditor/topic_editor.cpp
index 044ca1553..de9788ac2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/TopicEditor/topic_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/TopicEditor/topic_editor.cpp
@@ -9,11 +9,11 @@
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <TopicEditorBase/topic_previewer.h>
 
-#include <QInputDialog>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QMessageBox>
-#include <QPushButton>
+#include <QtWidgets/QInputDialog>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QPushButton>
 
 
 namespace PlanOverlaysPlugin
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/TopicEditor/topic_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/TopicEditor/topic_editor.h
index d007037cc..493609913 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/TopicEditor/topic_editor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/TopicEditor/topic_editor.h
@@ -8,7 +8,7 @@
 #include <LtsSession/lts_session.h>
 #include <TopicEditorBase/topic_editor_base.h>
 
-#include <QJsonArray>
+#include <QtCore/QJsonArray>
 
 
 namespace Ui { class PlanTopicEditor; }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlay_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlay_dialog.cpp
index d338717a1..cabf998e2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlay_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlay_dialog.cpp
@@ -14,7 +14,7 @@
 
 #include <Viewer/LtsFileDialog/lts_file_dialog_widget.h>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QDesktopWidget>
 #include <QtWidgets/QDialog>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlay_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlay_model.cpp
index fbd6d138b..ed6e8457c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlay_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlay_model.cpp
@@ -4,10 +4,10 @@
 #include "plan_overlay_model.h"
 #include <utility>
 
-#include <QByteArray>
-#include <QDataStream>
+#include <QtCore/QByteArray>
+#include <QtCore/QDataStream>
 #include <QMimeData>
-#include <QJsonArray>
+#include <QtCore/QJsonArray>
 
 #include <FileManagement/flm_dtc.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlay_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlay_model.h
index 67c3a9cd4..40bd97b16 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlay_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlay_model.h
@@ -6,8 +6,8 @@
 #include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
 #include <NGLLogger/INGLLogger.h>
 
-#include <QAbstractItemModel>
-#include <QJsonObject>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QJsonObject>
 
 
 namespace PlanOverlaysPlugin
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.cpp
index 0420c5022..205c1c486 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.cpp
@@ -31,16 +31,16 @@
 #include <Viewer/SituationMap/Map/map.h>
 #include <Viewer/SituationMap/GeometryModel/geometry_model_factory.h>
 
-#include <QCoreApplication>
-#include <QDateTime>
-#include <QFile>
-#include <QPointer>
-#include <QStandardPaths>
-#include <QHBoxLayout>
-#include <QMainWindow>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDateTime>
+#include <QtCore/QFile>
+#include <QtCore/QPointer>
+#include <QtCore/QStandardPaths>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QMainWindow>
 #include <QtGlobal>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #include <iostream>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.h
index cffafc122..ea1c136be 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.h
@@ -12,7 +12,7 @@
 #include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace Core
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/plan_overlays_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/plan_overlays_plugin_interface.h
index 344a536df..d0ef11a82 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/plan_overlays_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/plan_overlays_plugin_interface.h
@@ -6,8 +6,8 @@
 #include <PluginInterfaces/topic_replay_interface.h>
 #include <TopicEditorBase/topic_editor_interface.h>
 
-#include <QJsonArray>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
 
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_edit_dialog.cpp
index 78f628b76..d1dc3a610 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_edit_dialog.cpp
@@ -9,7 +9,7 @@
 #include <ngltools/ngltools_dtg.h>
 #include <PresentationManagement/pre_translation.h>
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 namespace PresentationManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_model.cpp
index af159a87b..cbd7739ef 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_model.cpp
@@ -6,7 +6,7 @@
 #include <ngltools/ngltools_dtg.h>
 #include <PresentationManagement/pre_translation.h>
 
-#include <QGuiApplication>
+#include <QtGui/QGuiApplication>
 #include <QPalette>
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/toolz.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/toolz.h
index 845e44669..ccc8d3105 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/toolz.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/toolz.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <preguicommon_export.h>
-#include <QString>
+#include <QtCore/QString>
 
 
 namespace LtsScriptTimeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_dialog.cpp
index 4fabcc440..3d32a0aa4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_dialog.cpp
@@ -10,7 +10,7 @@
 #include <LtsSession/lts_session_data.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 namespace PresentationManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_mobile_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_mobile_dialog.cpp
index 8843de45f..aa7a13938 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_mobile_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_mobile_dialog.cpp
@@ -18,11 +18,11 @@
 #include <AudioVideoManagement/ava_session.h>
 
 #include <QHostInfo>
-#include <QDateTime>
-#include <QJsonDocument>
-#include <QProgressBar>
-#include <QLabel>
-#include <QVBoxLayout>
+#include <QtCore/QDateTime>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QProgressBar>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QVBoxLayout>
 
 namespace PresentationManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_mobile_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_mobile_dialog.h
index 5550483b9..1e9a21bc7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_mobile_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_mobile_dialog.h
@@ -15,7 +15,7 @@
 #include <Plugins/AudioVideoManagement/avm_data_plugin_interface.h>
 #include <AudioVideoManagement/ava_types.h>
 
-#include <QProgressDialog>
+#include <QtWidgets/QProgressDialog>
 
 
 namespace AudioVideoManagement {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/ScriptChooser/script_chooser.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/ScriptChooser/script_chooser.cpp
index 5bf899140..8441d562a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/ScriptChooser/script_chooser.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/ScriptChooser/script_chooser.cpp
@@ -10,9 +10,9 @@
 #include <LtsWidgets/lts_global_wait_dialog.h>
 #include <LtsWidgets/lts_message_dialog.h>
 #include <Plugins/PresentationManagement/Gui/Common/pre_model.h>
-#include <QMessageBox>
-#include <QCloseEvent>
-#include <QTimer>
+#include <QtWidgets/QMessageBox>
+#include <QtGui/QCloseEvent>
+#include <QtCore/QTimer>
 
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/ScriptChooser/script_chooser.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/ScriptChooser/script_chooser.h
index f264c378f..e2cf2d64b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/ScriptChooser/script_chooser.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/ScriptChooser/script_chooser.h
@@ -9,7 +9,7 @@
 #include <LtsWidgets/lts_frameless_dialog.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <Services/PresentationManagement/pre_ftc.h>
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 
 namespace Ui { class ScriptChooser; }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/db_reader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/db_reader.cpp
index 720495121..a824c1bd1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/db_reader.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/db_reader.cpp
@@ -8,12 +8,12 @@
 #include <LtsPluginManager/lts_plugin_loader.h>
 #include <ngldb/nsqlquery.h>
 #include <ngldb/dbtransaction.h>
-#include <QSqlDriver>
-#include <QSqlError>
-#include <QSqlField>
-#include <QSqlIndex>
-#include <QSqlRecord>
-#include <QVariant>
+#include <QtSql/QSqlDriver>
+#include <QtSql/QSqlError>
+#include <QtSql/QSqlField>
+#include <QtSql/QSqlIndex>
+#include <QtSql/QSqlRecord>
+#include <QtCore/QVariant>
 
 namespace TakeHomePackageGenerator
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/db_reader.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/db_reader.h
index e4165a190..fed9db42f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/db_reader.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/db_reader.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <QVector>
-#include <QSqlDatabase>
+#include <QtCore/QVector>
+#include <QtSql/QSqlDatabase>
 
 #include <PluginInterfaces/record_replay_plugin.h>
 #include <PresentationManagement/logger.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/dvd_writer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/dvd_writer.cpp
index 049178476..29042e6fe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/dvd_writer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/dvd_writer.cpp
@@ -3,7 +3,7 @@
 
 #include "dvd_writer.h"
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
 
 namespace TakeHomePackageGenerator
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/dvd_writer.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/dvd_writer.h
index e86d791a3..446c21bde 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/dvd_writer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/dvd_writer.h
@@ -6,11 +6,11 @@
 #include <PresentationManagement/logger.h>
 #include "export.h"
 
-#include <QObject>
-#include <QString>
-#include <QProcess>
-#include <QPointer>
-#include <QProgressDialog>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QProcess>
+#include <QtCore/QPointer>
+#include <QtWidgets/QProgressDialog>
 
 namespace TakeHomePackageGenerator
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_process.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_process.cpp
index aa8c4b0f3..f93e3f00d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_process.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_process.cpp
@@ -4,10 +4,10 @@
 #include "export_process.h"
 #include <utility>
 #include "export_step.h"
-#include <QDir>
-#include <QJsonDocument>
+#include <QtCore/QDir>
+#include <QtCore/QJsonDocument>
 #include <QJsonParseError>
-#include <QProgressDialog>
+#include <QtWidgets/QProgressDialog>
 #include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
 #include <Plugins/AssetManagement/asm_data_plugin_interface.h>
 #include <ngltools/ngltools_filesystem.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_process.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_process.h
index 466a3db26..352b9ed13 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_process.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_process.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QJsonArray>
+#include <QtCore/QObject>
+#include <QtCore/QJsonArray>
 
 #include <preguiscriptcommon_export.h>
 #include <Plugins/PresentationManagement/Gui/Common/topic_assignment.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_step.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_step.h
index 1bd836ff2..7aa7e5f42 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_step.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export_step.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #include <preguiscriptcommon_export.h>
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 
 #include <LtsScriptTimeline/track_entry.h>
 #include <PluginInterfaces/topic_replay_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/situation_exporter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/situation_exporter.cpp
index 2dac37d29..b784cd301 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/situation_exporter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/situation_exporter.cpp
@@ -9,13 +9,13 @@
 #include <ngldb/dbtransaction.h>
 #include <ngldb/nsqlquery.h>
 
-#include <QFile>
-#include <QSqlRecord>
-#include <QSqlError>
-#include <QSqlField>
-#include <QSqlIndex>
-#include <QSqlDatabase>
-#include <QVariant>
+#include <QtCore/QFile>
+#include <QtSql/QSqlRecord>
+#include <QtSql/QSqlError>
+#include <QtSql/QSqlField>
+#include <QtSql/QSqlIndex>
+#include <QtSql/QSqlDatabase>
+#include <QtCore/QVariant>
 
 
 namespace TakeHomePackageGenerator
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/situation_exporter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/situation_exporter.h
index 9dfeda17b..2efa3f984 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/situation_exporter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/situation_exporter.h
@@ -3,8 +3,8 @@
 #pragma once
 
 #include <PresentationManagement/logger.h>
-#include <QString>
-#include <QSqlDatabase>
+#include <QtCore/QString>
+#include <QtSql/QSqlDatabase>
 
 namespace TakeHomePackageGenerator
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/topic_designer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/topic_designer.cpp
index ba301c549..e86530422 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/topic_designer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/topic_designer.cpp
@@ -3,19 +3,19 @@
 
 #include "topic_designer.h"
 
-#include <QDebug>
-#include <QPaintEvent>
-#include <QPainter>
-#include <QPen>
-#include <QBrush>
-#include <QColor>
-#include <QPoint>
-#include <QRect>
-#include <QSize>
+#include <QtCore/QDebug>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
+#include <QtGui/QBrush>
+#include <QtGui/QColor>
+#include <QtCore/QPoint>
+#include <QtCore/QRect>
+#include <QtCore/QSize>
 #include <QCursor>
-#include <QTimer>
-#include <QScrollArea>
-#include <QScrollBar>
+#include <QtCore/QTimer>
+#include <QtWidgets/QScrollArea>
+#include <QtWidgets/QScrollBar>
 
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/topic_designer.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/topic_designer.h
index 2ad084456..be2379e1b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/topic_designer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/topic_designer.h
@@ -6,11 +6,11 @@
 #include <preguiscriptcommon_export.h>
 #include <TopicEditorBase/topic_editor_utils.h>
 
-#include <QWidget>
-#include <QVector>
+#include <QtWidgets/QWidget>
+#include <QtCore/QVector>
 #include <QLinkedList>
-#include <QPointer>
-#include <QScrollArea>
+#include <QtCore/QPointer>
+#include <QtWidgets/QScrollArea>
 
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_journal_types.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_journal_types.cpp
index d2f1914ed..58a41d44e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_journal_types.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_journal_types.cpp
@@ -1,6 +1,6 @@
 #include "pre_journal_types.h"
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <ngltools/ngltools_dtg.h>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_journal_types.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_journal_types.h
index 97b2dbc5f..a1868dd6c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_journal_types.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_journal_types.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <QCoreApplication>
-#include <QVector>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QVector>
 
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_screen.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_screen.cpp
index e7ec73dfb..2f8ade837 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_screen.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_screen.cpp
@@ -1,7 +1,7 @@
 #include "pre_screen.h"
 
 #include <QStyleOption>
-#include <QPainter>
+#include <QtGui/QPainter>
 
 
 Screen::Screen()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_screen.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_screen.h
index 4b24686ef..83fe5e51f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_screen.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_screen.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 
 class Screen : public QWidget
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.cpp
index 546d666fe..562f00fff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.cpp
@@ -64,19 +64,19 @@
 #include <Plugins/Evaluations/evl_gui_plugin_interface.h>
 #include <Plugins/PlanOverlays/plan_overlays_plugin_interface.h>
 
-#include <QCoreApplication>
-#include <QStringList>
-#include <QDateTime>
-#include <QDir>
-#include <QFileDialog>
-#include <QJsonDocument>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QStringList>
+#include <QtCore/QDateTime>
+#include <QtCore/QDir>
+#include <QtWidgets/QFileDialog>
+#include <QtCore/QJsonDocument>
 #include <QJsonParseError>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonValue>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonValue>
 #include <QMutableVectorIterator>
-#include <QPoint>
-#include <QTimer>
+#include <QtCore/QPoint>
+#include <QtCore/QTimer>
 
 
 using namespace LtsScriptTimeline;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.h
index 01a533301..9f2ae5359 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.h
@@ -28,9 +28,9 @@
 #include <Plugins/SituationReplay/srp_gui_plugin_interface.h>
 #include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
 
-#include <QString>
-#include <QStringList>
-#include <QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QMap>
 #include <functional>
 #include <memory>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_gui_plugin.cpp
index eb3e3b262..5a165ddcc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_gui_plugin.cpp
@@ -31,14 +31,14 @@
 #include <Services/PresentationManagement/pre_operator_rights.h>
 #include <PresentationManagement/pre_dtc.h>
 
-#include <QDir>
+#include <QtCore/QDir>
 #include <QJsonParseError>
-#include <QJsonDocument>
-#include <QProgressDialog>
-#include <QTimer>
-#include <QFileDialog>
-#include <QVBoxLayout>
-#include <QDateTime>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QProgressDialog>
+#include <QtCore/QTimer>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QVBoxLayout>
+#include <QtCore/QDateTime>
 
 #include <stdlib.h> 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_storyboard.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_storyboard.h
index efd411c0c..522c4d952 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_storyboard.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_storyboard.h
@@ -6,7 +6,7 @@
 #include <LtsScriptTimeline/track_entry.h>
 #include <LtsSession/lts_session.h>
 
-#include <QVector>
+#include <QtCore/QVector>
 
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_topic_designer_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_topic_designer_dialog.h
index 82d73c491..8dbdb1c35 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_topic_designer_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_topic_designer_dialog.h
@@ -5,7 +5,7 @@
 
 #include <LtsWidgets/lts_dialog.h>
 
-#include <QVector>
+#include <QtCore/QVector>
 
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_journal_types.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_journal_types.cpp
index 29d9a618d..004ec1a1b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_journal_types.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_journal_types.cpp
@@ -1,6 +1,6 @@
 #include "pre_journal_types.h"
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <ngltools/ngltools_dtg.h>
 #include <Common/LtsTimeline/timeline_utils.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_journal_types.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_journal_types.h
index f38909891..d7c69c189 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_journal_types.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_journal_types.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <QCoreApplication>
-#include <QVector>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QVector>
 
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen.cpp
index 22bdba93d..ac667c159 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen.cpp
@@ -2,7 +2,7 @@
 
 #include <LtsUtilsGui/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h>
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOption>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_recorder.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_recorder.cpp
index 8757aa482..96027469a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_recorder.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_recorder.cpp
@@ -5,10 +5,10 @@
 #include <utility>
 #include "pre_screen.h"
 #include "pre_topic_item.h"
-#include <QProcess>
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QJsonObject>
+#include <QtCore/QProcess>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
 
 namespace PresentationManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_recorder.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_recorder.h
index c83f51716..1e2ea5f31 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_recorder.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_recorder.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QTemporaryDir>
-#include <QSet>
+#include <QtCore/QSet>
 #include <Services/PresentationManagement/logger.h>
 #include "pre_topic_recorder.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_shotter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_shotter.cpp
index 40dd579df..5843c0b91 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_shotter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_shotter.cpp
@@ -3,13 +3,13 @@
 
 #include "pre_screen_shotter.h"
 #include <utility>
-#include <QProcess>
+#include <QtCore/QProcess>
 #include "pre_screen.h"
 #include <limits>
 #include "pre_topic_item.h"
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
 
 namespace PresentationManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_shotter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_shotter.h
index 754f9a587..3c5fe98a0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_shotter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_shotter.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QTemporaryDir>
-#include <QSet>
+#include <QtCore/QSet>
 #include <Services/PresentationManagement/logger.h>
 #include "pre_topic_shotter.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_delegate.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_delegate.cpp
index 141960f19..75abf34d6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_delegate.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_delegate.cpp
@@ -5,10 +5,10 @@
 #include <LtsTimeline/timeline_header_view.h>
 #include <LtsTimeline/timeline_view.h>
 
-#include <QApplication>
-#include <QGuiApplication>
-#include <QPainter>
-#include <QDebug>
+#include <QtWidgets/QApplication>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QPainter>
+#include <QtCore/QDebug>
 
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.cpp
index f98e44866..0921c7e8e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.cpp
@@ -74,23 +74,23 @@
 #include <Common2Core/tpm_tools.h>
 #include <LtsUtils/LtsUtilsCore/await.h>
 
-#include <QCoreApplication>
-#include <QDateTime>
-#include <QDir>
-#include <QFileDialog>
-#include <QInputDialog>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDateTime>
+#include <QtCore/QDir>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QInputDialog>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QJsonValue>
-#include <QMenu>
+#include <QtCore/QJsonValue>
+#include <QtWidgets/QMenu>
 #include <QMutableVectorIterator>
-#include <QPoint>
-#include <QStringList>
-#include <QTimer>
+#include <QtCore/QPoint>
+#include <QtCore/QStringList>
+#include <QtCore/QTimer>
 #include <QMapIterator>
-#include <QSaveFile>
+#include <QtCore/QSaveFile>
 #include <QEventLoop>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.h
index ec4c37bea..4ec5a3f51 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.h
@@ -27,9 +27,9 @@
 #include <functional>
 #include <memory>
 
-#include <QString>
-#include <QStringList>
-#include <QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QMap>
 #include <QTemporaryDir>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog_drag_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog_drag_handler.cpp
index f4d28428b..e265ff926 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog_drag_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog_drag_handler.cpp
@@ -6,12 +6,12 @@
 #include <LtsTimeline/timeline_widget.h>
 #include <TopicEditorBase/topic_editor_utils.h>
 
-#include <QApplication>
-#include <QDebug>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDebug>
 #include <QDrag>
 #include <QMimeData>
-#include <QMouseEvent>
-#include <QTimer>
+#include <QtGui/QMouseEvent>
+#include <QtCore/QTimer>
 
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog_resize_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog_resize_handler.cpp
index 8dd09e42a..51bb8339c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog_resize_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog_resize_handler.cpp
@@ -5,8 +5,8 @@
 
 #include <LtsTimeline/timeline_view.h>
 
-#include <QDebug>
-#include <QTimer>
+#include <QtCore/QDebug>
+#include <QtCore/QTimer>
 
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog_select_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog_select_handler.cpp
index 56a78b370..001089851 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog_select_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog_select_handler.cpp
@@ -4,7 +4,7 @@
 #include <QToolTip>
 
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_model.cpp
index 923ee38ce..e09cd533f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_model.cpp
@@ -10,9 +10,9 @@
 #include <LtsTimeline/timeline_widget.h>
 #include <Services/PresentationManagement/logger.h>
 
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_timeline_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_timeline_gui_plugin.cpp
index ee524bc1f..3d598c1be 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_timeline_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_timeline_gui_plugin.cpp
@@ -36,15 +36,15 @@
 
 #include <stdlib.h> 
 
-#include <QDir>
+#include <QtCore/QDir>
 #include <QJsonParseError>
-#include <QJsonDocument>
-#include <QProgressDialog>
-#include <QTimer>
-#include <QFileDialog>
-#include <QVBoxLayout>
-#include <QDateTime>
-#include <QDebug>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QProgressDialog>
+#include <QtCore/QTimer>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QVBoxLayout>
+#include <QtCore/QDateTime>
+#include <QtCore/QDebug>
 
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_storyboard.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_storyboard.cpp
index c95e8e807..f4fb5059e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_storyboard.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_storyboard.cpp
@@ -4,13 +4,13 @@
 #include <LtsPrinting/printing.h>
 #include "pre_script_dialog_select_handler.h"
 
-#include <QDir>
-#include <QLabel>
-#include <QJsonArray>
+#include <QtCore/QDir>
+#include <QtWidgets/QLabel>
+#include <QtCore/QJsonArray>
 #include <QTextTable>
-#include <QFileDialog>
+#include <QtWidgets/QFileDialog>
 #include <QPrinter>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QPrintDialog>
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_storyboard.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_storyboard.h
index fbea3a345..aa9346638 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_storyboard.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_storyboard.h
@@ -6,8 +6,8 @@
 #include <LtsWidgets/lts_dialog.h>
 #include "pre_topic_item.h"
 
-#include <QTableWidget>
-#include <QVector>
+#include <QtWidgets/QTableWidget>
+#include <QtCore/QVector>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_designer_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_designer_dialog.h
index 82d73c491..8dbdb1c35 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_designer_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_designer_dialog.h
@@ -5,7 +5,7 @@
 
 #include <LtsWidgets/lts_dialog.h>
 
-#include <QVector>
+#include <QtCore/QVector>
 
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_item.cpp
index b5c4b9acd..ff0e0f419 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_item.cpp
@@ -4,15 +4,15 @@
 
 #include <PresentationManagement/pre.hpp>
 
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QPainter>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
 
 
 #include <LtsTimeline/timeline_utils.h>
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_item.h
index 807723798..decaf69e9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_item.h
@@ -7,7 +7,7 @@
 #include <PluginInterfaces/topic_replay_interface.h>
 #include <TopicEditorBase/topic_editor_utils.h>
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.cpp
index 31fcf92fc..d99e95ad2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.cpp
@@ -6,8 +6,8 @@
 
 #include <LtsUtils/LtsUtilsCore/await.h>
 
-#include <QFile>
-#include <QThread>
+#include <QtCore/QFile>
+#include <QtCore/QThread>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.h
index 373cf88ea..2943cc5e0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <QObject>
-#include <QTemporaryFile>
-#include <QProcess>
+#include <QtCore/QObject>
+#include <QtCore/QTemporaryFile>
+#include <QtCore/QProcess>
 #include <Services/PresentationManagement/logger.h>
 
 class Screen;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_shotter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_shotter.cpp
index f0a09fb29..31df833af 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_shotter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_shotter.cpp
@@ -3,10 +3,10 @@
 
 #include "pre_topic_shotter.h"
 #include "pre_screen.h"
-#include <QFile>
-#include <QThread>
-#include <QScreen>
-#include <QTimer>
+#include <QtCore/QFile>
+#include <QtCore/QThread>
+#include <QtGui/QScreen>
+#include <QtCore/QTimer>
 
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_shotter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_shotter.h
index 9a43de7bc..87ef863f4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_shotter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_shotter.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <QObject>
-#include <QTemporaryFile>
-#include <QProcess>
+#include <QtCore/QObject>
+#include <QtCore/QTemporaryFile>
+#include <QtCore/QProcess>
 #include <Services/PresentationManagement/logger.h>
 
 class Screen;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_utils.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_utils.h
index 04b17d924..c3deaa839 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_utils.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_utils.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QVector>
+#include <QtCore/QVector>
 
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/pre_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/pre_gui_plugin_interface.h
index a92a897a5..0ba6c860e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/pre_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/pre_gui_plugin_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/pre_presentation_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/pre_presentation_gui_plugin_interface.h
index a1dffc3e0..a0eea7803 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/pre_presentation_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/pre_presentation_gui_plugin_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/pre_script_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/pre_script_gui_plugin_interface.h
index dd5595b06..c18e59461 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/pre_script_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/pre_script_gui_plugin_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/pre_script_timeline_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/pre_script_timeline_gui_plugin_interface.h
index 431fdee33..56f80f90b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/pre_script_timeline_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/pre_script_timeline_gui_plugin_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.cpp
index 24a4b2ad2..31a525a75 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.cpp
@@ -12,16 +12,16 @@
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
 
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 #include <LtsSession/lts_session.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <FileManagement/flm_translation.h>
 
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
 #ifdef BUILD_WITH_EXTERNAL_DDS
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.h
index 9dc667a85..190c43157 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.h
@@ -5,7 +5,7 @@
 
 #include <memory>
 #include <vector>
-#include <QSet>
+#include <QtCore/QSet>
 
 namespace Core {
 class FunctionReplyObject;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.cpp
index d9c2d6115..b77ae052b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.cpp
@@ -6,9 +6,9 @@
 
 #ifdef BUILD_WITH_EXTERNAL_DDS
 
-#include <QIcon>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtGui/QIcon>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
 namespace ProjectDataManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.h
index 1aa347c9b..fee0c7206 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <LtsWidgets/lts_abstract_table_model.h>
-#include <QSet>
+#include <QtCore/QSet>
 
 #ifdef BUILD_WITH_EXTERNAL_DDS
 #include <ProjectDataManagement/pdm_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.cpp
index a38be9248..be16b1b28 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.cpp
@@ -6,9 +6,9 @@
 
 #ifdef BUILD_WITH_EXTERNAL_DDS
 
-#include <QCheckBox>
-#include <QHBoxLayout>
-#include <QPushButton>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QPushButton>
 #include <ProjectDataManagement/pdm_translation.h>
 #include <LtsUtilsCore/json_object.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.h
index 5298dc055..ddf5f3db5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.h
@@ -6,7 +6,7 @@
 #include <LtsWidgets/lts_frameless_dialog.h>
 #include <ProjectDataManagement/logger.h>
 #include <ProjectDataManagement/pdm_dtc.h>
-#include <QSet>
+#include <QtCore/QSet>
 
 #ifdef BUILD_WITH_EXTERNAL_DDS
 #include <ProjectDataManagement/pdm_gear_class.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp
index 7497e8b3d..c4f7a324c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp
@@ -2,11 +2,11 @@
 
 
 #include "pdm_combobox.h"
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QSet>
-#include <QSortFilterProxyModel>
-#include <QStandardItemModel>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QSet>
+#include <QtCore/QSortFilterProxyModel>
+#include <QtGui/QStandardItemModel>
 #include <LtsUtilsSettings/settings.h>
 #include <LtsWidgets/lts_combo_box.h>
 #include <ProjectDataManagement/pdm_translation.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.h
index decb6a9e9..53db23e84 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.h
@@ -4,7 +4,7 @@
 #pragma once
 
 
-#include <QSortFilterProxyModel>
+#include <QtCore/QSortFilterProxyModel>
 #include <memory>
 
 class QComboBox;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/pdm_charge_table_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/pdm_charge_table_gui_plugin_interface.h
index 7b7322786..f9337a279 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/pdm_charge_table_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/pdm_charge_table_gui_plugin_interface.h
@@ -2,7 +2,7 @@
 
 
 #pragma once
-#include <QSet>
+#include <QtCore/QSet>
 #include <functional>
 
 class QComboBox;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/pdm_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/pdm_gui_plugin_interface.h
index cbd101341..1781e8838 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/pdm_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/pdm_gui_plugin_interface.h
@@ -2,7 +2,7 @@
 
 
 #pragma once
-#include <QSet>
+#include <QtCore/QSet>
 #include <functional>
 #include <ProjectDataManagement/pdm_enums.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_rfb_protocol.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_rfb_protocol.h
index 62365daac..874a886ba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_rfb_protocol.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_rfb_protocol.h
@@ -3,10 +3,10 @@
 #pragma once
 
 #include <QtGlobal>
-#include <QVector>
-#include <QDataStream>
+#include <QtCore/QVector>
+#include <QtCore/QDataStream>
 #include <QVarLengthArray>
-#include <QIODevice>
+#include <QtCore/QIODevice>
 
 namespace ProjectionWorkstation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_vnc_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_vnc_handler.h
index 59b1bebd6..be7e0312c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_vnc_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_vnc_handler.h
@@ -4,10 +4,10 @@
 
 #include "pws_rfb_protocol.h"
 
-#include <QObject>
-#include <QTcpSocket>
-#include <QDataStream>
-#include <QHostAddress>
+#include <QtCore/QObject>
+#include <QtNetwork/QTcpSocket>
+#include <QtCore/QDataStream>
+#include <QtNetwork/QHostAddress>
 
 #include <pwscommon_export.h>
 #include <LtsProjectionWorkstation/logger.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_control_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_control_dialog.cpp
index e64f7183e..509d21bc2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_control_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_control_dialog.cpp
@@ -13,8 +13,8 @@
 
 #include <nglsettings/nglsettings_connections.h>
 
-#include <QJsonObject>
-#include <QUuid>
+#include <QtCore/QJsonObject>
+#include <QtCore/QUuid>
 #include <QHostInfo>
 
 #include <functional>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_vnc_viewer_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_vnc_viewer_dialog.cpp
index 9c0b3bdf6..153089c60 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_vnc_viewer_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_vnc_viewer_dialog.cpp
@@ -5,12 +5,12 @@
 
 #include <LtsProjectionWorkstation/logger.h>
 
-#include <QMutexLocker>
-#include <QPainter>
+#include <QtCore/QMutexLocker>
+#include <QtGui/QPainter>
 #include <QOpenGLPaintDevice>
-#include <QOpenGLFunctions>
-#include <QThread>
-#include <QTimer>
+#include <QtGui/QOpenGLFunctions>
+#include <QtCore/QThread>
+#include <QtCore/QTimer>
 
 #include <cmath>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_vnc_viewer_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_vnc_viewer_dialog.h
index 435da1c08..763d4e6dd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_vnc_viewer_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_vnc_viewer_dialog.h
@@ -6,12 +6,12 @@
 #include <Plugins/ProjectionWorkstation/Common/pws_rfb_protocol.h>
 #include <Plugins/ProjectionWorkstation/Common/pws_vnc_handler.h>
 
-#include <QMutex>
+#include <QtCore/QMutex>
 #include <QOpenGLFramebufferObject>
 #include <QOpenGLTextureBlitter>
-#include <QOpenGLWidget>
-#include <QOpenGLFunctions>
-#include <QHostAddress>
+#include <QtWidgets/QOpenGLWidget>
+#include <QtGui/QOpenGLFunctions>
+#include <QtNetwork/QHostAddress>
 
 namespace Ui { class VncViewerDialog; }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_aes_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_aes_model.cpp
index 2ff4685d8..71193cb01 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_aes_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_aes_model.cpp
@@ -3,7 +3,7 @@
 
 #include "rep_input_aes_model.h"
 #include <ngltools/ngltools_dtg.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 namespace ReportManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_aes_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_aes_model.h
index e545f72eb..1cb2474e2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_aes_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_aes_model.h
@@ -9,7 +9,7 @@
 #include <ReportManagement/rep_enums.hpp>
 
 #include <LtsWidgets/lts_abstract_table_model.h>
-#include <QSortFilterProxyModel>
+#include <QtCore/QSortFilterProxyModel>
 
 
 namespace ReportManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_charge_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_charge_model.h
index 5f5a10ce6..a99c10ea2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_charge_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_charge_model.h
@@ -8,7 +8,7 @@
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
 
 #include <LtsWidgets/lts_abstract_table_model.h>
-#include <QSortFilterProxyModel>
+#include <QtCore/QSortFilterProxyModel>
 
 namespace ReportManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_abstract_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_abstract_model.h
index 80450d599..38d5b94f5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_abstract_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_abstract_model.h
@@ -3,12 +3,12 @@
 
 #pragma once
 
-#include <QSet>
-#include <QSortFilterProxyModel>
-#include <QAbstractTableModel>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QSet>
+#include <QtCore/QSortFilterProxyModel>
+#include <QtCore/QAbstractTableModel>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 #include <QVariantList>
 #include <QtGui/QBrush>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_air_support_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_air_support_model.cpp
index 4b9f2ec24..31b64d952 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_air_support_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_air_support_model.cpp
@@ -13,7 +13,7 @@
 #include <LtsSession/lts_session.h>
 #include <ngltools/ngltools_dtg.h>
 
-#include <QFont>
+#include <QtGui/QFont>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_building_damage_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_building_damage_model.cpp
index 2781a8454..44dec7ac6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_building_damage_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_building_damage_model.cpp
@@ -11,7 +11,7 @@
 #include <LtsSession/lts_session.h>
 #include <ngltools/ngltools_dtg.h>
 
-#include <QFont>
+#include <QtGui/QFont>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_administration_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_administration_model.cpp
index fa9c56937..eef845b86 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_administration_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_administration_model.cpp
@@ -11,7 +11,7 @@
 
 #include <LtsSession/lts_session.h>
 
-#include <QFont>
+#include <QtGui/QFont>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_resupply_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_resupply_model.cpp
index ddfc412bc..bf4d12ba7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_resupply_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_resupply_model.cpp
@@ -11,7 +11,7 @@
 
 #include <LtsSession/lts_session.h>
 
-#include <QFont>
+#include <QtGui/QFont>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_firings_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_firings_model.cpp
index fcf14a07c..0ef4fcadc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_firings_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_firings_model.cpp
@@ -12,7 +12,7 @@
 #include <LtsSession/lts_session.h>
 #include <ngltools/ngltools_dtg.h>
 
-#include <QFont>
+#include <QtGui/QFont>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_maintenance_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_maintenance_model.cpp
index b3b2da126..a67d26bc7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_maintenance_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_maintenance_model.cpp
@@ -11,7 +11,7 @@
 #include <LtsSession/lts_session.h>
 #include <ngltools/ngltools_dtg.h>
 
-#include <QFont>
+#include <QtGui/QFont>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_mine_area_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_mine_area_model.cpp
index 70863da6b..278a87249 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_mine_area_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_mine_area_model.cpp
@@ -11,7 +11,7 @@
 
 #include <LtsSession/lts_session.h>
 
-#include <QFont>
+#include <QtGui/QFont>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_nbc_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_nbc_model.cpp
index 4d5ca1eda..327a52de1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_nbc_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_nbc_model.cpp
@@ -12,7 +12,7 @@
 
 #include <LtsSession/lts_session.h>
 
-#include <QFont>
+#include <QtGui/QFont>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_participant_distance_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_participant_distance_model.cpp
index 3bec186b7..b96aba969 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_participant_distance_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_participant_distance_model.cpp
@@ -10,7 +10,7 @@
 
 #include <LtsSession/lts_session.h>
 
-#include <QFont>
+#include <QtGui/QFont>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_sanitation_material_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_sanitation_material_model.cpp
index df7c71213..d63c38aa2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_sanitation_material_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_sanitation_material_model.cpp
@@ -11,7 +11,7 @@
 #include <ParticipantManagement/ppm_translation.h>
 #include <LtsSession/lts_session.h>
 
-#include <QFont>
+#include <QtGui/QFont>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_unit_power_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_unit_power_model.cpp
index 4b5e2889e..9b225b217 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_unit_power_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_unit_power_model.cpp
@@ -10,7 +10,7 @@
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 #include <ngltools/ngltools_dtg.h>
 
-#include <QFont>
+#include <QtGui/QFont>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.cpp
index 583f00784..9fc44812f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.cpp
@@ -7,10 +7,10 @@
 #include "rep_report_preview.h"
 #include "ui_rep_report_edit.h"
 
-#include <QAction>
+#include <QtGui/QAction>
 #include <QElapsedTimer>
-#include <QMenu>
-#include <QTimer>
+#include <QtWidgets/QMenu>
+#include <QtCore/QTimer>
 
 #include <LtsSession/lts_session_data.h>
 #include <LtsSession/lts_session_manager.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_list.cpp
index aae6c0a01..65091adaa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_list.cpp
@@ -13,8 +13,8 @@
 #include <LtsPrinting/printing.h>
 #include <ReportManagement/rep_operator_rights.h>
 
-#include <QTreeView>
-#include <QDateTime>
+#include <QtWidgets/QTreeView>
+#include <QtCore/QDateTime>
 
 namespace ReportManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_model.cpp
index 383b6d66d..bdffe5e78 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_model.cpp
@@ -6,7 +6,7 @@
 #include <ngltools/ngltools_dtg.h>
 #include <ReportManagement/rep_translation.h>
 #include <ParticipantManagement/ppm_translation.h>
-#include <QSet>
+#include <QtCore/QSet>
 
 namespace dds
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.cpp
index fbed16686..95ac64c43 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.cpp
@@ -56,10 +56,10 @@
 #include <nglsettings/nglsettings_settings.h>
 #include <ngltools/ngltools_filesystem.h>
 
-#include <QDir>
-#include <QDateTime>
-#include <QPixmap>
-#include <QStandardItemModel>
+#include <QtCore/QDir>
+#include <QtCore/QDateTime>
+#include <QtGui/QPixmap>
+#include <QtGui/QStandardItemModel>
 
 namespace ReportManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_viewer_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_viewer_gui_plugin.cpp
index fe6f62cd6..d0f65b7d5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_viewer_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_viewer_gui_plugin.cpp
@@ -11,8 +11,8 @@
 #include <KDReports/KDReports.h>
 
 #include <TopicEditor/topic_editor.h>
-#include <QBoxLayout>
-#include <QLabel>
+#include <QtWidgets/QBoxLayout>
+#include <QtWidgets/QLabel>
 
 namespace ReportManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Common/saa_utils.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Common/saa_utils.h
index a2379ee05..e93e7fbdd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Common/saa_utils.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Common/saa_utils.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <QProcess>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QProcess>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <ParticipantManagement/ppm_enums.hpp>
 
 namespace SAAUtils
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/SAAChooser/saa_chooser.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/SAAChooser/saa_chooser.cpp
index b9876d4d8..10c218ab8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/SAAChooser/saa_chooser.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/SAAChooser/saa_chooser.cpp
@@ -5,13 +5,13 @@
 #include <LtsSession/lts_session_manager.h>
 #include <LtsWidgets/lts_message_dialog.h>
 #include <LtsWidgets/lts_global_wait_dialog.h>
-#include <QAbstractItemView>
+#include <QtWidgets/QAbstractItemView>
 #include <saa_dialog_model.h>
 #include "saa_chooser.h"
 #include "ui_saa_chooser.h"
 
-#include <QProcess>
-#include <QTimer>
+#include <QtCore/QProcess>
+#include <QtCore/QTimer>
 
 namespace SAAInterfaceAdapterAdler
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/SAAChooser/saa_chooser.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/SAAChooser/saa_chooser.h
index 352c86e0a..60f18e7eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/SAAChooser/saa_chooser.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/SAAChooser/saa_chooser.h
@@ -9,9 +9,9 @@
 #include <ParticipantManagement/ppm_dtc.h>
 
 #include <SAAs/Common/saa_utils.h>
-#include <QDialog>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtWidgets/QDialog>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 
 namespace Ui {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_dialog_model.h
index 959964d6c..f4c1e8140 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_dialog_model.h
@@ -10,8 +10,8 @@
 #include <SAAs/Common/logger.h>
 #include <SAAs/Common/saa_utils.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace SAAInterfaceAdapterAdler
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_gui_plugin.cpp
index ae418d813..9712db999 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_gui_plugin.cpp
@@ -11,7 +11,7 @@
 #include <Plugins/AssetManagement/asm_data_plugin_interface.h>
 #include <SAAChooser/saa_chooser.h>
 #include <SAAs/Common/logger.h>
-#include <QProcess>
+#include <QtCore/QProcess>
 
 namespace SAAInterfaceAdapterAdler
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_gui_plugin.h
index 451c3d008..7f0892df9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_gui_plugin.h
@@ -7,7 +7,7 @@
 #include <Lts/Common/ProjectConfig/project_defines.h>
 #include <ParticipantManagement/ppm.hpp>
 #include <AssetManagement/asm_dtc.h>
-#include <QPointer>
+#include <QtCore/QPointer>
 
 class QProcess;
 namespace SAAInterfaceAdapterAdler
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/scr_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/scr_gui_plugin.cpp
index cf61a6000..71807e536 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/scr_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/scr_gui_plugin.cpp
@@ -14,7 +14,7 @@
 
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QToolButton>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 
 namespace ScreenRecording
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_worker.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_worker.cpp
index 2dba1dcef..beb56dd9a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_worker.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_worker.cpp
@@ -10,8 +10,8 @@
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtWidgets/QFileDialog>
-#include <QThread>
-#include <QProcess>
+#include <QtCore/QThread>
+#include <QtCore/QProcess>
 
 
 namespace ScreenRecording
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_worker.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_worker.h
index b23f20236..920707788 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_worker.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_worker.h
@@ -5,8 +5,8 @@
 
 #include <cstdlib>
 
-#include <QFileInfo>
-#include <QRect>
+#include <QtCore/QFileInfo>
+#include <QtCore/QRect>
 
 
 class QProcess;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog.cpp
index 85caf7fbd..1d63e1d0d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog.cpp
@@ -10,7 +10,7 @@
 
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
 
-#include <QVBoxLayout>
+#include <QtWidgets/QVBoxLayout>
 
 
 namespace ServiceManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_group.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_group.cpp
index 3213eee8b..766f875be 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_group.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_group.cpp
@@ -2,7 +2,7 @@
 #include "scm_dialog_group.h"
 #include "ui_scm_dialog_group.h"
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 
 namespace ServiceManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_group.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_group.h
index 1dd63ada0..527aacdfc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_group.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_group.h
@@ -2,8 +2,8 @@
 
 #include "scm_dialog_service.h"
 
-#include <QWidget>
-#include <QVector>
+#include <QtWidgets/QWidget>
+#include <QtCore/QVector>
 
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_service.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_service.cpp
index 79398577a..bf51df11b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_service.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_service.cpp
@@ -1,7 +1,7 @@
 #include "scm_dialog_service.h"
 #include "ui_scm_dialog_service.h"
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 
 namespace ServiceManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_service.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_service.h
index 24b02af33..a4b7480b2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_service.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_service.h
@@ -2,7 +2,7 @@
 
 #include <ServiceManagement/scm_dtc.h> 
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_edit_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_edit_gui_plugin.h
index 701a8f0d8..f31beeca1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_edit_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_edit_gui_plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <ServiceManagement/logger.h>
 #include <ServiceManagement/scm_ftc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Common/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Common/settings.cpp
index 4b05ea1a0..79f1d5514 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Common/settings.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Common/settings.cpp
@@ -6,7 +6,7 @@
 #include <nglsettings/nglsettings_settings.h>
 #include <ngltools/ngltools_filesystem.h>
 
-#include <QSettings>
+#include <QtCore/QSettings>
 
 namespace ServiceMonitor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Common/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Common/settings.h
index 4c18993b8..f2cd79d25 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Common/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Common/settings.h
@@ -2,7 +2,7 @@
 
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL { class Settings; }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_dialog.cpp
index e4d44fb01..b1c481ebb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_dialog.cpp
@@ -11,7 +11,7 @@
 #include <Common/logger.h>
 
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace ServiceMonitor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.cpp
index 4a2637d1a..c08c82047 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.cpp
@@ -7,10 +7,10 @@
 
 #include <Common/logger.h>
 
-#include <QByteArray>
-#include <QJsonValue>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QByteArray>
+#include <QtCore/QJsonValue>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
 namespace ServiceMonitor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.h
index ddda28cc0..d2641dbea 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.h
@@ -11,7 +11,7 @@
 #include <LtsSession/lts_session.h>
 #include <LtsWidgets/lts_abstract_table_model.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
-#include <QSet>
+#include <QtCore/QSet>
 
 namespace ServiceMonitor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_dialog.cpp
index 862928502..f6ca713a3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_dialog.cpp
@@ -13,8 +13,8 @@
 #include <Common/logger.h>
 
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
-#include <QHeaderView>
+#include <QtWidgets/QTreeView>
+#include <QtWidgets/QHeaderView>
 
 namespace ServiceMonitor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.cpp
index a674e84df..092cc8ca7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.cpp
@@ -12,11 +12,11 @@
 #include <ProjectDataManagement/pdm_to_string.h>
 #include <Common/logger.h>
 
-#include <QByteArray>
-#include <QJsonArray>
-#include <QJsonValue>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QByteArray>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonValue>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
 namespace ServiceMonitor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.h
index 0d0a5c035..6fc3811fe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.h
@@ -13,7 +13,7 @@
 #include <LtsSession/lts_session.h>
 #include <LtsWidgets/lts_abstract_table_model.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
-#include <QSet>
+#include <QtCore/QSet>
 
 namespace ServiceMonitor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_equipment_check.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_equipment_check.cpp
index bb3da64da..8b70c3e71 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_equipment_check.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_equipment_check.cpp
@@ -5,10 +5,10 @@
 
 #include <ProjectDataManagement/pdm_to_string.h>
 
-#include <QAction>
-#include <QMenu>
-#include <QTimer>
-#include <QTreeView>
+#include <QtGui/QAction>
+#include <QtWidgets/QMenu>
+#include <QtCore/QTimer>
+#include <QtWidgets/QTreeView>
 #include <LtsSession/lts_session_data.h>
 #include <LtsDataView/lts_data_view.h>
 #include <LtsPrinting/printing.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.cpp
index 12a41a4d3..21cf9289b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.cpp
@@ -14,9 +14,9 @@
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <ngltools/ngltools_dtg.h>
-#include <QApplication>
-#include <QDateTime>
-#include <QTimer>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDateTime>
+#include <QtCore/QTimer>
 #include <Common/logger.h>
 #include <Symbology/symbol_data_to_render_role.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.h
index f4fa35778..d91c09738 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.h
@@ -11,7 +11,7 @@
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
 #include <AdvancedSymbology/Helper/table_model_symbol_renderer.h>
-#include <QSet>
+#include <QtCore/QSet>
 
 class QTimer;
 namespace ServiceMonitor
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_check_button_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_check_button_handler.cpp
index 54c795bc7..001d082b1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_check_button_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_check_button_handler.cpp
@@ -8,8 +8,8 @@
 
 #include <ProjectDataManagement/pdm_to_string.h>
 #include <LtsSession/lts_session_data.h>
-#include <QMenu>
-#include <QAction>
+#include <QtWidgets/QMenu>
+#include <QtGui/QAction>
 
 namespace LtsDataView
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_check_button_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_check_button_handler.h
index 6476c2b4e..42677784a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_check_button_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_check_button_handler.h
@@ -11,8 +11,8 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <LtsWidgets/lts_dialog.h>
 
-#include <QMenu>
-#include <QAction>
+#include <QtWidgets/QMenu>
+#include <QtGui/QAction>
 
 
 namespace LtsDataView
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_dialog.cpp
index 844c6619d..6f66e74f0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_dialog.cpp
@@ -11,10 +11,10 @@
 
 #include <LtsSession/lts_session.h>
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
-#include <QMenu>
+#include <QtWidgets/QTreeView>
+#include <QtWidgets/QMenu>
 #include <QWidgetAction>
-#include <QLabel>
+#include <QtWidgets/QLabel>
 
 #include <Common/PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/Buildings/bld_data_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_edit.cpp
index c246d5344..f7d88554d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_edit.cpp
@@ -17,9 +17,9 @@
 #include <InfrastructureManagement/ism_data_plugin_interface.h>
 
 
-#include <QComboBox>
-#include <QJsonDocument>
-#include <QJsonArray>
+#include <QtWidgets/QComboBox>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
 #include <QSpacerItem>
 
 namespace ServiceMonitor
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.cpp
index 6ecbfcff6..5a9149532 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.cpp
@@ -12,12 +12,12 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 
 
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QAction>
-#include <QPainter>
-#include <QTextDocument>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtGui/QAction>
+#include <QtGui/QPainter>
+#include <QtGui/QTextDocument>
 
 
 namespace ServiceMonitor
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.h
index 5d644ad89..9b9d2e8d7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.h
@@ -9,9 +9,9 @@
 #include <Plugins/Buildings/bld_data_plugin_interface.h>
 #include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
 
-#include <QSet>
-#include <QMenu>
-#include <QStyledItemDelegate>
+#include <QtCore/QSet>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QStyledItemDelegate>
 
 #include <nglwidgets/ngltreemodel.h>
 #include <nglwidgets/ngltreeitem.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_manipulation_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_manipulation_model.cpp
index 99aa24608..4a8bb5637 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_manipulation_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_manipulation_model.cpp
@@ -5,7 +5,7 @@
 #include <LtsSession/lts_session_data.h>
 #include <Common/logger.h>
 #include <ngltools/ngltools_dtg.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 namespace ServiceMonitor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_manipulation_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_manipulation_model.h
index cfa3bdb49..5bf973d41 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_manipulation_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_manipulation_model.h
@@ -8,7 +8,7 @@
 
 #include <ParticipantManagement/ppm.hpp>
 #include <ProjectDataManagement/pdm_dtc.h>
-#include <QSet>
+#include <QtCore/QSet>
 #include <Common/logger.h>
 
 namespace ServiceMonitor
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_single_service_equipment_check_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_single_service_equipment_check_dialog.cpp
index 42a62ccc4..3c88a2cd7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_single_service_equipment_check_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_single_service_equipment_check_dialog.cpp
@@ -7,9 +7,9 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <FileManagement/flm_translation.h>
 
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <LtsUtilsSettings/settings.h>
 
 namespace ServiceMonitor
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_structure_element_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_structure_element_edit.cpp
index 853738400..4c20a8cbe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_structure_element_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_structure_element_edit.cpp
@@ -15,9 +15,9 @@
 #include <InfrastructureManagement/ism_data_plugin_interface.h>
 
 
-#include <QComboBox>
-#include <QJsonDocument>
-#include <QJsonArray>
+#include <QtWidgets/QComboBox>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
 
 namespace ServiceMonitor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/smo_monitors_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/smo_monitors_gui_plugin_interface.h
index 7dada4b97..b31ef33cb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/smo_monitors_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/smo_monitors_gui_plugin_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QVector>
+#include <QtCore/QVector>
 
 namespace ServiceMonitor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/_explosion_single_central_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/_explosion_single_central_to_map.h
index d5226009a..dbe9652cb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/_explosion_single_central_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/_explosion_single_central_to_map.h
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/single_fire_central.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp
index 5644cf593..92c4cf9f6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp
@@ -73,10 +73,10 @@
 
 
 #include <limits>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <functional>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.h
index 1b6be4ebf..0984790f6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.h
@@ -17,8 +17,8 @@
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
 
 
-#include <QObject>
-#include <QPointer>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
 
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/air_support_impact_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/air_support_impact_to_map.h
index f85259f70..018fa1fa0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/air_support_impact_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/air_support_impact_to_map.h
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/single_fire.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/alarm_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/alarm_to_map.cpp
index 8e0cec5e3..871e1ffab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/alarm_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/alarm_to_map.cpp
@@ -8,7 +8,7 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 
 
-#include <QPainter>
+#include <QtGui/QPainter>
 
 #include <sstream>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/bccontamination_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/bccontamination_to_map.h
index 87388dc2b..a81bc45e6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/bccontamination_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/bccontamination_to_map.h
@@ -7,7 +7,7 @@
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 
 #include <MapObjects/single_fire.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.h
index 3113b74d6..d14f1bb35 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.h
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/virtual_mine.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/borderline_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/borderline_to_map.h
index f9f47dd2c..2295cc3bd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/borderline_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/borderline_to_map.h
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/polyline.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.h
index 2399d623d..a82f8f110 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.h
@@ -14,8 +14,8 @@
 
 
 
-#include <QObject>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
 
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.h
index 4e258e53a..2867c2810 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.h
@@ -14,8 +14,8 @@
 
 
 
-#include <QObject>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
 
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildinghitlineinfo_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildinghitlineinfo_to_map.cpp
index 0cf710eed..ef0d7076d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildinghitlineinfo_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildinghitlineinfo_to_map.cpp
@@ -8,9 +8,9 @@
 #include <Map/object_factory.h>
 
 
-#include <QTimer>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QTimer>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildings_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildings_to_map.cpp
index 2bd51ad0f..dfc1180c4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildings_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildings_to_map.cpp
@@ -15,9 +15,9 @@
 
 
 #include <QPolygonF>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.cpp
index d4c9f9c6a..1a435e82a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.cpp
@@ -11,7 +11,7 @@
 #include <ParticipantManagement/Data/ppm_data_plugin.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #define ADD_UNIQUE_MAP_ID_TO_NOTIFIY(uniqueMapId) addUniqueMapIdToNotifiy(uniqueMapId, __FILE__, __LINE__)
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.h
index b900ba763..284b8e0f6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.h
@@ -7,7 +7,7 @@
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <FilterManagement/flt_data_plugin_aes_display_filter.h>
 #include <MapObjects/area_fire.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/danger_area_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/danger_area_to_map.h
index 267f5359c..4582e76ea 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/danger_area_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/danger_area_to_map.h
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/danger_area.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/dus_single_mine_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/dus_single_mine_to_map.h
index f77eca751..4c74266f0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/dus_single_mine_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/dus_single_mine_to_map.h
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/participant.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.h
index 9fdd189c7..958244503 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.h
@@ -6,8 +6,8 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/area_fire.h>
-#include <QSet>
-#include <QTimer>
+#include <QtCore/QSet>
+#include <QtCore/QTimer>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/emergency_call_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/emergency_call_to_map.cpp
index 007d26bd4..4dc953ebd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/emergency_call_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/emergency_call_to_map.cpp
@@ -9,9 +9,9 @@
 #include <Common/LtsAppDescriptor/lts_app_descriptor.h>
 
 
-#include <QDateTime>
-#include <QPainter>
-#include <QDebug>
+#include <QtCore/QDateTime>
+#include <QtGui/QPainter>
+#include <QtCore/QDebug>
 
 #include <sstream>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_area_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_area_to_map.h
index e05fe847c..2bd125545 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_area_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_area_to_map.h
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/area_fire.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.h
index 6bf690898..41a47a34d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.h
@@ -6,8 +6,8 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/area_fire.h>
-#include <QSet>
-#include <QTimer>
+#include <QtCore/QSet>
+#include <QtCore/QTimer>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_single_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_single_to_map.h
index d85956211..b131eb6c9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_single_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_single_to_map.h
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/single_fire.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/functional_area_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/functional_area_to_map.h
index 87a7ae36d..004ef4609 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/functional_area_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/functional_area_to_map.h
@@ -9,7 +9,7 @@
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/functional_area.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/gas_pipe_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/gas_pipe_to_map.h
index 1cd6626a8..76fa8e085 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/gas_pipe_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/gas_pipe_to_map.h
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/polygon.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_nasat_9liner.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_nasat_9liner.cpp
index 70f20979a..0ebaab9fa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_nasat_9liner.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_nasat_9liner.cpp
@@ -12,11 +12,11 @@
 
 
 #include <QPolygonF>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/hitlineinfo_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/hitlineinfo_to_map.cpp
index fd0b5a314..85581cac2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/hitlineinfo_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/hitlineinfo_to_map.cpp
@@ -14,8 +14,8 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 
-#include <QDateTime>
-#include <QTimer>
+#include <QtCore/QDateTime>
+#include <QtCore/QTimer>
 
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.h
index 76224f5f6..cd05681a2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.h
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/participant.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.h
index 32d93afc3..4b23b2707 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.h
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/mine_field.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_corridor_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_corridor_to_map.h
index f85b93f61..6a0d6b3df 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_corridor_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_corridor_to_map.h
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/polygon.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.cpp
index 205fecafe..d5b9cfafc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.cpp
@@ -11,11 +11,11 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <InfrastructureManagement/ism_translation.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QJsonArray>
-#include <QGuiApplication>
+#include <QtCore/QJsonArray>
+#include <QtGui/QGuiApplication>
 
 #include <sstream>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.h
index 808481f14..de4d6b754 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.h
@@ -18,7 +18,7 @@
 #include <MapObjects/map_object_attributes.h>
 
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mse_bridge_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mse_bridge_to_map.cpp
index ba4d4e33b..7a3cdd3db 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mse_bridge_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mse_bridge_to_map.cpp
@@ -16,8 +16,8 @@
 #include <Common/resource_path.h>
 
 
-#include <QUrl>
-#include <QDir>
+#include <QtCore/QUrl>
+#include <QtCore/QDir>
 
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mse_point_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mse_point_to_map.cpp
index 5eb1478b3..0e4011d5d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mse_point_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mse_point_to_map.cpp
@@ -10,7 +10,7 @@
 #include <Plugins/Buildings/bld_info_gui_plugin_interface.h> 
 
 
-#include <QPainter>
+#include <QtGui/QPainter>
 
 #include <sstream>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/ncontamination_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/ncontamination_to_map.h
index 973061772..e5e4261a9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/ncontamination_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/ncontamination_to_map.h
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/nuclear_agent.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/off_route_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/off_route_to_map.h
index fc5c39305..75cca6379 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/off_route_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/off_route_to_map.h
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/virtual_mine.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 #define OFFROUTEMINE_HAS_SECONDARY_VIEW
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.cpp
index c8d3a9a4c..bce780362 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.cpp
@@ -19,11 +19,11 @@
 #include <Symbology/symbol_data_to_render_role.h>
 #include <ProjectDataManagement/pdm_to_string.h>
 #include <ParticipantManagement/ppm_enums.hpp>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 
 
 #include <QElapsedTimer>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.h
index aee31ba47..013629a07 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.h
@@ -18,7 +18,7 @@
 
 #include <MapObjects/participant.h>
 
-#include <QPointer>
+#include <QtCore/QPointer>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.cpp
index 6fd6174ad..e1f2965ca 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.cpp
@@ -4,8 +4,8 @@
 #include "pdm_handler.h"
 #include <utility>
 #include <ProjectDataManagement/pdm_dtc.h>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.h
index 85181672b..3c2a5aca1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.h
@@ -3,8 +3,8 @@
 
 #pragma once
 #include <Common/situation_map_logging.h>
-#include <QMap>
-#include <QObject>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
 
 #include <memory> 
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/plugin_provider.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/plugin_provider.h
index 2cf7513ad..6139656e6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/plugin_provider.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/plugin_provider.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <memory>
-#include <QObject>
+#include <QtCore/QObject>
 #include "sitmapdds_export.h"
 
 namespace LtsAppDescriptor
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/recon_area_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/recon_area_to_map.h
index 971d994f7..aa6e34726 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/recon_area_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/recon_area_to_map.h
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/biological_agent.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/resource_manager_mode.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/resource_manager_mode.h
index 7fd885d1e..672bc052c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/resource_manager_mode.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/resource_manager_mode.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/shootback_area_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/shootback_area_to_map.h
index fd35dd826..2bf96adc1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/shootback_area_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/shootback_area_to_map.h
@@ -6,7 +6,7 @@
 #include "sim_to_situation_map_tmpl.h"
 #include <Plugins/TargetManagement/tgt_data_plugin_interface.h>
 #include <MapObjects/polygon.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sim_to_situation_map_tmpl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sim_to_situation_map_tmpl.h
index 587c18b69..3c9f5022d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sim_to_situation_map_tmpl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sim_to_situation_map_tmpl.h
@@ -26,9 +26,9 @@
 
 
 
-#include <QObject>
-#include <QMap>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+#include <QtCore/QVector>
 
 
 const char SimIdProperty[]        = "SimId";
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sound_area_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sound_area_to_map.cpp
index 4e2ca6c87..102ed0be7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sound_area_to_map.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sound_area_to_map.cpp
@@ -9,10 +9,10 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <InfrastructureManagement/ism_translation.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QJsonArray>
+#include <QtCore/QJsonArray>
 
 #include <sstream>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/special_areas_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/special_areas_to_map.h
index d36e32c51..32b25c09a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/special_areas_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/special_areas_to_map.h
@@ -6,7 +6,7 @@
 #include "sim_to_situation_map_tmpl.h"
 #include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
 #include <MapObjects/polygon.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/technical_area_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/technical_area_to_map.h
index 4d6ce1241..c969788e1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/technical_area_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/technical_area_to_map.h
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/polygon.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/training_area_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/training_area_to_map.h
index a2796b27f..20a4cc778 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/training_area_to_map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/training_area_to_map.h
@@ -6,7 +6,7 @@
 #include "sim_to_situation_map_tmpl.h"
 #include <Plugins/AssetManagement/asm_data_plugin_interface.h>
 #include <MapObjects/polygon.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/unified_map_object_data.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/unified_map_object_data.h
index a5cb8a48a..ec5191051 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/unified_map_object_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/unified_map_object_data.h
@@ -9,7 +9,7 @@
 
 
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_widget.h
index 1e5f70d46..b3efa81a9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_widget.h
@@ -12,7 +12,7 @@
 
 
 
-#include <QTableView>
+#include <QtWidgets/QTableView>
 
 class QToolButton;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.cpp
index fefe5ac73..5aa4ea433 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.cpp
@@ -10,10 +10,10 @@
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 
 
-#include <QString>
-#include <QBuffer>
-#include <QPainter>
-#include <QGuiApplication>
+#include <QtCore/QString>
+#include <QtCore/QBuffer>
+#include <QtGui/QPainter>
+#include <QtGui/QGuiApplication>
 
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.cpp
index a0d074a2d..c1f7450d6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.cpp
@@ -22,9 +22,9 @@
 #include <Proxies/Buildings/bld_ftc.h>
 
 
-#include <QMenu>
+#include <QtWidgets/QMenu>
 #include <QItemSelection>
-#include <QGridLayout>
+#include <QtWidgets/QGridLayout>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.h
index a8dc9b5cd..b26db493a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.h
@@ -18,8 +18,8 @@
 #include <ServiceMonitor/Gui/Monitors/smo_check_button_handler.h>
 
 
-#include <QPointer>
-#include <QDialog>
+#include <QtCore/QPointer>
+#include <QtWidgets/QDialog>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/TopicEditor/topic_editor.cpp
index b2cda5640..1eaf8bbb8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/TopicEditor/topic_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/TopicEditor/topic_editor.cpp
@@ -7,10 +7,10 @@
 #include <TopicEditorBase/topic_preview_widget.h>
 #include <TopicEditorBase/topic_previewer.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.cpp
index 5e2ced38b..476fb4dbc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.cpp
@@ -9,7 +9,7 @@
 #include <ngltools/ngltools_dtg.h>
 
 
-#include <QIcon>
+#include <QtGui/QIcon>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.h
index ae856f8f7..0f6623997 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.h
@@ -5,7 +5,7 @@
 
 #include <Common/situation_map_logging.h>
 #include <Map/map.h>
-#include <QAbstractTableModel>
+#include <QtCore/QAbstractTableModel>
 
 #include <LtsSession/lts_session.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/plugin_provider_lts_session.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/plugin_provider_lts_session.h
index d40a16a98..ebe33178b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/plugin_provider_lts_session.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/plugin_provider_lts_session.h
@@ -7,7 +7,7 @@
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_manager.h>
 #include <LtsSession/lts_session_data.h>
-#include <QPointer>
+#include <QtCore/QPointer>
 
 #include <AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <AreaEffectSimulation/aes_info_gui_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_gui_plugin.cpp
index d9fa5f59b..6270e5094 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_gui_plugin.cpp
@@ -60,14 +60,14 @@
 #include <MathUtils/simple_helper.h>
 #include <MathUtils/math_const.h>
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QLocale>
-#include <QLayout>
-#include <QFormLayout>
-#include <QJsonDocument>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QFormLayout>
+#include <QtCore/QJsonDocument>
 #include <QJsonParseError>
-#include <QUuid>
-#include <QIcon>
+#include <QtCore/QUuid>
+#include <QtGui/QIcon>
 
 #include <math.h>
 
@@ -85,7 +85,7 @@ static QString viewshedSvcName() { return QStringLiteral("Viewshed"); }
 #include "MapObjectSelection/map_object_selection_widget.h"
 #include "viewshed_dialog.h"
 
-#include <QThread>
+#include <QtCore/QThread>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_gui_plugin.h
index 65ad382b7..78b3407d7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_gui_plugin.h
@@ -32,7 +32,7 @@
 #include <Rubberbands/rubberband_factory.h>
 
 #include <QMetaMethod>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_layer_control.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_layer_control.cpp
index 1d861bc7d..d02a3b4f6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_layer_control.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_layer_control.cpp
@@ -7,8 +7,8 @@
 #include <FilterManagement/Gui/FilterChange/flt_filter_change.h>
 #include <LtsUtilsSettings/settings.h>
 
-#include <QTimer>
-#include <QStyledItemDelegate>
+#include <QtCore/QTimer>
+#include <QtWidgets/QStyledItemDelegate>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_register_app_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_register_app_handler.h
index 0cb82b9e3..4d3849ad1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_register_app_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_register_app_handler.h
@@ -8,7 +8,7 @@
 #include <OperatorManagement/opm_data_plugin_interface.h>
 
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 
 namespace OperatorManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_widget_control.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_widget_control.cpp
index ed72a1fa0..110fdca05 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_widget_control.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_widget_control.cpp
@@ -11,7 +11,7 @@
 #include <LtsUtilsSettings/settings.h>
 
 
-#include <QToolButton>
+#include <QtWidgets/QToolButton>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init.cpp
index b7935ad5f..5ab4b4140 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init.cpp
@@ -5,10 +5,10 @@
 #include <utility>
 #include "situation_map_init_p.h"
 
-#include <QCoreApplication>
-#include <QMenu>
-#include <QFile>
-#include <QDir>
+#include <QtCore/QCoreApplication>
+#include <QtWidgets/QMenu>
+#include <QtCore/QFile>
+#include <QtCore/QDir>
 #include <QJsonParseError>
 
 #include <ngltools/ngltools_filesystem.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/terrain_profile_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/terrain_profile_handler.h
index 2c91fb837..2023c4454 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/terrain_profile_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/terrain_profile_handler.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QPointer>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
 #include <SituationMap/Common/situation_map_logging.h>
 
 namespace LtsSession
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/viewshed_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/viewshed_dialog.h
index 51b4519b4..490acf7c2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/viewshed_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/viewshed_dialog.h
@@ -5,12 +5,12 @@
 
 #include <LtsWidgets/lts_dialog.h>
 
-#include <QFormLayout>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QLineEdit>
-#include <QDoubleValidator>
-#include <QSlider>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QLineEdit>
+#include <QtGui/QDoubleValidator>
+#include <QtWidgets/QSlider>
 
 
 class ViewshedDialog : public LtsWidgets::LtsDialog
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMapScriptFilter/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMapScriptFilter/TopicEditor/topic_editor.cpp
index 9d8f80c69..7cb8ac624 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMapScriptFilter/TopicEditor/topic_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMapScriptFilter/TopicEditor/topic_editor.cpp
@@ -10,9 +10,9 @@
 #include <TopicEditorBase/topic_preview_widget.h>
 #include <TopicEditorBase/topic_previewer.h>
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QJsonParseError>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h
index 2074a1ce0..e5a49d1fe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h
@@ -8,11 +8,11 @@
 #include <Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/map_object_type.h>
 #include <Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/resource_manager_mode.h>
 
-#include <QColor>
-#include <QPointer>
-#include <QPointF>
-#include <QPolygon>
-#include <QVector>
+#include <QtGui/QColor>
+#include <QtCore/QPointer>
+#include <QtCore/QPointF>
+#include <QtGui/QPolygon>
+#include <QtCore/QVector>
 #include <functional>
 #include <memory>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/situation_map_script_filter_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/situation_map_script_filter_gui_plugin_interface.h
index 564dcd810..e99b51a8e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/situation_map_script_filter_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/situation_map_script_filter_gui_plugin_interface.h
@@ -6,7 +6,7 @@
 #include <PluginInterfaces/topic_replay_interface.h>
 #include <TopicEditorBase/topic_editor_interface.h>
 
-#include <QPointer>
+#include <QtCore/QPointer>
 
 namespace MarkerManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/TopicEditor/topic_editor.cpp
index f82513221..399e8f288 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/TopicEditor/topic_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/TopicEditor/topic_editor.cpp
@@ -18,9 +18,9 @@
 
 
 
-#include <QDebug>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QDebug>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
 #include <QtMath>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_dialog.cpp
index b4c75bf66..f221e4e70 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_dialog.cpp
@@ -3,7 +3,7 @@
 
 #include "replay_control_dialog.h"
 
-#include <QHBoxLayout>
+#include <QtWidgets/QHBoxLayout>
 
 
 namespace SituationReplay
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_gui_plugin.cpp
index 96de428b7..a38206edc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_gui_plugin.cpp
@@ -12,7 +12,7 @@
 #include <PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/export.h>
 #include <Plugins/SituationMapPlugin/situation_map_script_filter_gui_plugin_interface.h>
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 
 
 namespace SituationReplay
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_gui_plugin.h
index a3e853a06..2a7a69c63 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_gui_plugin.h
@@ -12,7 +12,7 @@
 #include <Plugins/MarkerManagement/mrk_gui_plugin_interface.h>
 #include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
 #include <MarkerManagement/Gui/Common/mrk_apply_filter.h>
-#include <QPointer>
+#include <QtCore/QPointer>
 
 
 namespace LtsScriptTimeline { class TopicEditor; }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_widget.cpp
index 7eda68af2..02cff2d74 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_widget.cpp
@@ -15,7 +15,7 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <SituationMap/Map/operator_map_settings.h> 
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 
 namespace SituationReplay
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/srp_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/srp_gui_plugin_interface.h
index 4e42c2e61..2917e469d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/srp_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/srp_gui_plugin_interface.h
@@ -6,7 +6,7 @@
 #include <PluginInterfaces/topic_replay_interface.h>
 #include <TopicEditorBase/topic_editor_interface.h>
 
-#include <QPointer>
+#include <QtCore/QPointer>
 
 namespace MarkerManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp
index 2ced6b194..e706982a0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp
@@ -14,11 +14,11 @@
 #include <SituationReplayManagement/logger.h>
 #include <LtsUtils/LtsUtilsCore/await.h>
 
-#include <QCoreApplication>
-#include <QPointer>
-#include <QProcess>
-#include <QTimer>
-#include <QDebug>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QPointer>
+#include <QtCore/QProcess>
+#include <QtCore/QTimer>
+#include <QtCore/QDebug>
 
 
 namespace SituationReplayManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.h
index 74fcd7913..ef817f394 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.h
@@ -7,8 +7,8 @@
 #include <Core/core_dts_types.h>
 #include <SituationReplayManagement/logger.h>
 
-#include <QPointer>
-#include <QSet>
+#include <QtCore/QPointer>
+#include <QtCore/QSet>
 
 class QProcess;
 namespace SituationReplayManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog.cpp
index 820590d3c..0f373cabb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog.cpp
@@ -15,7 +15,7 @@
 #include <QModelIndexList>
 
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace SituationReplayManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_management_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_management_gui_plugin.cpp
index aea80a4be..b083e9dc8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_management_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_management_gui_plugin.cpp
@@ -17,8 +17,8 @@
 #include <FilterManagement/flt_symbol_appearance_settings.h>
 #include <Services/SituationReplayManagement/srm_operator_rights.h>
 
-#include <QTimer>
-#include <QDebug>
+#include <QtCore/QTimer>
+#include <QtCore/QDebug>
 
 
 namespace SituationReplayManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Base/styles_color_scheme.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Base/styles_color_scheme.h
index 988d98006..7f79d8b45 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Base/styles_color_scheme.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Base/styles_color_scheme.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QString>
-#include <QColor>
+#include <QtCore/QString>
+#include <QtGui/QColor>
 
 
 namespace ColorScheme
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Dark/rme_dark_style.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Dark/rme_dark_style.cpp
index 12203eb0e..c95852a66 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Dark/rme_dark_style.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Dark/rme_dark_style.cpp
@@ -7,15 +7,15 @@
 
 #include <TabBarTabStyle/tab_bar_tab_style.h>
 
-#include <QApplication>
-#include <QDebug>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDebug>
 #include <QDesktopWidget>
-#include <QFont>
+#include <QtGui/QFont>
 #include <QPalette>
 #include <QRgb>
-#include <QString>
-#include <QStyle>
-#include <QStyleFactory>
+#include <QtCore/QString>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QStyleFactory>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Dark/rme_dark_style.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Dark/rme_dark_style.h
index 3257e7308..f60119a70 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Dark/rme_dark_style.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Dark/rme_dark_style.h
@@ -5,7 +5,7 @@
 
 #include <PluginInterfaces/style_plugin_interface.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 class RmeDarkStyle : public QObject, public StylePlugin::Plugin
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Light/rme_light_style.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Light/rme_light_style.cpp
index fcbe5f91f..8f42a0d24 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Light/rme_light_style.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Light/rme_light_style.cpp
@@ -6,15 +6,15 @@
 
 #include <TabBarTabStyle/tab_bar_tab_style.h>
 
-#include <QApplication>
-#include <QDebug>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDebug>
 #include <QDesktopWidget>
-#include <QFont>
+#include <QtGui/QFont>
 #include <QPalette>
 #include <QRgb>
-#include <QString>
-#include <QStyle>
-#include <QStyleFactory>
+#include <QtCore/QString>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QStyleFactory>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Light/rme_light_style.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Light/rme_light_style.h
index 23cf6187b..77d1d4be9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Light/rme_light_style.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Light/rme_light_style.h
@@ -5,7 +5,7 @@
 
 #include <PluginInterfaces/style_plugin_interface.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 class RmeLightStyle : public QObject, public StylePlugin::Plugin
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/TabBarTabStyle/tab_bar_tab_style.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/TabBarTabStyle/tab_bar_tab_style.h
index 863845307..e3caccaa7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/TabBarTabStyle/tab_bar_tab_style.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/TabBarTabStyle/tab_bar_tab_style.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QColor>
+#include <QtGui/QColor>
 
 
 #ifndef TABBARTABSTYLE_EXPORT
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Test/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Test/main.cpp
index 5fb59094f..7a9b7cfa8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Test/main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Test/main.cpp
@@ -5,9 +5,9 @@
 #include <NGLLogger/INGLLogger.h>
 #include <nglapplication/nglapplication.h>
 
-#include <QApplication>
-#include <QDebug>
-#include <QStringList>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDebug>
+#include <QtCore/QStringList>
 
 
 int main(int argc, char** argv)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Test/stylePluginTest.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Test/stylePluginTest.h
index b29e47ace..be4b797c1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Test/stylePluginTest.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Test/stylePluginTest.h
@@ -5,7 +5,7 @@
 
 #include "styleplugintest_export.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/Common/tpm_exported_scripts_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/Common/tpm_exported_scripts_model.cpp
index 1858d5c7a..519ccc953 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/Common/tpm_exported_scripts_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/Common/tpm_exported_scripts_model.cpp
@@ -6,13 +6,13 @@
 
 #include <ngltools/ngltools_dtg.h>
 
-#include <QDateTime>
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QDateTime>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 
 namespace TakeHomePackageManager
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/Common/tpm_process_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/Common/tpm_process_dialog.h
index 99348cd6c..147a057fb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/Common/tpm_process_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/Common/tpm_process_dialog.h
@@ -2,7 +2,7 @@
 
 #include "thpcommon_export.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpManagement/tpm_exported_scripts_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpManagement/tpm_exported_scripts_dialog.cpp
index 4bcd93332..41f89d019 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpManagement/tpm_exported_scripts_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpManagement/tpm_exported_scripts_dialog.cpp
@@ -18,20 +18,20 @@
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>
 
-#include <QDir>
-#include <QFile>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QProcess>
-#include <QTemporaryFile>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QUrl>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QProcess>
+#include <QtCore/QTemporaryFile>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkRequest>
+#include <QtNetwork/QNetworkReply>
+#include <QtCore/QUrl>
 #include <QtWebSockets/QWebSocket>
 #include <QLocale>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QFileSystemWatcher>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpManagement/tpm_exported_scripts_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpManagement/tpm_exported_scripts_dialog.h
index bb752a50f..4e7a46b6c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpManagement/tpm_exported_scripts_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpManagement/tpm_exported_scripts_dialog.h
@@ -8,7 +8,7 @@
 #include <Common/tpm_exported_scripts_model.h>
 #include <LtsWidgets/lts_dialog.h>
 
-#include <QUrlQuery>
+#include <QtCore/QUrlQuery>
 
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpUsbManagement/tpm_usb_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpUsbManagement/tpm_usb_dialog.cpp
index 20f8843de..f7916f139 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpUsbManagement/tpm_usb_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpUsbManagement/tpm_usb_dialog.cpp
@@ -23,24 +23,24 @@
 #include <ngltools/ngltools_filesystem.h>
 
 
-#include <QDir>
-#include <QFile>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QProcess>
-#include <QTemporaryFile>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QUrl>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QProcess>
+#include <QtCore/QTemporaryFile>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkRequest>
+#include <QtNetwork/QNetworkReply>
+#include <QtCore/QUrl>
 #include <QtWebSockets/QWebSocket>
 #include <QLocale>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QFileSystemWatcher>
-#include <QTreeView>
-#include <QFuture>
-#include <QFutureWatcher>
+#include <QtWidgets/QTreeView>
+#include <QtCore/QFuture>
+#include <QtCore/QFutureWatcher>
 #include <QtCore/qstring.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qfile.h>
@@ -49,13 +49,13 @@
 #include <QtCore/qthread.h>
 #include <QtConcurrent>
 #include <QDirIterator>
-#include <QFileDialog>
+#include <QtWidgets/QFileDialog>
 
 #ifdef Q_OS_UNIX
 #include <unistd.h>
 #endif
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #ifdef Q_OS_UNIX
 #define _compiler_warning(x) _Pragma(#x)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpUsbManagement/tpm_usb_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpUsbManagement/tpm_usb_gui_plugin.cpp
index 719e4df06..f330eecb9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpUsbManagement/tpm_usb_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpUsbManagement/tpm_usb_gui_plugin.cpp
@@ -8,7 +8,7 @@
 
 
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/tpm_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/tpm_gui_plugin_interface.h
index 23da4ec8a..cdd08bbed 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/tpm_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/tpm_gui_plugin_interface.h
@@ -2,7 +2,7 @@
 
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 
 namespace TakeHomePackageManager
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_exported_scripts_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_exported_scripts_model.cpp
index 31258eb96..1003959a0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_exported_scripts_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_exported_scripts_model.cpp
@@ -6,14 +6,14 @@
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <ngltools/ngltools_dtg.h>
 
-#include <QDateTime>
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QSaveFile>
+#include <QtCore/QDateTime>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QSaveFile>
 #include <QFileSystemWatcher>
 #include <QMutableVectorIterator>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_exported_scripts_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_exported_scripts_model.h
index 66a3cd649..402e53817 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_exported_scripts_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_exported_scripts_model.h
@@ -8,8 +8,8 @@
 #include "thp2common_export.h"
 #include <Common2Core/tpm_js_parser.h>
 
-#include <QDateTime>
-#include <QDir>
+#include <QtCore/QDateTime>
+#include <QtCore/QDir>
 
 
 class QFileSystemWatcher;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_file_copy.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_file_copy.cpp
index e748b73a1..bd4524a53 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_file_copy.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_file_copy.cpp
@@ -6,24 +6,24 @@
 #include <Common2/tpm_process_dialog.h>
 #include <Common2Core/tpm_tools.h>
 
-#include <QDir>
-#include <QFile>
-#include <QTemporaryFile>
-#include <QTimer>
-#include <QFuture>
-#include <QFutureWatcher>
-#include <QString>
-#include <QFile>
-#include <QFileInfo>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QTemporaryFile>
+#include <QtCore/QTimer>
+#include <QtCore/QFuture>
+#include <QtCore/QFutureWatcher>
+#include <QtCore/QString>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
 #include <QtConcurrent>
 #include <QDirIterator>
-#include <QFileDialog>
+#include <QtWidgets/QFileDialog>
 
 #ifdef Q_OS_UNIX
 #include <unistd.h>
 #endif
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #ifdef Q_OS_UNIX
 #define _compiler_warning(x) _Pragma(#x)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_file_copy.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_file_copy.h
index e74f5df5d..33f44c1de 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_file_copy.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_file_copy.h
@@ -7,7 +7,7 @@
 #include <LtsWidgets/lts_dialog.h>
 
 #include <QFileInfoList>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 
 namespace TakeHomePackageManager
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_process_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_process_dialog.cpp
index bce41f689..9116555f1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_process_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_process_dialog.cpp
@@ -13,7 +13,7 @@
 
 
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_process_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_process_dialog.h
index ceae8b1bb..59580675a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_process_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_process_dialog.h
@@ -5,7 +5,7 @@
 
 #include "thp2common_export.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_topics_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_topics_model.cpp
index 76777466e..1d58acc5e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_topics_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_topics_model.cpp
@@ -6,9 +6,9 @@
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <TopicEditorBase/topic_editor_utils.h>
 
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 
 namespace TakeHomePackageManager
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2Core/tpm_js_parser.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2Core/tpm_js_parser.cpp
index 4c1441d12..9d875fe0f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2Core/tpm_js_parser.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2Core/tpm_js_parser.cpp
@@ -9,8 +9,8 @@
 #include <LtsUtilsCore/json.h>
 
 #include <QMapIterator>
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
+#include <QtCore/QRegularExpression>
+#include <QtCore/QRegularExpressionMatch>
 
 #include <utility>
 
@@ -19,7 +19,7 @@
 
 
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2Core/tpm_js_parser.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2Core/tpm_js_parser.h
index 3be7c2d12..f69d7d5f9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2Core/tpm_js_parser.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2Core/tpm_js_parser.h
@@ -8,9 +8,9 @@
 #include <LtsUtilsCore/json.h>
 #include <Common2Core/tpm_tools.h>
 
-#include <QJsonArray>
-#include <QFile>
-#include <QMap>
+#include <QtCore/QJsonArray>
+#include <QtCore/QFile>
+#include <QtCore/QMap>
 
 
 using namespace LtsUtils;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2Core/tpm_tools.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2Core/tpm_tools.cpp
index f508b46c6..f64ae7a6a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2Core/tpm_tools.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2Core/tpm_tools.cpp
@@ -4,9 +4,9 @@
 #include "tpm_tools.h"
 #include "tpm_js_parser.h"
 
-#include <QFile>
-#include <QSaveFile>
-#include <QDir>
+#include <QtCore/QFile>
+#include <QtCore/QSaveFile>
+#include <QtCore/QDir>
 
 #include <memory>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2Core/tpm_tools.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2Core/tpm_tools.h
index 66a70602a..488f35f35 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2Core/tpm_tools.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2Core/tpm_tools.h
@@ -7,10 +7,10 @@
 
 #include <memory>
 
-#include <QSaveFile>
+#include <QtCore/QSaveFile>
 #include <QEventLoop>
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 
 
 
@@ -24,7 +24,7 @@
 
 
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2Management/tpm2_exported_scripts_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2Management/tpm2_exported_scripts_dialog.cpp
index bc932fd52..a04cb5f54 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2Management/tpm2_exported_scripts_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2Management/tpm2_exported_scripts_dialog.cpp
@@ -20,22 +20,22 @@
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>
 
-#include <QDir>
-#include <QFile>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QProcess>
-#include <QTemporaryFile>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QUrl>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QProcess>
+#include <QtCore/QTemporaryFile>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkRequest>
+#include <QtNetwork/QNetworkReply>
+#include <QtCore/QUrl>
 #include <QtWebSockets/QWebSocket>
 #include <QLocale>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QTemporaryDir>
-#include <QDesktopServices>
+#include <QtGui/QDesktopServices>
 
 #include <memory>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2Management/tpm2_exported_scripts_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2Management/tpm2_exported_scripts_dialog.h
index f9c1145c5..fb9f6d8ab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2Management/tpm2_exported_scripts_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2Management/tpm2_exported_scripts_dialog.h
@@ -8,7 +8,7 @@
 #include <Common2/tpm_exported_scripts_model.h>
 #include <LtsWidgets/lts_dialog.h>
 
-#include <QUrlQuery>
+#include <QtCore/QUrlQuery>
 
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2UsbManagement/tpm_usb_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2UsbManagement/tpm_usb_dialog.cpp
index 1c805e2d1..aa7f5f264 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2UsbManagement/tpm_usb_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2UsbManagement/tpm_usb_dialog.cpp
@@ -20,37 +20,37 @@
 #include <ngltools/ngltools_filesystem.h>
 
 
-#include <QDir>
-#include <QFile>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QProcess>
-#include <QTemporaryFile>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QUrl>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QProcess>
+#include <QtCore/QTemporaryFile>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkRequest>
+#include <QtNetwork/QNetworkReply>
+#include <QtCore/QUrl>
 #include <QLocale>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QFileSystemWatcher>
-#include <QTreeView>
-#include <QFuture>
-#include <QFutureWatcher>
-#include <QString>
-#include <QFile>
-#include <QFileInfo>
-#include <QVector>
+#include <QtWidgets/QTreeView>
+#include <QtCore/QFuture>
+#include <QtCore/QFutureWatcher>
+#include <QtCore/QString>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QVector>
 
 #include <QtConcurrent>
 #include <QDirIterator>
-#include <QFileDialog>
+#include <QtWidgets/QFileDialog>
 
 #ifdef Q_OS_UNIX
 #include <unistd.h>
 #endif
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #ifdef Q_OS_UNIX
 #define _compiler_warning(x) _Pragma(#x)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/tpm2_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/tpm2_gui_plugin_interface.h
index f107365f3..df3367e1b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/tpm2_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/tpm2_gui_plugin_interface.h
@@ -2,7 +2,7 @@
 
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 
 namespace TakeHomePackageManager
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/old/tgt_shootback_target_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/old/tgt_shootback_target_view.cpp
index f1aee2f18..2f1f8cf9f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/old/tgt_shootback_target_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/old/tgt_shootback_target_view.cpp
@@ -7,7 +7,7 @@
 #include "tgt_shootback_target_edit.h"
 
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace TargetManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_dialog.cpp
index 8ad9f2813..bd58f2eed 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_dialog.cpp
@@ -15,9 +15,9 @@
 
 #include "tgt_target_area_assignment_dialog.h"
 
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
 
 namespace TargetManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_model.cpp
index 41b3ba3b2..e21cf7cd0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_area_model.cpp
@@ -9,8 +9,8 @@
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ParticipantManagement/ppm_translation.h>
 
-#include <QApplication> 
-#include <QBuffer>
+#include <QtWidgets/QApplication> 
+#include <QtCore/QBuffer>
 
 namespace TargetManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_assignment_part_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_assignment_part_model.cpp
index 3a9ae37c9..2f48bbf81 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_assignment_part_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_assignment_part_model.cpp
@@ -9,8 +9,8 @@
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ParticipantManagement/ppm_translation.h>
 
-#include <QApplication> 
-#include <QBuffer>
+#include <QtWidgets/QApplication> 
+#include <QtCore/QBuffer>
 
 namespace TargetManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_common.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_common.cpp
index 7c72970fc..3bcaf782f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_common.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_common.cpp
@@ -3,7 +3,7 @@
 
 #include "tgt_common.h"
 
-#include <QColor>
+#include <QtGui/QColor>
 
 
 namespace TargetManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.cpp
index af9389d5b..c5b8c6896 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.cpp
@@ -7,7 +7,7 @@
 #include <SituationMap/Symbology/symbol_result.h>
 #include <SituationMap/Symbology/symbol_dictionary.h>
 
-#include <QApplication> 
+#include <QtWidgets/QApplication> 
 
 namespace TargetManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_shootback_target_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_shootback_target_edit.cpp
index d8b3be9a7..f69a9df73 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_shootback_target_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_shootback_target_edit.cpp
@@ -7,7 +7,7 @@
 
 #include <LtsUtilsSettings/settings.h>
 
-#include <QBuffer>
+#include <QtCore/QBuffer>
 
 namespace TargetManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_dialog.cpp
index 30459e755..4cde6570c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_dialog.cpp
@@ -16,12 +16,12 @@
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
 
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QMessageBox>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QMessageBox>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 namespace TargetManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_edit.cpp
index 2b9d01771..3c2b79611 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_edit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_edit.cpp
@@ -9,7 +9,7 @@
 
 #include <LtsUtilsSettings/settings.h>
 
-#include <QBuffer>
+#include <QtCore/QBuffer>
 
 namespace TargetManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_dialog.cpp
index f5e0014f4..c351b1d7c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_dialog.cpp
@@ -17,11 +17,11 @@
 
 #include "tgt_target_area_assignment_dialog.h"
 
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 namespace TargetManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_model.cpp
index 57b6a24bc..1eb58657a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_part_model.cpp
@@ -9,8 +9,8 @@
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ParticipantManagement/ppm_translation.h>
 
-#include <QApplication> 
-#include <QBuffer>
+#include <QtWidgets/QApplication> 
+#include <QtCore/QBuffer>
 
 namespace TargetManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.cpp
index f3409416e..600d53d5c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.cpp
@@ -3,8 +3,8 @@
 
 #include "tgt_telegrams.h"
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace TargetManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.h
index ffc08a5bc..6ab55d613 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.h
@@ -5,8 +5,8 @@
 
 #include <cstdint>
 #include <exception>
-#include <QJsonObject>
-#include <QString>
+#include <QtCore/QJsonObject>
+#include <QtCore/QString>
 
 #include <Services/TargetManagement/tgt_dtc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Data/tln_data_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Data/tln_data_plugin.cpp
index d25fc4f93..9e9694459 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Data/tln_data_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Data/tln_data_plugin.cpp
@@ -9,12 +9,12 @@
 #include <ExerciseEventManagement/eem_db_structs.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QTimer>
-#include <QUrlQuery>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonValue>
+#include <QtCore/QTimer>
+#include <QtCore/QUrlQuery>
 #include <QtWebSockets/QWebSocket>
 
 namespace TimeLineManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Data/tln_data_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Data/tln_data_plugin.h
index 00a7be319..78df94d05 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Data/tln_data_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Data/tln_data_plugin.h
@@ -3,14 +3,14 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <PluginInterfaces/data_plugin_interface.h>
 #include <Plugins/Timeline/tln_data_plugin_interface.h>
 #include <ExerciseEventManagement/eem.hpp>
 
-#include <QHash>
-#include <QMap>
-#include <QVector>
+#include <QtCore/QHash>
+#include <QtCore/QMap>
+#include <QtCore/QVector>
 
 class QTimer;
 class QWebSocket;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BCContamination/tln_bccontamination_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BCContamination/tln_bccontamination_item.cpp
index 4888b90ff..9103f77a6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BCContamination/tln_bccontamination_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BCContamination/tln_bccontamination_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_bccontamination_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BiteMessage/tln_bite_message_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BiteMessage/tln_bite_message_filter.cpp
index c22d70ccd..dcae4b1bb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BiteMessage/tln_bite_message_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BiteMessage/tln_bite_message_filter.cpp
@@ -6,9 +6,9 @@
 #include <LtsWidgets/lts_date_time_edit.h>
 #include <LtsWidgets/lts_dialog.h>
 
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QPushButton>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QPushButton>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BiteMessage/tln_bite_message_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BiteMessage/tln_bite_message_item.cpp
index 72029ebf4..bbb69fd3a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BiteMessage/tln_bite_message_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BiteMessage/tln_bite_message_item.cpp
@@ -1,8 +1,8 @@
 #include "tln_bite_message_item.h"
 #include "../../logger.h"
 
-#include <QModelIndex>
-#include <QPainter>
+#include <QtCore/QModelIndex>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Block/tln_block_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Block/tln_block_item.cpp
index dbc46d2e4..b8a0ca04d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Block/tln_block_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Block/tln_block_item.cpp
@@ -2,12 +2,12 @@
 
 #include <LtsTimeline/item.h>
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QPixmap>
+#include <QtGui/QPixmap>
 
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Block/tln_block_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Block/tln_block_item.h
index 2387a5b6c..c0e13c912 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Block/tln_block_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Block/tln_block_item.h
@@ -3,7 +3,7 @@
 #include "../../tln_abstract_event_item.h"
 
 #include <vector>
-#include <QVector>
+#include <QtCore/QVector>
 
 
 class QPixmap;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Borderline/tln_borderline_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Borderline/tln_borderline_item.cpp
index 430960d1d..0b567d9e2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Borderline/tln_borderline_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Borderline/tln_borderline_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_borderline_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_filter.cpp
index 2e621fef0..0c2d840fd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_filter.cpp
@@ -11,13 +11,13 @@
 #include <LtsWidgets/lts_date_time_edit.h>
 #include <LtsWidgets/lts_spinbox.h>
 
-#include <QComboBox>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QPushButton>
-#include <QTimer>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QPushButton>
+#include <QtCore/QTimer>
 
 inline static void sort(QVector<QString> &items)
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_item.cpp
index 11490d8fc..756b54f74 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_item.cpp
@@ -2,11 +2,11 @@
 #include "tln_camera_video_event_factory.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
-#include <QFormLayout>
-#include <QLabel>
+#include <QtCore/QModelIndex>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QLabel>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_filter.cpp
index a404fda18..ccf5ece59 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_filter.cpp
@@ -5,9 +5,9 @@
 #include <ExerciseEventManagement/eem.hpp>
 #include <LtsWidgets/lts_date_time_edit.h>
 
-#include <QPushButton>
-#include <QGroupBox>
-#include <QGridLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QGridLayout>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_item.cpp
index 7eea7284d..3631058e2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_item.cpp
@@ -3,10 +3,10 @@
 #include "tln_cross_borderline_filter.h"
 #include "../../logger.h"
 
-#include <QFormLayout>
-#include <QLabel>
-#include <QModelIndex>
-#include <QPainter>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QLabel>
+#include <QtCore/QModelIndex>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/DangerArea/tln_danger_area_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/DangerArea/tln_danger_area_item.cpp
index 89cbdad26..637d50f37 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/DangerArea/tln_danger_area_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/DangerArea/tln_danger_area_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_danger_area_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EmergencyCall/tln_emergency_call_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EmergencyCall/tln_emergency_call_item.cpp
index 0832bd81a..3981e53f2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EmergencyCall/tln_emergency_call_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EmergencyCall/tln_emergency_call_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_emergency_call_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterDangerArea/tln_enter_danger_area_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterDangerArea/tln_enter_danger_area_item.cpp
index 418c47900..09ea5c406 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterDangerArea/tln_enter_danger_area_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterDangerArea/tln_enter_danger_area_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_enter_danger_area_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterFunctionalArea/tln_enter_functional_area_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterFunctionalArea/tln_enter_functional_area_item.cpp
index ae665145a..6c19055bd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterFunctionalArea/tln_enter_functional_area_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterFunctionalArea/tln_enter_functional_area_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_enter_functional_area_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterMineArea/tln_enter_mine_area_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterMineArea/tln_enter_mine_area_item.cpp
index e0223ce0b..6d4b47535 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterMineArea/tln_enter_mine_area_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterMineArea/tln_enter_mine_area_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_enter_mine_area_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterNuclear/tln_enter_nuclear_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterNuclear/tln_enter_nuclear_item.cpp
index ea6aec057..f647955b1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterNuclear/tln_enter_nuclear_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterNuclear/tln_enter_nuclear_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_enter_nuclear_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EquipmentErrorReport/tln_equipment_error_report_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EquipmentErrorReport/tln_equipment_error_report_item.cpp
index f80917254..e60fb5c9a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EquipmentErrorReport/tln_equipment_error_report_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EquipmentErrorReport/tln_equipment_error_report_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_equipment_error_report_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_filter.cpp
index 2153c8cdc..869c41a5b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_filter.cpp
@@ -6,12 +6,12 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsWidgets/lts_date_time_edit.h>
 
-#include <QComboBox>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtWidgets/QPushButton>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_item.cpp
index 8c4f8374c..8418e9b06 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_item.cpp
@@ -2,11 +2,11 @@
 #include "tln_fire_event_event_factory.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
-#include <QFormLayout>
-#include <QLabel>
+#include <QtCore/QModelIndex>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QLabel>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FriendlyFire/tln_friendly_fire_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FriendlyFire/tln_friendly_fire_item.cpp
index fe900b1ba..37afd6ef9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FriendlyFire/tln_friendly_fire_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FriendlyFire/tln_friendly_fire_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_friendly_fire_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FunctionalArea/tln_functional_area_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FunctionalArea/tln_functional_area_item.cpp
index fbb4f5a94..23ff8ed5a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FunctionalArea/tln_functional_area_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FunctionalArea/tln_functional_area_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_functional_area_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/GasPipe/tln_gas_pipe_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/GasPipe/tln_gas_pipe_item.cpp
index 08ba060dd..874d897b7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/GasPipe/tln_gas_pipe_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/GasPipe/tln_gas_pipe_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_gas_pipe_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.cpp
index 573418ef2..cccc246f6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.cpp
@@ -12,12 +12,12 @@
 #include <ProjectDataManagement/pdm_translation.h>
 #include <ParticipantManagement/ppm_translation.h>
 
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QJsonDocument>
-#include <QPushButton>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QPushButton>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_item.cpp
index ed2d70bbc..1ebeb7d0c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_item.cpp
@@ -2,11 +2,11 @@
 #include "tln_hit_event_factory.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
-#include <QFormLayout>
-#include <QLabel>
+#include <QtCore/QModelIndex>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QLabel>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitB/tln_hit_b_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitB/tln_hit_b_item.cpp
index d9e12eefd..c6039acd7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitB/tln_hit_b_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitB/tln_hit_b_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_hit_b_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.cpp
index 958cfe0ce..bd37e4cee 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.cpp
@@ -14,16 +14,16 @@
 #include <LtsWidgets/lts_date_time_edit.h>
 #include <LtsWidgets/lts_spinbox.h>
 
-#include <QComboBox>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QJsonDocument>
-#include <QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QPushButton>
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QJsonArray>
+#include <QtCore/QJsonArray>
 
 namespace Timeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_item.cpp
index 6bfbf1b89..924c1c69c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_item.cpp
@@ -4,12 +4,12 @@
 
 #include <AreaEffectSimulation/aes_translation.h>
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
-#include <QFormLayout>
-#include <QLabel>
-#include <QObject>
+#include <QtCore/QModelIndex>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QLabel>
+#include <QtCore/QObject>
 
 namespace Timeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitC/tln_hit_c_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitC/tln_hit_c_item.cpp
index 716dbccd1..42ffe9e51 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitC/tln_hit_c_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitC/tln_hit_c_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_hit_c_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.cpp
index 1a41025fe..0a59403cf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.cpp
@@ -8,12 +8,12 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsWidgets/lts_date_time_edit.h>
 
-#include <QComboBox>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtWidgets/QPushButton>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_item.cpp
index 79044f440..70cd29b7a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_item.cpp
@@ -2,11 +2,11 @@
 #include "tln_hit_effect_simulation_event_factory.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
-#include <QFormLayout>
-#include <QLabel>
+#include <QtCore/QModelIndex>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QLabel>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitGasPipe/tln_hit_gas_pipe_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitGasPipe/tln_hit_gas_pipe_item.cpp
index a46d1e30e..c23224872 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitGasPipe/tln_hit_gas_pipe_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitGasPipe/tln_hit_gas_pipe_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_hit_gas_pipe_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitMine/tln_hit_mine_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitMine/tln_hit_mine_item.cpp
index 3a1195956..bf5c8c929 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitMine/tln_hit_mine_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitMine/tln_hit_mine_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_hit_mine_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitN/tln_hit_n_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitN/tln_hit_n_item.cpp
index 567c4a885..3e595d843 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitN/tln_hit_n_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitN/tln_hit_n_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_hit_n_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveDangerArea/tln_leave_danger_area_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveDangerArea/tln_leave_danger_area_item.cpp
index a4e08202a..9231bfc44 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveDangerArea/tln_leave_danger_area_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveDangerArea/tln_leave_danger_area_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_leave_danger_area_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveFunctionalArea/tln_leave_functional_area_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveFunctionalArea/tln_leave_functional_area_item.cpp
index 9964ff7a8..a69b84351 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveFunctionalArea/tln_leave_functional_area_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveFunctionalArea/tln_leave_functional_area_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_leave_functional_area_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveMineArea/tln_leave_mine_area_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveMineArea/tln_leave_mine_area_item.cpp
index ffdd17126..fa086bc13 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveMineArea/tln_leave_mine_area_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveMineArea/tln_leave_mine_area_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_leave_mine_area_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveNuclear/tln_leave_nuclear_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveNuclear/tln_leave_nuclear_item.cpp
index 612df3254..39b470955 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveNuclear/tln_leave_nuclear_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveNuclear/tln_leave_nuclear_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_leave_nuclear_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Manipulation/tln_manipulation_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Manipulation/tln_manipulation_filter.cpp
index 3a1909614..c0f2104a6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Manipulation/tln_manipulation_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Manipulation/tln_manipulation_filter.cpp
@@ -6,9 +6,9 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsWidgets/lts_date_time_edit.h>
 
-#include <QPushButton>
-#include <QGroupBox>
-#include <QGridLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QGridLayout>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Manipulation/tln_manipulation_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Manipulation/tln_manipulation_item.cpp
index 5cea6b366..13644f2c0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Manipulation/tln_manipulation_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Manipulation/tln_manipulation_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_manipulation_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_filter.cpp
index 2b018123e..a1176bbfa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_filter.cpp
@@ -7,9 +7,9 @@
 #include <LtsWidgets/lts_date_time_edit.h>
 #include <MarkerManagement/mrk.hpp>
 
-#include <QPushButton>
-#include <QGroupBox>
-#include <QGridLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QGridLayout>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_filter.h
index e6ea08662..480b66626 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_filter.h
@@ -4,7 +4,7 @@
 
 #include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 
 namespace NGL
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_item.cpp
index 1c7ea2469..df37cecab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_item.cpp
@@ -2,10 +2,10 @@
 #include "tln_marker_event_factory.h"
 #include "../../logger.h"
 
-#include <QFormLayout>
-#include <QLabel>
-#include <QModelIndex>
-#include <QPainter>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QLabel>
+#include <QtCore/QModelIndex>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineArea/tln_mine_area_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineArea/tln_mine_area_item.cpp
index 2064767dd..2a1178e64 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineArea/tln_mine_area_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineArea/tln_mine_area_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_mine_area_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineCorridor/tln_mine_corridor_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineCorridor/tln_mine_corridor_item.cpp
index e058f6aa9..a4a0b598a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineCorridor/tln_mine_corridor_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineCorridor/tln_mine_corridor_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_mine_corridor_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/NContamination/tln_n_contamination_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/NContamination/tln_n_contamination_item.cpp
index 46b469870..b75a32bcf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/NContamination/tln_n_contamination_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/NContamination/tln_n_contamination_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_n_contamination_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_filter.cpp
index 0fe48ed84..9b4e40b99 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_filter.cpp
@@ -9,11 +9,11 @@
 #include <LtsWidgets/lts_spinbox.h>
 #include <LtsSession/lts_session_data.h>
 
-#include <QComboBox>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QJsonDocument>
-#include <QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QPushButton>
 
 namespace Timeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_item.cpp
index 732eef52d..558e76ece 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_item.cpp
@@ -2,11 +2,11 @@
 #include "tln_radio_cnr_event_factory.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
-#include <QFormLayout>
-#include <QLabel>
+#include <QtCore/QModelIndex>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QLabel>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_filter.cpp
index cb19ef17c..7ccd0c197 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_filter.cpp
@@ -9,11 +9,11 @@
 #include <LtsWidgets/lts_spinbox.h>
 #include <LtsSession/lts_session_data.h>
 
-#include <QComboBox>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QJsonDocument>
-#include <QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QPushButton>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_item.cpp
index c2df62483..29b901228 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_item.cpp
@@ -2,11 +2,11 @@
 #include "tln_radio_tvc_event_factory.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
-#include <QFormLayout>
-#include <QLabel>
+#include <QtCore/QModelIndex>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QLabel>
 
 namespace Timeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Sanitation/tln_sanitation_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Sanitation/tln_sanitation_item.cpp
index 07617791d..85414800d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Sanitation/tln_sanitation_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Sanitation/tln_sanitation_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_sanitation_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/TechnicalArea/tln_technical_area_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/TechnicalArea/tln_technical_area_item.cpp
index 41f5d7edb..d7a7942b5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/TechnicalArea/tln_technical_area_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/TechnicalArea/tln_technical_area_item.cpp
@@ -1,9 +1,9 @@
 #include "tln_technical_area_item.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_filter.cpp
index de47b2c27..4e169150d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_filter.cpp
@@ -6,11 +6,11 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsWidgets/lts_date_time_edit.h>
 
-#include <QComboBox>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QJsonDocument>
-#include <QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QPushButton>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_item.cpp
index 537ca42b9..4cc8ff612 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_item.cpp
@@ -2,12 +2,12 @@
 #include "tln_weapon_assignment_event_factory.h"
 #include "../../logger.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
-#include <QFormLayout>
-#include <QLabel>
-#include <QPixmap>
+#include <QtCore/QModelIndex>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QLabel>
+#include <QtGui/QPixmap>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_abstract_event_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_abstract_event_filter.cpp
index fd9c4e9f9..57194e046 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_abstract_event_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_abstract_event_filter.cpp
@@ -9,13 +9,13 @@
 #include <EventTypes/HitEffectSimulation/tln_hit_effect_simulation_event_factory.h>
 #include <EventTypes/WeaponAssignment/tln_weapon_assignment_event_factory.h>
 
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QComboBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QComboBox>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_abstract_event_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_abstract_event_filter.h
index ca95450e8..8c956a26e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_abstract_event_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_abstract_event_filter.h
@@ -5,7 +5,7 @@
 
 #include <ProjectDataManagement/pdm_enums.hpp>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 class QGridLayout;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_abstract_event_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_abstract_event_item.h
index 9bba2d1e6..7f5c5c0f6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_abstract_event_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_abstract_event_item.h
@@ -5,7 +5,7 @@
 #include <LtsTimeline/item.h>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 
-#include <QJsonObject>
+#include <QtCore/QJsonObject>
 
 
 class QPainter;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_event_timeline_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_event_timeline_gui_plugin.cpp
index 984b3271b..049ade877 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_event_timeline_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_event_timeline_gui_plugin.cpp
@@ -11,7 +11,7 @@
 #include <LtsSession/lts_session_manager.h>
 #include <LtsSession/lts_session_data.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_attribute.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_attribute.cpp
index 615b5cb24..49658a93d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_attribute.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_attribute.cpp
@@ -4,15 +4,15 @@
 #include <LtsWidgets/lts_spinbox.h>
 #include <LtsWidgets/lts_date_time_edit.h>
 
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QComboBox>
-#include <QCheckBox>
-#include <QGridLayout>
-#include <QVBoxLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QVBoxLayout>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_attribute.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_attribute.h
index a23459e6f..85edee5b9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_attribute.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_attribute.h
@@ -1,7 +1,7 @@
 #pragma once
 
 
-#include <QVariant>
+#include <QtCore/QVariant>
 
 
 class QGroupBox;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_dialog.cpp
index d4de4a524..d5d51a079 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_dialog.cpp
@@ -7,10 +7,10 @@
 #include <FileManagement/flm_translation.h>
 #include <LtsWidgets/lts_base.h>
 
-#include <QTreeView>
-#include <QHeaderView>
-#include <QPainter>
-#include <QDebug>
+#include <QtWidgets/QTreeView>
+#include <QtWidgets/QHeaderView>
+#include <QtGui/QPainter>
+#include <QtCore/QDebug>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_dialog.h
index a604a7103..ac29e0a93 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_dialog.h
@@ -4,7 +4,7 @@
 
 #include <LtsWidgets/lts_dialog.h>
 
-#include <QStyledItemDelegate>
+#include <QtWidgets/QStyledItemDelegate>
 #include <LtsSession/lts_session.h>
 #include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_edit_dialog.cpp
index 1d9ab242f..e9a98dfcb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_edit_dialog.cpp
@@ -8,7 +8,7 @@
 #include <LtsTimeline/timeline_utils.h>
 #include <LtsWidgets/lts_spinbox.h>
 #include <LtsWidgets/lts_date_time_edit.h>
-#include <QComboBox>
+#include <QtWidgets/QComboBox>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_model.cpp
index cdb20cea8..de1be7f88 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_model.cpp
@@ -17,20 +17,20 @@
 #include "EventTypes/WeaponAssignment/tln_weapon_assignment_event_factory.h"
 
 #include <FileManagement/flm_translation.h>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
 #include "logger.h"
 
 #include <ngltools/ngltools_dtg.h>
 
-#include <QApplication>
-#include <QPainter>
-#include <QDateTime>
+#include <QtWidgets/QApplication>
+#include <QtGui/QPainter>
+#include <QtCore/QDateTime>
 
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_model.h
index b524d59ad..577002b4d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_model.h
@@ -4,8 +4,8 @@
 
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 
-#include <QAbstractItemModel>
-#include <QStyledItemDelegate>
+#include <QtCore/QAbstractItemModel>
+#include <QtWidgets/QStyledItemDelegate>
 
 
 namespace NGL { class INGLLogger; }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_info_dialog.cpp
index 40589d40c..657671e4a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_info_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_info_dialog.cpp
@@ -15,11 +15,11 @@
 #include <Plugins/SituationReplay/srp_gui_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonValue>
-#include <QTimer>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonValue>
+#include <QtCore/QTimer>
 
 namespace Timeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_dialog.cpp
index 71176f3b5..ae786f46c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_dialog.cpp
@@ -7,8 +7,8 @@
 #include <Viewer/LtsDataView/lts_data_view.h>
 #include <LtsPrinting/printing.h>
 
-#include <QHeaderView>
-#include <QTreeView>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QTreeView>
 
 namespace Timeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_model.cpp
index 094d20b5d..8ccb385a4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_model.cpp
@@ -10,8 +10,8 @@
 #include <LtsSession/lts_session_data.h>
 #include <MarkerManagement/mrk_data_plugin_interface.h>
 
-#include <QJsonObject>
-#include <QDateTime>
+#include <QtCore/QJsonObject>
+#include <QtCore/QDateTime>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_legend.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_legend.cpp
index e53d8faca..164216d9a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_legend.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_legend.cpp
@@ -19,10 +19,10 @@
 
 #include <LtsUtilsSettings/settings.h>
 
-#include <QLabel>
-#include <QImage>
-#include <QPixmap>
-#include <QPainter>
+#include <QtWidgets/QLabel>
+#include <QtGui/QImage>
+#include <QtGui/QPixmap>
+#include <QtGui/QPainter>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_delegate.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_delegate.cpp
index db2d74e04..55a83126e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_delegate.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_delegate.cpp
@@ -5,10 +5,10 @@
 #include <LtsTimeline/timeline_view.h>
 #include <LtsTimeline/timeline_header_view.h>
 
-#include <QGuiApplication>
-#include <QPainter>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QPainter>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.cpp
index 7f1f2f3b7..edd9b6e50 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.cpp
@@ -37,21 +37,21 @@
 #include <LtsWidgets/lts_overlay_loading.h>
 
 
-#include <QFormLayout>
-#include <QSpinBox>
-#include <QLineEdit>
-#include <QTextEdit>
-#include <QPushButton>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QPushButton>
 
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QCryptographicHash>
-#include <QInputDialog>
-#include <QLabel>
-#include <QMenu>
-#include <QThread>
-#include <QTimer>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QCryptographicHash>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QMenu>
+#include <QtCore/QThread>
+#include <QtCore/QTimer>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.h
index 6c10004dc..0e0fc32bb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.h
@@ -21,7 +21,7 @@
 #include <Plugins/SituationReplay/srp_data_plugin_interface.h>
 #include <Plugins/SituationReplayManagement/srm_data_plugin_interface.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 
 namespace NGL { class INGLLogger; }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.cpp
index 4c43213e4..f341cce07 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.cpp
@@ -40,23 +40,23 @@
 
 #include <LtsWidgets/lts_message_dialog.h>
 #include "tln_abstract_event_item.h"
-#include <QSqlDatabase>
-#include <QSqlQuery>
-#include <QSqlError>
-#include <QSqlRecord>
-#include <QSqlField>
-#include <QJsonDocument>
+#include <QtSql/QSqlDatabase>
+#include <QtSql/QSqlQuery>
+#include <QtSql/QSqlError>
+#include <QtSql/QSqlRecord>
+#include <QtSql/QSqlField>
+#include <QtCore/QJsonDocument>
 #include <QJsonParseError>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 #include <QElapsedTimer>
-#include <QTimer>
-#include <QDateTime>
-#include <QFuture>
-#include <QFutureWatcher>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
+#include <QtCore/QFuture>
+#include <QtCore/QFutureWatcher>
 #include <QtConcurrent>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 #include "Services/AudioVideoManagement/stream_name_mapping.h"
 #include <map>
 #include <stdio.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.h
index 4e5073905..e1ec282d0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.h
@@ -16,14 +16,14 @@
 #include <Plugins/AudioVideoManagement/avm_menu_edit_gui_plugin_interface.h>
 #include <AudioVideoManagement/Shared/stream_list_result.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QMutex>
-#include <QPainter>
-#include <QSqlDatabase>
+#include <QtCore/QMutex>
+#include <QtGui/QPainter>
+#include <QtSql/QSqlDatabase>
 #include <QStyleOptionViewItem>
-#include <QUuid>
+#include <QtCore/QUuid>
 
 #include <memory> 
 #include <functional>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_progress.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_progress.cpp
index 5f04ee4d4..afcbd1f44 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_progress.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_progress.cpp
@@ -7,8 +7,8 @@
 #include <Viewer/LtsDataView/lts_data_view.h>
 #include <LtsPrinting/printing.h>
 
-#include <QHeaderView>
-#include <QTreeView>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QTreeView>
 #include <QPalette>
 #include <QSpacerItem>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_proxy_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_proxy_model.h
index 91bfe1930..07ea18b23 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_proxy_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_proxy_model.h
@@ -3,7 +3,7 @@
 
 
 
-#include <QSortFilterProxyModel>
+#include <QtCore/QSortFilterProxyModel>
 
 
 class QModelIndex;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_select_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_select_handler.cpp
index 81c6e7e6e..4ba916094 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_select_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_select_handler.cpp
@@ -5,9 +5,9 @@
 #include "tln_timeline_delegate.h"
 #include "tln_timeline_model.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.cpp
index 664cefb51..82332d2d4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.cpp
@@ -1,8 +1,8 @@
 #include "tln_utils.h"
 #include "ProjectDataManagement/pdm_translation.h"
 
-#include <QHash>
-#include <QCoreApplication> 
+#include <QtCore/QHash>
+#include <QtCore/QCoreApplication> 
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.h
index 718e3bd8b..33d3a2fd4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.h
@@ -2,7 +2,7 @@
 
 #include <ProjectDataManagement/pdm_enums.hpp>
 
-#include <QString>
+#include <QtCore/QString>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeEditingModeUI.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeEditingModeUI.cpp
index 9445e9808..14dfba0d5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeEditingModeUI.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeEditingModeUI.cpp
@@ -15,9 +15,9 @@
 
 #include "logger.h"
 
-#include <QLabel>
-#include <QPushButton>
-#include <QVBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QVBoxLayout>
 
 namespace Timeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeEditingModeUI.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeEditingModeUI.h
index 87db3b3f0..871c162d2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeEditingModeUI.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeEditingModeUI.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <NGLLogger/INGLLogger.h>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class QLabel;
 class QPushButton;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeSelectionModeUI.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeSelectionModeUI.h
index 72a21e860..881d5b055 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeSelectionModeUI.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeSelectionModeUI.h
@@ -6,11 +6,11 @@
 
 #include <NGLLogger/INGLLogger.h>
 
-#include <QComboBox>
-#include <QWidget>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntry.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntry.cpp
index 17fcbb089..9c2c67157 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntry.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntry.cpp
@@ -8,11 +8,11 @@
 #include "../detail_data.h"
 #include "logger.h"
 
-#include <QColor>
+#include <QtGui/QColor>
 #include <QSizePolicy>
-#include <QJsonArray>
+#include <QtCore/QJsonArray>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntry.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntry.h
index 3c5e3e5d4..5cf8b33c2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntry.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntry.h
@@ -6,14 +6,14 @@
 
 #include "FilterTableEntryAttribute.h"
 
-#include <QWidget>
-#include <QHBoxLayout>
-#include <QPushButton>
-#include <QComboBox>
-#include <QPaintEvent>
-#include <QPainter>
-#include <QList>
-#include <QGroupBox>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QPainter>
+#include <QtCore/QList>
+#include <QtWidgets/QGroupBox>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntryAttribute.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntryAttribute.cpp
index 7c2886b4a..108903a75 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntryAttribute.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntryAttribute.cpp
@@ -8,9 +8,9 @@
 #include "logger.h"
 #include "../detail_data.h"
 
-#include <QVBoxLayout>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtWidgets/QVBoxLayout>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntryAttribute.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntryAttribute.h
index 2a68ddd12..9245f15bc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntryAttribute.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntryAttribute.h
@@ -6,7 +6,7 @@
 
 #include "AttributeEditingModeUI.h"
 #include "AttributeSelectionModeUI.h"
-#include <QGroupBox>
+#include <QtWidgets/QGroupBox>
 
 class QLabel;
 class QVBoxLayout;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterWindow.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterWindow.cpp
index 73f5a0607..18d9e5176 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterWindow.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterWindow.cpp
@@ -10,10 +10,10 @@
 #include "logger.h"
 #include <FileManagement/flm_translation.h>
 
-#include <QMessageBox>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonDocument>
+#include <QtWidgets/QMessageBox>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
 #include <QJsonParseError>
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
@@ -21,7 +21,7 @@
 #endif
 
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterWindow.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterWindow.h
index c5c4b8b7f..5ae0ce638 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterWindow.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterWindow.h
@@ -8,8 +8,8 @@
 #include <NGLLogger/INGLLogger.h>
 #include <LtsSession/lts_session.h>
 
-#include <QTimer>
-#include <QJsonArray>
+#include <QtCore/QTimer>
+#include <QtCore/QJsonArray>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/FilterEquationFunctions.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/FilterEquationFunctions.cpp
index 8533608aa..a34680f80 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/FilterEquationFunctions.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/FilterEquationFunctions.cpp
@@ -7,9 +7,9 @@
 #include "FilterValueInterpreter.h"
 #include "../../detail_data.h"
 
-#include <QString>
-#include <QRect>
-#include <QVariant>
+#include <QtCore/QString>
+#include <QtCore/QRect>
+#include <QtCore/QVariant>
 
 namespace Timeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/FilterValueInterpreter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/FilterValueInterpreter.cpp
index 7bf01ef31..4e0e5340c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/FilterValueInterpreter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/FilterValueInterpreter.cpp
@@ -5,9 +5,9 @@
 #include "FilterValueInterpreter.h"
 #include "../../detail_data.h"
 
-#include <QString>
-#include <QStringList>
-#include <QRect>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QRect>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/FilterValueInterpreter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/FilterValueInterpreter.h
index 84ac06e63..9b6016ca2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/FilterValueInterpreter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/FilterValueInterpreter.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <QString>
-#include <QVariant>
+#include <QtCore/QString>
+#include <QtCore/QVariant>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/FilterWorker.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/FilterWorker.cpp
index a54a3e903..c1c75442f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/FilterWorker.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/FilterWorker.cpp
@@ -6,13 +6,13 @@
 #include "InfoWindow.h"
 #include "../../detail_data.h"
 
-#include <QString>
-#include <QStringList>
-#include <QApplication>
-#include <QJsonArray>
-#include <QJsonObject>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtWidgets/QApplication>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/FilterWorker.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/FilterWorker.h
index c5e643b28..1fde48665 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/FilterWorker.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/FilterWorker.h
@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <QVector>
-#include <QString>
-#include <QWidget>
-#include <QMap>
+#include <QtCore/QVector>
+#include <QtCore/QString>
+#include <QtWidgets/QWidget>
+#include <QtCore/QMap>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/InfoWindow.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/InfoWindow.cpp
index a0b6b3b1d..e90d76bbb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/InfoWindow.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/InfoWindow.cpp
@@ -4,8 +4,8 @@
 
 #include "InfoWindow.h"
 
-#include <QHBoxLayout>
-#include <QMessageBox>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QMessageBox>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/InfoWindow.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/InfoWindow.h
index 58e30080f..3d8d3a56a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/InfoWindow.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/interpreter/InfoWindow.h
@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include <QDialog>
-#include <QWidget>
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QTextEdit>
-#include <QLabel>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QLabel>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/AbstractAttributeWidget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/AbstractAttributeWidget.cpp
index 0c2f94c64..bc89adc3b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/AbstractAttributeWidget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/AbstractAttributeWidget.cpp
@@ -4,8 +4,8 @@
 
 #include "AbstractAttributeWidget.h"
 
-#include <QHBoxLayout>
-#include <QPushButton>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QPushButton>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/AbstractAttributeWidget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/AbstractAttributeWidget.h
index 02cae5369..6bf3159ae 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/AbstractAttributeWidget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/AbstractAttributeWidget.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class QHBoxLayout;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/AreaWidget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/AreaWidget.cpp
index 85565091a..41c126301 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/AreaWidget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/AreaWidget.cpp
@@ -4,9 +4,9 @@
 
 #include "AreaWidget.h"
 
-#include <QGridLayout>
-#include <QSpinBox>
-#include <QWidget>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QWidget>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/CheckBoxWidget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/CheckBoxWidget.cpp
index 7634fc559..72f38b929 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/CheckBoxWidget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/CheckBoxWidget.cpp
@@ -4,7 +4,7 @@
 #include "CheckBoxWidget.h"
 #include "../../detail_data.h"
 
-#include <QCheckBox>
+#include <QtWidgets/QCheckBox>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/ComboBox.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/ComboBox.cpp
index edd8bce12..ebf9d3cad 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/ComboBox.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/ComboBox.cpp
@@ -5,7 +5,7 @@
 #include "ComboBox.h"
 #include "logger.h"
 
-#include <QComboBox>
+#include <QtWidgets/QComboBox>
 
 namespace Timeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/DefaultRangeWidget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/DefaultRangeWidget.cpp
index d32efd821..99e255de6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/DefaultRangeWidget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/DefaultRangeWidget.cpp
@@ -5,10 +5,10 @@
 #include "DefaultRangeWidget.h"
 #include "logger.h"
 
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QSpinBox>
-#include <QWidget>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QWidget>
 
 namespace Timeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/RadiusWidget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/RadiusWidget.cpp
index 4caafc2d4..68c4fcac3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/RadiusWidget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/RadiusWidget.cpp
@@ -4,9 +4,9 @@
 
 #include "RadiusWidget.h"
 
-#include <QGridLayout>
-#include <QSpinBox>
-#include <QWidget>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QWidget>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/TimeRangeWidget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/TimeRangeWidget.cpp
index cf50b33ef..a440d8b7f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/TimeRangeWidget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/TimeRangeWidget.cpp
@@ -8,9 +8,9 @@
 
 #include <LtsWidgets/lts_date_time_edit.h>
 
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QDateTime>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtCore/QDateTime>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/attribute_value_lookup.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/attribute_value_lookup.cpp
index d0133bc31..3ac1eb746 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/attribute_value_lookup.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/attribute_value_lookup.cpp
@@ -14,7 +14,7 @@
 #include <OperatorManagement/opm_translation.h>
 #include <ParticipantManagement/ppm_translation.h>
 
-#include <QVector>
+#include <QtCore/QVector>
 
 namespace Timeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/attribute_value_lookup.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/attribute_value_lookup.h
index 189725695..5815b3a7e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/attribute_value_lookup.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/attribute_value_lookup.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <QMap>
-#include <QString>
+#include <QtCore/QMap>
+#include <QtCore/QString>
 #include <memory>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.cpp
index fe7e85af3..31c1400f0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.cpp
@@ -27,10 +27,10 @@
 #include <Services/AreaEffectSimulation/aes_translation.h>
 #include <Services/MarkerManagement/mrk_translation.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QVariant>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonValue>
+#include <QtCore/QVariant>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.h
index ee1018ce8..0758897f3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.h
@@ -9,9 +9,9 @@
 
 #include <Services/ProjectDataManagement/pdm_enums.hpp> 
 
-#include <QHash>
-#include <QMap>
-#include <QObject>
+#include <QtCore/QHash>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
 
 #include "attribute_value_lookup.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/excon_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/excon_filter.cpp
index 341d0eac3..4dfe92d8e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/excon_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/excon_filter.cpp
@@ -8,7 +8,7 @@
 #include <ProjectDataManagement/pdm_enums.hpp>
 #include "logger.h"
 
-#include <QVariant>
+#include <QtCore/QVariant>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/excon_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/excon_filter.h
index 26acdd9a4..ef04e514f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/excon_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/excon_filter.h
@@ -2,7 +2,7 @@
 
 #include <LtsTimelineClassic/EventList.h>
 
-#include <QJsonArray>
+#include <QtCore/QJsonArray>
 
 
 class QWidget;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_cache_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_cache_dialog.cpp
index 29c415d1d..81bdc5aa4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_cache_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_cache_dialog.cpp
@@ -4,9 +4,9 @@
 #include "tln_cache_dialog.h"
 #include "ui_tln_cache_dialog.h"
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_cache_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_cache_dialog.h
index d36cc7ada..afc828183 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_cache_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_cache_dialog.h
@@ -5,8 +5,8 @@
 
 #include "tln_dialog_model.h"
 
-#include <QDialog>
-#include <QVector>
+#include <QtWidgets/QDialog>
+#include <QtCore/QVector>
 
 
 namespace Ui
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog.cpp
index 3dc6c2504..9bd9c2ba9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog.cpp
@@ -24,18 +24,18 @@
 #include <LtsTimelineClassic/EventTools.h>
 #include <ngltools/ngltools_dtg.h>
 
-#include <QDialog>
-#include <QPushButton>
-#include <QLineEdit>
-#include <QTextEdit>
-#include <QFormLayout>
-#include <QSpinBox>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QSpinBox>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 #include <QJsonParseError>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 using namespace LtsTimelineClassic;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog.h
index cea9ffc2f..ca1a9c7f2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog.h
@@ -20,7 +20,7 @@
 
 #include <Plugins/SituationReplay/srp_gui_plugin_interface.h>
 
-#include <QJsonArray>
+#include <QtCore/QJsonArray>
 
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog_model.cpp
index 4bb460e5c..c1efed8a6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog_model.cpp
@@ -19,16 +19,16 @@
 #include <AudioVideoManagement/stream_name_mapping.h>
 #include <Plugins/Timeline/tln_data_plugin_interface.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonValue>
-#include <QDateTime>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonValue>
+#include <QtCore/QDateTime>
 #include <QMutableVectorIterator>
 #include <QtWebSockets/QWebSocket> 
-#include <QTimer>
-#include <QUrl>
-#include <QUrlQuery>
+#include <QtCore/QTimer>
+#include <QtCore/QUrl>
+#include <QtCore/QUrlQuery>
 
 
 using namespace LtsTimelineClassic;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog_model.h
index 36968fa99..53fe75246 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog_model.h
@@ -13,7 +13,7 @@
 #include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
 
-#include <QJsonArray>
+#include <QtCore/QJsonArray>
 #include <QAbstractSocket>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list.cpp
index a3591557d..3cb29a8bd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list.cpp
@@ -11,8 +11,8 @@
 #include <LtsTimelineClassic/EventGraphic.h>
 #include <LtsPrinting/printing.h>
 
-#include <QHeaderView>
-#include <QTreeView>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QTreeView>
 
 const int MAX_EVENTS = 30; 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_columns.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_columns.cpp
index e0662912a..2143f4c81 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_columns.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_columns.cpp
@@ -9,13 +9,13 @@
 #include <FileManagement/flm_translation.h>
 #include <LtsWidgets/lts_dialog.h>
 
-#include <QSortFilterProxyModel>
-#include <QAbstractItemModel>
-#include <QColor>
+#include <QtCore/QSortFilterProxyModel>
+#include <QtCore/QAbstractItemModel>
+#include <QtGui/QColor>
 
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
 #include <QJsonParseError>
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_columns.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_columns.h
index 7c5164ab7..ccee786eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_columns.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_columns.h
@@ -8,7 +8,7 @@
 
 #include "logger.h"
 
-#include <QCheckBox>
+#include <QtWidgets/QCheckBox>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_model.cpp
index 8fcfc560a..d1cc06c7f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_model.cpp
@@ -6,8 +6,8 @@
 #include <ParticipantManagement/ppm_translation.h>
 #include <Services/AreaEffectSimulation/aes_translation.h>
 
-#include <QJsonObject>
-#include <QDateTime>
+#include <QtCore/QJsonObject>
+#include <QtCore/QDateTime>
 
 
 namespace Timeline
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_legend.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_legend.cpp
index 158288e0c..251d51e97 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_legend.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_legend.cpp
@@ -12,10 +12,10 @@
 #include <ProjectDataManagement/pdm_enums.hpp>
 #include <ProjectDataManagement/pdm_translation.h>
 
-#include <QLabel>
-#include <QImage>
-#include <QPixmap>
-#include <QPainter>
+#include <QtWidgets/QLabel>
+#include <QtGui/QImage>
+#include <QtGui/QPixmap>
+#include <QtGui/QPainter>
 
 namespace Timeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_show_details.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_show_details.cpp
index c767f8a1a..7b3ee58e8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_show_details.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_show_details.cpp
@@ -17,10 +17,10 @@
 #include <Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.h>
 #include <Plugins/SituationReplay/srp_gui_plugin_interface.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonValue>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonValue>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_view_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_view_gui_plugin.cpp
index b316eb7bc..3da4cae81 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_view_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_view_gui_plugin.cpp
@@ -12,7 +12,7 @@
 #include <LtsSession/lts_session_manager.h>
 #include <LtsSession/lts_session_data.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace Timeline
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/tln_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/tln_data_plugin_interface.h
index 55dd13b1e..d43dc580a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/tln_data_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/tln_data_plugin_interface.h
@@ -5,8 +5,8 @@
 
 #include <PluginInterfaces/data_plugin_interface.h>
 #include <ExerciseEventManagement/eem.hpp>
-#include <QVector>
-#include <QJsonObject>
+#include <QtCore/QVector>
+#include <QtCore/QJsonObject>
 
 #ifndef TLNDATAPLUGININTERFACE_EXPORT
 # ifdef BUILD_STATIC_LIBRARIES
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBase/Gui/Notification/tab_notification_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBase/Gui/Notification/tab_notification_gui_plugin.cpp
index 1ab75041c..27a598169 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBase/Gui/Notification/tab_notification_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBase/Gui/Notification/tab_notification_gui_plugin.cpp
@@ -6,7 +6,7 @@
 
 #include <LtsSession/lts_session.h>
 #include <LtsNotification/lts_notification.h>
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <TrainingAreaBase/logger.h>
 
 namespace TrainingAreaBase
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/OcTerminal/taboc_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/OcTerminal/taboc_gui_plugin.cpp
index bb4a230db..7c83d57a2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/OcTerminal/taboc_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/OcTerminal/taboc_gui_plugin.cpp
@@ -10,7 +10,7 @@
 #include <LtsWidgets/lts_message_dialog.h>
 #include <LtsWidgets/lts_base_layout_widget.h> 
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 namespace TrainingAreaBaseOC
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_dialog.cpp
index b0fe52c39..bf1e8dd94 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_dialog.cpp
@@ -9,7 +9,7 @@
 #include <LtsSession/lts_session_data.h>
 
 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 namespace TrainingAreaBaseOC
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_gui_plugin.cpp
index 43954b093..c345fe072 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_gui_plugin.cpp
@@ -11,7 +11,7 @@
 #include <LtsNotification/lts_notification.h>
 #include <LtsWidgets/lts_dialog.h> 
 #include <LtsWidgets/lts_splash.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace TrainingAreaBaseOC
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_model.h
index 1ea10126e..79c574644 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_model.h
@@ -5,7 +5,7 @@
 #include <TrainingAreaBaseOC/taboc_dtc.h>
 #include <TrainingAreaBaseOC/logger.h>
 #include <LtsWidgets/lts_abstract_table_model.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 namespace LtsSession
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/VirtualKeyboard/Gui/VirtualKeyboard/vkb_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/VirtualKeyboard/Gui/VirtualKeyboard/vkb_gui_plugin.cpp
index d34bf83b1..b348f8535 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/VirtualKeyboard/Gui/VirtualKeyboard/vkb_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/VirtualKeyboard/Gui/VirtualKeyboard/vkb_gui_plugin.cpp
@@ -9,15 +9,15 @@
 #include <LtsVirtualKeyboard/LtsVirtualKeyboard.h>
 #include <LtsVirtualKeyboard/LtsKeyPushButton.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QDesktopWidget>
 #include <QDoubleSpinBox>
-#include <QLineEdit>
-#include <QPlainTextEdit>
-#include <QScrollArea>
-#include <QSpinBox>
-#include <QTextEdit>
-#include <QComboBox>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QPlainTextEdit>
+#include <QtWidgets/QScrollArea>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QComboBox>
 #ifdef Q_OS_WIN
 #include <windows.h>
 #endif
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/VirtualKeyboard/Gui/VirtualKeyboard/vkb_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/VirtualKeyboard/Gui/VirtualKeyboard/vkb_gui_plugin.h
index 3bc385814..40af2b070 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/VirtualKeyboard/Gui/VirtualKeyboard/vkb_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/VirtualKeyboard/Gui/VirtualKeyboard/vkb_gui_plugin.h
@@ -6,7 +6,7 @@
 
 #include <Plugins/VirtualKeyboard/vkb_gui_plugin_interface.h>
 #include <NGLLogger/INGLLogger.h>
-#include <QPointer>
+#include <QtCore/QPointer>
 
 namespace LtsVirtualKeyboard
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_model.h
index b3783f567..6de755fc8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_model.h
@@ -9,7 +9,7 @@
 #include <WarehouseGuez/whg_dtc.h>
 #include <WarehouseGuez/logger.h>
 
-#include <QHash>
+#include <QtCore/QHash>
 
 namespace WarehouseManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_model.cpp
index 0ff796e52..243140aa9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/injury_model_model.cpp
@@ -7,7 +7,7 @@
 #include <WarehouseGuez/logger.h>
 #include <WarehouseGuez/whg_translation.h>
 
-#include <QIcon>
+#include <QtGui/QIcon>
 
 namespace WarehouseManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/skeleton/Skeleton.Stage1/skl_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/skeleton/Skeleton.Stage1/skl_data_plugin_interface.h
index ea70ec352..35a20edef 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/skeleton/Skeleton.Stage1/skl_data_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/skeleton/Skeleton.Stage1/skl_data_plugin_interface.h
@@ -5,7 +5,7 @@
 
 #include <PluginInterfaces/data_plugin_interface.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace Skeleton
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/skeleton/Skeleton.Stage2/skl_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/skeleton/Skeleton.Stage2/skl_data_plugin_interface.h
index ea70ec352..35a20edef 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/skeleton/Skeleton.Stage2/skl_data_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/skeleton/Skeleton.Stage2/skl_data_plugin_interface.h
@@ -5,7 +5,7 @@
 
 #include <PluginInterfaces/data_plugin_interface.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace Skeleton
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/skeleton/Skeleton.Stage3/skl_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/skeleton/Skeleton.Stage3/skl_data_plugin_interface.h
index ea70ec352..35a20edef 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/skeleton/Skeleton.Stage3/skl_data_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/skeleton/Skeleton.Stage3/skl_data_plugin_interface.h
@@ -5,7 +5,7 @@
 
 #include <PluginInterfaces/data_plugin_interface.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace Skeleton
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/skeleton/Skeleton.Stage3/skl_gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/skeleton/Skeleton.Stage3/skl_gui_plugin_interface.h
index 557bc42d6..69fe1600b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/skeleton/Skeleton.Stage3/skl_gui_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/skeleton/Skeleton.Stage3/skl_gui_plugin_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #ifndef SKLGUIPLUGININTERFACE_EXPORT
 # ifdef BUILD_STATIC_LIBRARIES
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/skeleton/base/skl_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/skeleton/base/skl_data_plugin_interface.h
index ea70ec352..35a20edef 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/skeleton/base/skl_data_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/skeleton/base/skl_data_plugin_interface.h
@@ -5,7 +5,7 @@
 
 #include <PluginInterfaces/data_plugin_interface.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace Skeleton
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Projects/AHTC/main.h b/qt6-after/qt6-migrated-legatus/Lts/Projects/AHTC/main.h
index 169df4eb6..b7f784bda 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Projects/AHTC/main.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Projects/AHTC/main.h
@@ -2,7 +2,7 @@
 
 #include <PluginInterfaces/project_plugin_interface.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 class Project : public QObject, public ProjectPlugin::Plugin
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Projects/ComMaster/main.h b/qt6-after/qt6-migrated-legatus/Lts/Projects/ComMaster/main.h
index 907c7b4a1..95e893d01 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Projects/ComMaster/main.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Projects/ComMaster/main.h
@@ -2,7 +2,7 @@
 
 #include <PluginInterfaces/project_plugin_interface.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 class Project : public QObject, public ProjectPlugin::Plugin
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Projects/DemoTablet/main.h b/qt6-after/qt6-migrated-legatus/Lts/Projects/DemoTablet/main.h
index bf58b822a..506d9b1cc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Projects/DemoTablet/main.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Projects/DemoTablet/main.h
@@ -2,7 +2,7 @@
 
 #include <PluginInterfaces/project_plugin_interface.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 class Project : public QObject, public ProjectPlugin::Plugin
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Projects/Ets/main.h b/qt6-after/qt6-migrated-legatus/Lts/Projects/Ets/main.h
index 2a7b878c2..3316b173b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Projects/Ets/main.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Projects/Ets/main.h
@@ -2,7 +2,7 @@
 
 #include <PluginInterfaces/project_plugin_interface.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 class Project : public QObject, public ProjectPlugin::Plugin
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Projects/Guez/main.h b/qt6-after/qt6-migrated-legatus/Lts/Projects/Guez/main.h
index 408fe3314..b43b120c1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Projects/Guez/main.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Projects/Guez/main.h
@@ -2,7 +2,7 @@
 
 #include <PluginInterfaces/project_plugin_interface.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 class Project : public QObject, public ProjectPlugin::Plugin
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Projects/L400P2/main.h b/qt6-after/qt6-migrated-legatus/Lts/Projects/L400P2/main.h
index 5f3313fe3..dc6281553 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Projects/L400P2/main.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Projects/L400P2/main.h
@@ -2,7 +2,7 @@
 
 #include <PluginInterfaces/project_plugin_interface.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 class Project : public QObject, public ProjectPlugin::Plugin
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Projects/Legatus/main.h b/qt6-after/qt6-migrated-legatus/Lts/Projects/Legatus/main.h
index 034d3d3a1..9c79f31f9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Projects/Legatus/main.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Projects/Legatus/main.h
@@ -2,7 +2,7 @@
 
 #include <PluginInterfaces/project_plugin_interface.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 class Project : public QObject, public ProjectPlugin::Plugin
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Projects/Qatar/main.h b/qt6-after/qt6-migrated-legatus/Lts/Projects/Qatar/main.h
index f9d9e20e0..8893d2a55 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Projects/Qatar/main.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Projects/Qatar/main.h
@@ -2,7 +2,7 @@
 
 #include <PluginInterfaces/project_plugin_interface.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 class Project : public QObject, public ProjectPlugin::Plugin
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Projects/QatarMOUT/main.h b/qt6-after/qt6-migrated-legatus/Lts/Projects/QatarMOUT/main.h
index 469fe455e..77599f919 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Projects/QatarMOUT/main.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Projects/QatarMOUT/main.h
@@ -2,7 +2,7 @@
 
 #include <PluginInterfaces/project_plugin_interface.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 class Project : public QObject, public ProjectPlugin::Plugin
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_api.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_api.h
index 4c9f92087..f47165004 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_api.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_api.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "buildingcontrolbsm_export.h"
-#include <QObject>
+#include <QtCore/QObject>
 #include <logger.h>
 #include "bsm_types.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.cpp
index 0ba822b04..6dcadae1f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.cpp
@@ -4,8 +4,8 @@
 
 #include "bsm_socket.h"
 #include "bsm_telegrams_configuration_setup.h"
-#include <QTimer>
-#include <QHostAddress>
+#include <QtCore/QTimer>
+#include <QtNetwork/QHostAddress>
 
 static const int s_aliveTimeout = 10;  
 namespace BuildingControlUnit
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.h
index 1a45ca91c..7d244dbc3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.h
@@ -2,9 +2,9 @@
 
 #pragma once
 
-#include <QObject>
-#include <QHostAddress>
-#include <QTcpSocket>
+#include <QtCore/QObject>
+#include <QtNetwork/QHostAddress>
+#include <QtNetwork/QTcpSocket>
 #include <logger.h>
 #include "bsm_types.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket_handler.cpp
index bd29ba61d..4608e0cea 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket_handler.cpp
@@ -12,7 +12,7 @@
 #include "bsm_telegrams_sw_version_report.h"
 #include "bsm_telegrams_sw_version_request.h"
 #include "bsm_telegrams_technical_status_request.h"
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <QHostInfo>
 
 namespace BuildingControlUnit
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket_handler.h
index aea9cb5f3..6ed1a0e97 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket_handler.h
@@ -2,9 +2,9 @@
 
 #pragma once
 
-#include <QObject>
-#include <QMap>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+#include <QtCore/QTimer>
 #include <QElapsedTimer>
 #include <logger.h>
 #include "bsm_socket.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_telegrams_base.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_telegrams_base.h
index 397bb28ac..078cbec52 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_telegrams_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_telegrams_base.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QByteArray>
+#include <QtCore/QByteArray>
 #include "buildingcontrolbsm_export.h"
 
 namespace BuildingControlUnit
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_telegrams_direct_fire.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_telegrams_direct_fire.h
index c2695af5a..13ec05d40 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_telegrams_direct_fire.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_telegrams_direct_fire.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "bsm_telegrams_base.h"
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace BuildingControlUnit
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_test_main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_test_main.cpp
index c8dba23a2..a1e991481 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_test_main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_test_main.cpp
@@ -2,7 +2,7 @@
 
 
 #include <nglapplication/nglcoreapplication.h>
-#include <QVector>
+#include <QtCore/QVector>
 #include "bsm_api.h"
 
 int main(int argc, char **argv)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_types.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_types.h
index 692e18aea..db265690b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_types.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_types.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 #include <bcu_types.h>
 
 namespace BuildingControlUnit
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/handeleffect.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/handeleffect.cpp
index 1f329b71f..136796c54 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/handeleffect.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/handeleffect.cpp
@@ -2,8 +2,8 @@
 
 
 #include "handeleffect.h"
-#include <QUrlQuery>
-#include <QTimer>
+#include <QtCore/QUrlQuery>
+#include <QtCore/QTimer>
 
 namespace BuildingControlUnit
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/handeleffects.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/handeleffects.cpp
index 1ce6b5725..381367873 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/handeleffects.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/handeleffects.cpp
@@ -5,13 +5,13 @@
 #include <utility>
 #include "handeleffect.h"
 #include "handle_http_request.h"
-#include <QTimer>
-#include <QUrlQuery>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QDateTime>
-#include <QJsonArray>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QUrlQuery>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QDateTime>
+#include <QtCore/QJsonArray>
+#include <QtCore/QDateTime>
 
 namespace BuildingControlUnit
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/main.cpp
index 871d9aeaa..bd38672ba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/main.cpp
@@ -1,8 +1,8 @@
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include "xmlreader.h"
 #include "handeleffects.h"
-#include <QString>
-#include <QDebug>
+#include <QtCore/QString>
+#include <QtCore/QDebug>
 
 
 int main(int argc, char *argv[])
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.cpp
index e41caff0e..e26bae598 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.cpp
@@ -3,8 +3,8 @@
 
 #include "xmlreader.h"
 
-#include <QFile>
-#include <QUrlQuery>
+#include <QtCore/QFile>
+#include <QtCore/QUrlQuery>
 #include <QXmlStreamAttributes>
 
 namespace BuildingControlUnit
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.h
index 1d2dd387f..a9b4c4a08 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.h
@@ -8,9 +8,9 @@
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
-#include <QXmlStreamReader>
-#include <QVector>
-#include <QUrl>
+#include <QtCore/QXmlStreamReader>
+#include <QtCore/QVector>
+#include <QtCore/QUrl>
 
 namespace BuildingControlUnit
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/json_api.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/json_api.h
index b27f71490..d29c342db 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/json_api.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/json_api.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "buildingcontroljson_export.h"
 #include <VWM/vwm_types.h>
 #include <BSM/bsm_types.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/web_socket_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/web_socket_handler.h
index 1a2a22b61..edc26e0f2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/web_socket_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/web_socket_handler.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QQueue>
 #include <QtWebSockets/QWebSocketServer>
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/test_read_xml.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/test_read_xml.cpp
index 3c64ebfa6..8fdde4610 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/test_read_xml.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/test_read_xml.cpp
@@ -3,9 +3,9 @@
 
 
 #include <nglapplication/nglcoreapplication.h>
-#include <QDateTime>
-#include <QString>
-#include <QTimer>
+#include <QtCore/QDateTime>
+#include <QtCore/QString>
+#include <QtCore/QTimer>
 #include "vwm_api.h"
 #include "vwm_math.h"
 #include "test_read_xml.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/test_read_xml.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/test_read_xml.h
index 750860d2c..e3fd82f54 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/test_read_xml.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/test_read_xml.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <NGLLogger/INGLLogger.h>
 #include "vwm_api.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/test_vwm_xml.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/test_vwm_xml.cpp
index 5fecc2f46..9b7caadf6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/test_vwm_xml.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/test_vwm_xml.cpp
@@ -14,11 +14,11 @@
 
 #include <bcu_xml_reader.h>
 
-#include <QStringList>
-#include <QFile>
+#include <QtCore/QStringList>
+#include <QtCore/QFile>
 #include <QPolygonF>
-#include <QDomDocument>
-#include <QDebug>
+#include <QtXml/QDomDocument>
+#include <QtCore/QDebug>
 
 static QDomElement getChildElement(const QDomElement &parent, const QString &childTag, bool bThrow = true)
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.cpp
index 09f8f612c..a1f8fe2e1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.cpp
@@ -7,9 +7,9 @@
 #include "vwm_xml_reader.h"
 #include "vwm_state_store.h"
 #include "vwm_math.h"
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <settings.h>
-#include <QFile>
+#include <QtCore/QFile>
 #include <initializer_list>
 #ifdef LTS_DEBUG
 
@@ -17,11 +17,11 @@
 #  include <sstream>
 #endif 
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 #include <QJsonParseError>
-#include <QDebug>
+#include <QtCore/QDebug>
 
 namespace BuildingControlUnit
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.h
index 1beb276a9..291853142 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "vwm_building_room_geometry.h"
-#include <QObject>
+#include <QtCore/QObject>
 #include <logger.h>
 #include "vwm_building.h"
 #include "vwm_types.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building.cpp
index 133a42448..6d86ef3ab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building.cpp
@@ -4,9 +4,9 @@
 #include "vwm_building.h"
 #include <utility>
 #include "vwm_math.h"
-#include <QSet>
-#include <QVector>
-#include <QLineF>
+#include <QtCore/QSet>
+#include <QtCore/QVector>
+#include <QtCore/QLineF>
 #include <settings.h>
 
 #include <algorithm>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building.h
index 0983c04ea..440af8796 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <QString>
-#include <QMap>
-#include <QVector>
+#include <QtCore/QString>
+#include <QtCore/QMap>
+#include <QtCore/QVector>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 #include <logger.h>
 #include "vwm_types.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.cpp
index bb5f183af..739227a53 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.cpp
@@ -5,7 +5,7 @@
 #include "bcu_xml_reader.h"
 
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
-#include <QDebug>
+#include <QtCore/QDebug>
 #include <algorithm>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.h
index 602e4a13d..8f8ebce15 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QString>
-#include <QMap>
+#include <QtCore/QString>
+#include <QtCore/QMap>
 #include <QPolygonF>
 #include <QDomElement>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_math.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_math.h
index 93edf6b2c..7fb822c7a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_math.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_math.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
-#include <QVector>
+#include <QtCore/QVector>
 #include "vwm_building.h"
 #include "vwm_types.h"
 #include "buildingcontrolvwm_export.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_math_unit_test.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_math_unit_test.h
index 6f11a61dd..2c7413c1c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_math_unit_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_math_unit_test.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class VwmMathUnitTest : public QObject
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_state_store.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_state_store.cpp
index e7c78eb67..b9b180fce 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_state_store.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_state_store.cpp
@@ -3,13 +3,13 @@
 #include "vwm_state_store.h"
 #include <utility>
 #include <logger.h>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QString>
-#include <QFile>
-#include <QStandardPaths>
-#include <QDir>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QString>
+#include <QtCore/QFile>
+#include <QtCore/QStandardPaths>
+#include <QtCore/QDir>
 
 
 namespace BuildingControlUnit
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_state_store.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_state_store.h
index 17af547b7..eca61326e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_state_store.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_state_store.h
@@ -5,7 +5,7 @@
 #include "vwm_building.h"
 #include "vwm_types.h"
 #include "buildingcontrolvwm_export.h"
-#include <QMap>
+#include <QtCore/QMap>
 
 namespace BuildingControlUnit
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_types.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_types.h
index 85f3f4772..aef9b1f4c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_types.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_types.h
@@ -5,8 +5,8 @@
 
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 #include <utility>
-#include <QMap>
-#include <QVector>
+#include <QtCore/QMap>
+#include <QtCore/QVector>
 #include <cstdint>
 #include <iostream>
 #include <bcu_types.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_xml_reader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_xml_reader.cpp
index 1c5fc6a62..adb47abe2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_xml_reader.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_xml_reader.cpp
@@ -5,9 +5,9 @@
 #include "vwm_xml_reader.h"
 #include "vwm_building_room_geometry.h"
 #include <logger.h>
-#include <QFile>
-#include <QDomDocument>
-#include <QSet>
+#include <QtCore/QFile>
+#include <QtXml/QDomDocument>
+#include <QtCore/QSet>
 #include <bcu_xml_reader.h>
 
 namespace BuildingControlUnit
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_xml_reader.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_xml_reader.h
index cc4dcd1c8..2a8055bd6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_xml_reader.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_xml_reader.h
@@ -6,7 +6,7 @@
 #include "vwm_building_room_geometry.h"
 #include "vwm_types.h"
 #include "buildingcontrolvwm_export.h"
-#include <QMap>
+#include <QtCore/QMap>
 
 namespace BuildingControlUnit
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/bcu_types.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/bcu_types.h
index 75cddbcd7..76aaf3bf0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/bcu_types.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/bcu_types.h
@@ -4,9 +4,9 @@
 #pragma once
 
 #include <iostream>
-#include <QVector>
-#include <QMap>
-#include <QSet>
+#include <QtCore/QVector>
+#include <QtCore/QMap>
+#include <QtCore/QSet>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 
 namespace BuildingControlUnit
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/bcu_xml_reader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/bcu_xml_reader.cpp
index 880646ada..ec07a9e8e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/bcu_xml_reader.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/bcu_xml_reader.cpp
@@ -5,8 +5,8 @@
 #include "bcu_xml_reader.h"
 #include "logger.h"
 #include <QDomElement>
-#include <QDomDocument>
-#include <QFile>
+#include <QtXml/QDomDocument>
+#include <QtCore/QFile>
 
 namespace BuildingControlUnit
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/handle_http_request.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/handle_http_request.cpp
index 1aa09a986..7f15d9ca3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/handle_http_request.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/handle_http_request.cpp
@@ -3,9 +3,9 @@
 
 #include "handle_http_request.h"
 #include <QAuthenticator>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QTimer>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkReply>
+#include <QtCore/QTimer>
 
 namespace BuildingControlUnit
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/handle_http_request.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/handle_http_request.h
index eeff72cdd..473e6a179 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/handle_http_request.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/handle_http_request.h
@@ -2,14 +2,14 @@
 
 #pragma once
 
-#include <QObject>
-#include <QNetworkRequest>
+#include <QtCore/QObject>
+#include <QtNetwork/QNetworkRequest>
 #include <QQueue>
-#include <QMap>
-#include <QSet>
+#include <QtCore/QMap>
+#include <QtCore/QSet>
 #include <logger.h>
 #include "bcu_types.h"
-#include <QTime>
+#include <QtCore/QTime>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/main_handler.h
index a7f7f333b..60a92c6bc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/main_handler.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <BSM/bsm_api.h>
 #include <Json/json_api.h>
 #include <VWM/vwm_api.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/settings.h
index afbe621c2..e9367f797 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/settings.h
@@ -2,7 +2,7 @@
 
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 #include "buildingcontrolcommon_export.h"
 
 namespace BuildingControlUnit
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/web_socket_telegrams.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/web_socket_telegrams.cpp
index bd7667fdb..7a0e8445e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/web_socket_telegrams.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/web_socket_telegrams.cpp
@@ -3,9 +3,9 @@
 
 #include "web_socket_telegrams.h"
 #include <utility>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 
 namespace BuildingControlUnit
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/web_socket_telegrams.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/web_socket_telegrams.h
index d690cba8f..c727b50cd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/web_socket_telegrams.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/web_socket_telegrams.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <QString>
-#include <QVector>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 #include "buildingcontrolcommon_export.h"
 #include <bcu_types.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.cpp
index 5bcc55df1..74831a43f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.cpp
@@ -5,9 +5,9 @@
 #include <utility>
 #include "building_process.h"
 #include "main_handler.h"
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QStandardPaths>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 #include <ngldb/nsqlquery.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.h
index 7156ece93..451a61503 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 #include "ism_handler.h"
 #include "logger.h"
 #include <bld_fts.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp
index fd832c207..12c172100 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp
@@ -9,12 +9,12 @@
 
 #include <QStandardPaths>
 #include <QFile>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QTransform>
 #include <QtWebSockets/QWebSocket>
 #include <QXmlStreamWriter>
-#include <QJsonArray>
-#include <QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
 #include <ngltools/ngltools_filesystem.h>
 
 #include <LtsCoordTrans/lts_coord_trans.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.h
index 062c0a24e..0e2683dfe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.h
@@ -5,7 +5,7 @@
 
 #include <QAbstractSocket>
 #include <QProcess>
-#include <QVector>
+#include <QtCore/QVector>
 #include <QUrl>
 #include "ism_handler.h"
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp
index f3c2282f1..d45c0d630 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp
@@ -4,11 +4,11 @@
 #include "ism_handler.h"
 #include <utility>
 #include "main_handler.h"
-#include <QTimer>
-#include <QJsonDocument>
+#include <QtCore/QTimer>
+#include <QtCore/QJsonDocument>
 #include <QJsonParseError>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <QtWebSockets/QWebSocket>
 #include <web_socket_telegrams.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.h
index 3d1eec332..2334788fb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.h
@@ -2,11 +2,11 @@
 
 
 #pragma once
-#include <QObject>
-#include <QMap>
-#include <QSet>
-#include <QHash>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+#include <QtCore/QSet>
+#include <QtCore/QHash>
+#include <QtCore/QVector>
 
 #include <InfrastructureManagement/ism.hpp>
 #include <InfrastructureManagement/ism_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.cpp
index 1eee8a300..486bced7e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.cpp
@@ -5,7 +5,7 @@
 #include "settings.h"
 #include <DDS/Core/pacemaker.h>
 #include <AssetManagement/asm_dtc.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace Buildings
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.h
index d4df8217d..4be46523d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <memory>
-#include <QObject>
+#include <QtCore/QObject>
 #include "building_control_handler.h"
 #include "dds_handler.h"
 #include "ism_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.h
index 393cd4011..71796ab6a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.h
@@ -2,7 +2,7 @@
 
 #pragma once
 #include <ProjectDataManagement/pdm.hpp>
-#include <QMap>
+#include <QtCore/QMap>
 #include "logger.h"
 
 namespace Buildings
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.h
index b10ec5877..1801bab35 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.h
@@ -3,7 +3,7 @@
 
 #pragma once
 #include <ParticipantManagement/ppm.hpp>
-#include <QHash>
+#include <QtCore/QHash>
 #include "logger.h"
 
 namespace Buildings
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.h
index 5c25c9666..696605277 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.h
@@ -3,7 +3,7 @@
 
 #pragma once
 #include <ParticipantManagement/ppm.hpp>
-#include <QHash>
+#include <QtCore/QHash>
 #include "logger.h"
 #include <bld_fts.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/settings.h
index 71f221dee..2aab71f98 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/settings.h
@@ -2,8 +2,8 @@
 
 
 #pragma once
-#include <QString>
-#include <QPair>
+#include <QtCore/QString>
+#include <QtCore/QPair>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.cpp
index 14d646c2e..9c9c996e5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.cpp
@@ -6,9 +6,9 @@
 #include "building_process.h"
 
 #include <QtWebSockets/QWebSocket>
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.h
index ae0da6766..5cd76ae45 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtWebSockets/QWebSocketServer>
 #include "building_control_handler.h"
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.cpp
index 5e76819bb..bdae89051 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.cpp
@@ -4,12 +4,12 @@
 
 #include <utility>
 #include <AudioVideoManagement/avm_translation.h>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QSet>
-#include <QVector>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QSet>
+#include <QtCore/QVector>
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 namespace AudioVideoManagement {
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h
index 873a9a7d1..51aa70e6a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <QString>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QVector>
-#include <QSet>
+#include <QtCore/QString>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QVector>
+#include <QtCore/QSet>
 #include "svccnrhelper_export.h"
 
 // Use avm_enums.hpp from RTI DDS tools
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Messages/reply_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Messages/reply_message.cpp
index 695b04681..1f9ce1447 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Messages/reply_message.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Messages/reply_message.cpp
@@ -8,7 +8,7 @@
 #include <QtCore/QUuid>
 #include <QtCore/QJsonDocument>
 #include <QtGlobal>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 namespace CombatNetRadio
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/active_exercises.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/active_exercises.h
index 0fb1bde37..b1fe85a29 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/active_exercises.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/active_exercises.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <set>
 
 namespace ExerciseManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.cpp
index 541332b6b..b5b5b8a9e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.cpp
@@ -7,10 +7,10 @@
 #include <AudioVideoManagement/avm_dtc.h>
 #include <AudioVideoManagement/avm_translation.h>
 #include <InfrastructureManagement/ism_dtc.h>
-#include <QDateTime>
-#include <QString>
+#include <QtCore/QDateTime>
+#include <QtCore/QString>
 #include <QtGlobal>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
 
 namespace CombatNetRadio
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.h
index 10ec0c079..8d180b654 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.h
@@ -5,8 +5,8 @@
 
 #include "WebSocketInterface/Messages/reply_message.h"
 #include "logger.h"
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 #include <boost/optional.hpp>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/exercise_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/exercise_manager.cpp
index e5559693f..2921502e3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/exercise_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/exercise_manager.cpp
@@ -10,9 +10,9 @@
 #include "config_cnr.h"
 #include "positions_cnr.h"
 #include <ExerciseManagement/exm_dtc.h>
-#include <QUuid>
-#include <QDateTime>
-#include <QJsonDocument>
+#include <QtCore/QUuid>
+#include <QtCore/QDateTime>
+#include <QtCore/QJsonDocument>
 #include <memory>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/exercise_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/exercise_manager.h
index da1c5e92a..8752e516c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/exercise_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/exercise_manager.h
@@ -4,10 +4,10 @@
 #pragma once
 
 #include "WebSocketInterface/Messages/reply_message.h"
-#include <QObject>
-#include <QString>
-#include <QTimer>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QTimer>
+#include <QtCore/QVector>
 #include <map>
 #include <vector>
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/helper.cpp
index dcb330a03..2d331f362 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/helper.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/helper.cpp
@@ -5,8 +5,8 @@
 #include <LtsUtilsCore/json_object.h>
 #include <AudioVideoManagement/avm.hpp>
 #include <InfrastructureManagement/ism.hpp>
-#include <QString>
-#include <QJsonDocument>
+#include <QtCore/QString>
+#include <QtCore/QJsonDocument>
 
 namespace CombatNetRadio
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/positions_cnr.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/positions_cnr.cpp
index 64b5fee22..0b4087e6c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/positions_cnr.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/positions_cnr.cpp
@@ -9,8 +9,8 @@
 #include <ParticipantManagement/ppm.hpp>
 #include <LtsUtils/LtsUtilsCore/outdated_position.h>
 #include <QtGlobal>
-#include <QDateTime>
-#include <QSet>
+#include <QtCore/QDateTime>
+#include <QtCore/QSet>
 
 namespace
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/positions_cnr.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/positions_cnr.h
index 5600f7fa7..0dd9bc824 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/positions_cnr.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/positions_cnr.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "WebSocketInterface/Messages/reply_message.h"
-#include <QVector>
+#include <QtCore/QVector>
 #include <boost/optional.hpp>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/training_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/training_area.cpp
index c37921ff4..431a657b7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/training_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/training_area.cpp
@@ -9,7 +9,7 @@
 #include <AssetManagement/asm_dtc.h>
 #include <InfrastructureManagement/ism_dtc.h>
 #include <QtGlobal>
-#include <QPointF>
+#include <QtCore/QPointF>
 
 namespace CombatNetRadio
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.cpp
index 50f0c3893..2fcfa5bcd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.cpp
@@ -3,9 +3,9 @@
 
 #include "checkmk_handler.h"
 
-#include <QTimer>
-#include <QHostAddress>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtNetwork/QHostAddress>
+#include <QtCore/QDateTime>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.h
index 4130e6c4e..fb6935f97 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.h
@@ -6,9 +6,9 @@
 #include "logger.h"
 #include <InfrastructureManagement/ism_dtc.h>
 #include <ComponentMonitor/cmo.hpp>
-#include <QTimer>
-#include <QTcpSocket>
-#include <QDataStream>
+#include <QtCore/QTimer>
+#include <QtNetwork/QTcpSocket>
+#include <QtCore/QDataStream>
 
 namespace DDSConnector
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler_schedule_check.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler_schedule_check.cpp
index 3d26b5e6b..7acaf34a6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler_schedule_check.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler_schedule_check.cpp
@@ -4,9 +4,9 @@
 #include "checkmk_handler_schedule_check.h"
 #include <utility>
 
-#include <QTimer>
-#include <QHostAddress>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtNetwork/QHostAddress>
+#include <QtCore/QDateTime>
 
 namespace ComponentMonitor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler_schedule_check.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler_schedule_check.h
index b7a94c88e..67ede960e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler_schedule_check.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler_schedule_check.h
@@ -7,9 +7,9 @@
 #include "logger.h"
 #include <ComponentMonitor/cmo_fts.h>
 #include <ComponentMonitor/cmo.hpp>
-#include <QTimer>
-#include <QTcpSocket>
-#include <QDataStream>
+#include <QtCore/QTimer>
+#include <QtNetwork/QTcpSocket>
+#include <QtCore/QDataStream>
 
 namespace DDSConnector
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/component_status_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/component_status_handler.cpp
index ddab0ed30..04d56bce4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/component_status_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/component_status_handler.cpp
@@ -7,7 +7,7 @@
 #include <ComponentMonitor/cmo.hpp>
 #include <ComponentMonitor/cmo_dts.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace ComponentMonitor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/component_status_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/component_status_handler.h
index ed45692ae..a5dea1bfc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/component_status_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/component_status_handler.h
@@ -6,7 +6,7 @@
 #include "logger.h"
 #include <InfrastructureManagement/ism_dtc.h>
 #include <ComponentMonitor/cmo.hpp>
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 
 namespace DDSConnector
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/initialization.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/initialization.cpp
index c847041a7..c60071393 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/initialization.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/initialization.cpp
@@ -6,7 +6,7 @@
 #include <ComponentMonitor/cmo.hpp>
 #include <ComponentMonitor/cmo_dts.h>
 #include <ComponentMonitor/settings.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace ComponentMonitor
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/initialization.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/initialization.h
index 9c813e6e8..10ae3624f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/initialization.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/initialization.h
@@ -9,7 +9,7 @@
 #include "checkmk_handler_schedule_check.h"
 #include <InfrastructureManagement/ism_dtc.h>
 #include <ComponentMonitor/cmo.hpp>
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 
 namespace DDSConnector
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/main_handler.h
index 97d425fd5..dda492e75 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/main_handler.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include "dds_handler.h"
 #include "cmo_db.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/settings.h
index c0ef06239..3a32b993e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/settings.h
@@ -2,7 +2,7 @@
 
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/Simulator/main_sim.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/Simulator/main_sim.cpp
index 1b3fb875f..704e95c88 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/Simulator/main_sim.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/Simulator/main_sim.cpp
@@ -1,11 +1,11 @@
 
 
 
-#include <QCoreApplication>
-#include <QStringList>
-#include <QTcpSocket>
-#include <QTimer>
-#include <QDebug>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QStringList>
+#include <QtNetwork/QTcpSocket>
+#include <QtCore/QTimer>
+#include <QtCore/QDebug>
 #include "main_sim.h"
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/Simulator/main_sim.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/Simulator/main_sim.h
index 99ea82753..0df0199db 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/Simulator/main_sim.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/Simulator/main_sim.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QTcpServer>
+#include <QtNetwork/QTcpServer>
 
 class QTimer;
 class PayloadSender : public QObject
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dgps_config.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dgps_config.cpp
index 6077528d6..ac6eda6a1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dgps_config.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dgps_config.cpp
@@ -1,8 +1,8 @@
 
 
-#include <QSettings>
-#include <QFileInfo>
-#include <QCoreApplication>
+#include <QtCore/QSettings>
+#include <QtCore/QFileInfo>
+#include <QtCore/QCoreApplication>
 #include "dgps_config.h"
 
 using namespace DifferentialGPS;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dgps_config.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dgps_config.h
index f387c149e..b081d5bd9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dgps_config.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dgps_config.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace DifferentialGPS
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/mainthread.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/mainthread.cpp
index 1837d7df0..7331be373 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/mainthread.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/mainthread.cpp
@@ -6,8 +6,8 @@
 #include "tetra_if_impl.h"
 #include "trimble_if.h"
 
-#include <QMutexLocker>
-#include <QTimer>
+#include <QtCore/QMutexLocker>
+#include <QtCore/QTimer>
 #include <DDS/Core/pacemaker.h>
 
 namespace DifferentialGPS
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/tcpsocket.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/tcpsocket.cpp
index cacc2e2f8..5227c0c1c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/tcpsocket.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/tcpsocket.cpp
@@ -2,9 +2,9 @@
 
 #include "tcpsocket.h"
 
-#include <QTcpSocket>
-#include <QHostAddress>
-#include <QTimer>
+#include <QtNetwork/QTcpSocket>
+#include <QtNetwork/QHostAddress>
+#include <QtCore/QTimer>
 
 namespace DifferentialGPS
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/tetra_if.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/tetra_if.cpp
index babb27b56..8f2194982 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/tetra_if.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/tetra_if.cpp
@@ -6,10 +6,10 @@
 #ifdef BUILD_RTI
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QTcpSocket>
-#include <QHostAddress>
+#include <QtNetwork/QTcpSocket>
+#include <QtNetwork/QHostAddress>
 #include <QNetworkInterface>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #include <CoPrtCnv/CoPrtCnvRadioTelegram.hpp>
 #include <CoPrtCnv/CoPrtCnvTelegramConverter.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/trimble_if.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/trimble_if.cpp
index 3a32f091c..7fb19f049 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/trimble_if.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/trimble_if.cpp
@@ -6,10 +6,10 @@
 #include "dgps_config.h"
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QTcpSocket>
-#include <QHostAddress>
-#include <QFile>
-#include <QTimer>
+#include <QtNetwork/QTcpSocket>
+#include <QtNetwork/QHostAddress>
+#include <QtCore/QFile>
+#include <QtCore/QTimer>
 
 namespace DifferentialGPS
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/feedGeoJson.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/feedGeoJson.cpp
index 31e96bb62..b078fb550 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/feedGeoJson.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/feedGeoJson.cpp
@@ -6,10 +6,10 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 #include <QPolygonF>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/feedGeoJson.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/feedGeoJson.h
index 30d88d258..9cdb96e25 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/feedGeoJson.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/feedGeoJson.h
@@ -12,7 +12,7 @@
 
 #include <DDS/DDSConnector/dds_connector.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QPointF>
+#include <QtCore/QPointF>
 
 namespace FeedGeoJson
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/websocket_server.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/websocket_server.cpp
index 953b51d7a..5845c1680 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/websocket_server.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/websocket_server.cpp
@@ -7,7 +7,7 @@
 
 #include "websocket_server.h"
 #include <utility>
-#include <QDebug>
+#include <QtCore/QDebug>
 
 WebSocketServer::WebSocketServer(quint16 port, QObject *parent)
   : QObject(parent),
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/websocket_server.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/websocket_server.h
index e0aaca2f2..ba0ac9dfe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/websocket_server.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/websocket_server.h
@@ -14,7 +14,7 @@
 
 #ifndef WEBSOCKETSERVER_H
 #define WEBSOCKETSERVER_H
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtWebSockets/QWebSocketServer>
 #include <QtWebSockets/QWebSocket>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/abstract_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/abstract_socket_handler.cpp
index d1b8e03b2..13d61e9ba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/abstract_socket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/abstract_socket_handler.cpp
@@ -4,8 +4,8 @@
 #include "abstract_socket_handler.h"
 #include "guez_nasat_telegrams.h"
 #include "settings.h"
-#include <QDateTime>
-#include <QJsonDocument>
+#include <QtCore/QDateTime>
+#include <QtCore/QJsonDocument>
 
 namespace GuezNasat
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/abstract_socket_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/abstract_socket_handler.h
index b1a48e802..340d7d492 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/abstract_socket_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/abstract_socket_handler.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtWebSockets/QWebSocketServer>
 #include <logger.h>
 #include "guez_nasat_telegrams.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/dds_handler.h
index ecab7f0a0..b378c917f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/dds_handler.h
@@ -11,8 +11,8 @@
 #include <ParticipantManagement/ppm.hpp>
 #include <ProjectDataManagement/pdm_dtc.h>
 #include <TrainingAreaBase/tab_dts.h>
-#include <QHash>
-#include <QSet>
+#include <QtCore/QHash>
+#include <QtCore/QSet>
 
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/guez_nasat_telegrams.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/guez_nasat_telegrams.cpp
index 19afb0368..dc072b9f8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/guez_nasat_telegrams.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/guez_nasat_telegrams.cpp
@@ -3,8 +3,8 @@
 
 #include "guez_nasat_telegrams.h"
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace GuezNasat
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/guez_nasat_telegrams.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/guez_nasat_telegrams.h
index 1543aea2e..1da7b8ce2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/guez_nasat_telegrams.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/guez_nasat_telegrams.h
@@ -5,8 +5,8 @@
 
 #include <cstdint>
 #include <exception>
-#include <QJsonObject>
-#include <QString>
+#include <QtCore/QJsonObject>
+#include <QtCore/QString>
 
 namespace GuezNasat
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft.h
index 05db4d45d..355ee7dbd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QHash>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
 #include <GuezNasat/gna_dts.h>
 #include <GuezNasat/gna_fts.h>
 #include <GuezNasat/gna_db.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft_participant.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft_participant.cpp
index e8b34c88d..891e82d5d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft_participant.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft_participant.cpp
@@ -8,7 +8,7 @@
 #include "dds_handler.h"
 #include "handler_participant.h"
 #include <GuezNasat/gna_db.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace GuezNasat
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft_participant.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft_participant.h
index 376505233..caf5c0cb9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft_participant.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft_participant.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QHash>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
 #include <GuezNasat/gna_dts.h>
 #include <GuezNasat/gna_fts.h>
 #include <ExerciseManagement/exm_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_impact.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_impact.cpp
index 62198002b..1b552b1e0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_impact.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_impact.cpp
@@ -6,9 +6,9 @@
 #include "dds_handler.h"
 #include "handler_participant.h"
 
-#include <QDateTime>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QDateTime>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <ParticipantManagement/ppm.hpp>
 #include <LtsCoordTrans/lts_coord_trans.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_impact.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_impact.h
index 30c9a8758..ddaf9358e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_impact.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_impact.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QHash>
-#include <QObject>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
 #include <AreaEffectSimulation/aes_ftc.h>
 #include <ProjectDataManagement/pdm.hpp>
 #include "guez_nasat_telegrams.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_nine_liner.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_nine_liner.cpp
index 6a0b2e0a2..24d5e1fe8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_nine_liner.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_nine_liner.cpp
@@ -9,7 +9,7 @@
 #include "initialization.h"
 #include "dds_handler.h"
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <LtsCoordTrans/lts_coord_trans.h>
 
 namespace GuezNasat
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_nine_liner.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_nine_liner.h
index f39292404..103a10cdd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_nine_liner.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_nine_liner.h
@@ -7,8 +7,8 @@
 #include "handler_participant.h"
 #include "logger.h"
 #include <GuezNasat/gna_dtc.h>
-#include <QHash>
-#include <QObject>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
 
 namespace GuezNasat
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.cpp
index 4940dd060..7fba5f8b2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.cpp
@@ -9,7 +9,7 @@
 #include "dds_handler.h"
 #include <LtsCoordTrans/lts_coord_trans.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace GuezNasat
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.h
index 7f7663f26..745eecd5f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QHash>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
 #include <GuezNasat/gna.hpp>
 #include <ParticipantManagement/ppm_dtc_types.h>
 #include "guez_nasat_telegrams.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/initialization.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/initialization.cpp
index cc58f00ba..a4059e921 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/initialization.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/initialization.cpp
@@ -16,7 +16,7 @@
 #include <DDS/DDSConnector/dds_connector.h>
 #include <DDS/Core/pacemaker.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace GuezNasat
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/settings.h
index 0b1b08b0d..21b2437fa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/settings.h
@@ -2,8 +2,8 @@
 
 
 #pragma once
-#include <QPointF>
-#include <QString>
+#include <QtCore/QPointF>
+#include <QtCore/QString>
 #include "svcgnaserver_export.h"
 
 namespace NGL
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/tcp_socket_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/tcp_socket_handler.h
index fe7f0cfb9..30587c60e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/tcp_socket_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/tcp_socket_handler.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QTcpServer>
+#include <QtNetwork/QTcpServer>
 #include "logger.h"
 #include "abstract_socket_handler.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/aes_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/aes_handler.cpp
index 10883fe5e..8251d9bc6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/aes_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/aes_handler.cpp
@@ -12,8 +12,8 @@
 
 #include <EntityTypeStruct.h>
 
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 
 using namespace AreaEffectSimulation;
 namespace HighLevelArchitecture
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/aes_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/aes_handler.h
index 813b57236..ffd5ea52b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/aes_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/aes_handler.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <AreaEffectSimulation/aes_dtc.h>
 #include <AreaEffectSimulation/aes_ftc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.cpp
index 578471db0..3e7b61850 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.cpp
@@ -3,8 +3,8 @@
 
 #include "damage_model.h"
 
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 
 namespace HighLevelArchitecture
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.h
index 1cb67251f..4f47c8c58 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.h
@@ -5,8 +5,8 @@
 
 #include <Common/identifierstruct.h>
 
-#include <QObject>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 #include <EntityIdentifierStruct.h>
 #include <DamageStatusEnum32.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/dds_handler.h
index bf5a0dedb..7f20e163e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/dds_handler.h
@@ -5,7 +5,7 @@
 #include <DDS/DDSConnector/dds_connector.h>
 #include <DDS/Core/core_dts_types.h>
 #include <ExerciseManagement/exm_dtc.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <Common/logger.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.cpp
index 143eb976a..79bb31e91 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.cpp
@@ -6,8 +6,8 @@
 #include "ngs_handler.h"
 #include "web_socket_handler.h"
 #include <Common/settings.h>
-#include <QCoreApplication>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QTimer>
 #include <DDS/Core/pacemaker.h>
 
 namespace HighLevelArchitecture
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.h
index d8e7fbae0..49045f9f0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include "dds_handler.h"
 #include <Common/logger.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.cpp
index d8f70e20a..266ab4f37 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.cpp
@@ -30,8 +30,8 @@
 
 #include <NGSException.h>
 
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 #include <QtCore/QtEndian>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <Core/core_enums.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.h
index 68ef40c41..9b99bb4c0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.h
@@ -4,10 +4,10 @@
 
 #include <Common/participantposition.h>
 
-#include <QObject>
-#include <QPointF>
-#include <QMap>
-#include <QSet>
+#include <QtCore/QObject>
+#include <QtCore/QPointF>
+#include <QtCore/QMap>
+#include <QtCore/QSet>
 #include <QTransform>
 
 #include <WorldLocationStruct.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_handler.cpp
index 8a3b29e1f..0cbd68a3d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_handler.cpp
@@ -8,7 +8,7 @@
 #include "socketreader.h"
 #include <Common/settings.h>
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QHostInfo>
 
 namespace HighLevelArchitecture
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_handler.h
index d8322c8ca..00a19aff4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_handler.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include "dds_handler.h"
 #include "ppm_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ppm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ppm_handler.h
index cea8131b0..f5d1846b1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ppm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ppm_handler.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QSet>
+#include <QtCore/QObject>
+#include <QtCore/QSet>
 
 #include <ParticipantManagement/ppm.hpp>
 #include <ParticipantManagement/ppm_ftc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_actionrequest.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_actionrequest.h
index 3b7d020a0..a285166d6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_actionrequest.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_actionrequest.h
@@ -8,7 +8,7 @@
 #include <IObserverActionRequestIntClassCB.h>
 #include <IObserverActionRequestIntInstance.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <Common/logger.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_data.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_data.h
index 86535bf37..f90933f68 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_data.h
@@ -8,7 +8,7 @@
 #include <IObserverDataIntClassCB.h>
 #include <IObserverDataIntInstance.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <Common/logger.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_engagementreply.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_engagementreply.h
index 910abc2e1..c7fa427da 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_engagementreply.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_engagementreply.h
@@ -8,7 +8,7 @@
 #include <IObserverEngagementReplyIntClassCB.h>
 #include <IObserverEngagementReplyIntInstance.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <Common/logger.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_eventreport.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_eventreport.h
index 91971e55f..cd3a3bdde 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_eventreport.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_eventreport.h
@@ -8,7 +8,7 @@
 #include <IObserverEventReportIntClassCB.h>
 #include <IObserverEventReportIntInstance.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <Common/logger.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_weaponfire.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_weaponfire.h
index b26d4d149..befe46453 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_weaponfire.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_weaponfire.h
@@ -8,7 +8,7 @@
 #include <IObserverWeaponFireIntClassCB.h>
 #include <IObserverWeaponFireIntInstance.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <Common/logger.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_observer_object_cb.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_observer_object_cb.h
index 0767387b7..3044482d2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_observer_object_cb.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_observer_object_cb.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <IObserverBaseEntityObjInstance.h>
 #include <IObserverEmbeddedSystemObjInstance.h>
 #include <IObserverEnvironmentObjectObjInstance.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/web_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/web_socket_handler.cpp
index d916ee21c..ebd528ca3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/web_socket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/web_socket_handler.cpp
@@ -9,7 +9,7 @@
 #include "ppm_handler.h"
 #include <Common/settings.h>
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtWebSockets/QWebSocket>
 
 namespace HighLevelArchitecture
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/web_socket_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/web_socket_handler.h
index 3778c2419..d4c5ed7ba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/web_socket_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/web_socket_handler.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QQueue>
 #include <QtWebSockets/QWebSocketServer>
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/identifierstruct.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/identifierstruct.h
index bcfd25cbb..4e6b26f0e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/identifierstruct.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/identifierstruct.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 #include "hlacommon_export.h"
 
 namespace rpr2
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/participantposition.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/participantposition.h
index ea5aa2be5..2aafd83cf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/participantposition.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/participantposition.h
@@ -3,8 +3,8 @@
 #pragma once
 
 #include <WorldLocationStruct.h>
-#include <QString>
-#include <QPointF>
+#include <QtCore/QString>
+#include <QtCore/QPointF>
 #include <Core/core.hpp>
 #include "hlacommon_export.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/player_callback.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/player_callback.h
index d52b02e58..b7f40003b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/player_callback.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/player_callback.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <NullPlayerCallback.h>
 
 #include "hlacommon_export.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/settings.h
index 4542a319f..7a6a4e674 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/settings.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 #include <IObserver.h>
 #include "hlacommon_export.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/typestruct.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/typestruct.cpp
index e171c78e9..4a0c9fa2e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/typestruct.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/typestruct.cpp
@@ -4,8 +4,8 @@
 #include "typestruct.h"
 #include "settings.h"
 #include <EntityTypeStruct.h>
-#include <QStringList>
-#include <QVector>
+#include <QtCore/QStringList>
+#include <QtCore/QVector>
 
 namespace HighLevelArchitecture
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/typestruct.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/typestruct.h
index c4a8c040f..15fe80f82 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/typestruct.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/typestruct.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 #include "hlacommon_export.h"
 
 namespace rpr2
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.cpp
index 77893eb64..fb7dac0af 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.cpp
@@ -13,8 +13,8 @@
 
 #include <EntityTypeStruct.h>
 
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.h
index f806d1f48..0ff7437be 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.h
@@ -2,9 +2,9 @@
 
 #pragma once
 
-#include <QObject>
-#include <QHash>
-#include <QSet>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtCore/QSet>
 
 #include <AreaEffectSimulation/aes_dtc.h>
 #include <AreaEffectSimulation/aes_ftc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/damage_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/damage_model.cpp
index 22d28ce58..a25f05ac1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/damage_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/damage_model.cpp
@@ -3,8 +3,8 @@
 
 #include "damage_model.h"
 
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 
 namespace HighLevelArchitecture
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/damage_model.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/damage_model.h
index 04de9e1fa..1eb4cc374 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/damage_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/damage_model.h
@@ -5,8 +5,8 @@
 
 #include <Common/identifierstruct.h>
 
-#include <QObject>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 #include <TacticalStatusStruct.h>
 #include <EntityIdentifierStruct.h>
 #include <DamageStatusEnum32.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.h
index b8424120d..ddd1da378 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.h
@@ -5,7 +5,7 @@
 #include <DDS/DDSConnector/dds_connector.h>
 #include <DDS/Core/core_dts_types.h>
 #include <ExerciseManagement/exm_dtc.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <Common/logger.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.cpp
index 0237c322f..8f977b269 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.cpp
@@ -6,8 +6,8 @@
 #include "web_socket_handler.h"
 #include "Common/identifierstruct.h"
 
-#include <QCoreApplication>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QTimer>
 #include <Common/settings.h>
 #include <Common/logger.h>
 #include <DDS/Core/pacemaker.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.h
index d8e7fbae0..49045f9f0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include "dds_handler.h"
 #include <Common/logger.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.cpp
index bb3a7f8a8..3bd1a4e64 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.cpp
@@ -30,10 +30,10 @@
 
 #include <NGSException.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QPolygonF>
 #include <QTransform>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <AreaEffectSimulation/aes_enums.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.h
index 915315ab9..1f8409615 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.h
@@ -4,10 +4,10 @@
 
 #include <Common/participantposition.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <IObserver.h>
-#include <QMap>
-#include <QSet>
+#include <QtCore/QMap>
+#include <QtCore/QSet>
 #include <QTransform>
 
 #include <ProjectDataManagement/pdm_enums.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_handler.cpp
index cd9f5ec69..12ca07c29 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_handler.cpp
@@ -6,7 +6,7 @@
 #include <Common/logger.h>
 #include <Common/settings.h>
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QHostInfo>
 
 namespace HighLevelArchitecture
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_handler.h
index 65d9b40ac..3b61a8ae0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_handler.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include "dds_handler.h"
 #include "ppm_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ppm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ppm_handler.h
index d9d14207c..0be899558 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ppm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ppm_handler.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QSet>
+#include <QtCore/QObject>
+#include <QtCore/QSet>
 
 #include <ParticipantManagement/ppm.hpp>
 #include <ParticipantManagement/ppm_ftc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_weaponfire.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_weaponfire.h
index b26d4d149..befe46453 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_weaponfire.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_weaponfire.h
@@ -8,7 +8,7 @@
 #include <IObserverWeaponFireIntClassCB.h>
 #include <IObserverWeaponFireIntInstance.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <Common/logger.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_observer_object_cb.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_observer_object_cb.h
index 1f2a52b2f..7f585a539 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_observer_object_cb.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_observer_object_cb.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <IObserverBaseEntityObjInstance.h>
 #include <IObserverEnvironmentObjectObjInstance.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/web_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/web_socket_handler.cpp
index ffc526553..facea3745 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/web_socket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/web_socket_handler.cpp
@@ -9,7 +9,7 @@
 #include "ppm_handler.h"
 #include <Common/settings.h>
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtWebSockets/QWebSocket>
 
 namespace HighLevelArchitecture
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/web_socket_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/web_socket_handler.h
index b97f4067a..a91d9d75f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/web_socket_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/web_socket_handler.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QQueue>
 #include <QtWebSockets/QWebSocketServer>
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/damage_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/damage_model.cpp
index 22d28ce58..a25f05ac1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/damage_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/damage_model.cpp
@@ -3,8 +3,8 @@
 
 #include "damage_model.h"
 
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 
 namespace HighLevelArchitecture
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/damage_model.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/damage_model.h
index 04de9e1fa..1eb4cc374 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/damage_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/damage_model.h
@@ -5,8 +5,8 @@
 
 #include <Common/identifierstruct.h>
 
-#include <QObject>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 #include <TacticalStatusStruct.h>
 #include <EntityIdentifierStruct.h>
 #include <DamageStatusEnum32.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.cpp
index 40359240c..f4d60979b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.cpp
@@ -6,8 +6,8 @@
 #include "web_socket_interface.h"
 #include "Common/identifierstruct.h"
 
-#include <QCoreApplication>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QTimer>
 #include <Common/settings.h>
 #include <Common/logger.h>
 #include <DDS/Core/pacemaker.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.h
index aa0120473..63ae37373 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 
 #include <Common/logger.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.cpp
index 998133cf5..f0a20e94f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.cpp
@@ -29,10 +29,10 @@
 
 #include <NGSException.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QPolygonF>
 #include <QTransform>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <AreaEffectSimulation/aes_enums.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.h
index a2d353d69..da855e336 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.h
@@ -5,10 +5,10 @@
 #include "ws_telegrams.h"
 #include <Common/participantposition.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <IObserver.h>
-#include <QMap>
-#include <QSet>
+#include <QtCore/QMap>
+#include <QtCore/QSet>
 #include <QTransform>
 
 #include <ProjectDataManagement/pdm_enums.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_handler.cpp
index cef027704..03820dc5c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_handler.cpp
@@ -6,13 +6,13 @@
 #include <Common/logger.h>
 #include <Common/settings.h>
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QHostInfo>
 
 
 #include "RTIVector.h"
 
-#include <QVector>
+#include <QtCore/QVector>
 
 namespace HighLevelArchitecture
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_handler.h
index d19ba79bd..e19fdd63e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_handler.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include "ngs_handler.h"
 #include <Common/logger.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/web_socket_interface.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/web_socket_interface.cpp
index ea37b8f76..7ddcb571f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/web_socket_interface.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/web_socket_interface.cpp
@@ -7,11 +7,11 @@
 #include "web_socket_interface.h"
 #include "ws_telegrams.h"
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace HighLevelArchitecture
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/web_socket_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/web_socket_interface.h
index da398b47b..c797a1e5f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/web_socket_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/web_socket_interface.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtWebSockets/QWebSocket>
 #include <QtWebSockets/QWebSocketServer>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ws_telegrams.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ws_telegrams.cpp
index dcd341462..67c1185ec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ws_telegrams.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ws_telegrams.cpp
@@ -3,8 +3,8 @@
 
 #include "ws_telegrams.h"
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace HighLevelArchitecture
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ws_telegrams.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ws_telegrams.h
index 4e64b32ea..5c03e68ea 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ws_telegrams.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ws_telegrams.h
@@ -5,8 +5,8 @@
 
 #include <cstdint>
 #include <exception>
-#include <QJsonObject>
-#include <QString>
+#include <QtCore/QJsonObject>
+#include <QtCore/QString>
 
 namespace HighLevelArchitecture
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_abmeldung.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_abmeldung.cpp
index 245784115..a6e442f91 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_abmeldung.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_abmeldung.cpp
@@ -1,7 +1,7 @@
 #include "ex_abmeldung.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 #include <AdlerJson/generatetelegrams.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_anmeldebestaetigung.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_anmeldebestaetigung.cpp
index 1c011d601..f2c76b88e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_anmeldebestaetigung.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_anmeldebestaetigung.cpp
@@ -1,7 +1,7 @@
 #include "ex_anmeldebestaetigung.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 #include <AdlerJson/generatetelegrams.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_anmeldung.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_anmeldung.cpp
index 62b09ff36..cf3eb185f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_anmeldung.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_anmeldung.cpp
@@ -1,7 +1,7 @@
 #include "ex_anmeldung.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 
 #include <AdlerJson/generatetelegrams.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_aq_freitext.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_aq_freitext.cpp
index 0ae778530..a6fb805b5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_aq_freitext.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_aq_freitext.cpp
@@ -1,7 +1,7 @@
 #include "ex_aq_freitext.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 #include "msgcompares.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_erkundungsanfrage.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_erkundungsanfrage.cpp
index 7f0e99cf4..7fab229a0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_erkundungsanfrage.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_erkundungsanfrage.cpp
@@ -1,7 +1,7 @@
 #include "ex_erkundungsanfrage.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 
 #include <AdlerJson/generatetelegrams.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_erkundungsergebnisse.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_erkundungsergebnisse.cpp
index ffc186598..eaea1724f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_erkundungsergebnisse.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_erkundungsergebnisse.cpp
@@ -1,7 +1,7 @@
 #include "ex_erkundungsergebnisse.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 
 #include <AdlerJson/generatetelegrams.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fh_feuerhalt.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fh_feuerhalt.cpp
index 582a16fc7..5f87b21a7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fh_feuerhalt.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fh_feuerhalt.cpp
@@ -1,7 +1,7 @@
 #include "ex_fh_feuerhalt.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 #include "msgcompares.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_flugbahnberechnung.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_flugbahnberechnung.cpp
index 79687b607..667a4c0d3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_flugbahnberechnung.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_flugbahnberechnung.cpp
@@ -1,7 +1,7 @@
 #include "ex_flugbahnberechnung.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 #include "msgcompares.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_flugbahndaten.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_flugbahndaten.cpp
index 2f976bf87..9f4b7be75 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_flugbahndaten.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_flugbahndaten.cpp
@@ -1,7 +1,7 @@
 #include "ex_flugbahndaten.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 #include "msgcompares.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_abgefeuert.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_abgefeuert.cpp
index c2910b5da..193980810 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_abgefeuert.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_abgefeuert.cpp
@@ -1,7 +1,7 @@
 #include "ex_fq_abgefeuert.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 
 #include <AdlerJson/generatetelegrams.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_feuerbereit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_feuerbereit.cpp
index 1e70f3fb4..933c763fd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_feuerbereit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_feuerbereit.cpp
@@ -1,7 +1,7 @@
 #include "ex_fq_feuerbereit.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 
 #include <AdlerJson/generatetelegrams.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_feuerkampf.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_feuerkampf.cpp
index 428bc1015..4cf9d02b8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_feuerkampf.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_feuerkampf.cpp
@@ -1,7 +1,7 @@
 #include "ex_fq_feuerkampf.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 #include "msgcompares.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_feuern.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_feuern.cpp
index f6df62f90..947337354 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_feuern.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_feuern.cpp
@@ -1,7 +1,7 @@
 #include "ex_fq_feuern.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 
 #include <AdlerJson/generatetelegrams.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_vollzugsmeldung.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_vollzugsmeldung.cpp
index 2e318031e..769433d3c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_vollzugsmeldung.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_vollzugsmeldung.cpp
@@ -1,7 +1,7 @@
 #include "ex_fq_vollzugsmeldung.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 
 #include <AdlerJson/generatetelegrams.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_wirkfeldplanung.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_wirkfeldplanung.cpp
index 4e7b36408..535037720 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_wirkfeldplanung.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_fq_wirkfeldplanung.cpp
@@ -1,7 +1,7 @@
 #include "ex_fq_wirkfeldplanung.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 #include "msgcompares.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_hq_fuehrungslinien.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_hq_fuehrungslinien.cpp
index 8f14ea2d2..64621f4ba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_hq_fuehrungslinien.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_hq_fuehrungslinien.cpp
@@ -1,7 +1,7 @@
 #include "ex_hq_fuehrungslinien.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 #include "msgcompares.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_hq_koordinierungsmassnahmen.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_hq_koordinierungsmassnahmen.cpp
index c359b6dad..d47edd85c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_hq_koordinierungsmassnahmen.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_hq_koordinierungsmassnahmen.cpp
@@ -1,7 +1,7 @@
 #include "ex_hq_koordinierungsmassnahmen.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 #include "msgcompares.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_mq_manuelle_quittung.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_mq_manuelle_quittung.cpp
index 8da0b870b..5de80ccf1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_mq_manuelle_quittung.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_mq_manuelle_quittung.cpp
@@ -1,7 +1,7 @@
 #include "ex_mq_manuelle_quittung.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 #include "msgcompares.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_sq_stellungsmeldung_fs.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_sq_stellungsmeldung_fs.cpp
index cbb361e6b..b93cdb49b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_sq_stellungsmeldung_fs.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_sq_stellungsmeldung_fs.cpp
@@ -1,7 +1,7 @@
 #include "ex_sq_stellungsmeldung_fs.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 #include "msgcompares.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_sq_stellungsmeldung_lp.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_sq_stellungsmeldung_lp.cpp
index 5725bf548..70aca5e27 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_sq_stellungsmeldung_lp.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_sq_stellungsmeldung_lp.cpp
@@ -1,7 +1,7 @@
 #include "ex_sq_stellungsmeldung_lp.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 #include "msgcompares.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_sq_stellungsmeldung_ws.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_sq_stellungsmeldung_ws.cpp
index f6a27ca80..dc9bbf789 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_sq_stellungsmeldung_ws.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_sq_stellungsmeldung_ws.cpp
@@ -1,7 +1,7 @@
 #include "ex_sq_stellungsmeldung_ws.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 #include "msgcompares.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_sq_stellungswechsel.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_sq_stellungswechsel.cpp
index 147f4348a..651557728 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_sq_stellungswechsel.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_sq_stellungswechsel.cpp
@@ -1,7 +1,7 @@
 #include "ex_sq_stellungswechsel.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 #include "msgcompares.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_status.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_status.cpp
index 753f256c8..66324d714 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_status.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_status.cpp
@@ -1,7 +1,7 @@
 #include "ex_status.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 #include <AdlerJson/generatetelegrams.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_tq_technische_quittung.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_tq_technische_quittung.cpp
index c2024561c..edf6fd24b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_tq_technische_quittung.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/ex_tq_technische_quittung.cpp
@@ -1,7 +1,7 @@
 #include "ex_tq_technische_quittung.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <AdlerJson/telegrams.h>
 #include "msgcompares.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/test_telegram_decoding.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/test_telegram_decoding.cpp
index 534df15e3..9085d9818 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/test_telegram_decoding.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/test_telegram_decoding.cpp
@@ -1,7 +1,7 @@
-#include <QDebug>
+#include <QtCore/QDebug>
 #include <nglapplication/nglcoreapplication.h>
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtTest/QTest>
 #include <AdlerJson/telegrams.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp
index 96acf575e..be034c870 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp
@@ -6,13 +6,13 @@
 #include "DDS/Core/core_types.h"
 #include "aes.hpp"
 #include "json_dispatcher.h"
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QPointF>
-#include <QRectF>
-#include <QString>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QPointF>
+#include <QtCore/QRectF>
+#include <QtCore/QString>
 #include <QTransform>
-#include <QVector>
+#include <QtCore/QVector>
 
 #include <time.h>
 #include <vector>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.h
index 3df64d6bf..f230280cf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.h
@@ -7,10 +7,10 @@
 #include "logger.h"
 #include "main_dispatcher.h"
 #include "telegrams.h"
-#include <QDateTime>
-#include <QHash>
-#include <QObject>
-#include <QUrl>
+#include <QtCore/QDateTime>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
+#include <QtCore/QUrl>
 #include <AreaEffectSimulation/aes_dtc.h>
 #include <AreaEffectSimulation/aes_ftc.h>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.cpp
index c2677ab9e..7939db0e2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.cpp
@@ -3,8 +3,8 @@
 
 #include "asm_handler.h"
 
-#include <QJsonArray>
-#include <QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.h
index 21a98bfa5..53a835058 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.h
@@ -7,7 +7,7 @@
 #include <AssetManagement/asm_dtc.h>
 #include <AssetManagement/asm_ftc.h>
 #include "main_dispatcher.h"
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace AssetManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.cpp
index 5ed7d87c4..a6064c47c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.cpp
@@ -8,8 +8,8 @@
 #include "nglsettings/nglsettings_settings.h"
 #include "ngltools/ngltools_filesystem.h"
 
-#include <QJsonArray>
-#include <QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
 #include <FileManagement/flm_dtc.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.h
index 97e0e3e22..5da1251e8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "logger.h"
-#include <QObject>
+#include <QtCore/QObject>
 #include <FileManagement/flm_ftc.h>
 #include <NotificationManagement/nom_ftc.h>
 #include <NotificationManagement/nom_ftc_types.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.cpp
index f5878325c..b8f9790aa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.cpp
@@ -10,10 +10,10 @@
 #include <AreaEffectSimulation/aes_operator_rights.h>
 
 #include <QHostInfo>
-#include <QJsonDocument>
-#include <QSettings>
-#include <QStringList>
-#include <QTimer>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QSettings>
+#include <QtCore/QStringList>
+#include <QtCore/QTimer>
 #include <QtWebSockets/QWebSocket>
 #include <nglsettings/nglsettings_settings.h>
 #include <vector>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.h
index 802c15e6e..3a8a6e352 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <QHash>
-#include <QObject>
-#include <QVector>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 #include <QtWebSockets/QWebSocket>
 #include <Core/core_types.h> 
 #include <TrainingAreaBase/tab_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_rx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_rx.cpp
index 514d7e91f..dbffc4e04 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_rx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_rx.cpp
@@ -6,7 +6,7 @@
 #include "json_dispatcher.h"
 #include "ppm_handler.h"
 #include "telegrams.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 
 namespace AdlerJson
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_rx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_rx.h
index f5ae7b188..814651d7f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_rx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_rx.h
@@ -6,8 +6,8 @@
 #include <TrainingAreaBase/recv_from_tab.h>
 #include <TrainingAreaBase/tx_mixin.h>
 #include <TrainingAreaBase/tab_plugin_interface.h>
-#include <QObject>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 #include <memory>
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_tx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_tx.cpp
index 63751dc3d..412a759a1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_tx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_tx.cpp
@@ -7,7 +7,7 @@
 #include "pdm_handler.h"
 #include "aes_handler.h"
 #include <ProjectDataManagement/pdm_enums.hpp>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtWebSockets/QWebSocket>
 namespace AdlerJson
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_tx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_tx.h
index b88599133..9c971420b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_tx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_tx.h
@@ -11,7 +11,7 @@
 #include <TrainingAreaBase/send_to_tab.h>
 #include <TrainingAreaBase/recv_from_tab.h>
 #include <TrainingAreaBase/tab_plugin_interface.h>
-#include <QHash>
+#include <QtCore/QHash>
 
 class QWebSocket;
 class PpmHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.cpp
index a81211dcd..42c5f2d7b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.cpp
@@ -7,7 +7,7 @@
 
 #include <nglsettings/nglsettings_settings.h>
 #include <DDS/Core/pacemaker.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace AdlerJson
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.h
index 1baee6b30..fce832567 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 #include <Core/core_types.h> 
 #include <TrainingAreaBase/dds_handler.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.cpp
index 2baad6b1f..9155b7641 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.cpp
@@ -3,8 +3,8 @@
 
 #include "pdm_handler.h"
 
-#include <QJsonArray>
-#include <QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
 
 namespace AdlerJson
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.h
index 035f51683..3b31a2bd7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.h
@@ -9,10 +9,10 @@
 #include <ProjectDataManagement/pdm.hpp>
 #include <ProjectDataManagement/pdm_dtc.h>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
-#include <QObject>
-#include <QHash>
-#include <QUrl>
-#include <QDateTime>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtCore/QUrl>
+#include <QtCore/QDateTime>
 
 namespace AdlerJson
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/plugin.h
index 58b6c3ebb..c65ae8ea8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/plugin.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "TrainingAreaBase/dds_handler.h"
-#include <QObject>
+#include <QtCore/QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 
 namespace AdlerJson
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.cpp
index d91c587ba..7fb8c041a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.cpp
@@ -5,7 +5,7 @@
 #include <utility>
 #include "Core/core.hpp"
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 
 #include "json_dispatcher.h"
 #include <QRandomGenerator>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.h
index 171b83636..f50a2e70b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.h
@@ -10,11 +10,11 @@
 #include <ParticipantManagement/ppm.hpp>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
-#include <QTimer>
-#include <QObject>
-#include <QHash>
-#include <QUrl>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtCore/QUrl>
+#include <QtCore/QDateTime>
 #include <telegrams.h>
 
 namespace AdlerJson
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/saa_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/saa_interface.h
index 84fa31ddc..0ecefd768 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/saa_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/saa_interface.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 #include <AdlerJson/telegrams.h>
 #include "ppm_handler.h"
 #include "aes_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/settings.cpp
index b4b6b0249..07f92b835 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/settings.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/settings.cpp
@@ -6,7 +6,7 @@
 #include <nglsettings/nglsettings_settings.h>
 #include <ngltools/ngltools_filesystem.h>
 #include <QtCore/QSettings>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 
 #include "LtsUtils/LtsUtilsCore/lts_portrange.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/settings.h
index df3ca9575..a8c95f737 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/settings.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <QString>
-#include <QJsonObject>
+#include <QtCore/QString>
+#include <QtCore/QJsonObject>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/telegrams.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/telegrams.cpp
index 14d78c5c1..2fd02eaeb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/telegrams.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/telegrams.cpp
@@ -1,9 +1,9 @@
 #include "telegrams.h"
 #include <utility>
 
-#include <QDebug>
-#include <QJsonDocument>
-#include <QString>
+#include <QtCore/QDebug>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QString>
 #include <ProjectDataManagement/pdm_translation.h>
 
 namespace AdlerJson
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/telegrams.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/telegrams.h
index c11b67ae6..299657a53 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/telegrams.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/telegrams.h
@@ -1,12 +1,12 @@
 #pragma once
 #include "saatelegrams_export.h"
-#include <QChar>
-#include <QDateTime>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QString>
-#include <QUuid>
-#include <QVector>
+#include <QtCore/QChar>
+#include <QtCore/QDateTime>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QString>
+#include <QtCore/QUuid>
+#include <QtCore/QVector>
 
 #include <ProjectDataManagement/pdm_enums.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ws_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ws_handler.cpp
index b53ffcf27..811c8b44d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ws_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ws_handler.cpp
@@ -1,7 +1,7 @@
 #include "ws_handler.h"
 
 #include <QtWebSockets/QWebSocket>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 namespace TrainingAreaBase {
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ws_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ws_handler.h
index 6d4d12568..a7f5f5d2d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ws_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ws_handler.h
@@ -5,7 +5,7 @@
 
 #include <TrainingAreaBase/training_area_telegrams.h>
 #include <QtWebSockets/QWebSocketServer>
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ws_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ws_interface.h
index 68919373e..4d4bb3370 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ws_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ws_interface.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <qobjectdefs.h>
 
 namespace TrainingAreaBase {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/aes_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/aes_handler.cpp
index 312bfae60..b2edd21a7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/aes_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/aes_handler.cpp
@@ -3,8 +3,8 @@
 
 #include "aes_handler.h"
 
-#include <QJsonArray>
-#include <QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
 
 
 namespace ApHlaJson
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/aes_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/aes_handler.h
index 5b8168b4d..d4392cde8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/aes_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/aes_handler.h
@@ -11,10 +11,10 @@
 #include <ParticipantManagement/ppm.hpp>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
-#include <QObject>
-#include <QHash>
-#include <QUrl>
-#include <QDateTime>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtCore/QUrl>
+#include <QtCore/QDateTime>
 
 namespace ApHlaJson
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_dispatcher.cpp
index e04431258..55c9f866e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_dispatcher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_dispatcher.cpp
@@ -5,9 +5,9 @@
 #include "hla_handler_rx.h"
 #include "hla_handler_tx.h"
 
-#include <QSettings>
+#include <QtCore/QSettings>
 #include <QtWebSockets/QWebSocket>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <nglsettings/nglsettings_settings.h>
 
 namespace ApHlaJson
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_dispatcher.h
index e78306dab..03d2ce96e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_dispatcher.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtWebSockets/QWebSocket>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 #include <Core/core_types.h> 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_rx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_rx.cpp
index b9da15f69..c3dc31183 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_rx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_rx.cpp
@@ -6,7 +6,7 @@
 #include "aes_handler.h"
 #include "ppm_handler.h"
 #include <TrainingAreaBase/training_area_telegrams.h>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 
 namespace ApHlaJson
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_rx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_rx.h
index 8c5057104..d10c9c741 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_rx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_rx.h
@@ -6,8 +6,8 @@
 #include <TrainingAreaBase/recv_from_tab.h>
 #include <TrainingAreaBase/tx_mixin.h>
 #include <TrainingAreaBase/tab_plugin_interface.h>
-#include <QObject>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 #include <memory>
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_tx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_tx.cpp
index 502e47754..834d28954 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_tx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_tx.cpp
@@ -4,7 +4,7 @@
 #include "hla_handler_tx.h"
 #include "ppm_handler.h"
 #include "pdm_handler.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtWebSockets/QWebSocket>
 namespace ApHlaJson
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_tx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_tx.h
index 904559856..ebeccb2ad 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_tx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_tx.h
@@ -9,7 +9,7 @@
 #include <TrainingAreaBase/send_to_tab.h>
 #include <TrainingAreaBase/recv_from_tab.h>
 #include <TrainingAreaBase/tab_plugin_interface.h>
-#include <QHash>
+#include <QtCore/QHash>
 
 class QWebSocket;
 class PpmHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_dispatcher.cpp
index ce9332c16..75891b3b5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_dispatcher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_dispatcher.cpp
@@ -6,7 +6,7 @@
 #include "hla_dispatcher.h"
 #include "hla_handler_tx.h"
 #include <nglsettings/nglsettings_settings.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace ApHlaJson
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_dispatcher.h
index d992b5bde..eac6481ec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_dispatcher.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 #include <Core/core_types.h> 
 #include "dds_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_handler_tx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_handler_tx.h
index bc150f75f..f1992877a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_handler_tx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_handler_tx.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "logger.h"
 #include <TrainingAreaBase/send_to_tab.h>
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/pdm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/pdm_handler.cpp
index 5149249fb..41403972c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/pdm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/pdm_handler.cpp
@@ -3,8 +3,8 @@
 
 #include "pdm_handler.h"
 
-#include <QJsonArray>
-#include <QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
 
 namespace ApHlaJson
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/pdm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/pdm_handler.h
index cd3e16f9d..e3bb50e05 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/pdm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/pdm_handler.h
@@ -7,10 +7,10 @@
 #include "dds_handler.h"
 #include <ProjectDataManagement/pdm.hpp>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
-#include <QObject>
-#include <QHash>
-#include <QUrl>
-#include <QDateTime>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtCore/QUrl>
+#include <QtCore/QDateTime>
 
 namespace ApHlaJson
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/plugin.h
index 7e46ab68b..91b9aa21d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 
 namespace ApHlaJson
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/ppm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/ppm_handler.cpp
index 530ee63da..f8e63f3a6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/ppm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/ppm_handler.cpp
@@ -3,7 +3,7 @@
 
 #include "ppm_handler.h"
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 
 
 namespace ApHlaJson
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/ppm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/ppm_handler.h
index e149fb6e6..60df386e9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/ppm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/ppm_handler.h
@@ -8,10 +8,10 @@
 #include <ParticipantManagement/ppm.hpp>
 #include <ParticipantManagement/ppm.hpp>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
-#include <QObject>
-#include <QHash>
-#include <QUrl>
-#include <QDateTime>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtCore/QUrl>
+#include <QtCore/QDateTime>
 
 namespace ApHlaJson
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/XDR_QtHandler/XDR_DirHandler_ifc.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/XDR_QtHandler/XDR_DirHandler_ifc.h
index 1a8ffc5a6..4f5788022 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/XDR_QtHandler/XDR_DirHandler_ifc.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/XDR_QtHandler/XDR_DirHandler_ifc.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <QObject>
-#include <QByteArray>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QString>
 
 class XDR_DirHandlerIfc : public QObject
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/XDR_QtHandler/XDR_DirHandler_linux.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/XDR_QtHandler/XDR_DirHandler_linux.cpp
index 0ecd16f1c..943acdbba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/XDR_QtHandler/XDR_DirHandler_linux.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/XDR_QtHandler/XDR_DirHandler_linux.cpp
@@ -3,9 +3,9 @@
 
 #include "XDR_DirHandler_linux.h"
 
-#include <QMap>
-#include <QThread>
-#include <QTimer>
+#include <QtCore/QMap>
+#include <QtCore/QThread>
+#include <QtCore/QTimer>
 #include <QVarLengthArray>
 
 #include <poll.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/XDR_QtHandler/XDR_DirHandler_linux.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/XDR_QtHandler/XDR_DirHandler_linux.h
index bf29998f8..a69096e92 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/XDR_QtHandler/XDR_DirHandler_linux.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/XDR_QtHandler/XDR_DirHandler_linux.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "XDR_DirHandler_ifc.h"
-#include <QMap>
+#include <QtCore/QMap>
 
 struct inotify_event;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/convert_to_json_file.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/convert_to_json_file.cpp
index cb1058605..a236e6a36 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/convert_to_json_file.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/convert_to_json_file.cpp
@@ -2,10 +2,10 @@
 
 
 #include "convert_to_json_file.h"
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QFile>
-#include <QDateTime>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QFile>
+#include <QtCore/QDateTime>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
 namespace TetraRadio
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_cleaner.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_cleaner.cpp
index 5a6408c85..bb31835d5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_cleaner.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_cleaner.cpp
@@ -4,13 +4,13 @@
 #include "directory_cleaner.h"
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <TrainingAreaBase/training_area_telegrams.h>
-#include <QDateTime>
-#include <QDir>
+#include <QtCore/QDateTime>
+#include <QtCore/QDir>
 #include <QDirIterator>
-#include <QTimer>
-#include <QThread>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QTimer>
+#include <QtCore/QThread>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <ctime>
 
 namespace TetraRadio
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_cleaner.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_cleaner.h
index e0d22461e..4eaca27c5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_cleaner.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_cleaner.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <NGLLogger/INGLLogger.h>
 
 class QThread;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_dispatcher.cpp
index 93fddc617..e2f96c4b1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_dispatcher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_dispatcher.cpp
@@ -5,7 +5,7 @@
 #include "convert_to_json_file.h"
 #include "directory_cleaner.h"
 #include <XDR_QtHandler/XDR_DirHandler.h>
-#include <QDir>
+#include <QtCore/QDir>
 
 namespace TetraRadio
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_dispatcher.h
index 2e898ef98..12eda7ee1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_dispatcher.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 #include <Core/core_types.h>
 #include "../TetraJson/convert_from_json.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/plugin.h
index b4acc1118..d3c5a7a3c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 
 namespace TetraRadio
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_dispatcher.cpp
index 908e152f9..e7eea709f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_dispatcher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_dispatcher.cpp
@@ -5,9 +5,9 @@
 #include "hla_handler_rx.h"
 #include "hla_handler_tx.h"
 
-#include <QSettings>
+#include <QtCore/QSettings>
 #include <QtWebSockets/QWebSocket>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <nglsettings/nglsettings_settings.h>
 
 namespace HlaJson
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_dispatcher.h
index 251df8237..3de625a78 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_dispatcher.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtWebSockets/QWebSocket>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 #include <Core/core_types.h> 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_rx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_rx.cpp
index 006ada883..776a68120 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_rx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_rx.cpp
@@ -5,7 +5,7 @@
 #include "hla_dispatcher.h"
 
 #include <TrainingAreaBase/training_area_telegrams.h>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 
 namespace HlaJson
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_rx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_rx.h
index 3a339012a..8de49967c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_rx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_rx.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #include <TrainingAreaBase/recv_from_tab.h>
-#include <QObject>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 #include <memory>
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_tx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_tx.cpp
index ec91dd6e4..6f9355f19 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_tx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_tx.cpp
@@ -2,7 +2,7 @@
 
 
 #include "hla_handler_tx.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtWebSockets/QWebSocket>
 
 namespace HlaJson
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_tx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_tx.h
index 9bb89a424..982e343a3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_tx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_tx.h
@@ -6,7 +6,7 @@
 #include "logger.h"
 #include <TrainingAreaBase/send_to_tab.h>
 #include <TrainingAreaBase/tab_plugin_interface.h>
-#include <QHash>
+#include <QtCore/QHash>
 
 class QWebSocket;
 namespace HlaJson
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_dispatcher.h
index 2a1eadd03..3f22af253 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_dispatcher.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 #include <Core/core_types.h> 
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_handler_tx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_handler_tx.h
index fc7295e1a..6a6bf418b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_handler_tx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_handler_tx.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "logger.h"
 #include <TrainingAreaBase/send_to_tab.h>
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/plugin.h
index e0600d7e5..9b557d4a5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 
 namespace HlaJson
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_dispatcher.cpp
index c450b252e..32da68611 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_dispatcher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_dispatcher.cpp
@@ -6,7 +6,7 @@
 #include "nmea_dispatcher.h"
 #include "nmea_handler_tx.h"
 
-#include <QSettings>
+#include <QtCore/QSettings>
 
 namespace Nmea
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_dispatcher.h
index 16931d285..52a11bbc3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_dispatcher.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 #include <Core/core_types.h> 
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_handler_tx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_handler_tx.h
index f438f60f7..78badeaee 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_handler_tx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_handler_tx.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "logger.h"
 #include <TrainingAreaBase/send_to_tab.h>
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_dispatcher.cpp
index 996b8ccd7..d5c94166c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_dispatcher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_dispatcher.cpp
@@ -4,7 +4,7 @@
 #include "nmea_dispatcher.h"
 #include "nmea_handler_rx.h"
 #include "nmea_handler_tx.h"
-#include <QSettings>
+#include <QtCore/QSettings>
 
 namespace Nmea
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_dispatcher.h
index e54508d5c..0ea29b2ca 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_dispatcher.h
@@ -3,11 +3,11 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtWebSockets/QWebSocketServer>
 #include <QtWebSockets/QWebSocket>
-#include <QTimer>
-#include <QUdpSocket>
+#include <QtCore/QTimer>
+#include <QtNetwork/QUdpSocket>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 #include <nglsettings/nglsettings_settings.h>
 #include <Core/core_types.h> 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_rx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_rx.cpp
index 5fab4d32b..498944dbe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_rx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_rx.cpp
@@ -3,10 +3,10 @@
 
 #include "nmea_handler_rx.h"
 #include <TrainingAreaBase/training_area_telegrams.h>
-#include <QDateTime>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QTimer>
+#include <QtCore/QDateTime>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QTimer>
 
 namespace Nmea
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_rx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_rx.h
index 26c03f25d..8af836277 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_rx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_rx.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <TrainingAreaBase/recv_from_tab.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include "logger.h"
 #include <cmath>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_tx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_tx.cpp
index 0b4c12646..36883bf25 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_tx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_tx.cpp
@@ -2,8 +2,8 @@
 
 
 #include "nmea_handler_tx.h"
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace Nmea
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_tx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_tx.h
index ca499d505..12db6d717 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_tx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_tx.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QUdpSocket>
+#include <QtCore/QObject>
+#include <QtNetwork/QUdpSocket>
 #include <QtWebSockets/QWebSocket>
 #include <TrainingAreaBase/send_to_tab.h>
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/plugin.h
index c9d742006..f995bad24 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 
 namespace Nmea
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_from_json.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_from_json.cpp
index 187434152..752474055 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_from_json.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_from_json.cpp
@@ -3,8 +3,8 @@
 
 #include "convert_from_json.h"
 #include <TrainingAreaBase/training_area_telegrams.h>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
 namespace TetraRadio
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_to_json.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_to_json.cpp
index c84836713..c276c8504 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_to_json.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_to_json.cpp
@@ -3,8 +3,8 @@
 
 #include "convert_to_json.h"
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace TetraRadio
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.cpp
index b19701868..2ffdcb807 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.cpp
@@ -5,14 +5,14 @@
 #include "NGLLogger/INGLLogger.h"
 #include "socket_dispatcher_json.h"
 #include <nglsettings/nglsettings_connections.h>
-#include <QCoreApplication>
-#include <QFile>
-#include <QSqlDatabase>
-#include <QJsonDocument>
-#include <QSettings>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QFile>
+#include <QtSql/QSqlDatabase>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QSettings>
 #include <ngldb/dbcommon.h>
 #include <CoPrtCnv/CoPrtCnvTelegramConverter.hpp>
-#include <QSettings>
+#include <QtCore/QSettings>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <qglobal.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.h
index 024d260f6..e735d31e6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 #include <memory>
 #include <NGLLogger/INGLLogger.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/socket_dispatcher_json.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/socket_dispatcher_json.cpp
index 98a2f25ef..a016c2630 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/socket_dispatcher_json.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/socket_dispatcher_json.cpp
@@ -2,9 +2,9 @@
 
 
 #include "socket_dispatcher_json.h"
-#include <QCoreApplication>
-#include <QDir>
-#include <QTcpServer>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDir>
+#include <QtNetwork/QTcpServer>
 
 namespace TetraRadio
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/socket_dispatcher_json.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/socket_dispatcher_json.h
index befbb8c92..3a078ec4a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/socket_dispatcher_json.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/socket_dispatcher_json.h
@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtWebSockets/QWebSocketServer>
 #include <QtWebSockets/QWebSocket>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 #include <PrtCnv/PrtCnvApplication.hpp>
 #include "convert_from_json.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/Test/test6.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/Test/test6.cpp
index ac68622fc..962ea5e24 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/Test/test6.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/Test/test6.cpp
@@ -1,5 +1,5 @@
-#include <QApplication>
-#include <QTimer>
+#include <QtWidgets/QApplication>
+#include <QtCore/QTimer>
 
 #include <iostream>
 #include <thread>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/abstract_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/abstract_dispatcher.h
index 3129fc6ce..b8e59796e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/abstract_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/abstract_dispatcher.h
@@ -9,13 +9,13 @@
 
 #include <ddkit/actors/Session.hpp>
 
-#include <QObject>
-#include <QMutex>
+#include <QtCore/QObject>
+#include <QtCore/QMutex>
 #include <QQueue>
-#include <QVector>
-#include <QMetaObject>
+#include <QtCore/QVector>
+#include <QtCore/QMetaObject>
 #include <QEventLoop>
-#include <QMutexLocker>
+#include <QtCore/QMutexLocker>
 
 
 namespace UAS
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/reader.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/reader.h
index 3dcee91e5..251ee3f0e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/reader.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/reader.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QQueue>
-#include <QMutex>
+#include <QtCore/QMutex>
 
 
 namespace UAS
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/tms_if_adapter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/tms_if_adapter.cpp
index 7bb14a891..4bd9f7e0d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/tms_if_adapter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/tms_if_adapter.cpp
@@ -6,7 +6,7 @@
 #include "dispatchers/report_point.h"
 #include "logger.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <set>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/uav_commander_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/uav_commander_impl.cpp
index 08b01711b..f7cf5df87 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/uav_commander_impl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/uav_commander_impl.cpp
@@ -6,8 +6,8 @@
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 
 
 using namespace LtsUtils;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/uav_commander_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/uav_commander_impl.h
index 4fe0eb30a..3480b57ea 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/uav_commander_impl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/uav_commander_impl.h
@@ -18,7 +18,7 @@
 #include <vector>
 
 #include <QQueue>
-#include <QPointer>
+#include <QtCore/QPointer>
 
 
 template<class T> using Optional = std::vector<T>;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/uav_commander.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/uav_commander.h
index b6d348f76..6567937ab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/uav_commander.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/uav_commander.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include <QVector3D>
-#include <QString>
+#include <QtCore/QString>
 
 
 namespace UAS
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/from_tab.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/from_tab.cpp
index 45a37bdef..5ea0ad2e8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/from_tab.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/from_tab.cpp
@@ -8,8 +8,8 @@
 #include <ProjectDataManagement/pdm_dtc.h>
 #include <TrainingAreaBase/recv_from_tab.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 
 namespace UAS
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin.cpp
index 88a6a7bdd..75f4b111a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin.cpp
@@ -6,8 +6,8 @@
 
 #include <nglsettings/nglsettings_settings.h>
 
-#include <QSettings>
-#include <QDebug>
+#include <QtCore/QSettings>
+#include <QtCore/QDebug>
 
 
 namespace UAS
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin.h
index 7be01680d..4eb0daf15 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QHostInfo>
 
 #include <TrainingAreaBase/tab_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin_instance.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin_instance.cpp
index 4338337f7..600155bfe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin_instance.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin_instance.cpp
@@ -18,7 +18,7 @@
 #include <TmsIfAdapter/tms_if_adapter.h>
 #include <TmsIfAdapter/uav_commander.h>
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 
 namespace UAS
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin_instance.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin_instance.h
index 7872b5b20..1b298e67c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin_instance.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin_instance.h
@@ -9,7 +9,7 @@
 #include <TrainingAreaBase/dds_handler.h>
 #include <Core/core_types.h> 
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace ProjectDataManagement { namespace Interface { class Dtc; } }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia.h
index 36b1bb869..8500aa684 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia.h
@@ -4,7 +4,7 @@
 #pragma once
 
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace NGL
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.cpp
index 954d19847..9aadcec44 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.cpp
@@ -13,7 +13,7 @@
 #include <TmsIfAdapter/uav_commander.h>
 
 #include <QVector3D>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #include <vector>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.h
index 9d465f7c7..5760e9a80 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.h
@@ -9,8 +9,8 @@
 #include <TrainingAreaBase/dds_handler.h>
 #include <ParticipantManagement/ppm_ftc.h>
 
-#include <QObject>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
 #include <memory>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_dispatcher.cpp
index 3adbebe5c..3c7a26feb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_dispatcher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_dispatcher.cpp
@@ -8,7 +8,7 @@
 #include "tetra_dispatcher.h"
 #include "tetra_handler_tx.h"
 #include <CoPrtCnv/CoPrtCnvTelegramConverter.hpp>
-#include <QSettings>
+#include <QtCore/QSettings>
 
 namespace WlsTetra
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_dispatcher.h
index 00421424c..e69dced38 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_dispatcher.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 #include <Core/core_types.h> 
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_handler_tx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_handler_tx.h
index 8d6f74066..8468276fa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_handler_tx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_handler_tx.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "logger.h"
 #include <TrainingAreaBase/send_to_tab.h>
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/plugin.h
index a3a6dfb60..c359c98b5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/plugin.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 
 namespace WlsTetra
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_dispatcher.h
index a49a73cc9..2af48922c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_dispatcher.h
@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtWebSockets/QWebSocketServer>
 #include <QtWebSockets/QWebSocket>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 #include <PrtCnv/PrtCnvApplication.hpp>
 #include <Core/core_types.h> 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_rx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_rx.cpp
index 45c5049ab..5f9ea5d32 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_rx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_rx.cpp
@@ -3,9 +3,9 @@
 
 #include "tetra_handler_rx.h"
 #include <TrainingAreaBase/training_area_telegrams.h>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QTimer>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QTimer>
 
 namespace WlsTetra
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_rx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_rx.h
index bb424b5d3..0fd7aabc8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_rx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_rx.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <TrainingAreaBase/recv_from_tab.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_tx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_tx.cpp
index aa040b83e..f015059e7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_tx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_tx.cpp
@@ -2,8 +2,8 @@
 
 
 #include "tetra_handler_tx.h"
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace WlsTetra
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_tx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_tx.h
index a1adab026..5b6aa0597 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_tx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_tx.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtWebSockets/QWebSocket>
 #include <TrainingAreaBase/send_to_tab.h>
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_prtcnv.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_prtcnv.cpp
index f5203d238..d277ed1de 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_prtcnv.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_prtcnv.cpp
@@ -4,11 +4,11 @@
 #include "plugin.h"
 #include "tetra_prtcnv.h"
 #include <nglsettings/nglsettings_connections.h>
-#include <QCoreApplication>
-#include <QFile>
-#include <QSqlDatabase>
-#include <QSettings>
-#include <QTcpServer>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QFile>
+#include <QtSql/QSqlDatabase>
+#include <QtCore/QSettings>
+#include <QtNetwork/QTcpServer>
 #include <ngldb/dbcommon.h>
 
 namespace WlsTetra
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_prtcnv.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_prtcnv.h
index 370be53ae..5d5af84d3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_prtcnv.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_prtcnv.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 #include <PrtCnv/PrtCnvApplication.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_dispatcher.cpp
index 7e976b555..1602016a1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_dispatcher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_dispatcher.cpp
@@ -5,9 +5,9 @@
 #include "wls_handler_rx.h"
 #include "wls_handler_tx.h"
 
-#include <QSettings>
+#include <QtCore/QSettings>
 #include <QtWebSockets/QWebSocket>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <nglsettings/nglsettings_settings.h>
 
 namespace WlsTetra
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_dispatcher.h
index b61e87e50..8e7945422 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_dispatcher.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtWebSockets/QWebSocket>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 #include <Core/core_types.h> 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_rx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_rx.cpp
index 97b98fe3c..8c05a60e9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_rx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_rx.cpp
@@ -5,7 +5,7 @@
 #include "wls_dispatcher.h"
 
 #include <TrainingAreaBase/training_area_telegrams.h>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 
 #include <CoPrtCnv/CoPrtCnvCentralTelegram.hpp>
 #include <CoPrtCnv/CoPrtCnvRadioTelegram.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_rx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_rx.h
index 1611b7480..6f9f3fa78 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_rx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_rx.h
@@ -4,9 +4,9 @@
 #pragma once
 
 #include <TrainingAreaBase/recv_from_tab.h>
-#include <QObject>
-#include <QSet>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QSet>
+#include <QtCore/QString>
 #include <memory>
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_tx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_tx.cpp
index 9cebf1bc3..debd3bcaf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_tx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_tx.cpp
@@ -4,7 +4,7 @@
 #include "wls_handler_tx.h"
 #include "wls_dispatcher.h"
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QtWebSockets/QWebSocket>
 
 #include <CoPrtCnv/CoPrtCnvCentralTelegram.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_tx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_tx.h
index de81c6d1f..9595ceda4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_tx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_tx.h
@@ -6,7 +6,7 @@
 #include "logger.h"
 #include <TrainingAreaBase/send_to_tab.h>
 #include <TrainingAreaBase/tab_plugin_interface.h>
-#include <QHash>
+#include <QtCore/QHash>
 
 class QWebSocket;
 namespace WlsTetra
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/json_keys.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/json_keys.h
index 2fe38af55..9e3259dc8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/json_keys.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/json_keys.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 #include <OcBaseDownload/WebSocketInterface/json_keys.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.cpp
index 01740733c..8a11a2ee4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.cpp
@@ -5,9 +5,9 @@
 #include <utility>
 #include "main_handler.h"
 #include "settings.h"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QJsonParseError>
-#include <QJsonObject>
+#include <QtCore/QJsonObject>
 
 namespace TrainingAreaBase
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.h
index 05e716b20..fcc815730 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.h
@@ -1,12 +1,12 @@
 
 
 #pragma once
-#include <QObject>
-#include <QMap>
-#include <QHash>
-#include <QLineF>
-#include <QRectF>
-#include <QPointF>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+#include <QtCore/QHash>
+#include <QtCore/QLineF>
+#include <QtCore/QRectF>
+#include <QtCore/QPointF>
 #include <QPolygonF>
 #include <QMatrix>
 #include <InfrastructureManagement/ism.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp
index 00e4ae37d..9d49db58a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp
@@ -18,9 +18,9 @@
 #include <nglsettings/nglsettings_connections.h>
 #include <ngldb/nsqlquery.h>
 
-#include <QUuid>
-#include <QJsonDocument>
-#include <QSqlDatabase>
+#include <QtCore/QUuid>
+#include <QtCore/QJsonDocument>
+#include <QtSql/QSqlDatabase>
 
 namespace TrainingAreaBase
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.h
index 588880b14..2b150f1b0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include "exm_handler.h"
 #include "ism_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.h
index 52f9928c8..2029d659a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.h
@@ -2,8 +2,8 @@
 
 #pragma once
 #include <ProjectDataManagement/pdm_dtc.h>
-#include <QMap>
-#include <QHash>
+#include <QtCore/QMap>
+#include <QtCore/QHash>
 #include "aes.hpp"
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.h
index 6453afe30..3a6c4f2e5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "main_handler.h"
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <AssetManagement/asm_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.cpp
index 616ef84bd..ac64d34bf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.cpp
@@ -4,7 +4,7 @@
 #include "ppm_handler.h"
 #include "main_handler.h"
 #include "send_to_tab.h"
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace TrainingAreaBase
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.h
index af0c45305..53287682b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.h
@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <QObject>
-#include <QMap>
-#include <QSet>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+#include <QtCore/QSet>
+#include <QtCore/QTimer>
 #include <memory>
 #include <unordered_map>
 #include <AreaEffectSimulation/aes_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.h
index 16ca89d8e..9a65cd826 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.h
@@ -7,7 +7,7 @@
 #include "training_area_telegrams.h"
 #include "send_to_tab.h"
 
-#include <QMap>
+#include <QtCore/QMap>
 
 namespace TrainingAreaBase
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.cpp
index 02f2b17a1..7901e84c5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.cpp
@@ -6,7 +6,7 @@
 #include "main_handler.h"
 #include "settings.h"
 #include <DDS/DTS/generic_dts.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace TrainingAreaBase
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.h
index 2f6c9a21d..ceea42c0e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "recv_from_tab.h"
 #include "dds_handler.h"
 #include "pdm_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/settings.cpp
index c111a69ab..1c65714eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/settings.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/settings.cpp
@@ -6,7 +6,7 @@
 #include <nglsettings/nglsettings_settings.h>
 #include <ngltools/ngltools_filesystem.h>
 #include <QtCore/QSettings>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 
 #include "LtsUtils/LtsUtilsCore/lts_portrange.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/settings.h
index 322f3a725..3bbd0cf47 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/settings.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <QString>
-#include <QJsonObject>
+#include <QtCore/QString>
+#include <QtCore/QJsonObject>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_plugin_interface.h
index 950d47e9c..5c5fb0a9e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_plugin_interface.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 
 #include <ProjectDataManagement/pdm.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.cpp
old mode 100755
new mode 100644
index 4eef044e5..77f36ebc3
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.cpp
@@ -4,9 +4,9 @@
 #include "training_area_telegrams.h"
 #include <utility>
 
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace TrainingAreaBase
 {
@@ -1005,9 +1005,9 @@ Header Header::fromJson(const QJsonObject &obj)
 
 QJsonObject Header::toJson() const
 {
-  return QJsonObject({{QStringLiteral("equipmentNumber"), equipmentNumber},
-                      {QStringLiteral("timeStamp"), qint64(timeStamp)}
-                     });
+  return QJsonObject{{QStringLiteral("equipmentNumber"), equipmentNumber},
+                      {QStringLiteral("timeStamp"), timeStamp}
+                     };
 }
 
 
@@ -1022,10 +1022,10 @@ RelativePosition RelativePosition::fromJson(const QJsonObject &obj)
 
 QJsonObject RelativePosition::toJson() const
 {
-  return QJsonObject({{QStringLiteral("offsetX"), offsetX},
+  return QJsonObject{{QStringLiteral("offsetX"), offsetX},
                       {QStringLiteral("offsetY"), offsetY},
                       {QStringLiteral("offsetZ"), offsetZ}
-                     });
+                     };
 }
 
 
@@ -1040,10 +1040,10 @@ AbsolutePosition AbsolutePosition::fromJson(const QJsonObject &obj)
 
 QJsonObject AbsolutePosition::toJson() const
 {
-  return QJsonObject({{QStringLiteral("lon"), lon},
+  return QJsonObject{{QStringLiteral("lon"), lon},
                       {QStringLiteral("lat"), lat},
                       {QStringLiteral("z"), z}
-                     });
+                     };
 }
 
 
@@ -1058,10 +1058,10 @@ OpsPosition OpsPosition::fromJson(const QJsonObject &obj)
 
 QJsonObject OpsPosition::toJson() const
 {
-  return QJsonObject({{QStringLiteral("opsId"), opsId},
+  return QJsonObject{{QStringLiteral("opsId"), opsId},
                       {QStringLiteral("moutObjectId"), moutObjectId},
                       {QStringLiteral("moutRoomId"), moutRoomId}
-                     });
+                     };
 }
 
 
@@ -1076,10 +1076,10 @@ GpsQuality GpsQuality::fromJson(const QJsonObject &obj)
 
 QJsonObject GpsQuality::toJson() const
 {
-  return QJsonObject({{QStringLiteral("moreThan4SatellitesAvailable"), moreThan4SatellitesAvailable},
+  return QJsonObject{{QStringLiteral("moreThan4SatellitesAvailable"), moreThan4SatellitesAvailable},
                       {QStringLiteral("dgpsModeAvailable"), dgpsModeAvailable},
                       {QStringLiteral("pdopValue"), pdopValue}
-                     });
+                     };
 }
 
 
@@ -1094,10 +1094,10 @@ Gear Gear::fromJson(const QJsonObject &obj)
 
 QJsonObject Gear::toJson() const
 {
-  return QJsonObject({{QStringLiteral("gearTasCode"), gearTasCode},
+  return QJsonObject{{QStringLiteral("gearTasCode"), gearTasCode},
                       {QStringLiteral("gearSerialNumber"), gearSerialNumber},
                       {QStringLiteral("chargeCounting"), chargeCounting}
-                     });
+                     };
 }
 
 
@@ -1114,12 +1114,12 @@ GearCharge GearCharge::fromJson(const QJsonObject &obj)
 
 QJsonObject GearCharge::toJson() const
 {
-  return QJsonObject({{QStringLiteral("gearTasCode"), gearTasCode},
+  return QJsonObject{{QStringLiteral("gearTasCode"), gearTasCode},
                       {QStringLiteral("gearSerialNumber"), gearSerialNumber},
                       {QStringLiteral("chargeTypeId"), chargeTypeId},
                       {QStringLiteral("remain"), remain},
                       {QStringLiteral("location"), location}
-                     });
+                     };
 }
 
 
@@ -1141,7 +1141,7 @@ WlsPosition WlsPosition::fromJson(const QJsonObject &obj)
 
 QJsonObject WlsPosition::toJson() const
 {
-  return QJsonObject({{QStringLiteral("x"), x},
+  return QJsonObject{{QStringLiteral("x"), x},
                       {QStringLiteral("y"), y},
                       {QStringLiteral("z"), z},
                       {QStringLiteral("wlsAreaId"), wlsAreaId},
@@ -1151,7 +1151,7 @@ QJsonObject WlsPosition::toJson() const
                       {QStringLiteral("playerOrientation"), playerOrientation},
                       {QStringLiteral("weaponOrientation"), weaponOrientation},
                       {QStringLiteral("isValid"), isValid}
-                     });
+                     };
 }
 
 
@@ -1171,7 +1171,7 @@ WlsParticipantState WlsParticipantState::fromJson(const QJsonObject &obj)
 
 QJsonObject WlsParticipantState::toJson() const
 {
-  return QJsonObject({{QStringLiteral("tagId"), tagId},
+  return QJsonObject{{QStringLiteral("tagId"), tagId},
                       {QStringLiteral("lastSeen"), lastSeen},
                       {QStringLiteral("voltage"), voltage},
                       {QStringLiteral("equipmentNumber"), equipmentNumber},
@@ -1179,37 +1179,37 @@ QJsonObject WlsParticipantState::toJson() const
                       {QStringLiteral("gpsOn"), gpsOn},
                       {QStringLiteral("inBlockedArea"), inBlockedArea},
                       {QStringLiteral("relativePosition"), relativePosition.toJson()}
-                     });
+                     };
 }
 
 
 BatteryState BatteryState::fromJson(const QJsonObject &obj)
 {
   BatteryState ret;
-  get(obj, QStringLiteral("batteryPort"), ret.batteryPort);
-  get(obj, QStringLiteral("battery"), ret.batteryPercent);
-  get(obj, QStringLiteral("voltage"), ret.voltage);
-  get(obj, QStringLiteral("temperature"), ret.temperature);
-  get(obj, QStringLiteral("frequency"), ret.frequency);
-  get(obj, QStringLiteral("generic"), ret.generic);
-  get(obj, QStringLiteral("current"), ret.current);
-  get(obj, QStringLiteral("switchOrValue"), ret.switchOrValue);
-  get(obj, QStringLiteral("serialNumber"), ret.serialNumber);
+  get(obj, QStringLiteral("batteryPort"), ret.m_batteryPort);
+  get(obj, QStringLiteral("battery"), ret.m_batteryPercent);
+  get(obj, QStringLiteral("voltage"), ret.m_voltage);
+  get(obj, QStringLiteral("temperature"), ret.m_temperature);
+  get(obj, QStringLiteral("frequency"), ret.m_frequency);
+  get(obj, QStringLiteral("generic"), ret.m_generic);
+  get(obj, QStringLiteral("current"), ret.m_current);
+  get(obj, QStringLiteral("switchOrValue"), ret.m_switchOrValue);
+  get(obj, QStringLiteral("serialNumber"), ret.m_serialNumber);
   return ret;
 }
 
 QJsonObject BatteryState::toJson() const
 {
-  return QJsonObject({{QStringLiteral("batteryPort"), batteryPort},
-                      {QStringLiteral("battery"), batteryPercent},
-                      {QStringLiteral("voltage"), voltage},
-                      {QStringLiteral("temperature"), temperature},
-                      {QStringLiteral("frequency"), frequency},
-                      {QStringLiteral("generic"), generic},
-                      {QStringLiteral("current"), current},
-                      {QStringLiteral("switchOrValue"), switchOrValue},
-                      {QStringLiteral("serialNumber"), serialNumber}
-                     });
+  return QJsonObject{{QStringLiteral("batteryPort"), batteryPort()},
+                      {QStringLiteral("battery"), batteryPercent()},
+                      {QStringLiteral("voltage"), voltage()},
+                      {QStringLiteral("temperature"), temperature()},
+                      {QStringLiteral("frequency"), frequency()},
+                      {QStringLiteral("generic"), generic()},
+                      {QStringLiteral("current"), current()},
+                      {QStringLiteral("switchOrValue"), switchOrValue()},
+                      {QStringLiteral("serialNumber"), serialNumber()}
+                     };
 }
 
 
@@ -1223,9 +1223,9 @@ Acknowledge Acknowledge::fromJson(const QJsonObject &obj)
 
 QJsonObject Acknowledge::toJson() const
 {
-  return QJsonObject({{QStringLiteral("timeStamp"), timeStamp},
+  return QJsonObject{{QStringLiteral("timeStamp"), timeStamp},
                       {QStringLiteral("ackCounter"), ackCounter}
-                     });
+                     };
 }
 
 
@@ -1243,13 +1243,13 @@ Init Init::fromJson(const QJsonObject &obj)
 
 QJsonObject Init::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("workstationId"), workstationId},
                       {QStringLiteral("restockCharges"), restockCharges},
                       {QStringLiteral("resetManipulation"), resetManipulation},
                       {QStringLiteral("resetVulnerabilityState"), resetVulnerabilityState},
                       {QStringLiteral("restockSanitationMaterial"), restockSanitationMaterial}
-                     });
+                     };
 }
 
 
@@ -1264,10 +1264,10 @@ ManipulationReport ManipulationReport::fromJson(const QJsonObject &obj)
 
 QJsonObject ManipulationReport::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("isManipulation"), isManipulation},
                       {QStringLiteral("equipmentFunctionId"), equipmentFunctionId}
-                     });
+                     };
 }
 
 
@@ -1281,9 +1281,9 @@ DemandBite DemandBite::fromJson(const QJsonObject &obj)
 
 QJsonObject DemandBite::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("withSelfTest"), withSelfTest}
-                     });
+                     };
 }
 
 
@@ -1297,9 +1297,9 @@ EquipmentOperationalState EquipmentOperationalState::fromJson(const QJsonObject
 
 QJsonObject EquipmentOperationalState::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("nbcProtectionActive"), nbcProtectionActive}
-                     });
+                     };
 }
 
 
@@ -1314,12 +1314,12 @@ void VulnerabilityModelBase::fromJson(const QJsonObject &obj, VulnerabilityModel
 
 QJsonObject VulnerabilityModelBase::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("vulnerabilityModelMineIed"), vulnerabilityModelMineIed},
                       {QStringLiteral("vulnerabilityModelAreaFire"), vulnerabilityModelAreaFire},
                       {QStringLiteral("vulnerabilityModelOperatingResource"), vulnerabilityModelOperatingResource},
                       {QStringLiteral("vulnerabilityModelAcWeaponry"), vulnerabilityModelAcWeaponry}
-                     });
+                     };
 }
 
 
@@ -1345,7 +1345,7 @@ DemandEquipmentConfigurationReport DemandEquipmentConfigurationReport::fromJson(
 
 QJsonObject DemandEquipmentConfigurationReport::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()}});
+  return QJsonObject{{QStringLiteral("header"), header.toJson()}};
 }
 
 
@@ -1415,10 +1415,10 @@ CtaDataError CtaDataError::fromJson(const QJsonObject &obj)
 
 QJsonObject CtaDataError::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("reason"), enumToJson(reason)},
                       {QStringLiteral("originTelegramId"), originTelegramId}
-                     });
+                     };
 }
 
 
@@ -1437,12 +1437,12 @@ void PositionReportBase::fromJson(const QJsonObject &obj, PositionReportBase &re
 
 QJsonObject PositionReportBase::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("relPosition"), relPosition.toJson()},
                       {QStringLiteral("geoPosition"), geoPosition.toJson()},
                       {QStringLiteral("opsPosition"), opsPosition.toJson()},
                       {QStringLiteral("gpsQuality"), gpsQuality.toJson()}
-                     });
+                     };
 }
 
 
@@ -1486,12 +1486,12 @@ void CreateAreaEffectSimulationBase::fromJson(const QJsonObject &obj, CreateArea
 
 QJsonObject CreateAreaEffectSimulationBase::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("aesDdsId"), aesDdsId},
                       {QStringLiteral("name"), QString::fromStdString(name)},
                       {QStringLiteral("partyId"), partyId},
                       {QStringLiteral("relEffectPosition"), relEffectPosition.toJson()}
-                     });
+                     };
 }
 
 
@@ -1523,9 +1523,9 @@ OcCommand OcCommand::fromJson(const QJsonObject &obj)
 
 QJsonObject OcCommand::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
     {QStringLiteral("action"), action}
-  });
+  };
 }
 
 
@@ -1597,7 +1597,7 @@ PauseEffectSimulation PauseEffectSimulation::fromJson(const QJsonObject &obj)
 
 QJsonObject PauseEffectSimulation::toJson() const
 {
-  return QJsonObject({{QStringLiteral("aesDdsId"), aesDdsId}});
+  return QJsonObject{{QStringLiteral("aesDdsId"), aesDdsId}};
 }
 
 
@@ -1614,12 +1614,12 @@ ResumeEffectSimulation ResumeEffectSimulation::fromJson(const QJsonObject &obj)
 
 QJsonObject ResumeEffectSimulation::toJson() const
 {
-  return QJsonObject({{QStringLiteral("aesDdsId"), aesDdsId},
+  return QJsonObject{{QStringLiteral("aesDdsId"), aesDdsId},
                       {QStringLiteral("sequelNumber"), sequelNumber},
                       {QStringLiteral("nextImpact"), nextImpact},
                       {QStringLiteral("resumeTime"), resumeTime},
                       {QStringLiteral("remainDuration"), remainDuration}
-                     });
+                     };
 }
 
 
@@ -1633,9 +1633,9 @@ MineAreaSegment MineAreaSegment::fromJson(const QJsonObject &obj)
 
 QJsonObject MineAreaSegment::toJson() const
 {
-  return QJsonObject({{QStringLiteral("relStart"), relStart.toJson()},
+  return QJsonObject{{QStringLiteral("relStart"), relStart.toJson()},
                       {QStringLiteral("relEnd"), relEnd.toJson()}
-                     });
+                     };
 }
 
 
@@ -1674,10 +1674,10 @@ MineAreaSingleMineState MineAreaSingleMineState::fromJson(const QJsonObject &obj
 
 QJsonObject MineAreaSingleMineState::toJson() const
 {
-  return QJsonObject({{QStringLiteral("aesDdsId"), aesDdsId},
+  return QJsonObject{{QStringLiteral("aesDdsId"), aesDdsId},
                       {QStringLiteral("mineCount"), mineCount},
                       {QStringLiteral("mineState"), arrayToJson(mineState)},
-                     });
+                     };
 }
 
 
@@ -1743,9 +1743,9 @@ DeactivateEffectSimulation DeactivateEffectSimulation::fromJson(const QJsonObjec
 
 QJsonObject DeactivateEffectSimulation::toJson() const
 {
-  return QJsonObject({{QStringLiteral("aesType"), enumToJson(aesType)},
+  return QJsonObject{{QStringLiteral("aesType"), enumToJson(aesType)},
                       {QStringLiteral("aesDdsId"), aesDdsId}
-                     });
+                     };
 }
 
 
@@ -1760,10 +1760,10 @@ ModifyAreaEffectSimulationName ModifyAreaEffectSimulationName::fromJson(const QJ
 
 QJsonObject ModifyAreaEffectSimulationName::toJson() const
 {
-  return QJsonObject({{QStringLiteral("aesType"), enumToJson(aesType)},
+  return QJsonObject{{QStringLiteral("aesType"), enumToJson(aesType)},
                       {QStringLiteral("aesDdsId"), aesDdsId},
                       {QStringLiteral("name"), QString::fromStdString(name)}
-                     });
+                     };
 }
 
 
@@ -1781,13 +1781,13 @@ MineTriggered MineTriggered::fromJson(const QJsonObject &obj)
 
 QJsonObject MineTriggered::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("mineAreaId"), mineAreaId},
                       {QStringLiteral("mineIndex"), mineIndex},
                       {QStringLiteral("chargeTypeId"), chargeTypeId},
                       {QStringLiteral("relPosition"), relPosition.toJson()},
                       {QStringLiteral("relPositionValid"), relPositionValid}
-                     });
+                     };
 }
 
 
@@ -1800,7 +1800,7 @@ DusMineReactivation DusMineReactivation::fromJson(const QJsonObject &obj)
 
 QJsonObject DusMineReactivation::toJson() const
 {
-  return QJsonObject({{QStringLiteral("dusSerialNumbers"), arrayToJson(dusSerialNumbers)}});
+  return QJsonObject{{QStringLiteral("dusSerialNumbers"), arrayToJson(dusSerialNumbers)}};
 }
 
 
@@ -1814,11 +1814,11 @@ void IedBaseData::fromJson(const QJsonObject &obj, IedBaseData &ret)
 
 QJsonObject IedBaseData::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("iedId"), iedId},
                       {QStringLiteral("tacticalState"), enumToJson(tacticalState)},
                       {QStringLiteral("statePyrotechnics"), statePyrotechnics}
-                     });
+                     };
 }
 
 
@@ -1937,7 +1937,7 @@ void StateChangeBase::fromJson(const QJsonObject &obj, StateChangeBase &ret)
 
 QJsonObject StateChangeBase::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("relPosition"), relPosition.toJson()},
                       {QStringLiteral("geoPosition"), geoPosition.toJson()},
                       {QStringLiteral("opsPosition"), opsPosition.toJson()},
@@ -1946,7 +1946,7 @@ QJsonObject StateChangeBase::toJson() const
                       {QStringLiteral("tasVitality"), tasVitality},
                       {QStringLiteral("vulnerabilityBits"), vulnerabilityBits},
                       {QStringLiteral("originatorId"), originatorId}
-                     });
+                     };
 }
 
 
@@ -1994,11 +1994,11 @@ DemandVulnerabilityStateChange DemandVulnerabilityStateChange::fromJson(const QJ
 
 QJsonObject DemandVulnerabilityStateChange::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("workstationId"), workstationId},
                       {QStringLiteral("reqestedState"), enumToJson(reqestedState)},
                       {QStringLiteral("vulnerabilityVitalityIndex"), vulnerabilityVitalityIndex}
-                     });
+                     };
 }
 
 
@@ -2014,11 +2014,11 @@ OperatorAction OperatorAction::fromJson(const QJsonObject &obj)
 
 QJsonObject OperatorAction::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("relPosition"), relPosition.toJson()},
                       {QStringLiteral("operatorId"), operatorId},
                       {QStringLiteral("action"), action}
-                     });
+                     };
 }
 
 
@@ -2034,11 +2034,11 @@ Reammunition Reammunition::fromJson(const QJsonObject &obj)
 
 QJsonObject Reammunition::toJson() const
 {
-  return QJsonObject({{QStringLiteral("chargeTypeId"), chargeTypeId},
+  return QJsonObject{{QStringLiteral("chargeTypeId"), chargeTypeId},
                       {QStringLiteral("newStock"), newStock},
                       {QStringLiteral("newDefaultStock"), newDefaultStock},
                       {QStringLiteral("tracerRatio"), tracerRatio}
-                     });
+                     };
 }
 
 
@@ -2054,10 +2054,10 @@ SelectiveReammunition SelectiveReammunition::fromJson(const QJsonObject &obj)
 
 QJsonObject SelectiveReammunition::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("gearId"), gearId},
                       {QStringLiteral("reammunitions"), arrayToJson(reammunitions)}
-                     });
+                     };
 }
 
 
@@ -2120,10 +2120,10 @@ FunctionalAreaEntry FunctionalAreaEntry::fromJson(const QJsonObject &obj)
 
 QJsonObject FunctionalAreaEntry::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("relPosition"), relPosition.toJson()},
                       {QStringLiteral("aesDdsId"), aesDdsId}
-                     });
+                     };
 }
 
 
@@ -2138,10 +2138,10 @@ RequestBroadcastTelegrams RequestBroadcastTelegrams::fromJson(const QJsonObject
 
 QJsonObject RequestBroadcastTelegrams::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("resetCounter"), resetCounter},
                       {QStringLiteral("broadcastIndex"), broadcastIndex}
-                     });
+                     };
 }
 
 
@@ -2162,7 +2162,7 @@ SpecialSensorData SpecialSensorData::fromJson(const QJsonObject &obj)
 
 QJsonObject SpecialSensorData::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("relPosition"), relPosition.toJson()},
                       {QStringLiteral("operationalState"), operationalState},
                       {QStringLiteral("airSensor"), airSensor},
@@ -2171,7 +2171,7 @@ QJsonObject SpecialSensorData::toJson() const
                       {QStringLiteral("solidMatterSampleExtractor"), solidMatterSampleExtractor},
                       {QStringLiteral("type"), type},
                       {QStringLiteral("nbcType"), nbcType}
-                     });
+                     };
 }
 
 
@@ -2189,7 +2189,7 @@ void MinelayerTrailerDataBase::fromJson(const QJsonObject &obj, MinelayerTrailer
 
 QJsonObject MinelayerTrailerDataBase::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("relPosition"), relPosition.toJson()},
                       {QStringLiteral("barrierId"), barrierId},
                       {QStringLiteral("layingDensity"), layingDensity},
@@ -2197,7 +2197,7 @@ QJsonObject MinelayerTrailerDataBase::toJson() const
                       {QStringLiteral("effectDuration"), effectDuration},
                       {QStringLiteral("indirectChargeTasCode"), indirectChargeTasCode},
                       {QStringLiteral("mineCount"), mineCount}
-                     });
+                     };
 }
 
 
@@ -2240,11 +2240,11 @@ MinelayerTrailerPosition MinelayerTrailerPosition::fromJson(const QJsonObject &o
 
 QJsonObject MinelayerTrailerPosition::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("relPosition"), relPosition.toJson()},
                       {QStringLiteral("indirectChargeTasCode"), indirectChargeTasCode},
                       {QStringLiteral("dusSerialNo"), qint64(dusSerialNo)}
-                     });
+                     };
 }
 
 
@@ -2258,9 +2258,9 @@ LanguageSelection LanguageSelection::fromJson(const QJsonObject &obj)
 
 QJsonObject LanguageSelection::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("languageSelection"), enumToJson(languageSelection)}
-                     });
+                     };
 }
 
 
@@ -2275,10 +2275,10 @@ EquipmentMessage EquipmentMessage::fromJson(const QJsonObject &obj)
 
 QJsonObject EquipmentMessage::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("message"), QString::fromStdString(message)},
                       {QStringLiteral("msgId"), msgId}
-                     });
+                     };
 }
 
 
@@ -2295,12 +2295,12 @@ EquipmentMessageOC EquipmentMessageOC::fromJson(const QJsonObject &obj)
 
 QJsonObject EquipmentMessageOC::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("subject"), QString::fromStdString(subject)},
                       {QStringLiteral("message"), QString::fromStdString(message)},
                       {QStringLiteral("senderId"), senderId},
                       {QStringLiteral("receiverId"), receiverId}
-                     });
+                     };
 }
 
 
@@ -2313,10 +2313,10 @@ void OpaquePayloadDataBase::fromJson(const QJsonObject &obj, OpaquePayloadDataBa
 
 QJsonObject OpaquePayloadDataBase::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("payload"), arrayToJson(payload)},
                       {QStringLiteral("payloadType"), enumToJson(payloadType)}
-                     });
+                     };
 }
 
 
@@ -2367,14 +2367,14 @@ EquipmentEvent EquipmentEvent::fromJson(const QJsonObject &obj)
 
 QJsonObject EquipmentEvent::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("relPosition"), relPosition.toJson()},
                       {QStringLiteral("equipmentFunctionId"), equipmentFunctionId},
                       {QStringLiteral("subDeviceId"), subDeviceId},
                       {QStringLiteral("uniqueId"), uniqueId},
                       {QStringLiteral("code"), code},
                       {QStringLiteral("payload"), arrayToJson(payload)}
-                     });
+                     };
 }
 
 
@@ -2388,9 +2388,9 @@ EquipmentGearAssignment EquipmentGearAssignment::fromJson(const QJsonObject &obj
 
 QJsonObject EquipmentGearAssignment::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("gears"), arrayToJson(gears)}
-                     });
+                     };
 }
 
 
@@ -2404,9 +2404,9 @@ EquipmentGearChargeState EquipmentGearChargeState::fromJson(const QJsonObject &o
 
 QJsonObject EquipmentGearChargeState::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("charges"), arrayToJson(charges)}
-                     });
+                     };
 }
 
 
@@ -2426,13 +2426,13 @@ ExerciseEnvironmentData ExerciseEnvironmentData::fromJson(const QJsonObject &obj
 
 QJsonObject ExerciseEnvironmentData::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("exerciseId"), exerciseId},
                       {QStringLiteral("timeZone"), timeZone},
                       {QStringLiteral("utmZone"), utmZone},
                       {QStringLiteral("utmBand"), utmBand},
                       {QStringLiteral("grid"), QString::fromStdString(grid)}
-                     });
+                     };
 }
 
 
@@ -2448,11 +2448,11 @@ BiteError BiteError::fromJson(const QJsonObject &obj)
 
 QJsonObject BiteError::toJson() const
 {
-  return QJsonObject({{QStringLiteral("errorNumber"), errorNumber},
+  return QJsonObject{{QStringLiteral("errorNumber"), errorNumber},
                       {QStringLiteral("canDeviceNumber"), canDeviceNumber},
                       {QStringLiteral("subdeviceNumber"), subdeviceNumber},
                       {QStringLiteral("uniqueId"), uniqueId}
-                     });
+                     };
 }
 
 
@@ -2471,14 +2471,14 @@ BiteReport BiteReport::fromJson(const QJsonObject &obj)
 
 QJsonObject BiteReport::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("loginType"), enumToJson(loginType)},
                       {QStringLiteral("biteState"), biteState},
                       {QStringLiteral("configState"), configState},
                       {QStringLiteral("batteryState"), batteryState},
                       {QStringLiteral("configError"), configError},
                       {QStringLiteral("biteErrors"), arrayToJson(biteErrors)}
-                     });
+                     };
 }
 
 
@@ -2493,10 +2493,10 @@ EquipmentGearEvent EquipmentGearEvent::fromJson(const QJsonObject &obj)
 
 QJsonObject EquipmentGearEvent::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("charge"), charge.toJson()},
                       {QStringLiteral("chargeAmount"), chargeAmount}
-                     });
+                     };
 }
 
 
@@ -2515,14 +2515,14 @@ CesHitInformation CesHitInformation::fromJson(const QJsonObject &obj)
 
 QJsonObject CesHitInformation::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("chargeTasCodeDirect"), chargeTasCodeDirect},
                       {QStringLiteral("chargeTasCodeIndirect"), chargeTasCodeIndirect},
                       {QStringLiteral("originatorEquipmentNumber"), originatorEquipmentNumber},
                       {QStringLiteral("directionDegree"), directionDegree},
                       {QStringLiteral("distance"), distance},
                       {QStringLiteral("effectPercent"), effectPercent}
-                     });
+                     };
 }
 
 
@@ -2536,9 +2536,9 @@ ParticipantSwVersionsRequest ParticipantSwVersionsRequest::fromJson(const QJsonO
 
 QJsonObject ParticipantSwVersionsRequest::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("chargeAmount"), equipmentFunctionId}
-                     });
+                     };
 }
 
 
@@ -2554,11 +2554,11 @@ EquipmentSwVersion EquipmentSwVersion::fromJson(const QJsonObject &obj)
 
 QJsonObject EquipmentSwVersion::toJson() const
 {
-  return QJsonObject({{QStringLiteral("equipmentFunctionId"), equipmentFunctionId},
+  return QJsonObject{{QStringLiteral("equipmentFunctionId"), equipmentFunctionId},
                       {QStringLiteral("subDeviceId"), subDeviceId},
                       {QStringLiteral("uniqueId"), uniqueId},
                       {QStringLiteral("swVersion"), swVersion}
-                     });
+                     };
 }
 
 
@@ -2572,9 +2572,9 @@ ParticipantSwVersions ParticipantSwVersions::fromJson(const QJsonObject &obj)
 
 QJsonObject ParticipantSwVersions::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("subDeviceId"), arrayToJson(equipments)}
-                     });
+                     };
 }
 
 
@@ -2601,7 +2601,7 @@ CesHitRequest CesHitRequest::fromJson(const QJsonObject &obj)
 
 QJsonObject CesHitRequest::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("chargeTasCodeDirect"), chargeTasCodeDirect},
                       {QStringLiteral("chargeTasCodeIndirect"), chargeTasCodeIndirect},
                       {QStringLiteral("originatorEquipmentNumber"), originatorEquipmentNumber},
@@ -2615,7 +2615,7 @@ QJsonObject CesHitRequest::toJson() const
                       {QStringLiteral("relPosition"), relPosition.toJson()},
                       {QStringLiteral("reserve1"), reserve1},
                       {QStringLiteral("reserve2"), reserve2}
-                     });
+                     };
 }
 
 
@@ -2634,14 +2634,14 @@ TechnicalArea TechnicalArea::fromJson(const QJsonObject &obj)
 
 QJsonObject TechnicalArea::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("aesDdsId"), aesDdsId},
                       {QStringLiteral("taType"), enumToJson(taType)},
                       {QStringLiteral("name"), QString::fromStdString(name)},
                       {QStringLiteral("relCorner"), relCorner.toJson()},
                       {QStringLiteral("width"), width},
                       {QStringLiteral("height"), height}
-                     });
+                     };
 }
 
 
@@ -2664,7 +2664,7 @@ void ParticipantModeBase::fromJson(const QJsonObject &obj, ParticipantModeBase &
 
 QJsonObject ParticipantModeBase::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("language"), enumToJson(language)},
                       {QStringLiteral("operationMode"), enumToJson(operationMode)},
                       {QStringLiteral("reactivationDetoxication"), reactivationDetoxication},
@@ -2677,7 +2677,7 @@ QJsonObject ParticipantModeBase::toJson() const
                       {QStringLiteral("handgrenadeSearchMode"), enumToJson(handgrenadeSearchMode)},
                       {QStringLiteral("internationalMode"), enumToJson(internationalMode)},
                       {QStringLiteral("abcProtectionMode"), enumToJson(abcProtectionMode)}
-                     });
+                     };
 }
 
 
@@ -2716,7 +2716,7 @@ DemandParticipantMode DemandParticipantMode::fromJson(const QJsonObject &obj)
 
 QJsonObject DemandParticipantMode::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()}});
+  return QJsonObject{{QStringLiteral("header"), header.toJson()}};
 }
 
 
@@ -2742,7 +2742,7 @@ void ParticipantConfigurationBase::fromJson(const QJsonObject &obj, ParticipantC
 
 QJsonObject ParticipantConfigurationBase::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("positionIntervallVehicle"), positionIntervallVehicle},
                       {QStringLiteral("positionIntervallPersonell"), positionIntervallPersonell},
                       {QStringLiteral("positionIntervallAircraft"), positionIntervallAircraft},
@@ -2758,7 +2758,7 @@ QJsonObject ParticipantConfigurationBase::toJson() const
                       {QStringLiteral("opticalCode"), enumToJson(opticalCode)},
                       {QStringLiteral("vulnerabilityModel"), vulnerabilityModel},
                       {QStringLiteral("validTimeOps"), validTimeOps}
-                     });
+                     };
 }
 
 
@@ -2797,7 +2797,7 @@ DemandParticipantConfiguration DemandParticipantConfiguration::fromJson(const QJ
 
 QJsonObject DemandParticipantConfiguration::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()}});
+  return QJsonObject{{QStringLiteral("header"), header.toJson()}};
 }
 
 
@@ -2812,10 +2812,10 @@ ExerciseStateData ExerciseStateData::fromJson(const QJsonObject &obj)
 
 QJsonObject ExerciseStateData::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("exerciseState"), enumToJson(exerciseState)},
                       {QStringLiteral("exerciseId"), exerciseId}
-                     });
+                     };
 }
 
 
@@ -2830,10 +2830,10 @@ EmergencyCall EmergencyCall::fromJson(const QJsonObject &obj)
 
 QJsonObject EmergencyCall::toJson() const
 {
-  return QJsonObject({{QStringLiteral("issi"), issi},
+  return QJsonObject{{QStringLiteral("issi"), issi},
                       {QStringLiteral("absPosition"), absPosition.toJson()},
                       {QStringLiteral("timeStamp"), timeStamp}
-                     });
+                     };
 }
 
 
@@ -2846,7 +2846,7 @@ RequestBroadcastStatistics RequestBroadcastStatistics::fromJson(const QJsonObjec
 
 QJsonObject RequestBroadcastStatistics::toJson() const
 {
-  return QJsonObject({{QStringLiteral("issi"), header.toJson()}});
+  return QJsonObject{{QStringLiteral("issi"), header.toJson()}};
 }
 
 
@@ -2860,9 +2860,9 @@ BroadcastInformation BroadcastInformation::fromJson(const QJsonObject &obj)
 
 QJsonObject BroadcastInformation::toJson() const
 {
-  return QJsonObject({{QStringLiteral("equipmentNumber"), equipmentNumber},
+  return QJsonObject{{QStringLiteral("equipmentNumber"), equipmentNumber},
                       {QStringLiteral("broadcastRequests"), broadcastRequests}
-                     });
+                     };
 }
 
 
@@ -2876,9 +2876,9 @@ BroadcastStatistics BroadcastStatistics::fromJson(const QJsonObject &obj)
 
 QJsonObject BroadcastStatistics::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("information"), arrayToJson(information)}
-                     });
+                     };
 }
 
 
@@ -2894,11 +2894,11 @@ GroupIssiInformation GroupIssiInformation::fromJson(const QJsonObject &obj)
 
 QJsonObject GroupIssiInformation::toJson() const
 {
-  return QJsonObject({{QStringLiteral("exerciseId"), exerciseId},
+  return QJsonObject{{QStringLiteral("exerciseId"), exerciseId},
                       {QStringLiteral("serverIssi"), serverIssi},
                       {QStringLiteral("broadcastIssi1"), broadcastIssi1},
                       {QStringLiteral("broadcastIssi2"), broadcastIssi2}
-                     });
+                     };
 }
 
 
@@ -2930,14 +2930,14 @@ QJsonObject ExerciseEquipmentAssignmentComplete::toJson() const
     QJsonArray equipmentNumbers;
     for (const int equipmentNumber : it.second)
       equipmentNumbers += equipmentNumber;
-    arrExercise += QJsonObject({{QStringLiteral("exerciseId"), it.first},
+    arrExercise += QJsonObject{{QStringLiteral("exerciseId"), it.first},
                                 {QStringLiteral("equipmentNumbers"), equipmentNumbers}
-                               });
+                               };
   }
 
-  return QJsonObject({{QStringLiteral("exerciseEquipmentAssignments"), arrExercise},
+  return QJsonObject{{QStringLiteral("exerciseEquipmentAssignments"), arrExercise},
                       {QStringLiteral("groupIssiInformation"), arrayToJson(groupIssiInformation)}
-                     });
+                     };
 }
 
 
@@ -2950,7 +2950,7 @@ ProxyConnectionState ProxyConnectionState::fromJson(const QJsonObject &obj)
 
 QJsonObject ProxyConnectionState::toJson() const
 {
-  return QJsonObject({{QStringLiteral("connectedToSystem"), connectedToSystem}});
+  return QJsonObject{{QStringLiteral("connectedToSystem"), connectedToSystem}};
 }
 
 
@@ -2964,9 +2964,9 @@ ParticipantLicenseChange ParticipantLicenseChange::fromJson(const QJsonObject &o
 
 QJsonObject ParticipantLicenseChange::toJson() const
 {
-  return QJsonObject({{QStringLiteral("equipmentNumber"), equipmentNumber},
+  return QJsonObject{{QStringLiteral("equipmentNumber"), equipmentNumber},
                       {QStringLiteral("licenseState"), enumToJson(licenseState)}
-                     });
+                     };
 }
 
 
@@ -2991,7 +2991,7 @@ WlsParticipantsStateReport WlsParticipantsStateReport::fromJson(const QJsonObjec
 
 QJsonObject WlsParticipantsStateReport::toJson() const
 {
-  return QJsonObject({{QStringLiteral("participantStates"), arrayToJson(participantStates)}});
+  return QJsonObject{{QStringLiteral("participantStates"), arrayToJson(participantStates)}};
 }
 
 
@@ -3005,9 +3005,9 @@ WlsBinarySfmData WlsBinarySfmData::fromJson(const QJsonObject &obj)
 
 QJsonObject WlsBinarySfmData::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("payload"), arrayToJson(payload)}
-                     });
+                     };
 }
 
 
@@ -3021,9 +3021,9 @@ WlsParticipantsConnectionState WlsParticipantsConnectionState::fromJson(const QJ
 
 QJsonObject WlsParticipantsConnectionState::toJson() const
 {
-  return QJsonObject({{QStringLiteral("equipmentNumber"), equipmentNumber},
+  return QJsonObject{{QStringLiteral("equipmentNumber"), equipmentNumber},
                       {QStringLiteral("dataCommunicationPossible"), dataCommunicationPossible}
-                     });
+                     };
 }
 
 
@@ -3049,7 +3049,7 @@ SanitationRepair SanitationRepair::fromJson(const QJsonObject &obj)
 
 QJsonObject SanitationRepair::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("originatorType"), enumToJson(originatorType)},
                       {QStringLiteral("equipmentNumberOrigin"), equipmentNumberOrigin},
                       {QStringLiteral("stateStart"), enumToJson(stateStart)},
@@ -3062,7 +3062,7 @@ QJsonObject SanitationRepair::toJson() const
                       {QStringLiteral("fullState"), fullState},
                       {QStringLiteral("timeOfTreatment"), timeOfTreatment},
                       {QStringLiteral("timeOfRecovery"), timeOfRecovery}
-                     });
+                     };
 }
 
 SanitaryMaterialStockReport SanitaryMaterialStockReport::fromJson(const QJsonObject &obj)
@@ -3079,13 +3079,13 @@ SanitaryMaterialStockReport SanitaryMaterialStockReport::fromJson(const QJsonObj
 
 QJsonObject SanitaryMaterialStockReport::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("sanitaryMaterialCount"), sanitaryMaterialCount},
                       {QStringLiteral("uniqueId"), uniqueId},
                       {QStringLiteral("sanitaryMaterialStock"), arrayToJson(sanitaryMaterialStock)},
                       {QStringLiteral("qualification"), enumToJson(qualification)},
                       {QStringLiteral("originatorEquipmentNumber"), originatorEquipmentNumber}
-                     });
+                     };
 }
 
 ApacheLaserDesignation ApacheLaserDesignation::fromJson(const QJsonObject &obj)
@@ -3101,12 +3101,12 @@ ApacheLaserDesignation ApacheLaserDesignation::fromJson(const QJsonObject &obj)
 
 QJsonObject ApacheLaserDesignation::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("gearId"), gearId},
                       {QStringLiteral("code"), code},
                       {QStringLiteral("outputPower"), outputPower},
                       {QStringLiteral("spotLocation"), spotLocation.toJson()}
-                     });
+                     };
 }
 
 Sanitation Sanitation::fromJson(const QJsonObject &obj)
@@ -3124,14 +3124,14 @@ Sanitation Sanitation::fromJson(const QJsonObject &obj)
 
 QJsonObject Sanitation::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("originatorEquipmentNumber"), originatorEquipmentNumber},
                       {QStringLiteral("uniqeId"), uniqeId},
                       {QStringLiteral("proceduresTaken"), proceduresTaken},
                       {QStringLiteral("sanitationResult"), enumToJson(sanitationResult)},
                       {QStringLiteral("sanitationEvaluation"), enumToJson(sanitationEvaluation)},
                       {QStringLiteral("qualification"), enumToJson(qualification)}
-                     });
+                     };
 }
 
 BatteryInfo BatteryInfo::fromJson(const QJsonObject &obj)
@@ -3145,33 +3145,33 @@ BatteryInfo BatteryInfo::fromJson(const QJsonObject &obj)
 
 QJsonObject BatteryInfo::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("batteryStates"), arrayToJson(batteryStates)}
-                     });
+                     };
 }
 
 BatteryAlarm BatteryAlarm::fromJson(const QJsonObject &obj)
 {
   BatteryAlarm ret;
-  get(obj, QStringLiteral("header"), ret.header);
-  get(obj, QStringLiteral("id"), ret.id);
-  get(obj, QStringLiteral("description"), ret.description);
-  get(obj, QStringLiteral("acknowledge"), ret.acknowledge);
-  get(obj, QStringLiteral("condition"), ret.condition);
-  get(obj, QStringLiteral("uniqueAlarmNumber"), ret.uniqueAlarmNumber);
-  get(obj, QStringLiteral("alarmTime"), ret.alarmTime);
+  get(obj, QStringLiteral("header"), ret.m_header);
+  get(obj, QStringLiteral("id"), ret.m_id);
+  get(obj, QStringLiteral("description"), ret.m_description);
+  get(obj, QStringLiteral("acknowledge"), ret.m_acknowledge);
+  get(obj, QStringLiteral("condition"), ret.m_condition);
+  get(obj, QStringLiteral("uniqueAlarmNumber"), ret.m_uniqueAlarmNumber);
+  get(obj, QStringLiteral("alarmTime"), ret.m_alarmTime);
   return ret;
 }
 
 QJsonObject BatteryAlarm::toJson() const
 {
   return QJsonObject{{QStringLiteral("header"), header().toJson()},
-                      {QStringLiteral("id"), id},
-                      {QStringLiteral("description"), description},
-                      {QStringLiteral("acknowledge"), acknowledge},
-                      {QStringLiteral("condition"), condition},
-                      {QStringLiteral("uniqueAlarmNumber"), uniqueAlarmNumber},
-                      {QStringLiteral("alarmTime"), alarmTime}
+                      {QStringLiteral("id"), m_id},
+                      {QStringLiteral("description"), description()},
+                      {QStringLiteral("acknowledge"), acknowledge()},
+                      {QStringLiteral("condition"), condition()},
+                      {QStringLiteral("uniqueAlarmNumber"), uniqueAlarmNumber()},
+                      {QStringLiteral("alarmTime"), alarmTime()}
                      };
 }
 
@@ -3186,9 +3186,9 @@ ServiceControl ServiceControl::fromJson(const QJsonObject &obj)
 
 QJsonObject ServiceControl::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("serviceControlState"), enumToJson(serviceControlState)}
-                     });
+                     };
 }
 
 SetDevicePowerRequest SetDevicePowerRequest::fromJson(const QJsonObject &obj)
@@ -3203,10 +3203,10 @@ SetDevicePowerRequest SetDevicePowerRequest::fromJson(const QJsonObject &obj)
 
 QJsonObject SetDevicePowerRequest::toJson() const
 {
-  return QJsonObject({{QStringLiteral("header"), header.toJson()},
+  return QJsonObject{{QStringLiteral("header"), header.toJson()},
                       {QStringLiteral("powerType"), enumToJson(powerType)},
                       {QStringLiteral("subdeviceId"), subdeviceId}
-                     });
+                     };
 }
 
 RestoreRadioReadiness RestoreRadioReadiness::fromJson(const QJsonObject &obj)
@@ -3224,12 +3224,12 @@ RestoreRadioReadiness RestoreRadioReadiness::fromJson(const QJsonObject &obj)
 
 QJsonObject RestoreRadioReadiness::toJson() const
 {
-  return QJsonObject({{HEADER(), header.toJson()},
+  return QJsonObject{{HEADER(), header.toJson()},
                       {READINESS_LOSS_POSITION(), readinessLossPosition.toJson()},
                       {READINESS_LOSS_TIME(), readinessLossTime},
                       {READINESS_RESTORE_POSITION(), readinessRestorePosition.toJson()},
                       {READINESS_RESTORE_TIME(), readinessRestoreTime}
-                     });
+                     };
 }
 
 
@@ -3245,10 +3245,8 @@ UAVAction UAVAction::fromJson(const QJsonObject &obj)
 
 QJsonObject UAVAction::toJson() const
 {
-  return QJsonObject({
-                       {TASK(), enumToJson(task)},
-                       {POSITION(), absPosition.toJson()},
-                     });
+  return QJsonObject{{TASK(), enumToJson(task)},
+                       {POSITION(), absPosition.toJson()}};
 }
 
 
@@ -3266,12 +3264,10 @@ UAVPerformMission UAVPerformMission::fromJson(const QJsonObject &obj)
 
 QJsonObject UAVPerformMission::toJson() const
 {
-  return QJsonObject({
-                       {HEADER(), header.toJson()},
-                       {ACTIONS(), arrayToJson(actions)},
-                       {MISSION_NAME(), missionName},
-                       {MISSION_ID(), missionId},
-                     });
+  return QJsonObject{{HEADER(), header.toJson()},
+                      {ACTIONS(), arrayToJson(actions)},
+                      {MISSION_NAME(), missionName},
+                      {MISSION_ID(), missionId}};
 }
 
 
@@ -3288,10 +3284,8 @@ UAVStatus UAVStatus::fromJson(const QJsonObject &obj)
 
 QJsonObject UAVStatus::toJson() const
 {
-  return QJsonObject({
-                       {HEADER(), header.toJson()},
-                       {UAVSTATE(), enumToJson(uavState)},
-                     });
+  return QJsonObject{{HEADER(), header.toJson()},
+                      {UAVSTATE(), enumToJson(uavState)}};
 }
 
 
@@ -3308,10 +3302,8 @@ UAVRadioLinkConnectionStatus UAVRadioLinkConnectionStatus::fromJson(const QJsonO
 
 QJsonObject UAVRadioLinkConnectionStatus::toJson() const
 {
-  return QJsonObject({
-                       {HEADER(), header.toJson()},
-                       {UAVCONNECTIONSTATE(), enumToJson(uavConnectionState)},
-                     });
+  return QJsonObject{{HEADER(), header.toJson()},
+                      {UAVCONNECTIONSTATE(), enumToJson(uavConnectionState)}};
 }
 
 
@@ -3330,12 +3322,10 @@ UAVMissionStatus UAVMissionStatus::fromJson(const QJsonObject &obj)
 
 QJsonObject UAVMissionStatus::toJson() const
 {
-  return QJsonObject({
-                       {HEADER(), header.toJson()},
-                       {CURRENT_ACTION(), enumToJson(currentAction)},
-                       {CURRENT_MISSION_NAME(), currentMissionName},
-                       {MISSION_ENDED(), missionEnded},
-                     });
+  return QJsonObject{{HEADER(), header.toJson()},
+                      {CURRENT_ACTION(), enumToJson(currentAction)},
+                      {CURRENT_MISSION_NAME(), currentMissionName},
+                      {MISSION_ENDED(), missionEnded}};
 }
 
 
@@ -3351,10 +3341,8 @@ UAVChangeState UAVChangeState::fromJson(const QJsonObject &obj)
 
 QJsonObject UAVChangeState::toJson() const
 {
-  return QJsonObject({
-                       {HEADER(), header.toJson()},
-                       {REQUESTED_STATE(), enumToJson(requestedState)}
-                     });
+  return QJsonObject{{HEADER(), header.toJson()},
+                      {REQUESTED_STATE(), enumToJson(requestedState)}};
 }
 
 ExFireReadiness ExFireReadiness::fromJson(const QJsonObject &obj)
@@ -3370,11 +3358,9 @@ ExFireReadiness ExFireReadiness::fromJson(const QJsonObject &obj)
 
 QJsonObject ExFireReadiness::toJson() const
 {
-    return QJsonObject({
-                       {HEADER(), header.toJson()},
+    return QJsonObject{{HEADER(), header.toJson()},
                        {PARTY_ID(), partyId},
-                       {REFERENCE(), reference}
-                     });
+                       {REFERENCE(), reference}};
 }
 
 ExFiredReport ExFiredReport::fromJson(const QJsonObject &obj)
@@ -3391,13 +3377,11 @@ ExFiredReport ExFiredReport::fromJson(const QJsonObject &obj)
 
 QJsonObject ExFiredReport::toJson() const
 {
-  return QJsonObject({
-                       {HEADER(), header.toJson()},
-                       {PARTY_ID(), partyId},
-                       {REFERENCE(), reference},
-                       {UNIT_IDENTIFIER(), unitIdentifier},
-                       {IDENTIFIER(), identifier}
-                     });
+  return QJsonObject{{HEADER(), header.toJson()},
+                      {PARTY_ID(), partyId},
+                      {REFERENCE(), reference},
+                      {UNIT_IDENTIFIER(), unitIdentifier},
+                      {IDENTIFIER(), identifier}};
 }
 
 ExConfirmationReport ExConfirmationReport::fromJson(const QJsonObject &obj)
@@ -3414,14 +3398,12 @@ ExConfirmationReport ExConfirmationReport::fromJson(const QJsonObject &obj)
 
 QJsonObject ExConfirmationReport::toJson() const
 {
-  return QJsonObject({
-                       {HEADER(), header.toJson()},
-                       {PARTY_ID(), partyId},
-                       {REFERENCE(), reference},
-                       {UNIT_IDENTIFIER(), unitIdentifier},
-                       {IDENTIFIER(), identifier}
-                     });  
+  return QJsonObject{{HEADER(), header.toJson()},
+                      {PARTY_ID(), partyId},
+                      {REFERENCE(), reference},
+                      {UNIT_IDENTIFIER(), unitIdentifier},
+                      {IDENTIFIER(), identifier}};
 }
 
-} 
-} 
+} // namespace TetraIcd
+} // namespace TrainingAreaBase
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.h
index a48fadc8d..93a8d70ee 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 #include <ctime>
 #include <string>
 #include <vector>
@@ -10,8 +10,9 @@
 #include <bitset>
 #include <unordered_map>
 #include <unordered_set>
+#include <ostream>
 
-#include <QJsonObject>
+#include <QtCore/QJsonObject>
 
 namespace TrainingAreaBase
 {
@@ -372,11 +373,8 @@ enum class UAVState
 
 struct Header
 {
-  int m_equipmentNumber = 0;
-  qint64 m_timeStamp = 0;
-
-  int equipmentNumber() const { return m_equipmentNumber; }
-  qint64 timeStamp() const { return m_timeStamp; }
+  int equipmentNumber = 0;
+  qint64 timeStamp = 0;
 
   static Header fromJson(const QJsonObject &obj);
   QJsonObject toJson() const;
@@ -2301,7 +2299,6 @@ struct BatteryAlarm : TrainingAreaTelegramTmpl<BatteryAlarm>
   qint64 m_alarmTime;
 
   Header header() const { return m_header; }
-  TelegramId id() const { return static_cast<TelegramId>(m_id); }
   QString description() const { return m_description; }
   bool acknowledge() const { return m_acknowledge; }
   bool condition() const { return m_condition; }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tx_mixin.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tx_mixin.h
index 0429c836e..336610342 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tx_mixin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tx_mixin.h
@@ -5,7 +5,7 @@
 #include "svctabserver_export.h"
 #include "send_to_tab.h"
 #include "logger.h"
-#include <QVector>
+#include <QtCore/QVector>
 #include <memory>
 
 namespace TrainingAreaBase
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.h
index d3ead667c..c95e695ce 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.h
@@ -5,13 +5,13 @@
 
 #include <memory>
 
-#include <QObject>
-#include <QByteArray>
-#include <QList>
-#include <QMap>
-#include <QPair>
-#include <QTimer>
-#include <QTcpSocket>
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QPair>
+#include <QtCore/QTimer>
+#include <QtNetwork/QTcpSocket>
 
 
 #include <LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.cpp
index 703522bcd..3435d3bf8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.cpp
@@ -3,7 +3,7 @@
 
 #include "connection_handler_serial.h"
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #include "settings.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.h
index 3ad3f8b24..953940914 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 #include <QtSerialPort/QSerialPort>
 
 #include <LtsSerialPortQuerry/lts_serial_port_querry.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.cpp
index a090c07e5..89c695368 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.cpp
@@ -3,7 +3,7 @@
 
 #include "connection_handler_tcp.h"
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #include "settings.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.h
index ab973827b..b512279b8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QTcpSocket>
+#include <QtCore/QObject>
+#include <QtNetwork/QTcpSocket>
 
 #include <LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h>
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.cpp
index 64bb77e31..3b8cc7eb4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.cpp
@@ -2,12 +2,12 @@
 
 #include "connection_handler_tcp_ttci.h"
 
-#include <QCoreApplication>
-#include <QDataStream>
-#include <QTimer>
-#include <QTcpServer>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDataStream>
+#include <QtCore/QTimer>
+#include <QtNetwork/QTcpServer>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 using namespace NGL;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.h
index 90ecafeb1..cee09292b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.h
@@ -2,13 +2,13 @@
 
 #pragma once
 
-#include <QObject>
-#include <QByteArray>
-#include <QDateTime>
-#include <QVector>
-#include <QList>
-#include <QPair>
-#include <QSettings>
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QDateTime>
+#include <QtCore/QVector>
+#include <QtCore/QList>
+#include <QtCore/QPair>
+#include <QtCore/QSettings>
 
 #include <LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.cpp
index d5715eb53..911a63545 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.cpp
@@ -1,9 +1,9 @@
 
 
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <utility>
-#include <QPointF>
+#include <QtCore/QPointF>
 
 #include <LtsUtils/qbytearray_byteaccess.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.h
index b54e7df60..4bdfed1cd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QByteArray>
+#include <QtCore/QByteArray>
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/main_handler.h
index e54d3680f..e311faa7b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/main_handler.h
@@ -2,9 +2,9 @@
 
 #pragma once
 
-#include <QObject>
-#include <QMap>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+#include <QtCore/QString>
 
 #include <AreaEffectSimulation/aes_dtc.h>
 #include <AreaEffectSimulation/aes_ftc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.cpp
index 0601b0b8a..d311fd2a4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.cpp
@@ -3,7 +3,7 @@
 
 #include "send_to_dds.h"
 
-#include <QPointF>
+#include <QtCore/QPointF>
 
 #include "main_handler.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.h
index e7a4fcd54..dd50e4d3d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.h
@@ -4,7 +4,7 @@
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "recv_from_tab.h"
 #include "dds_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/settings.h
index 069c72bcc..c0672c041 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/settings.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_channel.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_channel.h
index 6a4d894a1..86ab65687 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_channel.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_channel.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.cpp
index 2a4c0bb7f..f996fb7f1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.cpp
@@ -5,8 +5,8 @@
 #include "settings.h"
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QByteArray>
-#include <QChar>
+#include <QtCore/QByteArray>
+#include <QtCore/QChar>
 
 namespace TrainingAreaBaseOC
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.h
index 967c713cc..57b10f4f9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <QObject>
-#include <QTimer>
-#include <QTcpSocket>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+#include <QtNetwork/QTcpSocket>
 #include <QSerialPort>
 #include <LtsSerialPortQuerry/lts_serial_port_querry.h>
 namespace NGL
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/websocket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/websocket_handler.cpp
index d65250951..25772bbfd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/websocket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/websocket_handler.cpp
@@ -3,11 +3,11 @@
 
 #include "settings.h"
 
-#include <QPointF>
-#include <QTimer>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QPointF>
+#include <QtCore/QTimer>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 
 namespace TrainingAreaBaseOC {
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.h
index d30e62e48..313162b05 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.h
@@ -11,8 +11,8 @@
 
 #include "logger.h"
 #include <QtWebSockets/QWebSocket>
-#include <QTimer>
-#include <QObject>
+#include <QtCore/QTimer>
+#include <QtCore/QObject>
 
 
 #include <LtsWebSocket/client_connection.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercise_participant_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercise_participant_handler.h
index faca2158c..09556aeb7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercise_participant_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercise_participant_handler.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <QHash>
-#include <QObject>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
 #include "dds_handler_exercise.h"
 
 #include <ParticipantManagement/ppm_ftc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercises_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercises_handler.h
index 31760ff2b..1d01f0475 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercises_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercises_handler.h
@@ -2,9 +2,9 @@
 
 #pragma once
 
-#include <QHash>
-#include <QObject>
-#include <QVector>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 
 #include "dds_handler.h"
 #include <ParticipantManagement/ppm.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/interface_wms2ecc_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/interface_wms2ecc_impl.cpp
index 162f4fbaa..4b9119a47 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/interface_wms2ecc_impl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/interface_wms2ecc_impl.cpp
@@ -9,7 +9,7 @@
 #include <ParticipantManagement/ppm.hpp>
 
 
-#include <QString>
+#include <QtCore/QString>
 #include <vector>
 
 namespace WarehouseManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/main_handler.h
index f9d13e211..7868a0cbb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/main_handler.h
@@ -9,7 +9,7 @@
 #include "data_manager.h"
 
 #include "logger.h"
-#include <QObject>
+#include <QtCore/QObject>
 
 
 #include <LtsWebSocket/client_connection.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/settings.h
index 4125eec72..8434e031f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/settings.h
@@ -2,8 +2,8 @@
 
 
 #pragma once
-#include <QPointF>
-#include <QString>
+#include <QtCore/QPointF>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/ism_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/ism_handler.h
index 9dfe74fb3..7c2a6aa9d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/ism_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/ism_handler.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QHash>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
 
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main_handler.h
index 58d99c19e..dd77f6157 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main_handler.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include "dds_handler.h"
 #include "ism_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/settings.h
index 3e3d228a7..5c22e6f8e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/settings.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.cpp
index 26cec12c5..84d8d27ba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.cpp
@@ -12,8 +12,8 @@
 
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 
-#include <QJsonDocument>
-#include <QPointF>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QPointF>
 #include <QtWebSockets/QWebSocket>
 
 namespace WirelessLocationSystem
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.h
index 59c5dbba7..261f5966e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QQueue>
 #include <QtWebSockets/QWebSocketServer>
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_handler.cpp
index 4a733c6f2..becbd0034 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_handler.cpp
@@ -9,8 +9,8 @@
 #include "wls_sfm_message_converter.h"
 #include "web_socket_handler.h"
 
-#include <QTcpSocket>
-#include <QDateTime>
+#include <QtNetwork/QTcpSocket>
+#include <QtCore/QDateTime>
 #include <web_socket_handler.h>
 
 namespace WirelessLocationSystem
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_handler.h
index b48d3cf0b..c72159ac3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_handler.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <QTcpServer>
-#include <QTimer>
+#include <QtNetwork/QTcpServer>
+#include <QtCore/QTimer>
 #include <memory>
 #include "logger.h"
 #include "wls_participant_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_json_client_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_json_client_test.cpp
index c98783690..2430c945d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_json_client_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_json_client_test.cpp
@@ -2,10 +2,10 @@
 
 
 #include "wls_json_client_test.h"
-#include <QCoreApplication>
-#include <QStringList>
-#include <QString>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QStringList>
+#include <QtCore/QString>
+#include <QtCore/QTimer>
 
 WlsJsonclientTest::WlsJsonclientTest(const QString &hostname, unsigned short port)
   : m_socket(new QWebSocket(QString(), QWebSocketProtocol::VersionLatest, this))
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_json_client_test.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_json_client_test.h
index f918d25ba..aa1f893be 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_json_client_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_json_client_test.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtWebSockets/QWebSocket>
 
 class WlsJsonclientTest : public QObject
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.cpp
index 72d98d415..21c0fd086 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.cpp
@@ -5,7 +5,7 @@
 #include "wls_sfm_message.h"
 #include "wls_handler.h"
 #include "settings.h"
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.h
index e353e9b94..e8bb7ea81 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.h
@@ -3,11 +3,11 @@
 
 #pragma once
 
-#include <QByteArray>
-#include <QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QObject>
 #include <QQueue>
 #include <QStringBuilder>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 
 #include <math.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant_handler.cpp
index 03f1ca6f9..e48413249 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant_handler.cpp
@@ -6,7 +6,7 @@
 #include "web_socket_handler.h"
 #include "wls_handler.h"
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 namespace WirelessLocationSystem
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant_handler.h
index b557deb88..c477962c7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant_handler.h
@@ -5,9 +5,9 @@
 
 #include "logger.h"
 #include "wls_participant.h"
-#include <QHash>
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 #include <unordered_map>
 #include <unordered_set>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_sfm_message.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_sfm_message.h
index 7a0b74502..3ec81c2a3 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_sfm_message.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_sfm_message.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QByteArray>
+#include <QtCore/QByteArray>
 #include <WirelessLocationSystem/sfmconverter_export.h>
 
 namespace WirelessLocationSystem
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_sfm_message_converter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_sfm_message_converter.cpp
index 1e6c89752..d781b121c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_sfm_message_converter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_sfm_message_converter.cpp
@@ -3,8 +3,8 @@
 
 #include "wls_sfm_message_converter.h"
 
-#include <QByteArray>
-#include <QSharedPointer>
+#include <QtCore/QByteArray>
+#include <QtCore/QSharedPointer>
 
 #include <LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_sfm_message_converter.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_sfm_message_converter.h
index c7e8ca157..13c73436f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_sfm_message_converter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_sfm_message_converter.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QByteArray>
-#include <QSharedPointer>
+#include <QtCore/QByteArray>
+#include <QtCore/QSharedPointer>
 
 #include "wls_sfm_message.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/ModuleTests/alm_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/ModuleTests/alm_tests.cpp
index b474774bc..099b57ab0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/ModuleTests/alm_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/ModuleTests/alm_tests.cpp
@@ -9,10 +9,10 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QDateTime>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
 /* ----------------------------------------------------------------------------------
  * HOW TO RUN THE TESTS
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/alm_types.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/alm_types.h
index 03ce4cfbc..27b090ab5 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/alm_types.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/alm_types.h
@@ -3,7 +3,7 @@
 // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
 // Für die Migration erstellen wir minimale Typ-Definitionen
 
-#include <QString>
+#include <QtCore/QString>
 #include "almcommon_export.h"
 
 namespace AlarmManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.cpp
index 7b25b8e57..d851de5e2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.cpp
@@ -9,10 +9,10 @@
 #include "handler_configure_alarms.h"
 #include <utility>
 #include "initialization.h"
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QSet>
-#include <QTimer>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QSet>
+#include <QtCore/QTimer>
 #include <ProjectDataManagement/pdm_translation.h>
 #include <LtsUtilsCore/json_object.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.h
index 5a1d070bc..49c272c1c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "dds_handler.h"
 #include "logger.h"
 #include <alm_db.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.cpp
index accaaf815..51b9c6d7f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.cpp
@@ -14,9 +14,9 @@
 #include "alm_db.h"
 #include <DDS/DTS/generic_dts.h>
 
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QDebug>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QDebug>
 namespace AlarmManagement
 {
 HandlerEmergencyCall::HandlerEmergencyCall(const std::shared_ptr<HandlerConfigureAlarms> &configAlarmHandler,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.h
index fb8df9cdc..fa0d51a47 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <AlarmManagement/alm_db.h>
 #include "dds_handler.h"
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_participant.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_participant.h
index 9140ea27b..4432532f3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_participant.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_participant.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "dds_handler.h"
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/object_emergency_call.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/object_emergency_call.h
index ac4d1956c..1ed60ae9c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/object_emergency_call.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/object_emergency_call.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <dds_handler.h>
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/settings.h
index aeee5386a..8c3bca672 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp
index 0786e9657..757edc309 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp
@@ -18,7 +18,7 @@
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QRandomGenerator>
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.h
index a8d254220..fb1849040 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.h
@@ -21,9 +21,9 @@
 #pragma once
 
 #include <AreaEffectSimulation/logger.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <Core/core.hpp>
-#include <QJsonObject>
+#include <QtCore/QJsonObject>
 
 namespace Core
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/dm72_firing_strategy.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/dm72_firing_strategy.cpp
index 7886fb235..cc91996f2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/dm72_firing_strategy.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/dm72_firing_strategy.cpp
@@ -16,10 +16,10 @@
 #include <TrainingAreaBase/Plugins/AdlerJson/telegrams.h>
 #include <Trajectory/trajectory_transform.h>
 
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonValue>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonValue>
 #include <QTransform>
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/gmlrs_firing_strategy.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/gmlrs_firing_strategy.cpp
index 8c5c52ef6..75bee49a3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/gmlrs_firing_strategy.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/gmlrs_firing_strategy.cpp
@@ -14,8 +14,8 @@
 #include <Trajectory/trajectory_transform.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/smart_firing_strategy.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/smart_firing_strategy.cpp
index 9cdee395a..68a43f2d6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/smart_firing_strategy.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/smart_firing_strategy.cpp
@@ -13,8 +13,8 @@
 #include <TrainingAreaBase/Plugins/AdlerJson/telegrams.h>
 #include <TrajectorySplitter/trajectory_splitter.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.cpp
index 19ede9026..1f52a994c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.cpp
@@ -18,14 +18,14 @@
 // PPM
 #include "ParticipantManagement/ppm_ftc_types.h"
 #include "TrainingAreaBase/tab.hpp"
-#include <QDateTime>
-#include <QDebug>
-#include <QFile>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QTimer>
-#include <QVector>
-#include <QXmlStreamReader>
+#include <QtCore/QDateTime>
+#include <QtCore/QDebug>
+#include <QtCore/QFile>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QTimer>
+#include <QtCore/QVector>
+#include <QtCore/QXmlStreamReader>
 
 #include <iostream>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.h
index f47e98626..eaa094900 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.h
@@ -30,7 +30,7 @@
 
 #include <TrainingAreaBase/tab_dts.h>
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 #include <QtTest/QTest>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.cpp
index 9b52c4061..a12bc3677 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.cpp
@@ -20,8 +20,8 @@
 #include <Buildings/bld_ftc.h>
 
 
-#include <QTimer>
-#include <QDebug>
+#include <QtCore/QTimer>
+#include <QtCore/QDebug>
 
 #include <iostream>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.h
index 71fcce2d1..73c59bfd9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.h
@@ -25,7 +25,7 @@
 #include <ParticipantManagement/ppm_ftc.h>
 
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QtTest/QTest>
 
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp
index 85762ca14..e1d82addf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp
@@ -18,8 +18,8 @@
 #include <Core/core.hpp>
 
 
-#include <QTimer>
-#include <QDebug>
+#include <QtCore/QTimer>
+#include <QtCore/QDebug>
 
 #include <iostream>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.h
index 7879861ee..42cdc168a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.h
@@ -24,7 +24,7 @@
 #include <ParticipantManagement/ppm_ftc.h>
 
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QtTest/QTest>
 
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.cpp
index ee2c912a0..ffe831d66 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.cpp
@@ -17,8 +17,8 @@
 #include <AreaEffectSimulation/Utils/polygons.h>
 
 
-#include <QTimer>
-#include <QDebug>
+#include <QtCore/QTimer>
+#include <QtCore/QDebug>
 
 #include <iostream>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.h
index e6e95c287..25b3747b6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.h
@@ -23,7 +23,7 @@
 #include <ParticipantManagement/ppm_ftc.h>
 
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QtTest/QTest>
 
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_convert_mine_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_convert_mine_area.cpp
index e0923ca03..5f414c07b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_convert_mine_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_convert_mine_area.cpp
@@ -7,8 +7,8 @@
 
 #include "aes_convert_mine_area.h"
 
-#include <QTimer>
-#include <QLineF>
+#include <QtCore/QTimer>
+#include <QtCore/QLineF>
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
 
@@ -17,7 +17,7 @@
 #include <ngldb/dbconnection.h>
 #include <ngldb/sql_query_janitor.h>
 #include <QtSql/QSqlError>
-#include <QVariant>
+#include <QtCore/QVariant>
 
 
 #include <AreaEffectSimulation/aes_db_structs.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_convert_mine_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_convert_mine_area.h
index 6cf673d17..a20c70f24 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_convert_mine_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_convert_mine_area.h
@@ -9,8 +9,8 @@
 
 #include "aes_test_base.h"
 
-#include <QSqlDriver>
-#include <QSqlDatabase>
+#include <QtSql/QSqlDriver>
+#include <QtSql/QSqlDatabase>
 #include <QtSql/QSqlError>
 
 #include <AreaEffectSimulation/aes_enums.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_air_support_impact.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_air_support_impact.cpp
index 137295b31..02682d0ff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_air_support_impact.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_air_support_impact.cpp
@@ -6,9 +6,9 @@
   */
 
 #include "aes_test_air_support_impact.h"
-#include <QCoreApplication>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_base.cpp
index 2f40badbb..48e1904ef 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_base.cpp
@@ -8,7 +8,7 @@
 #include "aes_test_base.h"
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QtTest/QTest>
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_base.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_base.h
index 29c104f2c..aa2c07c39 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_base.h
@@ -10,7 +10,7 @@
 #include <AreaEffectSimulation/aes_ftc.h>
 #include <AreaEffectSimulation/aes_dtc.h>
 #include <AreaEffectSimulation/logger.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <DDS/DDSConnector/dds_connector.h>
 #include <memory>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_bccontamination.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_bccontamination.cpp
index 34de10ff7..35172b2c3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_bccontamination.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_bccontamination.cpp
@@ -6,9 +6,9 @@
   */
 
 #include "aes_test_bccontamination.h"
-#include <QCoreApplication>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_booby_trap.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_booby_trap.cpp
index a8fe0de07..0e918f948 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_booby_trap.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_booby_trap.cpp
@@ -6,9 +6,9 @@
   */
 
 #include "aes_test_booby_trap.h"
-#include <QCoreApplication>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_charge_administration.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_charge_administration.cpp
index 053e6c0ae..ca86bb4a8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_charge_administration.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_charge_administration.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "aes_test_charge_administration.h"
-#include <QCoreApplication>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_danger_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_danger_area.cpp
index dec731263..c96f2f38a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_danger_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_danger_area.cpp
@@ -6,9 +6,9 @@
   */
 
 #include "aes_test_danger_area.h"
-#include <QCoreApplication>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_area.cpp
index bd3a0b197..cea4083f5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_area.cpp
@@ -6,9 +6,9 @@
   */
 
 #include "aes_test_explosion_area.h"
-#include <QCoreApplication>
-#include <QTimer>
-#include <QTest>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QTimer>
+#include <QtTest/QTest>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_area_bulk.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_area_bulk.cpp
index 00db34429..f904d2cfa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_area_bulk.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_area_bulk.cpp
@@ -7,9 +7,9 @@
   */
 
 #include "aes_test_explosion_area_bulk.h"
-#include <QCoreApplication>
-#include <QTimer>
-#include <QTest>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QTimer>
+#include <QtTest/QTest>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_cluster.cpp
index 6a9d5af3a..42443920f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_cluster.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_cluster.cpp
@@ -8,9 +8,9 @@
 
 #include "aes_test_explosion_cluster.h"
 #include <ProjectDataManagement/pdm.hpp>
-#include <QCoreApplication>
-#include <QTimer>
-#include <QTest>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QTimer>
+#include <QtTest/QTest>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_single.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_single.cpp
index d8cc9f1d6..de49b4885 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_single.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_single.cpp
@@ -6,9 +6,9 @@
   */
 
 #include "aes_test_explosion_single.h"
-#include <QCoreApplication>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_gas_pipe.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_gas_pipe.cpp
index 5f6adf98a..9f60e4cbc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_gas_pipe.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_gas_pipe.cpp
@@ -6,9 +6,9 @@
   */
 
 #include "aes_test_gas_pipe.h"
-#include <QCoreApplication>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_gas_pipe.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_gas_pipe.h
index 7d7a3cd83..a7683dc77 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_gas_pipe.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_gas_pipe.h
@@ -9,7 +9,7 @@
 
 #include "aes_test_base.h"
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QPointF>
+#include <QtCore/QPointF>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_mine_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_mine_area.cpp
index 5bb04bf73..0698ac221 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_mine_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_mine_area.cpp
@@ -8,10 +8,10 @@
 #include "aes_test_mine_area.h"
 #include "Utils/polygons.h"
 #include "qjsonobject.h"
-#include <QCoreApplication>
-#include <QJsonDocument>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QJsonDocument>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>
 #include <LtsCoordTrans/lts_coord_trans.h>
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_ncontamination.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_ncontamination.cpp
index 77f33283e..c1bf72de1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_ncontamination.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_ncontamination.cpp
@@ -6,9 +6,9 @@
   */
 
 #include "aes_test_ncontamination.h"
-#include <QCoreApplication>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_off_route_mine.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_off_route_mine.cpp
index ed86d16c2..31dbb7946 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_off_route_mine.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_off_route_mine.cpp
@@ -6,9 +6,9 @@
   */
 
 #include "aes_test_off_route_mine.h"
-#include <QCoreApplication>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.h
index 4649b13ab..c115c79b9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QtTest/QTest>
 #include <NGLLogger/INGLLogger.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.h
index 2137de722..3354104ea 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.h
@@ -16,8 +16,8 @@
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 #include "trajectory_export.h"
 
-#include <QObject>
-#include <QPair>
+#include <QtCore/QObject>
+#include <QtCore/QPair>
 #include <QPolygonF>
 
 #include <vector>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator_vulcano.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator_vulcano.cpp
index ee940f45f..17022a657 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator_vulcano.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator_vulcano.cpp
@@ -10,8 +10,8 @@
 #include "trajectory_generator_vulcano.h"
 #include <utility>
 
-#include <QObject>
-#include <QPointF>
+#include <QtCore/QObject>
+#include <QtCore/QPointF>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator_vulcano.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator_vulcano.h
index b5e92dfb1..7a5c2caa6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator_vulcano.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator_vulcano.h
@@ -15,7 +15,7 @@
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
-#include <QVector>
+#include <QtCore/QVector>
 #include <QVector2D>
 
 #include <cmath>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_helper.cpp
index 561d47703..773e78fe9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_helper.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_helper.cpp
@@ -12,9 +12,9 @@
 
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 
-#include <QObject>
-#include <QString>
-#include <QDebug>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QDebug>
 
 #include <iostream>
 #include <cmath>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_point.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_point.h
index 5bd6fd660..b2ea46469 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_point.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_point.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <QVector>
+#include <QtCore/QVector>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 #include "trajectory_export.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_transform.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_transform.h
index 5137efc98..82fa71a5e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_transform.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_transform.h
@@ -3,7 +3,7 @@
 #include "trajectory_point.h"
 #include "trajectory_export.h"
 
-#include <QVector>
+#include <QtCore/QVector>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/TrajectorySplitter/UnitTest_TrajectorySplitter/trajectory_splitter_unit_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/TrajectorySplitter/UnitTest_TrajectorySplitter/trajectory_splitter_unit_test.h
index bae0e50b9..fc7adc6b7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/TrajectorySplitter/UnitTest_TrajectorySplitter/trajectory_splitter_unit_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/TrajectorySplitter/UnitTest_TrajectorySplitter/trajectory_splitter_unit_test.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QtTest/QTest>
 
 #include <Core/core.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/TrajectorySplitter/trajectory_splitter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/TrajectorySplitter/trajectory_splitter.cpp
index 56458cafb..2880712e8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/TrajectorySplitter/trajectory_splitter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/TrajectorySplitter/trajectory_splitter.cpp
@@ -10,7 +10,7 @@
 
 #include "trajectory_splitter.h"
 
-#include <QVector>
+#include <QtCore/QVector>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/TrajectorySplitter/trajectory_splitter.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/TrajectorySplitter/trajectory_splitter.h
index 491ccec06..51c4a57c3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/TrajectorySplitter/trajectory_splitter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/TrajectorySplitter/trajectory_splitter.h
@@ -12,7 +12,7 @@
 //#include "svcaescommon_export.h"
 
 #include <Core/core.hpp>
-#include <QVector>
+#include <QtCore/QVector>
 
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTest_FireAutomaton/aes_test_fire_automaton.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTest_FireAutomaton/aes_test_fire_automaton.cpp
index 3892bc9d8..588e2e16e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTest_FireAutomaton/aes_test_fire_automaton.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTest_FireAutomaton/aes_test_fire_automaton.cpp
@@ -6,11 +6,11 @@
 */
 
 
-#include <QCoreApplication>
-#include <QTimer>
-#include <QDateTime>
-#include <QTest>
-#include <QVector>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
+#include <QtTest/QTest>
+#include <QtCore/QVector>
 #include <QSignalSpy>
 
 #include <nglapplication/nglcoreapplication.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTest_FireAutomaton/aes_test_fire_automaton.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTest_FireAutomaton/aes_test_fire_automaton.h
index 8c95f0380..f3dac4217 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTest_FireAutomaton/aes_test_fire_automaton.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTest_FireAutomaton/aes_test_fire_automaton.h
@@ -9,7 +9,7 @@
 
 #include <cstdint>
 #include <QtCore>
-#include <QMetaType>
+#include <QtCore/QMetaType>
 
 #include <AreaEffectSimulation/Utils/fire_automaton.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Basics/basics_unit_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Basics/basics_unit_test.cpp
index 6f89d5ff1..1df01e1eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Basics/basics_unit_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Basics/basics_unit_test.cpp
@@ -12,8 +12,8 @@
 #include <nglapplication/nglcoreapplication.h>
 #include <AreaEffectSimulation/aes.hpp>
 #include <QtTest/QTest>
-#include <QTimer>
-#include <QDebug>
+#include <QtCore/QTimer>
+#include <QtCore/QDebug>
 #include <QtTest/QSignalSpy>
 
 #include <iostream>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Basics/basics_unit_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Basics/basics_unit_test.h
index 1b7af9ff0..a21441ef5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Basics/basics_unit_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Basics/basics_unit_test.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #include <../../logger.h>
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QtTest/QTest>
 #include <AreaEffectSimulation/Utils/firing_timer.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Polygons/polygons_unit_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Polygons/polygons_unit_test.cpp
index 24f621fa5..3daea55ab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Polygons/polygons_unit_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Polygons/polygons_unit_test.cpp
@@ -13,9 +13,9 @@
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <QTransform>
-#include <QTextStream> //
+#include <QtCore/QTextStream> //
 #include <QtTest/QTest>
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 #include <iostream>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Polygons/polygons_unit_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Polygons/polygons_unit_test.h
index affe39519..2bc019d95 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Polygons/polygons_unit_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_Polygons/polygons_unit_test.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QtTest/QTest>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_TneAlgo/tne_algo_unit_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_TneAlgo/tne_algo_unit_test.cpp
index 230f418ef..87ed154fd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_TneAlgo/tne_algo_unit_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_TneAlgo/tne_algo_unit_test.cpp
@@ -11,8 +11,8 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <QtTest/QTest>
-#include <QFile>
-#include <QDir>
+#include <QtCore/QFile>
+#include <QtCore/QDir>
 
 #include <iostream>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_TneAlgo/tne_algo_unit_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_TneAlgo/tne_algo_unit_test.h
index 64f139aef..02c9de459 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_TneAlgo/tne_algo_unit_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/UnitTest_TneAlgo/tne_algo_unit_test.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QtTest/QTest>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/aes_statemachine_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/aes_statemachine_test.cpp
index d37126bd1..320786655 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/aes_statemachine_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTests/aes_statemachine_test.cpp
@@ -6,9 +6,9 @@
   */
 
 #include "aes_statemachine_test.h"
-#include <QDebug>
+#include <QtCore/QDebug>
 #include <QSignalSpy>
-#include <QTest>
+#include <QtTest/QTest>
 #include <nglapplication/nglcoreapplication.h>
 
 using namespace AreaEffectSimulation;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/aes_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/aes_helper.cpp
index f4e028b7f..b70438475 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/aes_helper.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/aes_helper.cpp
@@ -8,8 +8,8 @@
 
 #include "aes_helper.h"
 
-#include <QHash>
-#include <QSet>
+#include <QtCore/QHash>
+#include <QtCore/QSet>
 
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/aes_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/aes_helper.h
index 34983923d..1ebed26fc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/aes_helper.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/aes_helper.h
@@ -11,11 +11,11 @@
 #include "svcaescommon_export.h"
 #include <math.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QPointF>
-#include <QString>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QPointF>
+#include <QtCore/QString>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 #include <LtsUtils/dds_bitarray.h>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 #include "aes_db.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/fire_automaton.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/fire_automaton.cpp
index 0d7990464..e60e62622 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/fire_automaton.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/fire_automaton.cpp
@@ -6,9 +6,9 @@
 */
 
 #include <QtGlobal>
-#include <QTimer>
-#include <QStringList>
-#include <QVector>
+#include <QtCore/QTimer>
+#include <QtCore/QStringList>
+#include <QtCore/QVector>
 
 #include <AreaEffectSimulation/logger.h>
 #include <AreaEffectSimulation/settings.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/fire_automaton.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/fire_automaton.h
index 9e9a36fe3..f808d700c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/fire_automaton.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/fire_automaton.h
@@ -6,10 +6,10 @@
     */
 
 #include <QtCore>
-#include <QObject>
-#include <QTimer>
-#include <QString>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 
 #include "../logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/firing_timer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/firing_timer.cpp
index 25aa58c97..5ea996cec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/firing_timer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/firing_timer.cpp
@@ -12,11 +12,11 @@
 
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 
-#include <QString>
-#include <QTimer>
+#include <QtCore/QString>
+#include <QtCore/QTimer>
 #include <QElapsedTimer>
-#include <QDateTime>
-#include <QDebug>
+#include <QtCore/QDateTime>
+#include <QtCore/QDebug>
 
 #include <iostream>
 #include <cmath>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/firing_timer.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/firing_timer.h
index fc942c0ea..0593478ad 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/firing_timer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/firing_timer.h
@@ -12,8 +12,8 @@
 #include "svcaescommon_export.h"
 #include "../logger.h"
 
-#include <QObject>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 
 #include <iosfwd>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/icons.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/icons.cpp
index 3d4017185..d81575888 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/icons.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/icons.cpp
@@ -11,10 +11,10 @@
 
 #include <AreaEffectSimulation/aes.hpp>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QGuiApplication>
-#include <QIcon>
-#include <QPainter>
-#include <QPixmap>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QIcon>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
 #include <QTransform>
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/polygons.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/polygons.h
index bfb5c5372..e8ac7423e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/polygons.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/polygons.h
@@ -10,9 +10,9 @@
 #include <AreaEffectSimulation/aes_db_structs.h>
 #include <ProjectDataManagement/pdm_enums.hpp>
 
-#include <QColor>
+#include <QtGui/QColor>
 #include <QPolygonF>
-#include <QRectF>
+#include <QtCore/QRectF>
 
 class QPointF;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/test_main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/test_main.cpp
index 7da1e162c..da7865c34 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/test_main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/test_main.cpp
@@ -12,9 +12,9 @@
 #include "icons.h"
 #include "polygons.h"
 
-#include <QWidget>
-#include <QLabel>
-#include <QIcon>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QLabel>
+#include <QtGui/QIcon>
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/tne_algorithmen.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/tne_algorithmen.h
index ff65355f1..7abf544c1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/tne_algorithmen.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/tne_algorithmen.h
@@ -10,8 +10,8 @@
 
 #include "svcaescommon_export.h"
 
-#include <QVector>
-#include <QPointF>
+#include <QtCore/QVector>
+#include <QtCore/QPointF>
 
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_handler_explosion_single_central.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_handler_explosion_single_central.cpp
index a7ce83bef..3cb5e34f9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_handler_explosion_single_central.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_handler_explosion_single_central.cpp
@@ -13,7 +13,7 @@
 
 #include <QPolygonF>
 #include <QTransform>
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
 
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_handler_explosion_single_central.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_handler_explosion_single_central.h
index a9e92a424..5b7bea572 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_handler_explosion_single_central.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_handler_explosion_single_central.h
@@ -12,8 +12,8 @@
 
 #include <Viewer/SituationMap/ElevationMap/elevation_map.h>
 
-#include <QMap>
-#include <QTimer>
+#include <QtCore/QMap>
+#include <QtCore/QTimer>
 
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_object_explosion_single_central.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_object_explosion_single_central.h
index 1e338f242..438a98ab9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_object_explosion_single_central.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_object_explosion_single_central.h
@@ -12,7 +12,7 @@
 #include <CentralEffectSimulation/ces_ftc.h>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 using Trajectory = QPair<QPolygonF, QVector<double>>;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.cpp
index df736fa15..4934e9e92 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.cpp
@@ -12,8 +12,8 @@
 #include <DDS/Core/pacemaker.h>
 #include <DDS/Core/core_dtc.h>
 #include <TrainingAreaBase/tab_dtc.h>
-#include <QCoreApplication>
-#include <QThread>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QThread>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.h
index fc8cdf106..0d879c489 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.h
@@ -20,7 +20,7 @@
 #include <InfrastructureManagement/ism_dtc.h>
 
 #include "logger.h"
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <QElapsedTimer>
 
 namespace Core
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/effector_state_machine.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/effector_state_machine.cpp
index 3f418e802..498e9de41 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/effector_state_machine.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/effector_state_machine.cpp
@@ -7,9 +7,9 @@
 #include "effector_state_machine.h"
 #include "settings.h"
 
-#include <QDateTime>
-#include <QDebug>
-#include <QMetaEnum>
+#include <QtCore/QDateTime>
+#include <QtCore/QDebug>
+#include <QtCore/QMetaEnum>
 #include <QRandomGenerator>
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/effector_state_machine.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/effector_state_machine.h
index 900ebfd33..f127bb3ee 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/effector_state_machine.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/effector_state_machine.h
@@ -6,9 +6,9 @@
 //   */
 #pragma once
 
-#include <QObject>
-#include <QTimer>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+#include <QtCore/QString>
 #include <aes_enums.hpp>
 
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_base.cpp
index b3c6e2342..112462edf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_base.cpp
@@ -9,7 +9,7 @@
 #include "main_handler.h"
 #include "settings.h"
 #include <nglsettings/nglsettings_settings.h>
-#include <QSettings>
+#include <QtCore/QSettings>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_base.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_base.h
index 0237b04c5..767c5b527 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_base.h
@@ -11,7 +11,7 @@
 #include <utility>
 #include "logger.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_bccontamination.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_bccontamination.h
index b4a615a1f..f50c7e5ab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_bccontamination.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_bccontamination.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "object_bccontamination.h"
 #include "object_danger_area.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_booby_trap.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_booby_trap.h
index 532119541..27d996a05 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_booby_trap.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_booby_trap.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "object_booby_trap.h"
 #include "handler_base.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_borderline.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_borderline.h
index 52d1112ab..ed67248c9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_borderline.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_borderline.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 #include "object_borderline.h"
 #include "handler_base.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_administration.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_administration.h
index aff577410..8e314dcf9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_administration.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_administration.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "handler_base.h"
-#include <QMap>
+#include <QtCore/QMap>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_effect.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_effect.h
index 54fa3da8d..a10f732c4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_effect.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_effect.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "aes_fts.h"
 
 #include "logger.h"
-#include <QHash>
+#include <QtCore/QHash>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_danger_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_danger_area.cpp
index 06fde42d2..80afb9290 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_danger_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_danger_area.cpp
@@ -12,7 +12,7 @@
 
 #include <TrainingAreaBase/tab_dtc.h>
 #include <QPolygonF>
-#include <QSet>
+#include <QtCore/QSet>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_danger_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_danger_area.h
index 3c1f0623b..5c2bd586a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_danger_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_danger_area.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "aes_db.h"
 #include "handler_base.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_dus_single_mine.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_dus_single_mine.cpp
index 769cf9446..3e037ccc8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_dus_single_mine.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_dus_single_mine.cpp
@@ -11,7 +11,7 @@
 #include "settings.h"
 #include "aes_db.h"
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_dus_single_mine.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_dus_single_mine.h
index e0c018b36..afb750524 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_dus_single_mine.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_dus_single_mine.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include <TrainingAreaBase/tab_dtc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.cpp
index 8ebd73b07..acf2b9a3d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.cpp
@@ -12,8 +12,8 @@
 #include "handler_charge_administration.h"
 #include "object_effect_cluster.h"
 #include "settings.h"
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QPolygonF>
 #include <ProjectDataManagement/pdm_translation.h>
 #include <Services/AreaEffectSimulation/Utils/polygons.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.h
index 23876bd8a..44b3191a2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.h
@@ -8,14 +8,14 @@
  */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "aes_db.h"
 #include "handler_base.h"
 #include "object_effect_cluster.h"
 
-#include <QCoreApplication> // qAddPostRoutine
-#include <QObject>
+#include <QtCore/QCoreApplication> // qAddPostRoutine
+#include <QtCore/QObject>
 
 // TAB
 #include <TrainingAreaBase/tab_dts.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effector.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effector.h
index 7186764ac..76ccc503c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effector.h
@@ -9,8 +9,8 @@
 #include "logger.h"
 #include <ParticipantManagement/ppm.hpp>
 
-#include <QObject>
-#include <QHash>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_area.h
index aa2c4f279..8c9ce87d5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_area.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "aes_db.h"
 #include "handler_base.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_cluster.cpp
index 9439887a9..19ebfab2f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_cluster.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_cluster.cpp
@@ -13,8 +13,8 @@
 #include <Services/AreaEffectSimulation/Utils/polygons.h>
 #include <ProjectDataManagement/pdm_translation.h>
 #include <QPolygonF>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 // for TrajectoryGenerator
 #include <LtsCoordTrans/lts_coord_trans.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_cluster.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_cluster.h
index 5da53f6ee..91ac2e6d3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_cluster.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_cluster.h
@@ -8,14 +8,14 @@
  */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "aes_db.h"
 #include "handler_base.h"
 #include "object_explosion_cluster.h"
 
-#include <QCoreApplication> // qAddPostRoutine
-#include <QObject>
+#include <QtCore/QCoreApplication> // qAddPostRoutine
+#include <QtCore/QObject>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_single.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_single.h
index e670adae6..824efc3ba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_single.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_single.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "aes_db.h"
 #include "handler_base.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_functional_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_functional_area.h
index e6f8528d3..15f88edba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_functional_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_functional_area.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "aes_db.h"
 #include "handler_base.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_gas_pipe.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_gas_pipe.cpp
index dce6de291..4204a4de2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_gas_pipe.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_gas_pipe.cpp
@@ -9,7 +9,7 @@
 #include "handler_gas_pipe.h"
 #include <utility>
 #include "object_gas_pipe.h"
-#include <QTimer>
+#include <QtCore/QTimer>
 #include "Utils/polygons.h"
 
 #include <QPolygonF>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_gas_pipe.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_gas_pipe.h
index eaa10ce30..2c846ad2b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_gas_pipe.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_gas_pipe.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 #include "object_gas_pipe.h"
 #include "handler_base.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_area.cpp
index db749ca1d..f4ee58cc7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_area.cpp
@@ -15,7 +15,7 @@
 #include "settings.h"
 #include <QPainterPath>
 #include <QPolygonF>
-#include <QSet>
+#include <QtCore/QSet>
 #include <TrainingAreaBase/tab_dtc.h>
 #include <TrainingAreaBase/Plugins/AdlerJson/telegrams.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_area.h
index 590c9e46e..407d97ad1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_area.h
@@ -7,7 +7,7 @@
  */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "aes_db.h"
 #include "handler_base.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_corridor.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_corridor.h
index 677121313..23c43bf6a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_corridor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_corridor.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "aes_db.h"
 #include "object_mine_corridor.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_ncontamination.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_ncontamination.h
index d9c8a8070..54a60e093 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_ncontamination.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_ncontamination.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "aes_db.h"
 #include "handler_base.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_off_route_mine.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_off_route_mine.h
index 2a528fc9f..932959479 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_off_route_mine.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_off_route_mine.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "object_off_route_mine.h"
 #include "handler_base.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_recon_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_recon_area.h
index e376afe3e..416d04e23 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_recon_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_recon_area.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "aes_db.h"
 #include "handler_base.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_technical_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_technical_area.h
index a06452253..738d300ec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_technical_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_technical_area.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "aes_db.h"
 #include "handler_base.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_trajectory.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_trajectory.cpp
index 166f07efd..478ec2a32 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_trajectory.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_trajectory.cpp
@@ -9,7 +9,7 @@
 #include "handler_trajectory.h"
 #include "object_trajectory.h"
 
-#include <QMap>
+#include <QtCore/QMap>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/main_handler.h
index aceb7a201..4928925f5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/main_handler.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 
 #include <TrainingAreaBase/tab_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/meteo_data_provider.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/meteo_data_provider.h
index 6f4e96625..f68726192 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/meteo_data_provider.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/meteo_data_provider.h
@@ -6,8 +6,8 @@
   */
 #pragma once
 
-#include <QObject>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
 #include <MeteoDataManagement/mdm_dtc.h>
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.cpp
index 52636b1e8..7645c9a02 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.cpp
@@ -12,8 +12,8 @@
 
 #include <TrainingAreaBase/tab_dtc.h>
 #include <QPolygonF>
-#include <QSet>
-#include <QTimer>
+#include <QtCore/QSet>
+#include <QtCore/QTimer>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.h
index d6c01e603..ccb1b0689 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.h
@@ -7,9 +7,9 @@
   */
 #pragma once
 
-#include <QMap>
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 
 #include <DDS/Core/core.hpp>
 #include <LtsCoordTrans/lts_coord_trans.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_air_support_impact.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_air_support_impact.h
index 0b89938ff..b199c71a2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_air_support_impact.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_air_support_impact.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "aes_db.h"
 #include "object_base.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.cpp
index 3fe84b313..71ddbedd7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.cpp
@@ -7,8 +7,8 @@
 
 #include "object_base.h"
 
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 
 using namespace AreaEffectSimulation;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h
index e1b4556e7..b9044a964 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <utility>
 #include <QPolygonF>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #include "aes_enums.hpp"
 #include "main_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_bccontamination.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_bccontamination.cpp
index f1d4ec1f5..0d1a9205a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_bccontamination.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_bccontamination.cpp
@@ -11,7 +11,7 @@
 #include "Utils/polygons.h"
 
 #include <QPolygonF>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_booby_trap.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_booby_trap.cpp
index 29515ab1c..1bb94c752 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_booby_trap.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_booby_trap.cpp
@@ -10,7 +10,7 @@
 #include "Utils/polygons.h"
 
 #include <QPolygonF>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_borderline.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_borderline.h
index 400065fef..7374450bc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_borderline.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_borderline.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "object_base.h"
 #include <Core/core_types.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_effect.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_effect.cpp
index d029edf87..8dea2972d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_effect.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_effect.cpp
@@ -1,7 +1,7 @@
 #include "object_charge_effect.h"
 #include "object_base.h"
-#include <QDateTime>
-#include <QTimer>
+#include <QtCore/QDateTime>
+#include <QtCore/QTimer>
 
 #include "main_handler.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_effect.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_effect.h
index ed5da2d6f..69ed8f018 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_effect.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_effect.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_danger_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_danger_area.cpp
index 58d933b69..9a5c258c4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_danger_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_danger_area.cpp
@@ -10,7 +10,7 @@
 #include "special_area_provider.h"
 
 #include "Utils/polygons.h"
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #include "handler_bccontamination.h"
 #include <LtsCoordTrans/lts_coord_trans.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_danger_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_danger_area.h
index 8bad2ce1b..c1c442b40 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_danger_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_danger_area.h
@@ -8,7 +8,7 @@
 
 #include "aes_db.h"
 #include "object_base.h"
-#include <QSet>
+#include <QtCore/QSet>
 #include <QPolygonF>
 #include <QPainterPath>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.cpp
index bf17087c5..1a8a3688a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.cpp
@@ -27,11 +27,11 @@
 #include <LtsUtils/dds_bitarray.h>
 #include <Proxies/TrainingAreaBase/Plugins/AdlerJson/telegrams.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonValue>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonValue>
 #include <QPolygonF>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QVector3D>
 
 // ToDo: mark the end of aes enum and update following (check Endemarke)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.h
index 6e9f271b1..2e0846a0c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.h
@@ -20,7 +20,7 @@
 
 #include <AreaEffectSimulation/Utils/fire_automaton.h>
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 using DetonationLocationRequest = CentralEffectSimulation::DetonationLocationRequest;
 using DetonationLocationReply = CentralEffectSimulation::DetonationLocationReply;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effector.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effector.h
index 4c053fbb7..f87bdbc7a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effector.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "logger.h"
 #include "effector_state_machine.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_area.cpp
index 05a832e62..60bf4b8c3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_area.cpp
@@ -12,7 +12,7 @@
 #include <LtsUtils/dds_bitarray.h>
 #include "handler_charge_administration.h"
 #include <QPolygonF>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <LtsUtils/dds_bitarray.h>
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.cpp
index ee4cd7860..48f28b2a6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.cpp
@@ -19,11 +19,11 @@
 #include <Trajectory/trajectory_generator_vulcano.h>
 #include <Trajectory/trajectory_helper.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonValue>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonValue>
 #include <QPolygonF>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QVector3D>
 
 /*
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.h
index 96c14680a..d1c93896b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.h
@@ -17,7 +17,7 @@
 #include <Utils/firing_timer.h>
 #include <Utils/aes_helper.h>
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 using DetonationLocationRequest = CentralEffectSimulation::DetonationLocationRequest;
 using DetonationLocationReply = CentralEffectSimulation::DetonationLocationReply;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_single.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_single.h
index d724976cd..02b3945a7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_single.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_single.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "aes_db.h"
 #include "object_base.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_functional_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_functional_area.cpp
index a39754a5a..b717dc6e3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_functional_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_functional_area.cpp
@@ -14,7 +14,7 @@
 #include <LtsCoordTrans/lts_coord_trans.h>
 
 #include <QPolygonF>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <cmath>
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_functional_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_functional_area.h
index bca266659..26ecc0fd9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_functional_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_functional_area.h
@@ -9,7 +9,7 @@
 #include "aes_db.h"
 #include "object_base.h"
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_gas_pipe.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_gas_pipe.h
index cf0923d34..78e64852b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_gas_pipe.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_gas_pipe.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "object_base.h"
 #include <Core/core_types.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area.cpp
index 076d024fc..40b1e7468 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area.cpp
@@ -15,7 +15,7 @@
 
 #include <AreaEffectSimulation/aes_translation.h>
 
-#include <QLineF>
+#include <QtCore/QLineF>
 #include <QPolygonF>
 #include <LtsUtils/LtsUtilsGui/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h> // LtsUtils::toOptional
 #include <LtsUtils/dds_bitarray.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_corridor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_corridor.cpp
index 6e08fa1c8..507f5c391 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_corridor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_corridor.cpp
@@ -10,7 +10,7 @@
 #include "special_area_provider.h"
 
 #include "Utils/polygons.h"
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ngldb/dbtransaction.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_corridor.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_corridor.h
index 1152aabea..2ff6ec441 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_corridor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_corridor.h
@@ -8,7 +8,7 @@
 
 #include "aes_db.h"
 #include "object_base.h"
-#include <QSet>
+#include <QtCore/QSet>
 #include <QPolygonF>
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_off_route_mine.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_off_route_mine.cpp
index 5acb8dd29..e7c45d593 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_off_route_mine.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_off_route_mine.cpp
@@ -11,7 +11,7 @@
 #include <QTransform>
 
 #include <QPolygonF>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_recon_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_recon_area.cpp
index 7350ebb06..ce16fac15 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_recon_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_recon_area.cpp
@@ -11,7 +11,7 @@
 
 #include "Utils/polygons.h"
 #include <QPolygonF>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_technical_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_technical_area.cpp
index 7355a2254..d71dd7942 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_technical_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_technical_area.cpp
@@ -12,7 +12,7 @@
 #include "Utils/polygons.h"
 #include "handler_charge_administration.h"
 #include <QPolygonF>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace AreaEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/special_area_provider.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/special_area_provider.h
index 50cd89ab6..41894568e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/special_area_provider.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/special_area_provider.h
@@ -6,8 +6,8 @@
   */
 #pragma once
 
-#include <QObject>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
 #include <InfrastructureManagement/ism_dtc.h>
 
 namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/ModuleTests/asm_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/ModuleTests/asm_tests.cpp
index 2bd416808..ae11bcdbd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/ModuleTests/asm_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/ModuleTests/asm_tests.cpp
@@ -9,8 +9,8 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QTest>
+#include <QtCore/QTimer>
+#include <QtTest/QTest>
 
 #include <AssetManagement/asm_ftc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/ModuleTests/asm_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/ModuleTests/asm_tests.h
index 73a4797d6..76d69fedf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/ModuleTests/asm_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/ModuleTests/asm_tests.h
@@ -12,7 +12,7 @@
 #include <AssetManagement/logger.h>
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace AssetManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/WebSocketInterface/Messages/reply_message.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/WebSocketInterface/Messages/reply_message.h
index fe4bc153a..33f80650c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/WebSocketInterface/Messages/reply_message.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/WebSocketInterface/Messages/reply_message.h
@@ -10,8 +10,8 @@
 
 #include <LtsWebSocket/reply_message.h>
 
-#include <QJsonArray>
-#include <QString>
+#include <QtCore/QJsonArray>
+#include <QtCore/QString>
 
 namespace AssetManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/WebSocketInterface/json_keys.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/WebSocketInterface/json_keys.h
index bd8d6e3e1..ee4a9328c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/WebSocketInterface/json_keys.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/WebSocketInterface/json_keys.h
@@ -8,7 +8,7 @@
   */
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 #include <OcBaseDownload/WebSocketInterface/json_keys.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_asset.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_asset.h
index fe1aa1c99..ecbd23ecd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_asset.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_asset.h
@@ -7,8 +7,8 @@
   */
 #pragma once
 
-#include <QObject>
-#include <QHash>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
 
 #include "dds_handler.h"
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_relay_info.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_relay_info.h
index 77466cacd..26a8c7ec3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_relay_info.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_relay_info.h
@@ -7,8 +7,8 @@
   */
 #pragma once
 
-#include <QObject>
-#include <QHash>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
 
 #include "dds_handler.h"
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_training_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_training_area.h
index a0241f8cc..164649867 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_training_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_training_area.h
@@ -7,9 +7,9 @@
   */
 #pragma once
 
-#include <QObject>
-#include <QMap>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+#include <QtCore/QVector>
 #include "asm_db_structs.h"
 #include "object_map_description.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_workstation_logout.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_workstation_logout.cpp
index f32d33532..ebacfca30 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_workstation_logout.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_workstation_logout.cpp
@@ -11,7 +11,7 @@
 #include "main_handler.h"
 #include "dds_handler.h"
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace AssetManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_workstation_logout.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_workstation_logout.h
index 5586f75c0..3bed9591a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_workstation_logout.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_workstation_logout.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
 
 #include "dds_handler.h"
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/main_handler.h
index 2c7a8d243..dc3eb22bb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/main_handler.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 
 #include "dds_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_training_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_training_area.h
index e6d1c2c59..4e23b19fa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_training_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_training_area.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "dds_handler.h"
 #include "logger.h"
 #include <Core/core_types.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/settings.h
index 2aae0a0b1..c9b6b3fb2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/settings.h
@@ -6,8 +6,8 @@
   */
 
 #pragma once
-#include <QString>
-#include <QPair>
+#include <QtCore/QString>
+#include <QtCore/QPair>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/change_rt_profile_circuit_name.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/change_rt_profile_circuit_name.cpp
index d38bd1ae8..ae474098f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/change_rt_profile_circuit_name.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/change_rt_profile_circuit_name.cpp
@@ -9,7 +9,7 @@
 
 #include "change_rt_profile_circuit_name.h"
 #include <AudioVideoManagement/iava_command_done_observer.h>
-#include <QString>
+#include <QtCore/QString>
 #include <QtGlobal>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/choose_stream.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/choose_stream.h
index 2c40f9d4d..0e7a2315e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/choose_stream.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/choose_stream.h
@@ -12,7 +12,7 @@
 #include <AudioVideoManagement/icommand.h>
 #include <AudioVideoManagement/ava_types.h>
 #include "svcavmcommon_export.h"
-#include <QString>
+#include <QtCore/QString>
 #include <boost/optional.hpp>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/get_eloka_list.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/get_eloka_list.h
index b96d8f1a6..0b5d2cedf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/get_eloka_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/get_eloka_list.h
@@ -11,8 +11,8 @@
 
 #include <AudioVideoManagement/icommand.h>
 #include <AudioVideoManagement/list_response_collector.h>
-#include <QVector>
-#include <QString>
+#include <QtCore/QVector>
+#include <QtCore/QString>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/get_stream_list.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/get_stream_list.h
index 77e9b543c..12d93ae9b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/get_stream_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/get_stream_list.h
@@ -12,7 +12,7 @@
 #include "icommand.h"
 #include <AudioVideoManagement/ava_types.h>
 #include <AudioVideoManagement/list_response_collector.h>
-#include <QVector>
+#include <QtCore/QVector>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/query_eloka.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/query_eloka.h
index 344d48e47..bd3d217df 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/query_eloka.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/query_eloka.h
@@ -12,7 +12,7 @@
 #include "icommand.h"
 #include <AudioVideoManagement/ava_types.h>
 #include <AudioVideoManagement/list_response_collector.h>
-#include <QVector>
+#include <QtCore/QVector>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/query_timeline.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/query_timeline.h
index bfa16f6c5..51b2683d7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/query_timeline.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/query_timeline.h
@@ -13,7 +13,7 @@
 #include <boost/optional.hpp>
 #include <AudioVideoManagement/ava_types.h>
 #include <AudioVideoManagement/list_response_collector.h>
-#include <QString>
+#include <QtCore/QString>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_abs_position.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_abs_position.h
index b37c5de69..f50b665f3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_abs_position.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_abs_position.h
@@ -12,7 +12,7 @@
 #include <AudioVideoManagement/icommand.h>
 #include <AudioVideoManagement/ava_types.h>
 #include <AudioVideoManagement/av_helper.h>
-#include <QString>
+#include <QtCore/QString>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_announcement_profile.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_announcement_profile.h
index f816e6f7e..a4325db6f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_announcement_profile.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_announcement_profile.h
@@ -12,8 +12,8 @@
 #include "icommand.h"
 #include <AudioVideoManagement/ava_types.h>
 #include <AudioVideoManagement/list_response_collector.h>
-#include <QString>
-#include <QVector>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 #include <boost/optional.hpp>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_rt_profile.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_rt_profile.cpp
index b62c2823d..8af08739a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_rt_profile.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_rt_profile.cpp
@@ -9,7 +9,7 @@
 
 #include "set_rt_profile.h"
 #include <AudioVideoManagement/iava_command_done_observer.h>
-#include <QString>
+#include <QtCore/QString>
 #include <QtGlobal>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_rt_profile_base.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_rt_profile_base.h
index ec1aa3402..d3432dc42 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_rt_profile_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_rt_profile_base.h
@@ -11,8 +11,8 @@
 
 #include <AudioVideoManagement/icommand.h>
 #include <AudioVideoManagement/list_response_collector.h>
-#include <QVector>
-#include <QString>
+#include <QtCore/QVector>
+#include <QtCore/QString>
 #include <boost/optional.hpp>
 #include <functional>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_script.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_script.cpp
index 4927ec85a..08649a2b1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_script.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_script.cpp
@@ -11,7 +11,7 @@
 #include "iava_comm.h"
 #include "iava_command_done_observer.h"
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_script.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_script.h
index f71fb226a..e35fc9db4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_script.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_script.h
@@ -11,7 +11,7 @@
 
 #include "icommand.h"
 #include <AudioVideoManagement/ava_types.h>
-#include <QString>
+#include <QtCore/QString>
 #include <boost/optional.hpp>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_video_profile.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_video_profile.h
index 31acd4f38..a1f5ddbdb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_video_profile.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/set_video_profile.h
@@ -11,10 +11,10 @@
 
 #include "icommand.h"
 #include <AudioVideoManagement/ava_types.h>
-#include <QString>
-#include <QList>
-#include <QVector>
-#include <QByteArray>
+#include <QtCore/QString>
+#include <QtCore/QList>
+#include <QtCore/QVector>
+#include <QtCore/QByteArray>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/start_script.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/start_script.cpp
index b57041ced..3b985f441 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/start_script.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/start_script.cpp
@@ -11,7 +11,7 @@
 #include "iava_comm.h"
 #include "iava_command_done_observer.h"
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/start_script.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/start_script.h
index 6fb25bf9c..d48bac4db 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/start_script.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/start_script.h
@@ -11,7 +11,7 @@
 
 #include "icommand.h"
 #include <AudioVideoManagement/ava_types.h>
-#include <QString>
+#include <QtCore/QString>
 #include <boost/optional.hpp>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/vd_set_script.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/vd_set_script.h
index fc7a08a48..fa96797cb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/vd_set_script.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/AvsCommands/vd_set_script.h
@@ -11,7 +11,7 @@
 
 #include "icommand.h"
 #include <AudioVideoManagement/ava_types.h>
-#include <QString>
+#include <QtCore/QString>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_ft_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_ft_tests.cpp
index c3873fa6c..6cd6338f0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_ft_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_ft_tests.cpp
@@ -11,8 +11,8 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QTest>
+#include <QtCore/QTimer>
+#include <QtTest/QTest>
 
 #include <AudioVideoManagement/avm_ftc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_ft_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_ft_tests.h
index b845ead51..1985b29b7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_ft_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_ft_tests.h
@@ -26,7 +26,7 @@
 #include <AudioVideoManagement/logger.h>
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.cpp
index 730a2bb6b..98f280d0d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.cpp
@@ -26,10 +26,10 @@
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QTest>
+#include <QtTest/QTest>
 #include <QtGlobal>
-#include <QStringList>
-#include <QMap>
+#include <QtCore/QStringList>
+#include <QtCore/QMap>
 #include <string>
 #include <algorithm>
 #include <iterator>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.h
index bc7ea2208..3cc83473c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.h
@@ -14,8 +14,8 @@
 #include <AudioVideoManagement/avm_ftc_types.h>
 #include <AudioVideoManagement/avm_dtc.h>
 #include <DDS/DDSConnector/dds_connector.h>
-#include <QObject>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/mvs_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/mvs_tests.cpp
index 57ea1a203..4f3e64fa9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/mvs_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/mvs_tests.cpp
@@ -11,8 +11,8 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QTest>
+#include <QtCore/QTimer>
+#include <QtTest/QTest>
 
 #include <AudioVideoManagement/avm_ftc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/mvs_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/mvs_tests.h
index 523ed3c11..12641c83d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/mvs_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/mvs_tests.h
@@ -25,7 +25,7 @@
 #include <AudioVideoManagement/logger.h>
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/asset_assignment_manager_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/asset_assignment_manager_test.cpp
index 2d6ca46dd..11e6fae75 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/asset_assignment_manager_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/asset_assignment_manager_test.cpp
@@ -14,7 +14,7 @@
 #include <AudioVideoManagement/mounting_point.h>
 #include <InfrastructureManagement/ism.hpp>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
-#include <QString>
+#include <QtCore/QString>
 #include <QSignalSpy>
 #include <vector>
 #include <functional>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/asset_assignment_manager_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/asset_assignment_manager_test.h
index 50a29dfb9..148fbf1ec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/asset_assignment_manager_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/asset_assignment_manager_test.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QTest>
+#include <QtTest/QTest>
 
 /**
  * @author Christian Fröbel
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/audio_video_handler_impl_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/audio_video_handler_impl_test.h
index 0c02cd3a5..095bdf416 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/audio_video_handler_impl_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/audio_video_handler_impl_test.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include <AudioVideoManagement/avm_enums.hpp>
-#include <QTest>
+#include <QtTest/QTest>
 #include <memory>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/av_helper_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/av_helper_test.cpp
index ab5c12839..7c3a57d00 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/av_helper_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/av_helper_test.cpp
@@ -9,8 +9,8 @@
 
 #include "av_helper_test.h"
 #include <AudioVideoManagement/av_helper.h>
-#include <QDateTime>
-#include <QByteArray>
+#include <QtCore/QDateTime>
+#include <QtCore/QByteArray>
 #include <string>
 
 using namespace AudioVideoManagement;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/av_helper_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/av_helper_test.h
index dcc83db23..372717d87 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/av_helper_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/av_helper_test.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QTest>
+#include <QtTest/QTest>
 
 /**
  * @author Christian Fröbel
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_comm_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_comm_test.cpp
index 22d1ad508..8d7243792 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_comm_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_comm_test.cpp
@@ -12,11 +12,11 @@
 #include <AudioVideoManagement/ava_comm.h>
 #include <AudioVideoManagement/ava_types.h>
 #include <AudioVideoManagement/avs_dialog.h>
-#include <QCoreApplication>
-#include <QDateTime>
-#include <QList>
-#include <QVector>
-#include <QByteArray>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDateTime>
+#include <QtCore/QList>
+#include <QtCore/QVector>
+#include <QtCore/QByteArray>
 #include <boost/optional.hpp>
 
 using namespace AudioVideoManagement;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_comm_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_comm_test.h
index 8e429d366..02c75c55a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_comm_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_comm_test.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QTest>
+#include <QtTest/QTest>
 #include <memory>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_control_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_control_test.cpp
index a04996072..1c8ccef1d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_control_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_control_test.cpp
@@ -15,9 +15,9 @@
 #include <AudioVideoManagement/stream_name_mapping.h>
 #include <AudioVideoManagement/avs_dialog.h>
 #include <AudioVideoManagement/list_response_collector.h>
-#include <QVector>
+#include <QtCore/QVector>
 #include <QtGlobal>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <QSignalSpy>
 #include <boost/optional.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_control_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_control_test.h
index d27685a6f..14a79db4c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_control_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_control_test.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QTest>
+#include <QtTest/QTest>
 #include <memory>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_test_server.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_test_server.cpp
index 2cda1c72c..84b28b303 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_test_server.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_test_server.cpp
@@ -11,7 +11,7 @@
 #include <utility>
 #include <QtCore/QStringList>
 #include <QtCore/QRegExp>
-#include <QString>
+#include <QtCore/QString>
 #include "ava_test_server.h"
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_test_server_main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_test_server_main.cpp
index 6353631c5..0809f9953 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_test_server_main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_test_server_main.cpp
@@ -8,7 +8,7 @@
   */
 
 #include "ava_test_server.h"
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 int main(int argc, char** argv)
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_timeline_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_timeline_test.h
index 2723bdaf8..e6ccfc870 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_timeline_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_timeline_test.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QTest>
+#include <QtTest/QTest>
 
 /**
  * @author Christian Fröbel
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/avs_command_queue_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/avs_command_queue_test.h
index b732bdf05..e2c0b5c86 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/avs_command_queue_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/avs_command_queue_test.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QTest>
+#include <QtTest/QTest>
 
 /**
  * @author Christian Fröbel
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/choose_stream_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/choose_stream_test.h
index 1e42dcb8e..4f02317c9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/choose_stream_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/choose_stream_test.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QTest>
+#include <QtTest/QTest>
 
 /**
  * @author Christian Fröbel
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/list_response_collector_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/list_response_collector_test.cpp
index a41951908..a52f958f7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/list_response_collector_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/list_response_collector_test.cpp
@@ -12,8 +12,8 @@
 #include <AudioVideoManagement/list_response_collector.h>
 #include <AudioVideoManagement/ava_types.h>
 #include <AudioVideoManagement/av_helper.h>
-#include <QString>
-#include <QVector>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 
 using namespace AudioVideoManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/list_response_collector_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/list_response_collector_test.h
index e8cbea09f..5792a01af 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/list_response_collector_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/list_response_collector_test.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QTest>
+#include <QtTest/QTest>
 
 /**
  * @author Christian Fröbel
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/main.cpp
index 8dd942c18..58a760cd9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/main.cpp
@@ -22,7 +22,7 @@
 #include <QtTest/QtTest>
 #include <QCommandLineParser>
 #include <QCommandLineOption>
-#include <QStringList>
+#include <QtCore/QStringList>
 #include <map>
 #include <functional>
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/parse_line_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/parse_line_test.h
index 8b2cd138c..1d92061d9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/parse_line_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/parse_line_test.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QTest>
+#include <QtTest/QTest>
 
 /**
  * @author Christian Fröbel
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/rt_state_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/rt_state_test.h
index 40acb642e..b5b47d175 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/rt_state_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/rt_state_test.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QTest>
+#include <QtTest/QTest>
 
 /**
  * @author Christian Fröbel
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/active_exercises.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/active_exercises.h
index 0cd4bbb7c..bb0b0f797 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/active_exercises.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/active_exercises.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <vector>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/asset.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/asset.h
index b84c11aeb..9aca6aa61 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/asset.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/asset.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "svcavmcommon_export.h"
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 
 namespace InfrastructureManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/asset_assignment_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/asset_assignment_manager.h
index 87ad8758b..2b534343b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/asset_assignment_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/asset_assignment_manager.h
@@ -12,7 +12,7 @@
 #include "exercise_context.h"
 #include "svcavmcommon_export.h"
 #include "logger.h"
-#include <QObject>
+#include <QtCore/QObject>
 #include <boost/optional.hpp>
 #include <map>
 #include <set>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler.h
index e22a6eb05..545823de8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include <memory>
-#include <QObject>
+#include <QtCore/QObject>
 
 class QString;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler_impl.cpp
index 966fe5174..97f5e62b2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler_impl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler_impl.cpp
@@ -15,7 +15,7 @@
 #include <AudioVideoManagement/avm.hpp>
 #include <InfrastructureManagement/ism.hpp>
 #include <LtsUtilsCore/json_object.h>
-#include <QString>
+#include <QtCore/QString>
 #include <QtGlobal>
 #include <string>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler_impl.h
index 84819d4fe..9ca8ae800 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler_impl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler_impl.h
@@ -14,7 +14,7 @@
 #include "svcavmcommon_export.h"
 #include <AudioVideoManagement/avm_db_structs.h>
 #include <boost/optional.hpp>
-#include <QObject>
+#include <QtCore/QObject>
 #include <string>
 #include <map>
 #include <cstdint>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_control.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_control.cpp
index 39a2be53d..9eafe5f60 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_control.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_control.cpp
@@ -6,8 +6,8 @@
   */
 
 #include "av_control.h"
-#include <QTimer>
-#include <QList>
+#include <QtCore/QTimer>
+#include <QtCore/QList>
 #include <time.h>
 
 // TODO: on reconnect operatingmode abgleichen!
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_helper.cpp
index cdd66a0b4..b6ed6516f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_helper.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_helper.cpp
@@ -8,8 +8,8 @@
   */
 
 #include "av_helper.h"
-#include <QByteArray>
-#include <QRegularExpression>
+#include <QtCore/QByteArray>
+#include <QtCore/QRegularExpression>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_socket.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_socket.h
index e3fb1378e..723479809 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_socket.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_socket.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <QObject>
-#include <QTimer>
-#include <QTcpSocket>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+#include <QtNetwork/QTcpSocket>
 #include <queue>
 
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_comm.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_comm.cpp
index da6563aec..6c74b44d6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_comm.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_comm.cpp
@@ -10,12 +10,12 @@
 #include "ava_comm.h"
 #include "av_helper.h"
 #include <AudioVideoManagement/logger.h>
-#include <QString>
-#include <QStringList>
-#include <QByteArray>
-#include <QList>
-#include <QTextStream>
-#include <QRect>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QTextStream>
+#include <QtCore/QRect>
 #include <cmath>
 #include <ngltools/ngltools_dtg.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_comm.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_comm.h
index 5912be73a..eb3bb801b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_comm.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_comm.h
@@ -14,7 +14,7 @@
 #include "svcavmcommon_export.h"
 #include "logger.h"
 #include <AudioVideoManagement/av_socket.h>
-#include <QList>
+#include <QtCore/QList>
 #include <QtGlobal>
 #include <boost/optional.hpp>
 #include <chrono>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.cpp
index 19e8f5fe2..64058fc80 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.cpp
@@ -28,12 +28,12 @@
 #include "AvsCommands/set_volume.h"
 #include "AvsCommands/keep_alive.h"
 #include <LtsUtils/scoped_connection.h>
-#include <QTimer>
-#include <QRect>
+#include <QtCore/QTimer>
+#include <QtCore/QRect>
 #include <QtGlobal>
 #include <chrono>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.h
index 6c3dab071..c11f82f1d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.h
@@ -16,10 +16,10 @@
 #include "avs_command_queue.h"
 #include "logger.h"
 #include <LtsUtils/LtsUtilsCore/connection.h>
-#include <QString>
-#include <QStringList>
-#include <QVector>
-#include <QObject>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVector>
+#include <QtCore/QObject>
 #include <chrono>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_session.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_session.h
index 3d97513c4..3a6c39b2b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_session.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_session.h
@@ -12,9 +12,9 @@
 #include "svcavmcommon_export.h"
 #include "ava_types.h"
 #include "logger.h"
-#include <QObject>
-#include <QString>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QTimer>
 
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_state.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_state.h
index 2327ac41c..382bb4427 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_state.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_state.h
@@ -12,10 +12,10 @@
 #include "ava_types.h"
 #include "rt_state.h"
 #include "svcavmcommon_export.h"
-#include <QString>
-#include <QStringList>
-#include <QMap>
-#include <QObject>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_types.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_types.cpp
index 6a1e37944..18d1a4e45 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_types.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_types.cpp
@@ -13,9 +13,9 @@
 
 #include <LtsUtilsCore/json_object.h>
 
-#include <QVector>
+#include <QtCore/QVector>
 #include <QtGlobal>
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_types.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_types.h
index 43fa84cdd..ab556b844 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_types.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_types.h
@@ -9,11 +9,11 @@
 
 #pragma once
 
-#include <QMetaType>
+#include <QtCore/QMetaType>
 #include "svcavmcommon_export.h"
-#include <QString>
-#include <QStringList>
-#include <QVector>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVector>
 #include <chrono>
 #include <cstdint>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_command_queue.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_command_queue.h
index c694e33cd..e6139ed1d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_command_queue.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_command_queue.h
@@ -11,8 +11,8 @@
 
 #include "logger.h"
 #include "svcavmcommon_export.h"
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 #include <deque>
 #include <memory>
 #include <chrono>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_dialog.h
index de6f8a922..f2334e9a5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_dialog.h
@@ -11,7 +11,7 @@
 
 #include "svcavmcommon_export.h"
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_menus.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_menus.cpp
index da9affd52..7c00dddb3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_menus.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_menus.cpp
@@ -15,7 +15,7 @@
 #include <AudioVideoManagement/avs_dialog.h>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
 #include <QtGlobal>
-#include <QString>
+#include <QtCore/QString>
 #include <algorithm>
 #include <utility>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_menus.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_menus.h
index ef3f78ff0..f06e5b7d1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_menus.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_menus.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "svcavmcommon_export.h"
-#include <QObject>
+#include <QtCore/QObject>
 #include <boost/optional.hpp>
 #include <functional>
 #include <InfrastructureManagement/ism_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.cpp
index 5da39d62a..38ee9f708 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.cpp
@@ -20,7 +20,7 @@
 #include <InfrastructureManagement/ism_dtc.h>
 #include <LtsUtilsCore/json_object.h>
 #include <ngldb/dbtransaction.h>
-#include <QStringList>
+#include <QtCore/QStringList>
 #include <algorithm>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.h
index b87f8bad7..644ab21d2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.h
@@ -11,11 +11,11 @@
 #include "logger.h"
 #include "avm_fts.h"
 #include <AudioVideoManagement/avm_db.h>
-#include <QObject>
-#include <QHash>
-#include <QVector>
-#include <QMap>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtCore/QVector>
+#include <QtCore/QMap>
+#include <QtCore/QString>
 #include <boost/optional.hpp>
 #include <memory>
 #include <functional>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.h
index b820ba841..ee20abce7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.h
@@ -11,9 +11,9 @@
 #include <logger.h>
 #include <avm_fts.h>
 #include <avm_db.h>
-#include <QObject>
-#include <QVector>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
+#include <QtCore/QMap>
 #include <cstdint>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.h
index 30b60f81c..4f2622543 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.h
@@ -12,7 +12,7 @@
 #include <dds/domain/DomainParticipant.hpp>
 #endif
 #include <DDS/Core/topic_lock_master.h>
-#include <QStringList>
+#include <QtCore/QStringList>
 
 #include <DDS/DDSConnector/dds_connector.h>
 #include <DDS/Core/core_dts_types.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.cpp
index 5021eccdd..b54c68695 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.cpp
@@ -15,7 +15,7 @@
 #include <AudioVideoManagement/avm_dts.h>
 #include <AudioVideoManagement/handler_menu_struct.h>
 #include <InfrastructureManagement/ism_dtc.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QtGlobal>
 #include <set>
 #include <algorithm>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.h
index 40af7d9f4..dab6db7e8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.h
@@ -13,7 +13,7 @@
 #include "handler_video_team.h"
 
 #include <AudioVideoManagement/avm_dtc.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <map>
 #include <vector>
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise.h
index c8ae4a231..9c4ccc8ba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise.h
@@ -13,7 +13,7 @@
 #include "svcavmcommon_export.h"
 #include "asset.h"
 #include "mounting_point.h"
-#include <QObject>
+#include <QtCore/QObject>
 #include <boost/optional.hpp>
 #include <memory>
 #include <map>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise_context.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise_context.cpp
index b19ade1af..6f1e5e3c2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise_context.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise_context.cpp
@@ -8,7 +8,7 @@
   */
 
 #include "exercise_context.h"
-#include <QString>
+#include <QtCore/QString>
 
 namespace
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise_handler.h
index 5c91c3834..b2dd13fb1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise_handler.h
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QMultiMap>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <AudioVideoManagement/avm_db.h>
 #include <ExerciseManagement/exm_dtc.h>
 #include <ExerciseManagement/exm_enums.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.cpp
index 3ede1b0fa..3745f2d55 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.cpp
@@ -18,7 +18,7 @@
 #include <ngldb/dbtransaction.h>
 #include <algorithm>
 #include <vector>
-#include <QSet>
+#include <QtCore/QSet>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.h
index ec81c5c20..b01d87c6c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.h
@@ -12,7 +12,7 @@
 #include <avm.hpp>
 #include <logger.h>
 #include <QtCore/QObject>
-#include <QMap>
+#include <QtCore/QMap>
 #include <vector>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_set_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_set_handler.h
index 68e5bd1c7..48f6dc843 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_set_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_set_handler.h
@@ -11,8 +11,8 @@
 #include <avm_db.h>
 #include <avm.hpp>
 #include <logger.h>
-#include <QMap>
-#include <QVector>
+#include <QtCore/QMap>
+#include <QtCore/QVector>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_frequency_planning_status.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_frequency_planning_status.h
index 04e86d13b..80a363e69 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_frequency_planning_status.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_frequency_planning_status.h
@@ -12,8 +12,8 @@
 #include "main_handler.h"
 #include <avm_fts.h>
 #include <AudioVideoManagement/avm_db.h>
-#include <QMap>
-#include <QObject>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
 #include <memory>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_menu_struct.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_menu_struct.cpp
index 9123e394e..170d7dd7c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_menu_struct.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_menu_struct.cpp
@@ -11,7 +11,7 @@
 #include "object_menu_struct.h"
 #include "audio_video_handler_impl.h"
 #include <AudioVideoManagement/avm_dts.h>
-#include <QVector>
+#include <QtCore/QVector>
 #include <tuple>
 
 namespace
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_menu_struct.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_menu_struct.h
index 66f08f3f4..b4e2c34d7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_menu_struct.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_menu_struct.h
@@ -9,9 +9,9 @@
 #include "logger.h"
 #include <AudioVideoManagement/avm_fts.h>
 #include <AudioVideoManagement/avm_db.h>
-#include <QObject>
-#include <QMap>
-#include <QList>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+#include <QtCore/QList>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.cpp
index 16aa8d8a7..a6021f08e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.cpp
@@ -10,9 +10,9 @@
 #include <utility>
 #include "object_video_receiver.h"
 
-#include <QNetworkReply>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtNetwork/QNetworkReply>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 #include <QEventLoop>
 #include <LtsUtilsCore/json_object.h>
 #include <QJsonParseError>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.h
index d8ee426f6..c43c6a64b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.h
@@ -7,8 +7,8 @@
   */
 #pragma once
 
-#include <QMap>
-#include <QObject>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
 
 #include "dds_handler.h"
 #include "logger.h"
@@ -16,8 +16,8 @@
 #include <avm_fts.h>
 
 // HTTP Request
-#include <QNetworkAccessManager>
-#include <QTimer>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtCore/QTimer>
 
 #include <AudioVideoManagement/avm_db.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_team.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_team.h
index 698b71c31..d0d02b148 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_team.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_team.h
@@ -12,8 +12,8 @@
 #include "main_handler.h"
 #include <avm_fts.h>
 #include <AudioVideoManagement/avm_db.h>
-#include <QMap>
-#include <QObject>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
 #include <memory>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/iava_comm.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/iava_comm.h
index f69209e00..a168d6518 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/iava_comm.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/iava_comm.h
@@ -14,8 +14,8 @@
 
 #include <boost/optional.hpp>
 
-#include <QObject>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 
 #include <chrono>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/icommand.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/icommand.h
index 9baa32253..54abc00e2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/icommand.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/icommand.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "svcavmcommon_export.h"
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/import_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/import_handler.h
index 4074b3a7e..96c5b176b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/import_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/import_handler.h
@@ -11,7 +11,7 @@
 
 #include <AudioVideoManagement/exercise_context.h>
 #include <AudioVideoManagement/avm_db.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <map>
 #include <cstdint>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ivd_comm.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ivd_comm.h
index c6d79df31..c9e0fa253 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ivd_comm.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ivd_comm.h
@@ -11,8 +11,8 @@
 
 #include "ava_types.h"
 #include "svcavmcommon_export.h"
-#include <QList>
-#include <QObject>
+#include <QtCore/QList>
+#include <QtCore/QObject>
 #include <chrono>
 
 class QString;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/list_response_collector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/list_response_collector.cpp
index 4eeab312b..88e93cbba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/list_response_collector.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/list_response_collector.cpp
@@ -9,8 +9,8 @@
 
 #include "list_response_collector.h"
 #include "av_helper.h"
-#include <QString>
-#include <QByteArray>
+#include <QtCore/QString>
+#include <QtCore/QByteArray>
 #include <QtGlobal>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/list_response_collector.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/list_response_collector.h
index 91054111d..3461daa1a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/list_response_collector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/list_response_collector.h
@@ -12,9 +12,9 @@
 #include "iava_comm.h"
 #include "ava_types.h"
 #include "svcavmcommon_export.h"
-#include <QVector>
-#include <QList>
-#include <QObject>
+#include <QtCore/QVector>
+#include <QtCore/QList>
+#include <QtCore/QObject>
 #include <functional>
 
 class QString;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/main_handler.h
index ff32557b1..d782b35d8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/main_handler.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "logger.h"
 #include "avm_db.h"
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/mounting_point.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/mounting_point.h
index 397a339ca..65cf8e9f1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/mounting_point.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/mounting_point.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "svcavmcommon_export.h"
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 
 namespace InfrastructureManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/rt_state.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/rt_state.cpp
index 8d49c8ceb..f5957e604 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/rt_state.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/rt_state.cpp
@@ -8,13 +8,13 @@
   */
 
 #include "rt_state.h"
-#include <QString>
+#include <QtCore/QString>
 #include <QtGlobal>
 #include <utility>
 #include <algorithm>
 #include <sstream>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/settings.h
index f09e37fd6..47b79e5b2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping.cpp
index b376a3cbe..97f635069 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping.cpp
@@ -13,7 +13,7 @@
 #include <AudioVideoManagement/avm_dtc.h>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
 #include <QtGlobal>
-#include <QString>
+#include <QtCore/QString>
 
 namespace
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping.h
index 9397641e8..7d11c4c49 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping.h
@@ -10,9 +10,9 @@
 #pragma once
 
 #include "svcavmcommon_export.h"
-#include <QObject>
-#include <QString>
-#include <QRegExp>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QRegExp>
 #include <cstdint>
 #include <map>
 #include <vector>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_publisher.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_publisher.h
index bd829c775..bb429ed34 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_publisher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_publisher.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <QMap>
-#include <QObject>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
 #include <AudioVideoManagement/avm.hpp>
 
 class QString;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_to_ava.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_to_ava.cpp
index bd71bd0eb..c9a6c0f53 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_to_ava.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_to_ava.cpp
@@ -11,7 +11,7 @@
 #include "stream_name_mapping.h"
 #include "ava_session.h"
 #include "ava_control.h"
-#include <QString>
+#include <QtCore/QString>
 #include <QtGlobal>
 #include <vector>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_to_ava.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_to_ava.h
index 54222f100..3caa4af45 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_to_ava.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_to_ava.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "svcavmcommon_export.h"
-#include <QObject>
+#include <QtCore/QObject>
 #include <cstdint>
 
 class QString;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.cpp
index 1ba694a01..ce1c33906 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.cpp
@@ -15,7 +15,7 @@
 #include "av_helper.h"
 #include <avm_dts.h>
 #include <algorithm>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 
 namespace AudioVideoManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.h
index 74ff0f9ba..be2ec8b9a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.h
@@ -12,8 +12,8 @@
 #include <avm_db.h>
 #include "logger.h"
 #include <QtCore/QObject>
-#include <QVector>
-#include <QMap>
+#include <QtCore/QVector>
+#include <QtCore/QMap>
 #include <boost/optional.hpp>
 #include <functional>
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_comm.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_comm.cpp
index 915161e73..18dbde5ec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_comm.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_comm.cpp
@@ -10,11 +10,11 @@
 #include "vd_comm.h"
 #include "av_helper.h"
 #include <AudioVideoManagement/logger.h>
-#include <QString>
-#include <QStringList>
-#include <QByteArray>
-#include <QList>
-#include <QTextStream>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QTextStream>
 #include <cmath>
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_comm.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_comm.h
index 6beeb078c..082833b72 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_comm.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_comm.h
@@ -14,7 +14,7 @@
 #include "svcavmcommon_export.h"
 #include "logger.h"
 #include <AudioVideoManagement/av_socket.h>
-#include <QList>
+#include <QtCore/QList>
 #include <QtGlobal>
 #include <chrono>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_control.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_control.cpp
index 7bf4d0ebc..2db4f70d6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_control.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_control.cpp
@@ -14,7 +14,7 @@
 #include "AvsCommands/vd_set_script.h"
 #include "AvsCommands/keep_alive.h"
 #include <LtsUtils/scoped_connection.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QtGlobal>
 #include <boost/optional.hpp>
 #include <chrono>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_control.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_control.h
index aff6a8966..07d7986cf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_control.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_control.h
@@ -15,10 +15,10 @@
 #include "avs_command_queue.h"
 #include "logger.h"
 #include <LtsUtils/LtsUtilsCore/connection.h>
-#include <QString>
-#include <QVector>
-#include <QTimer>
-#include <QObject>
+#include <QtCore/QString>
+#include <QtCore/QVector>
+#include <QtCore/QTimer>
+#include <QtCore/QObject>
 #include <chrono>
 
 class QStringList;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_session.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_session.h
index d18d66747..da3593ee2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_session.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_session.h
@@ -11,9 +11,9 @@
 
 #include "svcavmcommon_export.h"
 #include "logger.h"
-#include <QObject>
-#include <QString>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QTimer>
 
 
 namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.cpp
index 747ba4c06..d87133e5a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.cpp
@@ -9,10 +9,10 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 #include <QPolygonF>
-#include <QtTest>
+#include <QtTest/QtTest>
 
 /* ----------------------------------------------------------------------------------
  * HOW TO RUN THE TESTS (example)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.h
index 6cf10d6b2..7f0aa33f9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.h
@@ -24,8 +24,8 @@
 
 #include <DDS/DDSConnector/dds_connector.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QHash>
-#include <QPointF>
+#include <QtCore/QHash>
+#include <QtCore/QPointF>
 
 namespace CentralEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_blocked_areas.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_blocked_areas.cpp
index 40d5d477b..f8edfac02 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_blocked_areas.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_blocked_areas.cpp
@@ -11,8 +11,8 @@
 #include "CentralEffectSimulation/ces_ftc.h"
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 #include <QPolygonF>
 
 /* ----------------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.cpp
index ff9a6b3d3..e6d007ef3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.cpp
@@ -11,10 +11,10 @@
 #include "CentralEffectSimulation/ces_ftc.h"
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 #include <QPolygonF>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 /* ----------------------------------------------------------------------------------
  * HOW TO RUN THE TESTS (example)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.h
index 3016ba5c0..2d379d0df 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.h
@@ -17,7 +17,7 @@
 
 #include <DDS/DDSConnector/dds_connector.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QPointF>
+#include <QtCore/QPointF>
 
 namespace CentralEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.cpp
index 0c68da3eb..eee03f275 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.cpp
@@ -11,10 +11,10 @@
 #include "CentralEffectSimulation/ces_ftc.h"
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 #include <QPolygonF>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 /* ----------------------------------------------------------------------------------
  * HOW TO RUN THE TESTS (example)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.h
index 3abbddd31..52fd11536 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.h
@@ -17,7 +17,7 @@
 
 #include <DDS/DDSConnector/dds_connector.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QPointF>
+#include <QtCore/QPointF>
 
 namespace CentralEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing.cpp
index b964740a8..1cb80e024 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing.cpp
@@ -11,8 +11,8 @@
 #include "CentralEffectSimulation/ces_ftc.h"
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 #include <QPolygonF>
 
 /* ----------------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing_bsp.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing_bsp.cpp
index 9f6c1d9fb..d0dd6eb02 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing_bsp.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing_bsp.cpp
@@ -11,8 +11,8 @@
 #include "CentralEffectSimulation/ces_ftc.h"
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 #include <QPolygonF>
 
 /* ----------------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.cpp
index da8156dec..71742d379 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.cpp
@@ -11,10 +11,10 @@
 #include "CentralEffectSimulation/ces_ftc.h"
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 #include <QPolygonF>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 /* ----------------------------------------------------------------------------------
  * HOW TO RUN THE TESTS (example)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.h
index 74f3611fd..eea95aa7b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.h
@@ -17,7 +17,7 @@
 
 #include <DDS/DDSConnector/dds_connector.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QPointF>
+#include <QtCore/QPointF>
 
 namespace CentralEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_ownership.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_ownership.cpp
index f0cbfced9..325426a16 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_ownership.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_ownership.cpp
@@ -11,8 +11,8 @@
 #include "CentralEffectSimulation/ces_ftc.h"
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 #include <QPolygonF>
 
 /* ----------------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_simulated_movement.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_simulated_movement.cpp
index 09809f7a1..6f017f236 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_simulated_movement.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_simulated_movement.cpp
@@ -12,10 +12,10 @@
 #include <TrainingAreaBase/tab_fts.h>
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 #include <QPolygonF>
-#include <QTest>
+#include <QtTest/QTest>
 
 /* ----------------------------------------------------------------------------------
  * HOW TO RUN THE TESTS (example)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_smart.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_smart.cpp
index 097292402..9d972a640 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_smart.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_smart.cpp
@@ -12,10 +12,10 @@
 #include <TrainingAreaBase/tab_fts.h>
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 #include <QPolygonF>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 /* ----------------------------------------------------------------------------------
  * HOW TO RUN THE TESTS (example)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_smart.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_smart.h
index 0d050072f..6e8124a73 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_smart.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_smart.h
@@ -18,7 +18,7 @@
 
 #include <DDS/DDSConnector/dds_connector.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QPointF>
+#include <QtCore/QPointF>
 
 namespace CentralEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/handler_artillerie_sound.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/handler_artillerie_sound.cpp
index 89af757b5..e7239fe65 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/handler_artillerie_sound.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/handler_artillerie_sound.cpp
@@ -11,7 +11,7 @@
 
 #include <LtsUtilsSettings/settings.h>
 
-#include <QNetworkReply>
+#include <QtNetwork/QNetworkReply>
 #include <qmath.h>
 #include <math.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/handler_artillerie_sound.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/handler_artillerie_sound.h
index 744118c0f..d84fe0143 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/handler_artillerie_sound.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/handler_artillerie_sound.h
@@ -19,7 +19,7 @@
 #include <QtCore/QObject>
 
 // HTTP Request
-#include <QNetworkAccessManager>
+#include <QtNetwork/QNetworkAccessManager>
 
 namespace CesArtillerySound
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/plugin.h
index a3bc8af41..a32c4e01d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/plugin.h
@@ -18,7 +18,7 @@
 #include <CentralEffectSimulation/handler_building_data.h>
 #include <CentralEffectSimulation/main_handler.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CesArtillerySound
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/settings.h
index 56dd9c69d..4cb7f617a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.cpp
index 6eac69952..55c3e3ee5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.cpp
@@ -9,8 +9,8 @@
 #include "handler_participant_borderline.h"
 #include <utility>
 
-#include <QLineF>
-#include <QTimer>
+#include <QtCore/QLineF>
+#include <QtCore/QTimer>
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.h
index 9f5a37fe8..5501c9d11 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.h
@@ -15,8 +15,8 @@
 #include <CentralEffectSimulation/handler_participant.h>
 
 
-#include <QHash>
-#include <QRectF>
+#include <QtCore/QHash>
+#include <QtCore/QRectF>
 #include <QPolygonF>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_simulated_movement.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_simulated_movement.cpp
index ee80a20b7..675f66c15 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_simulated_movement.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_simulated_movement.cpp
@@ -9,7 +9,7 @@
 #include <utility>
 #include <CentralEffectSimulation/handler_participant.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ngldb/dbtransaction.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_simulated_movement.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_simulated_movement.h
index d209e9ea3..cf965279e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_simulated_movement.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_simulated_movement.h
@@ -18,7 +18,7 @@
 #include <ParticipantManagement/ppm_ftc.h>
 #include <CentralEffectSimulation/handler_participant.h>
 
-#include <QHash>
+#include <QtCore/QHash>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/plugin.h
index 4ea95f815..798706437 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/plugin.h
@@ -16,7 +16,7 @@
 #include <CentralEffectSimulation/main_handler.h>
 #include <CentralEffectSimulation/dds_handler.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 //namespace NGLDB
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/simulation_movement.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/simulation_movement.cpp
index fe7c4fe59..72695f0bf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/simulation_movement.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/simulation_movement.cpp
@@ -8,7 +8,7 @@
 
 #include "simulation_movement.h"
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 namespace CentralEffectSimulationBasic
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/simulation_movement.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/simulation_movement.h
index 90b7cc444..3ee740e30 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/simulation_movement.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/simulation_movement.h
@@ -12,9 +12,9 @@
 #include <CentralEffectSimulation/handler_participant.h>
 #include <CentralEffectSimulation/ces_db.h>
 
-#include <QLineF>
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QLineF>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 
 
 namespace CentralEffectSimulationBasic
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.cpp
index a4dea862c..564ecb47e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.cpp
@@ -15,8 +15,8 @@
 
 #include <float.h>
 
-#include <QLineF>
-#include <QDebug>
+#include <QtCore/QLineF>
+#include <QtCore/QDebug>
 
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.h
index a872a1d71..467c0aec2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/ces_building_model.h
@@ -15,7 +15,7 @@
 #include <InfrastructureManagement/ism.hpp>
 #include <LtsCoordTrans/lts_coord_trans.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QPolygonF>
 
 using namespace CentralEffectSimulation;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp
index 899bb9b02..f9e0b57a6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp
@@ -13,9 +13,9 @@
 #include <CentralEffectSimulation/handler_building_data.h>
 
 #include <QPainterPath>
-#include <QPointF>
+#include <QtCore/QPointF>
 #include <QPolygonF>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QTransform>
 
 #include <LtsUtils/dds_bitarray.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.h
index 699f8840e..80a95ca29 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.h
@@ -25,7 +25,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QVector>
 #include <QPolygonF>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace LtsUtils
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.cpp
index 4bce41b92..2cc336d34 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.cpp
@@ -13,8 +13,8 @@
 
 #include <float.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QVector3D>
 
 // operator<<
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.h
index 4b69085b2..42e7246fa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.h
@@ -16,8 +16,8 @@
 
 #include <CentralEffectSimulation/dds_handler.h>
 
-#include <QObject>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
 
 
 namespace NGL
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_ownership.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_ownership.cpp
index 26f9aba31..cb46bc143 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_ownership.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_ownership.cpp
@@ -10,8 +10,8 @@
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ngldb/dbtransaction.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 
 namespace CesBuildings
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/plugin.cpp
index 67628f464..49c5c868e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/plugin.cpp
@@ -10,7 +10,7 @@
 
 #include <CentralEffectSimulation/proxy_building.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace CesBuildings
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/plugin.h
index c381be325..a0f13f876 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/plugin.h
@@ -22,7 +22,7 @@
 #include <CentralEffectSimulation/handler_building_data.h>
 #include <DDS/DDSConnector/dds_connector.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CesBuildings
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp
index 1d895f6ec..aadbb8ede 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp
@@ -14,9 +14,9 @@
 #include <CentralEffectSimulation/handler_building_data.h>
 
 #include <QPainterPath>
-#include <QPointF>
+#include <QtCore/QPointF>
 #include <QPolygonF>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QTransform>
 
 #include <LtsUtils/dds_bitarray.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp
index ed11dc2ae..2fd8fccb8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp
@@ -17,8 +17,8 @@
 #include <ProjectDataManagement/pdm_enums.hpp>
 #include <cmath>
 
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 
 namespace dds
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/plugin.h
index 20e8b7597..19424bbfc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/plugin.h
@@ -18,7 +18,7 @@
 #include <CentralEffectSimulation/handler_building_data.h>
 #include <NGLLogger/INGLLogger.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace Ces2D
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/settings.h
index ea9137847..d9ce3e374 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ECHO/echoplugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ECHO/echoplugin.cpp
index cadd1732c..4b0f208a5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ECHO/echoplugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ECHO/echoplugin.cpp
@@ -7,7 +7,7 @@
   */
 
 #include "echoplugin.h"
-#include <QDebug>
+#include <QtCore/QDebug>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
 namespace Echo
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ECHO/echoplugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ECHO/echoplugin.h
index de7062963..8bba919e9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ECHO/echoplugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ECHO/echoplugin.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <CentralEffectSimulation/ces_plugin_interface.h>
 #include <NGLLogger/INGLLogger.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/expand_polygon.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/expand_polygon.h
index b1e2f9408..1fdfae62a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/expand_polygon.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/expand_polygon.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #include <QPolygonF>
-#include <QString>
+#include <QtCore/QString>
 
 namespace CesExplosions
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_artillery_l.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_artillery_l.h
index 3eae25d1f..82825f949 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_artillery_l.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_artillery_l.h
@@ -17,8 +17,8 @@
 //#include <CentralEffectSimulation/proxy_building.h>
 
 
-#include <QHash>
-#include <QVector>
+#include <QtCore/QHash>
+#include <QtCore/QVector>
 #include <QPolygonF>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp
index b1ef42f0e..de6839a68 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp
@@ -19,11 +19,11 @@
 #include <LtsCoordinate/lts_coordinate.h>
 
 
-#include <QPointF>
-#include <QVector>
-#include <QSet>
-#include <QDateTime>
-#include <QTimer>
+#include <QtCore/QPointF>
+#include <QtCore/QVector>
+#include <QtCore/QSet>
+#include <QtCore/QDateTime>
+#include <QtCore/QTimer>
 #include <QElapsedTimer>
 
 using namespace CentralEffectSimulation;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.h
index b0a9ca6ef..94ac3c3d7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.h
@@ -27,7 +27,7 @@
 #include <QtCore/QVector>
 #include <QPolygonF>
 #include <QQueue>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 // AES-Handling for Explosions
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp
index f94d59bdc..ad35db289 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp
@@ -18,13 +18,13 @@
 #include <CentralEffectSimulation/handler_participant.h>
 
 #include <QPainterPath>
-#include <QPointF>
+#include <QtCore/QPointF>
 #include <QPolygonF>
-#include <QVector>
-#include <QTimer>
+#include <QtCore/QVector>
+#include <QtCore/QTimer>
 #include <QTransform>
-#include <QDateTime>
-#include <QVariant>
+#include <QtCore/QDateTime>
+#include <QtCore/QVariant>
 
 
 namespace CesExplosions
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.h
index 3a410f5df..b10042443 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.h
@@ -23,8 +23,8 @@
 #include <QtCore/QVector>
 #include <QPolygonF>
 #include <QQueue>
-#include <QHash>
-#include <QTimer>
+#include <QtCore/QHash>
+#include <QtCore/QTimer>
 
 namespace LtsUtils
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/line_of_sight.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/line_of_sight.h
index ffeca0b91..4e034597f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/line_of_sight.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/line_of_sight.h
@@ -11,7 +11,7 @@
 #include <LtsCoordinate/lts_coordinate.h>
 #include <CentralEffectSimulation/proxy_building.h>
 
-#include <QFlags>
+#include <QtCore/QFlags>
 #pragma once
 
 namespace CesExplosions
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/plugin.h
index 081fe3440..115aa828c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/plugin.h
@@ -17,7 +17,7 @@
 #include <CentralEffectSimulation/dds_handler.h>
 #include <DDS/DDSConnector/dds_connector.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CesExplosions
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/settings.h
index 64d5e776f..755b897e4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp
index 476e98bef..a0a32ab3e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp
@@ -9,8 +9,8 @@
 #include "handler_functional_area.h"
 #include <utility>
 
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 
 #include <LtsUtils/dds_bitarray.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/plugin.h
index 3e130de56..c0c16d973 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/plugin.h
@@ -16,7 +16,7 @@
 #include <CentralEffectSimulation/main_handler.h>
 #include <CentralEffectSimulation/dds_handler.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CES_FUNCTIONAL_AREA
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/supplytimer.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/supplytimer.h
index 35f75a35d..cb32fcc8a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/supplytimer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/supplytimer.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 namespace CES_FUNCTIONAL_AREA
 {
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp
index c5631a345..14e9a3258 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp
@@ -13,9 +13,9 @@
 #include "settings.h"
 
 #include <QPainterPath>
-#include <QPointF>
+#include <QtCore/QPointF>
 #include <QPolygonF>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QTransform>
 
 #include <LtsUtils/dds_bitarray.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.cpp
index 5c11c43aa..c461dd511 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.cpp
@@ -9,8 +9,8 @@
 #include "handler_participant_gas_pipe.h"
 #include <utility>
 
-#include <QLineF>
-#include <QTimer>
+#include <QtCore/QLineF>
+#include <QtCore/QTimer>
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.h
index 709f2d42f..9cf08545c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.h
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include <QObject>
-#include <QHash>
-#include <QRectF>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtCore/QRectF>
 #include <QPolygonF>
 
 #include <CentralEffectSimulation/dds_handler.h>
@@ -20,7 +20,7 @@
 #include <AreaEffectSimulation/aes_dtc.h>
 #include <CentralEffectSimulation/handler_participant.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 // AES-Handling for participants
 namespace CentralEffectSimulationGasPipes
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/plugin.h
index cf8d7827b..c5ab2fc63 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/plugin.h
@@ -16,7 +16,7 @@
 #include <CentralEffectSimulation/dds_handler.h>
 #include <DDS/DDSConnector/dds_connector.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CesGasPipes
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/ammuconfig.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/ammuconfig.cpp
index f3daecfaf..07cd2c02e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/ammuconfig.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/ammuconfig.cpp
@@ -7,7 +7,7 @@
   */
 
 #include "ammuconfig.h"
-#include <QStringList>
+#include <QtCore/QStringList>
 
 namespace N_ConfigSystem
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/ammuconfig.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/ammuconfig.h
index 565462dc1..7f8cb5e3f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/ammuconfig.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/ammuconfig.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <QString>
-#include <QVector>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 #include "configsettings.h"
 #include <FW_Ballistic/Ammunition.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/configsettings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/configsettings.h
index 4d9b77270..282821508 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/configsettings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/configsettings.h
@@ -1,10 +1,10 @@
 #ifndef CONFIGSETTINGS_H
 #define CONFIGSETTINGS_H
 
-#include <QString>
-#include <QSettings>
-#include <QVector>
-#include <QStringList>
+#include <QtCore/QString>
+#include <QtCore/QSettings>
+#include <QtCore/QVector>
+#include <QtCore/QStringList>
 
 class ConfigSettings
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/geoconfig.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/geoconfig.cpp
index c377fbf9d..148f208e0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/geoconfig.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/geoconfig.cpp
@@ -7,7 +7,7 @@
   */
 
 #include "geoconfig.h"
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
 
 namespace N_ConfigSystem
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/geoconfig.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/geoconfig.h
index 45b5830e3..5240975fb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/geoconfig.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/geoconfig.h
@@ -13,7 +13,7 @@
 //#include "../logger.h"
 
 #include <ElevationMap/elevation_map_manager.h>
-#include <QString>
+#include <QtCore/QString>
 
 #include <iostream> // std::cout, std::endl, std::cin
 #include <stdlib.h>   // EXIT_SUCCESS
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_Types/GeoCoord.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_Types/GeoCoord.cpp
index c62179bf1..a55bff11e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_Types/GeoCoord.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_Types/GeoCoord.cpp
@@ -13,7 +13,7 @@
 
 #include "GeoCoord.hpp"
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QPointF>
+#include <QtCore/QPointF>
 
 namespace N_Math
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairing/GeoPairing.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairing/GeoPairing.cpp
index 5cb8da5e8..bfe43776a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairing/GeoPairing.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairing/GeoPairing.cpp
@@ -13,7 +13,7 @@
 #include <GeoPairingImpl/GeoPairingImplBalistic.hpp>
 #include <GeoPairingImpl/GeoPairingDataFireReport.hpp>
 #include <Schusstafel.h>
-#include <QScopedPointer>
+#include <QtCore/QScopedPointer>
 #include <FW_Ballistic/AmmunitionTypes.hpp>
 #include <GBL_ConfigSystem/ammuconfig.h>
 #include "../settings.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImpl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImpl.cpp
index 705352019..1b5699942 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImpl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImpl.cpp
@@ -22,7 +22,7 @@
 #include "GeoPairingImplAirTargetCacheData.hpp"
 
 #include "GeoPairingDataFireReport.hpp"
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 #define PAN_AMMU_TIMEPROG(ammunition) (ammunition       & 0x01)
 #define PAN_AMMU_INDEX(ammunition)   ((ammunition >> 1) & 0x03)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplFiredBullet.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplFiredBullet.cpp
index aa635c627..f4ba3d6e2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplFiredBullet.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplFiredBullet.cpp
@@ -22,7 +22,7 @@
 #include <GBL_ConfigSystem/geoconfig.h>
 #include <limits>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QPointF>
+#include <QtCore/QPointF>
 
 #ifdef WIN32
 #define RAND48_SEED_0   (0x330e)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/geo_settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/geo_settings.h
index 000446819..c15d4d0e2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/geo_settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/geo_settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.cpp
index f514e1301..32f77c2f4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.cpp
@@ -19,9 +19,9 @@
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <TrainingAreaBase/tab_ftc.h>
 
-#include <QSettings>
-#include <QFileInfo>
-#include <QDataStream>
+#include <QtCore/QSettings>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDataStream>
 
 
 using namespace N_ConfigSystem;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.h
index 1e695a6fe..73b8a39a2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.h
@@ -16,7 +16,7 @@
 #include <MeteoDataManagement/mdm_dtc.h>
 #include <CentralEffectSimulation/handler_participant.h>
 #include <FW_Ballistic/BallisticService.hpp>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #include <QtCore/QObject>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/plugin.h
index 0963025f7..44e554d03 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/plugin.h
@@ -17,7 +17,7 @@
 #include <CentralEffectSimulation/dds_handler.h>
 #include <NGLLogger/INGLLogger.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace CesGeoPairing
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/settings.h
index a5e93f1a2..e6940b9d7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.cpp
index 59c6a5bee..001c27618 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.cpp
@@ -8,8 +8,8 @@
 
 #include "handler_jamming.h"
 
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 #include <QRandomGenerator>
 
 #include <LtsUtils/dds_bitarray.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/plugin.h
index 09cf1f193..f2fb353c9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/plugin.h
@@ -16,7 +16,7 @@
 #include <CentralEffectSimulation/main_handler.h>
 #include <CentralEffectSimulation/dds_handler.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CES_JAMMING
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp
index 1f80d60dd..47a158fa2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp
@@ -16,8 +16,8 @@
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ProjectDataManagement/pdm_enums.hpp>
 
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 
 namespace dds
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/plugin.h
index afaf3b88e..190ee8f3b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/plugin.h
@@ -15,7 +15,7 @@
 #include <CentralEffectSimulation/main_handler.h>
 #include <CentralEffectSimulation/dds_handler.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CesMineAreas
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/settings.h
index 2c43d37b5..6490dbdb8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/handler_mine_laying_artillery.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/handler_mine_laying_artillery.cpp
index cabf4d7ca..7e5a06f7f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/handler_mine_laying_artillery.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/handler_mine_laying_artillery.cpp
@@ -8,10 +8,10 @@
 
 #include "handler_mine_laying_artillery.h"
 
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QTimer>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QTimer>
 #include <QTransform>
 #include <qrandom.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/handler_mine_laying_artillery.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/handler_mine_laying_artillery.h
index 32ba99f1c..9ec28326b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/handler_mine_laying_artillery.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/handler_mine_laying_artillery.h
@@ -15,8 +15,8 @@
 #include <CentralEffectSimulation/handler_participant.h>
 #include <CentralEffectSimulation/logger.h>
 
-#include <QMap>
-#include <QObject>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
 #include <QPolygonF>
 #include <QQueue>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/plugin.h
index 2732ebed7..dbcf8c3f6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/plugin.h
@@ -16,7 +16,7 @@
 
 #include <handler_mine_laying_artillery.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace MineLayingArtillery
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.cpp
index c02c69650..b586a3438 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.cpp
@@ -8,8 +8,8 @@
 
 #include "ces_mission_plan_handler.h"
 
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 #include <QRandomGenerator>
 
 #include <LtsUtils/dds_bitarray.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_object.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_object.cpp
index f0e8109ef..43406b20c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_object.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_object.cpp
@@ -8,8 +8,8 @@
 
 #include "ces_mission_plan_object.h"
 #include "qobject.h"
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 #include <ngltools/ngltools_dtg.h>
 namespace CES_MISSIONPLAN
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_object.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_object.h
index 3d988a7fc..7af3dcc4c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_object.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_object.h
@@ -14,9 +14,9 @@
 #include <CentralEffectSimulation/dds_handler.h>
 
 #include <CentralEffectSimulation/logger.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 
-#include <QObject>
+#include <QtCore/QObject>
 namespace CES_MISSIONPLAN
 {
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/plugin.h
index 1d0ab6019..ab0c73255 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/plugin.h
@@ -16,7 +16,7 @@
 #include <CentralEffectSimulation/main_handler.h>
 #include <CentralEffectSimulation/dds_handler.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CES_MISSIONPLAN
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/handler_nbc.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/handler_nbc.cpp
index 474b7dd1e..8bfda50fd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/handler_nbc.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/handler_nbc.cpp
@@ -9,8 +9,8 @@
 #include "handler_nbc.h"
 #include <utility>
 
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 
 #include <LtsUtils/dds_bitarray.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/plugin.h
index 319b2c751..04e14a6d3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/plugin.h
@@ -15,7 +15,7 @@
 #include <CentralEffectSimulation/main_handler.h>
 #include <CentralEffectSimulation/dds_handler.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CES_NBC
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_participant_building.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_participant_building.h
index 58bf6b1f4..087d66f71 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_participant_building.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_participant_building.h
@@ -15,7 +15,7 @@
 #include <CentralEffectSimulation/handler_participant.h>
 #include <CentralEffectSimulation/handler_building_data.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QtCore/QObject>
 
 // Handling for participants within buildings
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/plugin.h
index 8a2676c7f..5481aae2f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/plugin.h
@@ -19,7 +19,7 @@
 #include <CentralEffectSimulation/dds_handler.h>
 #include <CentralEffectSimulation/handler_building_data.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CesParticipantBuildings
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/settings.h
index 9c22ea0be..84c969639 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.h
index 466a10d42..b058492da 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <DDS/DDSConnector/dds_connector.h>
 #include <DDS/Core/core_dtc.h>
 #include <DDS/Core/topic_lock_master.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.cpp
index c872d8c41..58c95893f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.cpp
@@ -11,8 +11,8 @@
 #include <ParticipantManagement/ppm_common.h>
 
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QLineF>
-#include <QDateTime>
+#include <QtCore/QLineF>
+#include <QtCore/QDateTime>
 
 
 namespace TargetAreas
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.h
index 594f7d030..49c823401 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 //#include <CentralEffectSimulation/dds_handler.h>
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/plugin.h
index 867f3b9b0..05672c53f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/plugin.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <DDS/DDSConnector/dds_connector.h>
 #include <CentralEffectSimulation/ces_plugin_interface.h>
 #include <NGLLogger/INGLLogger.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/targettimer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/targettimer.cpp
index 6ad6aeff4..42cf8906e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/targettimer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/targettimer.cpp
@@ -8,7 +8,7 @@
 
 
 #include "targettimer.h"
-#include <QDebug>
+#include <QtCore/QDebug>
 
 TargetTimer::TargetTimer(int participantId,
                          int targetParticipantId,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/targettimer.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/targettimer.h
index e08901889..593629bf0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/targettimer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/targettimer.h
@@ -11,8 +11,8 @@
 #define TARGETTIMER_H
 
 
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 
 class TargetTimer: public QObject
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.cpp
index f7d178846..5f0273076 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.cpp
@@ -11,8 +11,8 @@
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 
-#include <QLineF>
-#include <QTimer>
+#include <QtCore/QLineF>
+#include <QtCore/QTimer>
 
 namespace CesVirtualMines
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.h
index 8091e1678..081090407 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.h
@@ -15,10 +15,10 @@
 #include <CentralEffectSimulation/dds_handler.h>
 #include <CentralEffectSimulation/handler_participant.h>
 
-#include <QTimer>
-#include <QObject>
-#include <QHash>
-#include <QRectF>
+#include <QtCore/QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtCore/QRectF>
 #include <QPolygonF>
 
 // AES-Handling for participants
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.cpp
index 55c551327..ba8ebe8af 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.cpp
@@ -11,8 +11,8 @@
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 
-#include <QLineF>
-#include <QTimer>
+#include <QtCore/QLineF>
+#include <QtCore/QTimer>
 
 namespace CesVirtualMines
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.h
index 4b9e3e2f3..309396aee 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.h
@@ -13,10 +13,10 @@
 #include <CentralEffectSimulation/aes_item_view_utm.h>
 #include <CentralEffectSimulation/handler_participant.h>
 
-#include <QTimer>
-#include <QObject>
-#include <QHash>
-#include <QRectF>
+#include <QtCore/QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtCore/QRectF>
 #include <QPolygonF>
 
 // AES-Handling for participants
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/plugin.h
index abe963641..4ff02c319 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/plugin.h
@@ -18,7 +18,7 @@
 #include <CentralEffectSimulation/dds_handler.h>
 #include <DDS/DDSConnector/dds_connector.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 
 namespace CesVirtualMines
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/aes_item_view_utm.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/aes_item_view_utm.h
index a65155123..bea16072f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/aes_item_view_utm.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/aes_item_view_utm.h
@@ -13,9 +13,9 @@
 #include <AreaEffectSimulation/aes_enums.hpp>
 #include <AreaEffectSimulation/aes.hpp>
 
-#include <QPointF>
+#include <QtCore/QPointF>
 #include <QPolygonF>
-#include <QVector>
+#include <QtCore/QVector>
 #include <QtCore/QHash>
 
 namespace CentralEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ces_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ces_plugin_interface.h
index 705481cea..8dec28b9b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ces_plugin_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ces_plugin_interface.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 #include <memory>
 #include <unordered_map>
 #include <DDS/DDSConnector/dds_connector.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.h
index 8b60444e2..5f9b43c2a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <DDS/DDSConnector/dds_connector.h>
 #include <DDS/Core/core_dtc.h>
 #include <DDS/Core/topic_lock_master.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.cpp
index 2d13a9314..68a87701a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.cpp
@@ -12,7 +12,7 @@
 #include "handler_participant.h"
 #include <LtsUtils/dds_bitarray.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QHash>
+#include <QtCore/QHash>
 #include <QHashIterator>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.h
index 238eff476..1fb3bc5dc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.h
@@ -12,9 +12,9 @@
 #include "svccesddscommon_export.h"
 #include <CentralEffectSimulation/dds_handler.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QPolygonF>
-#include <QHash>
+#include <QtCore/QHash>
 // Data for buildings
 
 namespace CentralEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.cpp
index 11ddadb91..c9d136fe0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.cpp
@@ -11,7 +11,7 @@
 #include <ParticipantManagement/ppm_common.h>
 
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QLineF>
+#include <QtCore/QLineF>
 
 namespace CentralEffectSimulation
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.h
index 5d40f8805..8c974358d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.h
@@ -18,7 +18,7 @@
 #include <LtsUtils/LtsUtilsCore/outdated_position.h>
 #include <LtsCoordinate/lts_coordinate.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtCore/QMap>
 #include <QtCore/QHash>
 #include <QtCore/QPointF>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/point_helpers.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/point_helpers.h
index 0aa7d4c55..7c76182d7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/point_helpers.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/point_helpers.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #include <QtCore/QPointF>
-#include <QString>
+#include <QtCore/QString>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <DDS/Core/core.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/proxy_building.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/proxy_building.h
index 31c549c40..769117eeb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/proxy_building.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/proxy_building.h
@@ -14,7 +14,7 @@
 
 #include <Core/core.hpp>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <memory>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/settings.cpp
index 900749b08..c602aebeb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/settings.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/settings.cpp
@@ -8,8 +8,8 @@
 
 #include "settings.h"
 
-#include <QSettings>
-#include <QVariant>
+#include <QtCore/QSettings>
+#include <QtCore/QVariant>
 #include <QGlobalStatic>
 
 #include <nglsettings/nglsettings_settings.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/settings.h
index d4501b6be..7588403f9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/settings.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "svccesddscommon_export.h"
-#include <QString>
+#include <QtCore/QString>
 
 
 // forward:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/handler_codification_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/handler_codification_data.h
index 8c4c912f7..e723adfda 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/handler_codification_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/handler_codification_data.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "dds_handler.h"
 #include "initialization.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/settings.h
index 1fcfd9541..7de3e47c8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/settings.h
@@ -7,7 +7,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 #include "svccodserver_export.h"
 
 namespace NGL
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.cpp
index fbdbba2e5..fd45609e4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.cpp
@@ -9,7 +9,7 @@
 #include "connection_handler_serial.h"
 #include <LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace EffectShowClient
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.h
index ef87aa4eb..8f30dfe35 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.h
@@ -11,8 +11,8 @@
 #include "logger.h"
 #include <LtsSerialPortQuerry/lts_serial_port_querry.h>
 
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 #include <QSerialPort>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.cpp
index 6c0362e89..64dd3178f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.cpp
@@ -10,7 +10,7 @@
 #include "settings.h"
 #include <LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace EffectShowClient
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.h
index be9be0633..ab0cdd1e6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QTcpSocket>
+#include <QtCore/QObject>
+#include <QtNetwork/QTcpSocket>
 
 #include <LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h>
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/control_unit_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/control_unit_handler.h
index c6b8e2ac3..ed01651ef 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/control_unit_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/control_unit_handler.h
@@ -11,8 +11,8 @@
 #include "logger.h"
 #include "handler_vehicle.h"
 #include "esc_helper.h"
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 
 namespace EffectShowClient
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_from_tab.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_from_tab.h
index a2064d9e2..3f8364bed 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_from_tab.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_from_tab.h
@@ -10,7 +10,7 @@
 #pragma once
 #include <TrainingAreaBase/tab_dtc.h>
 #include <EffectShowClient/esc_dts.h>
-#include <QString>
+#include <QtCore/QString>
 
 namespace EffectShowClient
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_to_tab.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_to_tab.cpp
index 6bf470592..b2cffaf77 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_to_tab.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_to_tab.cpp
@@ -10,7 +10,7 @@
 #include "esc_convert_to_tab.h"
 #include <LtsUtils/qbytearray_byteaccess.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
-#include <QByteArray>
+#include <QtCore/QByteArray>
 
 
 namespace EffectShowClient
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_to_tab.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_to_tab.h
index 323f7872d..8eb5fdc88 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_to_tab.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_to_tab.h
@@ -10,7 +10,7 @@
 #pragma once
 #include <TrainingAreaBase/tab_dtc.h>
 #include <EffectShowManagement/esm_dtc.h>
-#include <QString>
+#include <QtCore/QString>
 
 namespace EffectShowClient
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_helper.h
index 242110729..93f011365 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_helper.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_helper.h
@@ -7,7 +7,7 @@
   */
 
 #pragma once
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace EffectShowClient
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.cpp
index 2ee28f937..643572182 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.cpp
@@ -13,8 +13,8 @@
 #include "handler_order.h"
 #include "handler_vehicle.h"
 #include "control_unit_handler.h"
-#include <QTimer>
-#include <QCoreApplication>
+#include <QtCore/QTimer>
+#include <QtCore/QCoreApplication>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
 namespace EffectShowClient
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.h
index 91619ca28..53854904b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.h
@@ -7,8 +7,8 @@
   */
 #pragma once
 
-#include <QObject>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
 #include <EffectShowClient/esc_db.h>
 #include "handler_vehicle.h"
 #include "dds_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_smoke.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_smoke.cpp
index 30f446ffe..0d137a6db 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_smoke.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_smoke.cpp
@@ -14,8 +14,8 @@
 #include "handler_tab_data.h"
 #include "handler_order.h"
 #include "handler_vehicle.h"
-#include <QTimer>
-#include <QCoreApplication>
+#include <QtCore/QTimer>
+#include <QtCore/QCoreApplication>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
 namespace EffectShowClient
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_smoke.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_smoke.h
index 3c0d3fc11..86540fd1c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_smoke.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_smoke.h
@@ -7,8 +7,8 @@
   */
 #pragma once
 
-#include <QObject>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
 #include <EffectShowClient/esc_db.h>
 
 #include "handler_vehicle.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.cpp
index beb2edb1f..720b39722 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.cpp
@@ -16,7 +16,7 @@
 
 #include "handler_tab_data.h"
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.h
index 288ceb1d6..a2060ce19 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.h
@@ -7,8 +7,8 @@
   */
 #pragma once
 
-#include <QObject>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
 #include "handler_vehicle.h"
 #include "dds_handler.h"
 #include "control_unit_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.cpp
index 9c7f8b3d2..48aaf8035 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.cpp
@@ -16,7 +16,7 @@
 #include "handler_tab_data.h"
 #include "handler_vehicle.h"
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
 namespace EffectShowClient
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.h
index a44a79625..e33f2a6d2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.h
@@ -7,8 +7,8 @@
   */
 #pragma once
 
-#include <QObject>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
 #include <EffectShowClient/esc_db.h>
 #include "dds_handler.h"
 #include "esc_convert_from_tab.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_tab_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_tab_data.cpp
index e683e0b04..916ae5668 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_tab_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_tab_data.cpp
@@ -5,7 +5,7 @@
   * $Author$
   * Created by hjl, SLSE, 2017-02-20
   */
-#include <QVector>
+#include <QtCore/QVector>
 #include "main_handler.h"
 #include "handler_tab_data.h"
 #include "handler_order.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.cpp
index ffdcbdbdb..078766049 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.cpp
@@ -11,9 +11,9 @@
 #include "esc_helper.h"
 #include "control_unit_handler.h"
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace EffectShowClient
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.h
index 5b7a3b0b9..60e1e6b7b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.h
@@ -12,9 +12,9 @@
 #include "esc_convert_to_tab.h"
 #include "logger.h"
 #include "esc_helper.h"
-#include <QObject>
-#include <QTimer>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+#include <QtCore/QMap>
 
 namespace EffectShowClient
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/main_handler.h
index 5884dba2c..e6764a1f2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/main_handler.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include "dds_handler.h"
 #include <ngldb/db_service_handler.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.h
index 345c6f914..462da1215 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.h
@@ -8,7 +8,7 @@
 
 #include "dds_handler.h"
 #include "logger.h"
-#include <QObject>
+#include <QtCore/QObject>
 #include <NotificationManagement/nom_ftc.h>
 
 #include <Core/core_types.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/settings.h
index d597d5cde..6f34a402a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_effect_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_effect_cluster.cpp
index 1482cfdbd..bda6a2e32 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_effect_cluster.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_effect_cluster.cpp
@@ -6,8 +6,8 @@
   */
 
 #include "effect_show_effect_cluster.h"
-#include <QJsonDocument>
-#include <QObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QObject>
 #include "settings.h"
 
 const static int DEFAULT_EFFECT_DURATION = 777777;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_mine_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_mine_area.cpp
index f147ac36e..cb66dc23f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_mine_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_mine_area.cpp
@@ -7,7 +7,7 @@
 
 #include "effect_show_mine_area.h"
 
-#include <QLineF>
+#include <QtCore/QLineF>
 
 namespace EffectShowManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_mine_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_mine_area.h
index 94307777d..cf01bf6ab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_mine_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_mine_area.h
@@ -11,7 +11,7 @@
 #include <AreaEffectSimulation/aes_dtc.h>
 #include <EffectShowManagement/esm_db.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QPointF>
+#include <QtCore/QPointF>
 
 namespace EffectShowManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_from_tab.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_from_tab.h
index 3fab0f776..cc295e05a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_from_tab.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_from_tab.h
@@ -10,7 +10,7 @@
 #pragma once
 #include <TrainingAreaBase/tab_dtc.h>
 #include <EffectShowManagement/esm_db.h>
-#include <QString>
+#include <QtCore/QString>
 
 namespace EffectShowManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_to_tab.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_to_tab.cpp
index 6cbe3218f..80b8b747f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_to_tab.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_to_tab.cpp
@@ -10,7 +10,7 @@
 #include "esm_convert_to_tab.h"
 #include <LtsUtils/qbytearray_byteaccess.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
-#include <QByteArray>
+#include <QtCore/QByteArray>
 
 namespace EffectShowManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_to_tab.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_to_tab.h
index b7a229cf2..5807430b4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_to_tab.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_to_tab.h
@@ -10,7 +10,7 @@
 #pragma once
 #include <TrainingAreaBase/tab_dtc.h>
 #include <MeteoDataManagement/mdm_dtc.h>
-#include <QString>
+#include <QtCore/QString>
 
 namespace EffectShowManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_aes_data.cpp
index c87562d88..3991637e4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_aes_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_aes_data.cpp
@@ -4,7 +4,7 @@
   * $HeadURL$
   * $Author$
   */
-#include <QVector>
+#include <QtCore/QVector>
 #include "handler_aes_data.h"
 #include "object_aes_data.h"
 #include "handler_effect_show_vehicle_status.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_aes_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_aes_data.h
index c6fcb4cea..fbd41e255 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_aes_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_aes_data.h
@@ -11,7 +11,7 @@
 #include "logger.h"
 #include "handler_effect_show.h"
 #include <AreaEffectSimulation/aes_dtc.h>
-#include <QMap>
+#include <QtCore/QMap>
 
 namespace EffectShowManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.h
index 61b777a55..bd2a7c1cf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.h
@@ -7,8 +7,8 @@
   */
 #pragma once
 
-#include <QHash>
-#include <QTimer>
+#include <QtCore/QHash>
+#include <QtCore/QTimer>
 
 #include "dds_handler.h"
 #include "initialization.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.cpp
index b6276f9d9..d21942cd7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.cpp
@@ -13,8 +13,8 @@
 #include "esm_db.h"
 #include "initialization.h"
 
-#include <QTimer>
-#include <QCoreApplication>
+#include <QtCore/QTimer>
+#include <QtCore/QCoreApplication>
 
 namespace EffectShowManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.h
index 7e8dbbb82..05c04a7e1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.h
@@ -7,9 +7,9 @@
   */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 #include <QQueue>
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "dds_handler.h"
 #include "esm_convert_from_tab.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_vehicle_status.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_vehicle_status.cpp
index e2f9e38b3..36ad2a574 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_vehicle_status.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_vehicle_status.cpp
@@ -14,7 +14,7 @@
 #include "esm_db.h"
 #include "initialization.h"
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 namespace EffectShowManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_vehicle_status.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_vehicle_status.h
index c9d2c69ed..b6aeee559 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_vehicle_status.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_vehicle_status.h
@@ -7,9 +7,9 @@
   */
 #pragma once
 
-#include <QMap>
-#include <QTimer>
-#include <QObject>
+#include <QtCore/QMap>
+#include <QtCore/QTimer>
+#include <QtCore/QObject>
 
 #include "dds_handler.h"
 #include "esm_convert_from_tab.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_mdm_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_mdm_data.h
index 697433d20..990a79fa8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_mdm_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_mdm_data.h
@@ -8,7 +8,7 @@
 
 #include "dds_handler.h"
 #include "logger.h"
-#include <QHash>
+#include <QtCore/QHash>
 #include <MeteoDataManagement/mdm_dtc.h>
 
 namespace EffectShowManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_pdm_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_pdm_data.h
index 057286855..92ed6c9d5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_pdm_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_pdm_data.h
@@ -10,7 +10,7 @@
 
 #include "dds_handler.h"
 #include "logger.h"
-#include <QHash>
+#include <QtCore/QHash>
 #include <ProjectDataManagement/pdm_dtc.h>
 
 // Project Data Management - Handling for Effect Show Actors
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_ppm_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_ppm_data.h
index 80550fde1..965d5f0c2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_ppm_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_ppm_data.h
@@ -10,7 +10,7 @@
 
 #include "initialization.h"
 #include "logger.h"
-#include <QMap>
+#include <QtCore/QMap>
 #include <ParticipantManagement/ppm.hpp>
 
 // Participand Management-Handling for Effect Show Actors
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_tab_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_tab_data.cpp
index 4538a67d5..8fe854081 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_tab_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_tab_data.cpp
@@ -5,7 +5,7 @@
   * $Author$
   * Created by hjl, SLSE, 2017-02-20
   */
-#include <QVector>
+#include <QtCore/QVector>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include "initialization.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.cpp
index 066b8a615..876cb375d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.cpp
@@ -9,7 +9,7 @@
 #include "effect_show_mine_area.h"
 
 #include "initialization.h"
-#include <QLineF>
+#include <QtCore/QLineF>
 
 namespace EffectShowManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.h
index 2499950eb..5d4b0ba33 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "dds_handler.h"
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.h
index 84ca4057d..425a7e9b6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "dds_handler.h"
 #include "esm_convert_to_tab.h"
 #include "esm_convert_from_tab.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/settings.h
index 95d901018..913c07a21 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/ModuleTests/evl_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/ModuleTests/evl_tests.cpp
index 2c1b5f114..01f10624d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/ModuleTests/evl_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/ModuleTests/evl_tests.cpp
@@ -9,14 +9,14 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QDateTime>
-#include <QString>
-#include <QVector>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QTest>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtTest/QTest>
 
 #include <Evaluations/evl_ftc.h>
 #include <Evaluations/evl_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/evl_db_impl_custom.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/evl_db_impl_custom.cpp
index ad55b3406..bd881c267 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/evl_db_impl_custom.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/evl_db_impl_custom.cpp
@@ -9,7 +9,7 @@
 #include "evl_db_impl_custom.h"
 #include <ngldb/nsqlquery.h>
 #include <ngldb/sql_query_janitor.h>
-#include <QRegularExpression>
+#include <QtCore/QRegularExpression>
 
 namespace Evaluations
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_comment.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_comment.h
index 0fabc98ff..029d506b7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_comment.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_comment.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QHash>
+#include <QtCore/QHash>
 
 #include "dds_handler.h"
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_criterium.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_criterium.h
index ffbe8e33e..83e98d7ce 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_criterium.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_criterium.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QHash>
+#include <QtCore/QHash>
 
 #include "dds_handler.h"
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.cpp
index 4ed5b6615..cb0629c53 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.cpp
@@ -14,7 +14,7 @@
 
 #include "settings.h"
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 
 namespace Evaluations
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.h
index 3bb1847f9..c2d3d3289 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QHash>
+#include <QtCore/QHash>
 
 #include "dds_handler.h"
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.cpp
index b4610a0ea..42913fd70 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.cpp
@@ -8,8 +8,8 @@
 #include "san_category_line_json.h"
 #include <utility>
 
-#include <QJsonDocument>
-#include <QDebug>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QDebug>
 
 namespace Evaluations
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.h
index 1c94a9ff9..c9989989b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.h
@@ -3,7 +3,7 @@
 
 #include "logger.h"
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <Evaluations/evl_db_structs.h>
 
 namespace Evaluations 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/settings.h
index 31925cb82..0412faf71 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 #include "svcevlserver_export.h"
 
 namespace NGL
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/ModuleTests/eem_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/ModuleTests/eem_tests.cpp
index 65dbdfc60..c7a29ba21 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/ModuleTests/eem_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/ModuleTests/eem_tests.cpp
@@ -9,11 +9,11 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QDateTime>
-#include <QTest>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
+#include <QtTest/QTest>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 #include <LtsUtilsCore/json_object.h>
 
 /* Module tests for ExerciseEventManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.cpp
index e3874728e..f4890044f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.cpp
@@ -11,9 +11,9 @@
 #include <QtWebSockets/QWebSocket>
 #include <iostream>
 
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonValue>
+#include <QtCore/QJsonDocument>
 
 namespace ExerciseEventManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.h
index b2a78313a..99102a006 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.h
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QQueue>
 #include <QtWebSockets/QWebSocketServer>
 #include <memory>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include "../logger.h"
 
 namespace ExerciseEventManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/dds_handler.cpp
index 398ec1e75..ef42d3dc9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/dds_handler.cpp
@@ -8,7 +8,7 @@
 
 #include "dds_handler.h"
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace ExerciseEventManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.cpp
index c874c016e..6b346cfb3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.cpp
@@ -15,14 +15,14 @@
 #include "web_socket_server.h"
 #include "settings.h"
 
-#include <QSet>
+#include <QtCore/QSet>
 #include <QtCore/QThread>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 #include <LtsUtilsCore/json_object.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 using namespace ExerciseEventManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_equipment_error_registration.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_equipment_error_registration.cpp
index dbcfc8d2f..69149f56f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_equipment_error_registration.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_equipment_error_registration.cpp
@@ -15,13 +15,13 @@
 
 #include <ProjectDataManagement/pdm_enums.hpp>
 
-#include <QSet>
+#include <QtCore/QSet>
 #include <QtCore/QThread>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 using namespace ExerciseEventManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_participant_event.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_participant_event.cpp
index e8cb69a3a..1a130bc35 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_participant_event.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_participant_event.cpp
@@ -13,9 +13,9 @@
 #include "settings.h"
 #include <ProjectDataManagement/pdm_enums.hpp>
 
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QTimer>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QTimer>
 
 using namespace ExerciseEventManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/settings.cpp
index 161f45c24..886342448 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/settings.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/settings.cpp
@@ -8,7 +8,7 @@
 #include "settings.h"
 
 #include <QtCore/QSettings>
-#include <QPoint>
+#include <QtCore/QPoint>
 
 #include <nglsettings/nglsettings_settings.h>
 #include <ngltools/ngltools_filesystem.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/settings.h
index 0939c3e18..0f781c177 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/settings.h
@@ -6,8 +6,8 @@
   */
 
 #pragma once
-#include <QString>
-#include <QPair>
+#include <QtCore/QString>
+#include <QtCore/QPair>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.cpp
index f847b7b87..6141e2dad 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.cpp
@@ -15,10 +15,10 @@
 
 #include <ExerciseEventManagement/eem_db.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QtWebSockets/QWebSocket>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <ngldb/nsqlquery.h>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.h
index 0e0bd2353..ffdd13d1e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.h
@@ -9,9 +9,9 @@
 #pragma once
 
 #include <QAbstractSocket>
-#include <QTimer>
-#include <QVector>
-#include <QSharedPointer>
+#include <QtCore/QTimer>
+#include <QtCore/QVector>
+#include <QtCore/QSharedPointer>
 #include "logger.h"
 
 #include "dds_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.cpp
index c17d6391d..100b4b2ee 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.cpp
@@ -10,12 +10,12 @@
 #include "web_socket_server.h"
 #include <utility>
 
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QSqlError>
-#include <QTimer>
-#include <QUrlQuery>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtSql/QSqlError>
+#include <QtCore/QTimer>
+#include <QtCore/QUrlQuery>
 #include <QtWebSockets/QWebSocket>
 #include <QtWebSockets/QWebSocketServer>
 #include <ngldb/nsqlquery.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.h
index b9b309eed..06e6bc6c0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.h
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include <QMap>
-#include <QObject>
-#include <QSet>
-#include <QSqlDatabase>
-#include <QVector>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QSet>
+#include <QtSql/QSqlDatabase>
+#include <QtCore/QVector>
 #include <ExerciseEventManagement/eem_db_structs.h>
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_statemachine_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_statemachine_test.cpp
index f5f9edc26..ac6d1cbc3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_statemachine_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_statemachine_test.cpp
@@ -19,10 +19,10 @@
 #include <ExerciseManagement/settings.h>
 #include <ExerciseManagement/logger.h>
 
-#include <QCoreApplication>
-#include <QDebug>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
 #include <QSignalSpy>
-#include <QTest>
+#include <QtTest/QTest>
 #include <nglapplication/nglcoreapplication.h>
 #include <ngltools/ngltools_filesystem.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_statemachine_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_statemachine_test.h
index 7773802c0..b06b6d7cf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_statemachine_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_statemachine_test.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include <ExerciseManagement/exm_db.h>
 #include <ngldb/db_service_handler.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_tests.cpp
index 0a60ba0c8..233a41c97 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_tests.cpp
@@ -11,8 +11,8 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QTest>
+#include <QtCore/QTimer>
+#include <QtTest/QTest>
 
 #include <ExerciseManagement/exm_ftc.h>
 #include <AssetManagement/asm_ftc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.cpp
index c9397cbd6..3bf973e0b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.cpp
@@ -17,8 +17,8 @@
 #include <DDS/DTC/generic_dtc_impl.h>
 
 #include <QtTest/QTest>
-#include <QVariant>
-#include <QThread>
+#include <QtCore/QVariant>
+#include <QtCore/QThread>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.h
index 5fe935603..9b1876b4a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.h
@@ -8,7 +8,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <DDS/Generic/subscriber_listener.h>
 
 // For Topic Exercise
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests_main.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests_main.h
index ac96c61a6..5ee6f8a2d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests_main.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests_main.h
@@ -8,7 +8,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QSignalSpy>
 #include <ExerciseManagement/exm_dts_types.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/WebSocketInterface/Messages/reply_message.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/WebSocketInterface/Messages/reply_message.h
index 14f2518d6..58afaaf38 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/WebSocketInterface/Messages/reply_message.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/WebSocketInterface/Messages/reply_message.h
@@ -10,8 +10,8 @@
 
 #include <LtsWebSocket/reply_message.h>
 
-#include <QJsonArray>
-#include <QString>
+#include <QtCore/QJsonArray>
+#include <QtCore/QString>
 #include <QtCore/QVector>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/WebSocketInterface/json_keys.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/WebSocketInterface/json_keys.h
index 115348830..383911a67 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/WebSocketInterface/json_keys.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/WebSocketInterface/json_keys.h
@@ -8,7 +8,7 @@
   */
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 #include <OcBaseDownload/WebSocketInterface/json_keys.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_machine.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_machine.h
index ffea02c67..cdbd3be0f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_machine.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_machine.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QStateMachine>
 
 #include <ExerciseManagement/exm_enums.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_manager.h
index 8db0ba5c4..9db6e6e67 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_manager.h
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <functional>
-#include <QMap>
+#include <QtCore/QMap>
 
 #include <ExerciseManagement/exm_enums.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp
index 1e99e6ae8..6f1c01275 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp
@@ -14,8 +14,8 @@
 #include "object_exercise.h"
 #include "settings.h"
 
-//#include <QPixmap>
-#include <QTimer>
+//#include <QtGui/QPixmap>
+#include <QtCore/QTimer>
 #include <vector>
 
 #include <LtsUtils/dds_vector_to_pixmap.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.h
index 7618d61a0..125d45d3d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.h
@@ -8,11 +8,11 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QQueue>
-#include <QHash>
+#include <QtCore/QHash>
 #include <QCache>
-#include <QSize>
+#include <QtCore/QSize>
 
 #include <DBAdministration/exercise_table_generator.h>
 #include "dds_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise_phase.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise_phase.cpp
index 8c8628b00..0cb2497a4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise_phase.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise_phase.cpp
@@ -7,8 +7,8 @@
 
 #include "handler_exercise_phase.h"
 
-#include <QDateTime>
-#include <QString>
+#include <QtCore/QDateTime>
+#include <QtCore/QString>
 
 #include "dds_handler.h"
 #include "exm_db.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise_phase.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise_phase.h
index d800a0dcf..c75ed5ed7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise_phase.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise_phase.h
@@ -8,7 +8,7 @@
   */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "logger.h"
 #include "exm_fts.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/main_handler.h
index 3eee70bad..764a36935 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/main_handler.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include "dds_handler.h"
 #include "exm_db.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.cpp
index 434d7580e..7d3053b8c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.cpp
@@ -17,7 +17,7 @@
 #include <DBAdministration/copy_exercise.h>
 #include <DBAdministration/exercise_table_generator.h>
 #include <Lts/Common/ProjectConfig/project_defines.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 namespace ExerciseManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.h
index d16d5c30d..1b4a9971f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "dds_handler.h"
 #include <Core/core_types.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/settings.h
index 21c1d2f09..5c9f2ee64 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/settings.h
@@ -6,8 +6,8 @@
   */
 
 #pragma once
-#include <QString>
-#include <QPair>
+#include <QtCore/QString>
+#include <QtCore/QPair>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp
index 0779f51a4..ed2c73e46 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp
@@ -16,13 +16,13 @@
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
 
-#include <QTimer>
-#include <QDateTime>
-#include <QTest>
-#include <QSet>
-#include <QVector>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
+#include <QtTest/QTest>
+#include <QtCore/QSet>
+#include <QtCore/QVector>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
 #include <LtsUtils/pgarray.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.h
index 0ff28da8e..67a2c0a31 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.h
@@ -21,7 +21,7 @@
 #include <DDS/DDSConnector/dds_connector.h>
 
 #include <FileManagement/logger.h>
-#include <QPixmap>
+#include <QtGui/QPixmap>
 #include <ngldb/db_service_handler.h>
 
 namespace FileManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/Messages/reply_message.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/Messages/reply_message.h
index a768685de..2ef1f91e4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/Messages/reply_message.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/Messages/reply_message.h
@@ -10,8 +10,8 @@
 
 #include <LtsWebSocket/reply_message.h>
 
-#include <QJsonArray>
-#include <QString>
+#include <QtCore/QJsonArray>
+#include <QtCore/QString>
 
 namespace FileManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/json_keys.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/json_keys.h
index 5c63fb895..8fac48e65 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/json_keys.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/json_keys.h
@@ -8,7 +8,7 @@
   */
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 #include <OcBaseDownload/WebSocketInterface/json_keys.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/flm_db_impl_custom.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/flm_db_impl_custom.cpp
index 61788ce48..b97770f4d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/flm_db_impl_custom.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/flm_db_impl_custom.cpp
@@ -9,7 +9,7 @@
 #include "flm_db_impl_custom.h"
 #include <ngldb/nsqlquery.h>
 #include <ngldb/sql_query_janitor.h>
-#include <QRegularExpression>
+#include <QtCore/QRegularExpression>
 
 namespace FileManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/flm_dtc_impl_custom.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/flm_dtc_impl_custom.cpp
index e1175dbf2..514822e0c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/flm_dtc_impl_custom.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/flm_dtc_impl_custom.cpp
@@ -12,8 +12,8 @@
 #include <DDS/DTC/generic_dtc.h>
 #include <DDS/Generic/generic_data_reader.h>
 
-#include <QSet>
-#include <QVector>
+#include <QtCore/QSet>
+#include <QtCore/QVector>
 #include <unordered_map>
 
 //---------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_content.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_content.cpp
index 9f885b8e1..5e12d8c3f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_content.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_content.cpp
@@ -14,8 +14,8 @@
 #include "flm_db.h"
 #include "convert_db_to_dds.h"
 
-#include <QDir>
-#include <QFile>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
 
 //----------------------------------------------------------------------------------------------------------------------------
 namespace FileManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_content.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_content.h
index 3299f4c9c..a457afbe2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_content.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_content.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <QMap>
-#include <QVariant>
+#include <QtCore/QMap>
+#include <QtCore/QVariant>
 
 #include "base.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_type_info.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_type_info.h
index 975fb6e83..3d0e0f2a8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_type_info.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_type_info.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "base.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_folder.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_folder.h
index fd379deb5..7b93dbf27 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_folder.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_folder.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "base.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.h
index 8ce826c48..7fb15dd3f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "dds_handler.h"
 #include "flm_db.h"
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_server.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_server.h
index 1ef298df5..a7b740a18 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_server.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_server.h
@@ -8,7 +8,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <tcpserver/tcpserver.h>
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/settings.h
index bd89bf3ca..6ac258921 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/settings.h
@@ -8,8 +8,8 @@
   */
 
 #pragma once
-#include <QString>
-#include <QPair>
+#include <QtCore/QString>
+#include <QtCore/QPair>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/thp_script_httq.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/thp_script_httq.cpp
index 0e4b45b8f..5a4a74533 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/thp_script_httq.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/thp_script_httq.cpp
@@ -12,18 +12,18 @@
 
 #include <QtWebSockets/QWebSocket>
 #include <QtWebSockets/QWebSocketServer>
-#include <QFile>
+#include <QtCore/QFile>
 #include <QJsonParseError>
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QTemporaryFile>
-//#include <QSaveFile>
-#include <QDateTime>
-#include <QFileInfo>
-#include <QDir>
-#include <QUrlQuery>
-#include <QDebug>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QTemporaryFile>
+//#include <QtCore/QSaveFile>
+#include <QtCore/QDateTime>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
+#include <QtCore/QUrlQuery>
+#include <QtCore/QDebug>
 
 
 #define L QStringLiteral
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_aes_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_aes_filter.h
index ec961a064..f6bbbbde6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_aes_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_aes_filter.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 #include <FilterManagement/flt_fts.h>
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_building_component_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_building_component_filter.h
index 7d829e4a6..5545c6d74 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_building_component_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_building_component_filter.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 #include <FilterManagement/flt_fts.h>
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_filter_data_update.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_filter_data_update.h
index d040418ba..2a1e3c8a7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_filter_data_update.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_filter_data_update.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 #include <FilterManagement/flt_fts.h>
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_symbol_appearance.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_symbol_appearance.h
index 0daf3c9b8..73a2b8be1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_symbol_appearance.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_symbol_appearance.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 #include <FilterManagement/flt_fts.h>
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/settings.h
index 347cc5cce..20f888c52 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/handler_ied.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/handler_ied.cpp
index 734a231cc..c8c469e75 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/handler_ied.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/handler_ied.cpp
@@ -14,7 +14,7 @@
 
 #include <Proxies/TrainingAreaBase/tab_dtc.h>
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <ngldb/dbtransaction.h>
 #include <ngldb/nsqlquery.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/main_handler.h
index 8f1ae1524..c659ee948 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/main_handler.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 
 #include "dds_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/object_ied.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/object_ied.h
index 219d0b63a..5a6ac4c25 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/object_ied.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/object_ied.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "dds_handler.h"
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/settings.h
index 9b12096e1..379a5ca5d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/UnitTests/gmp_minefieldInterpreter_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/UnitTests/gmp_minefieldInterpreter_test.cpp
index 55a6d93c1..0e9818a09 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/UnitTests/gmp_minefieldInterpreter_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/UnitTests/gmp_minefieldInterpreter_test.cpp
@@ -9,8 +9,8 @@
 
 #include "gmp_minefieldInterpreter_test.h"
 
-#include <QCoreApplication>
-#include <QDateTime>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDateTime>
 #include <QtTest/QTest>
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/UnitTests/gmp_minefieldInterpreter_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/UnitTests/gmp_minefieldInterpreter_test.h
index d447a3746..5797f319a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/UnitTests/gmp_minefieldInterpreter_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/UnitTests/gmp_minefieldInterpreter_test.h
@@ -8,10 +8,10 @@
   */
 #pragma once
 
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 #include <QSignalSpy>
-#include <QPair>
+#include <QtCore/QPair>
 
 #include "../zssi_wi_Minenfeld_Interpreter.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/handler_minelayer_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/handler_minelayer_data.cpp
index 2571ffb98..476d6e97e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/handler_minelayer_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/handler_minelayer_data.cpp
@@ -18,7 +18,7 @@
 #include "dds_handler.h"
 #include "zssi_wi_Minenfeld_Interpreter.h"
 
-#include <QLineF>
+#include <QtCore/QLineF>
 
 #if BUILD_RTI
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/handler_minelayer_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/handler_minelayer_data.h
index c1faad494..58a6fd9ae 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/handler_minelayer_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/handler_minelayer_data.h
@@ -8,9 +8,9 @@
   */
 #pragma once
 
-#include <QObject>
-#include <QPointF>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QPointF>
+#include <QtCore/QTimer>
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ParticipantManagement/ppm.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/settings.h
index 03d4f57a4..df88911bd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 #include "gmp_export.h"
 
 namespace NGL
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Generator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Generator.cpp
index 6e66a759b..86f4ca713 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Generator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Generator.cpp
@@ -46,7 +46,7 @@ static char rcs_id[] = "$Id$";
 
 //------------------ includes ------------------------------
 
-#include <QString>
+#include <QtCore/QString>
 
 #include <stdio.h>
 #include <iostream>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Generator.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Generator.h
index ed3b903f4..7a7a04387 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Generator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Generator.h
@@ -48,7 +48,7 @@
 #define ZSSI_WI_MINENFELD_GENERATOR_H
 
 /*------------------ includes ----------------------------*/
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "GFS_map_cont.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Interpreter.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Interpreter.h
index ae44970e6..0e7252ccf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Interpreter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Interpreter.h
@@ -45,7 +45,7 @@
 
 /*------------------ includes ----------------------------*/
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "GFS_map_cont.h"
 #include "zssi_wi_Minenfeld_Generator.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/ism_import_buildings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/ism_import_buildings.cpp
index 70e8593c0..f9f873e39 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/ism_import_buildings.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/ism_import_buildings.cpp
@@ -13,16 +13,16 @@
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
 
-#include <QFile>
-#include <QTextStream>
-#include <QTimer>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QFile>
+#include <QtCore/QTextStream>
+#include <QtCore/QTimer>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 #include <QtWebSockets/QWebSocket>
-#include <QUrl>
+#include <QtCore/QUrl>
 
-#include <QThread>
+#include <QtCore/QThread>
 
 #include <InfrastructureManagement/ism_ftc.h>
 #include <InfrastructureManagement/ism_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/ism_import_buildings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/ism_import_buildings.h
index 321ca0e1c..8df0e58f6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/ism_import_buildings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/ism_import_buildings.h
@@ -13,7 +13,7 @@
 #include <InfrastructureManagement/ism_dtc.h>
 #include <DDS/DDSConnector/dds_connector.h>
 #include <InfrastructureManagement/logger.h>
-#include <QVector>
+#include <QtCore/QVector>
 
 //----------------------------------------------------------------------------------------------
 namespace InfrastructureManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp
index c967f85c7..4f4c7103d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp
@@ -13,13 +13,13 @@
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
 
-#include <QTimer>
-#include <QDateTime>
-#include <QTest>
-#include <QSet>
-#include <QVector>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
+#include <QtTest/QTest>
+#include <QtCore/QSet>
+#include <QtCore/QVector>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
 #include <LtsUtils/pgarray.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/WebSocketInterface/Messages/client_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/WebSocketInterface/Messages/client_message.cpp
index 7ba4f39a1..c609b779d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/WebSocketInterface/Messages/client_message.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/WebSocketInterface/Messages/client_message.cpp
@@ -14,7 +14,7 @@
 
 #include <QtCore/QJsonDocument>
 #include <QtCore/QUuid>
-#include <QSet>
+#include <QtCore/QSet>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/WebSocketInterface/data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/WebSocketInterface/data_manager.cpp
index f3bc1f41a..c1de9fe83 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/WebSocketInterface/data_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/WebSocketInterface/data_manager.cpp
@@ -24,8 +24,8 @@
 #include <InfrastructureManagement/ism_translation.h>
 #include <AssetManagement/asm_dtc.h>
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <LtsCoordTrans/lts_coord_trans.h>
 
 using namespace InfrastructureManagement;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_effect_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_effect_area.cpp
index a05404637..022190de7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_effect_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_effect_area.cpp
@@ -15,10 +15,10 @@
 #include "object_effect_area.h"
 #include "main_handler.h"
 
-#include <QDebug>
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QJsonArray>
+#include <QtCore/QDebug>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
 
 
 namespace InfrastructureManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_effect_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_effect_area.h
index c5dd4f7a1..73461249b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_effect_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_effect_area.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QHash>
+#include <QtCore/QHash>
 
 #include "base.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_instrumentation_asset.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_instrumentation_asset.h
index fddfd03cd..4ef7b4dd1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_instrumentation_asset.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_instrumentation_asset.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QHash>
+#include <QtCore/QHash>
 
 #include "base.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_schedule.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_schedule.h
index 0bab86e74..8301cc0c4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_schedule.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_schedule.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QHash>
+#include <QtCore/QHash>
 
 #include "base.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_structure_element.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_structure_element.cpp
index d2fc52609..bb6422365 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_structure_element.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_structure_element.cpp
@@ -16,8 +16,8 @@
 #include "object_instrumentation_asset.h"
 #include <ngldb/dbtransaction.h>
 #include "convert_db_to_dds.h"
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
 namespace InfrastructureManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_structure_element.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_structure_element.h
index 2a9d09554..496f4909b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_structure_element.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_structure_element.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <QMap>
-#include <QSet>
+#include <QtCore/QMap>
+#include <QtCore/QSet>
 #include "main_handler.h"
 #include "base.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_mounting_point_asset.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_mounting_point_asset.h
index f8250a9ee..9aef5710b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_mounting_point_asset.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_mounting_point_asset.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QHash>
+#include <QtCore/QHash>
 
 #include "base.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_special_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_special_area.h
index 04b6d7fdf..d59dbb77c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_special_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_special_area.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QHash>
+#include <QtCore/QHash>
 
 #include "base.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc_impl_custom.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc_impl_custom.cpp
index 0ac3a8952..3c6145c56 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc_impl_custom.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc_impl_custom.cpp
@@ -17,20 +17,20 @@
 #include <LtsCoordTrans/lts_coord_trans.h>
 
 
-#include <QSet>
-#include <QVector>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QSet>
+#include <QtCore/QVector>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
 #include <QtGui/QPolygonF>
 #include <QtGui/QTransform>
 #include <unordered_map>
 #include <algorithm>
-#include <QFile>
+#include <QtCore/QFile>
 
-#include <QMutex>
-#include <QMutexLocker>
+#include <QtCore/QMutex>
+#include <QtCore/QMutexLocker>
 
 //---------------------------------------------------------------------------------------------------------------------------------------------
 namespace InfrastructureManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc_impl_custom_p.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc_impl_custom_p.h
index 1b9b16f74..5fd893173 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc_impl_custom_p.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc_impl_custom_p.h
@@ -12,7 +12,7 @@
 #include <utility>
 #include  <LtsCoordinate/lts_coord_vector.h>
 
-#include <QHash>
+#include <QtCore/QHash>
 #include <QPolygonF>
 #include <QTransform>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_schedule.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_schedule.cpp
index 6f60b711f..64636f9d4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_schedule.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_schedule.cpp
@@ -9,7 +9,7 @@
 
 #include "object_main_schedule.h"
 #include <ngldb/dbtransaction.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 using namespace InfrastructureManagement;
 //----------------------------------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.cpp
index f2d4f443a..116eef970 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.cpp
@@ -19,8 +19,8 @@
 #include <LtsUtilsCore/json_object.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 
-#include <QJsonObject>
-#include <QTimer>
+#include <QtCore/QJsonObject>
+#include <QtCore/QTimer>
 
 namespace
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.h
index 6060067d5..e044c6dd7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <QMap>
-#include <QJsonArray>
+#include <QtCore/QMap>
+#include <QtCore/QJsonArray>
 #include "base.h"
 #include <Core/core_types.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_special_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_special_area.cpp
index 493846d87..b10cd96c2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_special_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_special_area.cpp
@@ -10,7 +10,7 @@
 #include "object_special_area.h"
 #include <utility>
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <QPolygonF>
 
 namespace InfrastructureManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_special_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_special_area.h
index 7d0f72458..d981dbdd3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_special_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_special_area.h
@@ -15,7 +15,7 @@
 #include <InfrastructureManagement/ism_db.h>
 
 #include <QtCore/QPointF>
-#include <QString>
+#include <QtCore/QString>
 #include <LtsCoordTrans/lts_coord_trans.h>
 
 namespace InfrastructureManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.cpp
index 31e845d2e..5a8d21307 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.cpp
@@ -8,13 +8,13 @@
   */
 
 #include "parse_building_xml.h"
-#include <QDomDocument>
-#include <QFile>
-#include <QPointF>
+#include <QtXml/QDomDocument>
+#include <QtCore/QFile>
+#include <QtCore/QPointF>
 
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.h
index 88eaefb20..0fded54cb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.h
@@ -10,8 +10,8 @@
 
 #include "svcismclient_export.h"
 
-#include <QObject>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 #include <InfrastructureManagement/ism_dtc.h>
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_manager.h
index 511780f2e..a575059e5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_manager.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
 
 #include <InfrastructureManagement/ism_enums.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_state_machine.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_state_machine.h
index 6f6cd4908..11c90addb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_state_machine.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_state_machine.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QStateMachine>
 
 #include <InfrastructureManagement/ism_enums.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/settings.cpp
index 9e38207da..286f91dec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/settings.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/settings.cpp
@@ -9,8 +9,8 @@
 
 #include "settings.h"
 
-#include <QSettings>
-#include <QVariant>
+#include <QtCore/QSettings>
+#include <QtCore/QVariant>
 #include <nglsettings/nglsettings_settings.h>
 #include <ngltools/ngltools_filesystem.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/settings.h
index 049e88cfc..15a272a00 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/settings.h
@@ -8,7 +8,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/ModuleTests/mrk_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/ModuleTests/mrk_tests.cpp
index f956f6b79..faa00bdfa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/ModuleTests/mrk_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/ModuleTests/mrk_tests.cpp
@@ -9,10 +9,10 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QDateTime>
-#include <QString>
-#include <QVector>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 
 #include <MarkerManagement/mrk_ftc.h>
 #include <MarkerManagement/mrk_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_snapshot.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_snapshot.h
index d61cf2cf5..d51632a2d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_snapshot.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_snapshot.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QVector>
+#include <QtCore/QVector>
 #include "dds_handler.h"
 #include "mrk_db.h"
 #include <Core/core_types.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/settings.h
index 467a94512..850d367c7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/settings.h
@@ -7,7 +7,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/ModuleTests/msg_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/ModuleTests/msg_tests.cpp
index b0494f47e..989afe98e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/ModuleTests/msg_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/ModuleTests/msg_tests.cpp
@@ -9,8 +9,8 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
 
 #include <Messaging/msg_ftc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercise_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercise_handler.h
index c20db984c..3da408b33 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercise_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercise_handler.h
@@ -10,8 +10,8 @@
 
 #include "dds_handler.h"
 #include "logger.h"
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 #include <TrainingAreaBase/tab_ftc.h>
 #include <OcSituationServer/oss_ftc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercises_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercises_handler.h
index 16473eae3..8c81fad15 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercises_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercises_handler.h
@@ -11,8 +11,8 @@
 #include "dds_handler.h"
 #include "logger.h"
 
-#include <QObject>
-#include <QHash>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
 #include <ParticipantManagement/ppm.hpp>
 #include <OcSituationServer/oss_dtc.h>
 #include <TrainingAreaBase/tab.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/handler_operator_message.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/handler_operator_message.h
index 865f483ba..baac013b4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/handler_operator_message.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/handler_operator_message.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "dds_handler.h"
 #include "exercises_handler.h"
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/settings.h
index 3c1796802..400866d03 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_infrastructure_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_infrastructure_data.h
index db6497115..485908a71 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_infrastructure_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_infrastructure_data.h
@@ -16,8 +16,8 @@
 #include <InfrastructureManagement/ism_dtc_types.h>
 #include <DDS/DTC/generic_dtc_impl.h>
 
-#include <QObject>
-#include <QHash>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
 
 namespace MeteoDataManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_unit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_unit.cpp
index 12706750a..88c12af19 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_unit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_unit.cpp
@@ -12,8 +12,8 @@
 #include "handler_infrastructure_data.h"
 #include "tcpweatherstation.h"
 #include "main_handler.h"
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 using namespace MeteoDataManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_units.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_units.h
index cae052b59..a51840ad2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_units.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_units.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 #include "handler_meteo_data_unit.h"
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/settings.h
index 0b6541658..d17956a5a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpclimate.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpclimate.h
index b6965bffc..32bcfb7db 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpclimate.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpclimate.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #include "tcpsocket.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpsocket.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpsocket.cpp
index 8a443fe19..c9229a181 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpsocket.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpsocket.cpp
@@ -8,7 +8,7 @@
 
 #include "tcpsocket.h"
 
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QHostInfo>
 //#include <sys/socket.h>   // used for keepalive
 //#include <netinet/tcp.h>  // used for keepalive
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpsocket.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpsocket.h
index 3636b90bb..59a9abf93 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpsocket.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpsocket.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QTcpSocket>
+#include <QtNetwork/QTcpSocket>
 #include "logger.h"
 
 namespace MeteoDataManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpweatherstation.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpweatherstation.h
index ac36ffd59..8f4a740ad 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpweatherstation.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpweatherstation.h
@@ -8,7 +8,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "logger.h"
 
 namespace MeteoDataManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpwind.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpwind.h
index 671ffe17c..0f58832ee 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpwind.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpwind.h
@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #include "tcpsocket.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/dds_handler.h
index 4fa08ca97..086c8a8c5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/dds_handler.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <DDS/DDSConnector/dds_connector.h>
 #include <DDS/Core/core_dts_types.h>
 #include <DDS/Core/core_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/main_handler.h
index f8705a815..a7c06f1c1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/main_handler.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include "dds_handler.h"
 #include "socket_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.cpp
index 07220a933..914f9b327 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.cpp
@@ -5,8 +5,8 @@
   * $Author$
   * Created by Gerlinde Rudolphus, SLTE, 2022-06-09
   */
-#include <QTime>
-#include <QDateTime>
+#include <QtCore/QTime>
+#include <QtCore/QDateTime>
 #include "nmea_handler.h"
 namespace NmeaManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.h
index fb5cbb9ea..35f0d7735 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.h
@@ -11,7 +11,7 @@
 
 #include <cmath>
 #include <QQueue>
-#include <QObject>
+#include <QtCore/QObject>
 #include "dds_handler.h"
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/settings.h
index e2c47260b..b6c4b037f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/settings.h
@@ -7,7 +7,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/socket_handler.cpp
index ef891d8a5..c88e6e529 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/socket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/socket_handler.cpp
@@ -7,7 +7,7 @@
   */
 
 #include "socket_handler.h"
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QLatin1String>
 #include "nmea_handler.h"
 #include  <QHostAddress>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/socket_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/socket_handler.h
index 4ed9cfb6d..e6d56c4eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/socket_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/socket_handler.h
@@ -8,16 +8,16 @@
 
 #pragma once
 
-#include <QObject>
-#include <QTcpSocket>
-#include <QTcpServer>
-#include <QUdpSocket>
+#include <QtCore/QObject>
+#include <QtNetwork/QTcpSocket>
+#include <QtNetwork/QTcpServer>
+#include <QtNetwork/QUdpSocket>
 #include <QAbstractSocket>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <NmeaManagement/nme_dts.h>
 #include <NmeaManagement/nme_fts.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "dds_handler.h"
 #include "nmea_handler.h"
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/ModuleTests/nom_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/ModuleTests/nom_tests.cpp
index b74ea5a5b..2adf6c6e5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/ModuleTests/nom_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/ModuleTests/nom_tests.cpp
@@ -10,10 +10,10 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QDateTime>
-#include <QString>
-#include <QVector>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 
 #include <NotificationManagement/nom_ftc.h>
 #include <NotificationManagement/nom_dtc.h>
@@ -23,7 +23,7 @@
 #include <NotificationManagement/settings.h>
 #include <LtsUtilsSettings/settings.h>
 #include <nglsettings/nglsettings_settings.h>
-#include <QSettings>
+#include <QtCore/QSettings>
 
 using namespace NotificationManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/handler_notification.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/handler_notification.h
index eb25ccff3..59d519707 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/handler_notification.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/handler_notification.h
@@ -9,7 +9,7 @@
 
 #include "dds_handler.h"
 #include <NotificationManagement/nom_db.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace NotificationManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.cpp
index bb22c8a42..168bb225d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.cpp
@@ -11,9 +11,9 @@
 #include "dds_handler.h"
 #include <ngldb/dbtransaction.h>
 
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
 
 namespace NotificationManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/settings.h
index 7b6c67b39..e4d1db5a2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/client_message.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/client_message.h
index 8d9bc417e..0236aa754 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/client_message.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/client_message.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #include <QtCore/QJsonObject>
-#include <QVector>
+#include <QtCore/QVector>
 
 #include <DDS/Core/core.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/reply_message.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/reply_message.h
index 20cdc0fa6..e11726926 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/reply_message.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/reply_message.h
@@ -12,8 +12,8 @@
 
 #include <DDS/Core/core.hpp>
 
-#include <QString>
-#include <QMap>
+#include <QtCore/QString>
+#include <QtCore/QMap>
 
 #include <QtCore/QVector>
 #include <QtCore/QJsonObject>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/data_manager.cpp
index fd7082880..ba3f95722 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/data_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/data_manager.cpp
@@ -9,7 +9,7 @@
   */
 #include "WebSocketInterface/data_manager.h"
 
-#include <QVector>
+#include <QtCore/QVector>
 
 namespace OcBaseDownload
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/websocket_interface_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/websocket_interface_handler.cpp
index e36a5372a..e18d3e824 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/websocket_interface_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/websocket_interface_handler.cpp
@@ -13,7 +13,7 @@
 #include "data_manager.h"
 #include "WebSocketInterface/Messages/client_message.h"
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace OcBaseDownload
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/websocket_interface_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/websocket_interface_handler.h
index 8a9065ef7..9430cccac 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/websocket_interface_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/websocket_interface_handler.h
@@ -8,8 +8,8 @@
   */
 #pragma once
 
-#include <QObject>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 
 #include <LtsWebSocket/lts_web_socket_client.h>
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/copy_database.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/copy_database.cpp
index 02cb44b0a..f07bf1646 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/copy_database.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/copy_database.cpp
@@ -14,10 +14,10 @@
 #include <ngldb/nsqlquery.h>
 #include <ngltools/ngltools_filesystem.h>
 
-#include <QDir>
-#include <QFile>
-#include <QProcess>
-#include <QSettings>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QProcess>
+#include <QtCore/QSettings>
 
 namespace OcBaseDownload
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/copy_database.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/copy_database.h
index 2141f2f6e..10c4e31d2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/copy_database.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/copy_database.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QProcess>
+#include <QtCore/QObject>
+#include <QtCore/QProcess>
 
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.cpp
index 88d53c020..1adbd2b04 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.cpp
@@ -9,11 +9,11 @@
 #include "handler_base_download.h"
 #include <utility>
 
-#include <QStringList>
-#include <QSettings>
-#include <QSqlDriver>
-#include <QSqlField>
-#include <QSqlRecord>
+#include <QtCore/QStringList>
+#include <QtCore/QSettings>
+#include <QtSql/QSqlDriver>
+#include <QtSql/QSqlField>
+#include <QtSql/QSqlRecord>
 
 #include <ngldb/dbconnection.h>
 #include <ngldb/dbtransaction.h>
@@ -25,8 +25,8 @@
 
 #include <ngltools/ngltools_filesystem.h>
 #include <DDS/Core/pacemaker.h>
-#include <QUuid>
-#include <QDateTime>
+#include <QtCore/QUuid>
+#include <QtCore/QDateTime>
 #include "copy_database.h"
 #include "main_handler.h"
 #include "settings.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.h
index d2e6f21d5..d7ac16f31 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.h
@@ -8,9 +8,9 @@
 #pragma once
 
 #include <QElapsedTimer>
-#include <QObject>
-#include <QSqlDatabase>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtSql/QSqlDatabase>
+#include <QtCore/QTimer>
 
 // db
 #include <AssetManagement/asm_db.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_pdf_download.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_pdf_download.cpp
index 6f6975a70..9b5bb4bc3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_pdf_download.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_pdf_download.cpp
@@ -10,7 +10,7 @@
 #include <utility>
 
 #include "WebSocketInterface/Messages/reply_message.h"
-#include <QUuid>
+#include <QtCore/QUuid>
 #include "pdf_downloader.h"
 #include <ngldb/db_service_handler.h>
 #include <nglsettings/nglsettings_connections.h>
@@ -22,8 +22,8 @@
 #include <ngltools/ngltools_filesystem.h>
 #include "main_handler.h"
 #include "settings.h"
-#include <QFileInfo>
-#include <QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
 
 namespace OcBaseDownload
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_pdf_download.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_pdf_download.h
index 4b17aea42..7b914484a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_pdf_download.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_pdf_download.h
@@ -9,7 +9,7 @@
 
 // dds
 #include <OcBaseDownload/obd_fts.h>
-#include <QSqlDatabase>
+#include <QtSql/QSqlDatabase>
 #include <FileManagement/flm_db.h>
 #include <FileManagement/flm_db_impl_custom.h>
 #include "WebSocketInterface/Messages/client_message.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/main_handler.h
index c75a9ed42..61b146de0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/main_handler.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 
 #include <ServiceManagement/scm_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_download_socket.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_download_socket.cpp
index 943d42673..76fa7f537 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_download_socket.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_download_socket.cpp
@@ -11,7 +11,7 @@
 #include <nglsettings/nglsettings_connections.h>
 #include <nglsettings/nglsettings_settings.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace OcBaseDownload
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_download_socket.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_download_socket.h
index b6b8a649f..f1c6cc94d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_download_socket.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_download_socket.h
@@ -9,9 +9,9 @@
 #pragma once
 
 #include "logger.h"
-#include <QObject>
-#include <QTcpSocket>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtNetwork/QTcpSocket>
+#include <QtCore/QString>
 
 class QTimer;
 namespace OcBaseDownload
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_downloader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_downloader.cpp
index ff80b1241..5adabea3f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_downloader.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_downloader.cpp
@@ -17,7 +17,7 @@
 #include <ngldb/db_service_handler.h>
 #include <ngltools/ngltools_filesystem.h>
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 
 namespace OcBaseDownload
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_downloader.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_downloader.h
index 271a01915..3576eb4eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_downloader.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_downloader.h
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include <QObject>
-#include <QString>
-#include <QVector>
-#include <QSqlDatabase>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QVector>
+#include <QtSql/QSqlDatabase>
 
 #include <DBAdministration/exercise_table_generator.h>
 #include <FileManagement/flm_db.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/settings.cpp
index 53f90e107..7f0917ea8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/settings.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/settings.cpp
@@ -10,7 +10,7 @@
 #include <QtCore/QSettings>
 #include <nglsettings/nglsettings_settings.h>
 #include <ngltools/ngltools_filesystem.h>
-#include <QDir>
+#include <QtCore/QDir>
 namespace OcBaseDownload
 {
 class NGLSettingsClass : public NGL::Settings
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/settings.h
index 80b60ee83..f712a2395 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/Messages/client_message.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/Messages/client_message.h
index 0d3a3f91c..7375e2c51 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/Messages/client_message.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/Messages/client_message.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #include <QtCore/QJsonObject>
-#include <QVector>
+#include <QtCore/QVector>
 
 #include <DDS/Core/core.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/Messages/reply_message.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/Messages/reply_message.h
index a21033b2b..996bcd5ca 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/Messages/reply_message.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/Messages/reply_message.h
@@ -12,8 +12,8 @@
 
 #include <DDS/Core/core.hpp>
 
-#include <QString>
-#include <QMap>
+#include <QtCore/QString>
+#include <QtCore/QMap>
 
 #include <QtCore/QVector>
 #include <QtCore/QJsonObject>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/data_manager.cpp
index 7e1e7d391..95e65e9f3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/data_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/data_manager.cpp
@@ -11,10 +11,10 @@
 
 #include "main_handler.h"
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QMap>
-#include <QVector>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QMap>
+#include <QtCore/QVector>
 
 namespace OcSituationClient
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/websocket_interface_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/websocket_interface_handler.h
index 077a4994e..e4ca80905 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/websocket_interface_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/websocket_interface_handler.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #include <QtCore/QObject>
-#include <QString>
+#include <QtCore/QString>
 
 #include <LtsWebSocket/lts_web_socket_client.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/central_aes_byte_reader.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/central_aes_byte_reader.h
index 3584c4ac6..5bbefb23a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/central_aes_byte_reader.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/central_aes_byte_reader.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QByteArray>
+#include <QtCore/QByteArray>
 #include "AreaEffectSimulation/aes_dtc.h"
 #include "OcSituationServer/oc_situation.h"
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.h
index 621b221ff..cc70c0c16 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.h
@@ -7,8 +7,8 @@
   */
 #pragma once
 
-#include <QObject>
-#include <QPointF>
+#include <QtCore/QObject>
+#include <QtCore/QPointF>
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_central_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_central_aes_data.cpp
index 8d1b843ac..3f2aaf2a8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_central_aes_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_central_aes_data.cpp
@@ -8,9 +8,9 @@
 
 #include "handler_oc_central_aes_data.h"
 
-#include <QLineF>
-#include <QPointF>
-#include <QTimer>
+#include <QtCore/QLineF>
+#include <QtCore/QPointF>
+#include <QtCore/QTimer>
 #include <Common/LtsCoordTrans/lts_coord_trans.h>
 #include <LtsUtils/qbytearray_byteaccess.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_central_aes_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_central_aes_data.h
index 6eb68e3ad..f337fa449 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_central_aes_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_central_aes_data.h
@@ -7,9 +7,9 @@
   */
 #pragma once
 
-#include <QObject>
-#include <QHash>
-#include <QSet>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtCore/QSet>
 
 #include <OcSituationServer/oc_situation.h>
 #include <AreaEffectSimulation/aes_ftc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.h
index 19c16e759..949be2f04 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.h
@@ -7,8 +7,8 @@
   */
 #pragma once
 
-#include <QMap>
-#include <QTimer>
+#include <QtCore/QMap>
+#include <QtCore/QTimer>
 
 #include <OcSituationServer/oc_situation.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.h
index 31718dd37..3cefb9583 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QHash>
+#include <QtCore/QHash>
 
 #include <ParticipantManagement/ppm.hpp>
 #include <ParticipantManagement/ppm_ftc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/main_handler.h
index adab38b9a..e72a66fc4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/main_handler.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 
 #include <AreaEffectSimulation/aes_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/settings.h
index 1dba58dd0..60f5fdf09 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/central_aes_data_queue.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/central_aes_data_queue.h
index c63342743..d18779800 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/central_aes_data_queue.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/central_aes_data_queue.h
@@ -9,10 +9,10 @@
 
 #include <QQueue>
 #include "oc_situation.h"
-#include <QObject>
+#include <QtCore/QObject>
 #include "logger.h"
-#include <QMutex>
-#include <QMutexLocker>
+#include <QtCore/QMutex>
+#include <QtCore/QMutexLocker>
 #include "central_aes_data_builder.h"
 
 namespace OcSituationServer
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.cpp
index 3a8fe0e83..0efc0474c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.cpp
@@ -10,7 +10,7 @@
 #include <utility>
 #include <functional>
 
-#include <QByteArray>
+#include <QtCore/QByteArray>
 
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <LtsUtils/qbytearray_byteaccess.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.h
index a6462130b..806c7c6d6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.h
@@ -7,10 +7,10 @@
   */
 #pragma once
 
-#include <QObject>
-#include <QTimer>
-#include <QMap>
-#include <QSet>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+#include <QtCore/QMap>
+#include <QtCore/QSet>
 #include <functional>
 
 #include "main_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.cpp
index a16f92518..94d7747d3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.cpp
@@ -15,7 +15,7 @@
 #include <LtsUtils/LtsUtilsCore/outdated_position.h>
 #include <ParticipantManagement/ppm_common.h>
 #include "settings.h"
-#include <QLineF>
+#include <QtCore/QLineF>
 #include "central_aes_data_queue.h"
 #include <QMultiMap>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.h
index 78c5d3dec..50dc6481c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.h
@@ -7,13 +7,13 @@
   */
 #pragma once
 
-#include <QMutex>
-#include <QObject>
-#include <QTimer>
-#include <QThread>
-#include <QVector>
+#include <QtCore/QMutex>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+#include <QtCore/QThread>
+#include <QtCore/QVector>
 #include <QPolygonF>
-#include <QSet>
+#include <QtCore/QSet>
 
 #include <AreaEffectSimulation/aes_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.cpp
index 639372c7b..f416f55c9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.cpp
@@ -8,7 +8,7 @@
 
 #include "handler_oc_data.h"
 
-#include <QMutexLocker>
+#include <QtCore/QMutexLocker>
 
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <LtsUtils/qbytearray_byteaccess.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.h
index 3e8e28e7a..acd934668 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.h
@@ -10,9 +10,9 @@
 #include "main_handler.h"
 #include "logger.h"
 
-#include <QMap>
-#include <QMutex>
-#include <QTimer>
+#include <QtCore/QMap>
+#include <QtCore/QMutex>
+#include <QtCore/QTimer>
 
 namespace OcSituationServer
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.h
index 8c72847c3..f3c8f3462 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.h
@@ -7,14 +7,14 @@
   */
 #pragma once
 
-#include <QMap>
-#include <QMutex>
-#include <QObject>
-#include <QPair>
-#include <QSet>
-#include <QTimer>
-#include <QThread>
-#include <QVector>
+#include <QtCore/QMap>
+#include <QtCore/QMutex>
+#include <QtCore/QObject>
+#include <QtCore/QPair>
+#include <QtCore/QSet>
+#include <QtCore/QTimer>
+#include <QtCore/QThread>
+#include <QtCore/QVector>
 
 #include <AreaEffectSimulation/aes_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/main_handler.h
index 50a763945..cb43def88 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/main_handler.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 
 #include <AreaEffectSimulation/aes_dtc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/position_converter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/position_converter.cpp
index 99b69b473..0aa71e335 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/position_converter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/position_converter.cpp
@@ -10,7 +10,7 @@
 
 #include <AssetManagement/asm_dtc.h>
 #include <ExerciseManagement/exm_dtc.h>
-#include <QMutex>
+#include <QtCore/QMutex>
 
 namespace OcSituationServer
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/settings.h
index f7bd985ae..577c7f974 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/ModuleTests/opm_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/ModuleTests/opm_tests.cpp
index 622d8583b..4291e86fa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/ModuleTests/opm_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/ModuleTests/opm_tests.cpp
@@ -14,10 +14,10 @@
 #include <OperatorManagement/opm_dtc.h>
 #include <AreaEffectSimulation/aes_operator_rights.h>
 
-#include <QTimer>
-#include <QTest>
-#include <QCryptographicHash>
-#include <QVector>
+#include <QtCore/QTimer>
+#include <QtTest/QTest>
+#include <QtCore/QCryptographicHash>
+#include <QtCore/QVector>
 
 using namespace OperatorManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/WebSocketInterface/Messages/reply_message.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/WebSocketInterface/Messages/reply_message.h
index da91b1d96..ada2b2025 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/WebSocketInterface/Messages/reply_message.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/WebSocketInterface/Messages/reply_message.h
@@ -10,8 +10,8 @@
 
 #include <LtsWebSocket/reply_message.h>
 
-#include <QJsonArray>
-#include <QString>
+#include <QtCore/QJsonArray>
+#include <QtCore/QString>
 
 namespace OperatorManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/WebSocketInterface/json_keys.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/WebSocketInterface/json_keys.h
index ec3593044..74dfde525 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/WebSocketInterface/json_keys.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/WebSocketInterface/json_keys.h
@@ -8,7 +8,7 @@
   */
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 #include <OcBaseDownload/WebSocketInterface/json_keys.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_access_control_level.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_access_control_level.h
index a219c5104..a020271bc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_access_control_level.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_access_control_level.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "main_handler.h"
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_active_apps.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_active_apps.h
index e9c947550..89fa43802 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_active_apps.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_active_apps.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QHash>
+#include <QtCore/QHash>
 #include <OperatorManagement/opm_dts.h>
 #include <OperatorManagement/opm_fts.h>
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_group.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_group.h
index 2886d733f..6706445ff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_group.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_group.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "main_handler.h"
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.h
index 2dc36990a..bbe07a17a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "logger.h"
 #include "opm_db.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.cpp
index 766b927e3..7200ec7df 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.cpp
@@ -13,9 +13,9 @@
 #include "object_operator.h"
 #include "handler_group.h"
 #include "opm_db.h"
-#include <QCryptographicHash>
-#include <QSet>
-#include <QTimer>
+#include <QtCore/QCryptographicHash>
+#include <QtCore/QSet>
+#include <QtCore/QTimer>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 
 namespace OperatorManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.h
index 3e24d1500..1a465cc51 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.h
@@ -7,8 +7,8 @@
   */
 #pragma once
 
-#include <QHash>
-#include <QObject>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
 #include <QQueue>
 
 #include "main_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.cpp
index 3b8251ce4..c2c8c2488 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.cpp
@@ -11,9 +11,9 @@
 #include "main_handler.h"
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <ngldb/dbtransaction.h>
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
 
 namespace OperatorManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.h
index 2faaf052e..20b1c0a6d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <Core/core_types.h>
-#include <QSet>
+#include <QtCore/QSet>
 
 // Generated
 #include <OperatorManagement/opm_db.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/opm_dtc_impl_custom.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/opm_dtc_impl_custom.cpp
index 0d44baed3..0fa0f3337 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/opm_dtc_impl_custom.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/opm_dtc_impl_custom.cpp
@@ -9,11 +9,11 @@
 
 #include "opm_dtc_impl_custom.h"
 #include <utility>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QVariantList>
-#include <QVector>
+#include <QtCore/QVector>
 #include <DDS/DTC/generic_dtc.h>
 #include <DDS/Generic/generic_data_reader.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/opm_dtc_impl_custom.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/opm_dtc_impl_custom.h
index 62319caea..1ee6ea292 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/opm_dtc_impl_custom.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/opm_dtc_impl_custom.h
@@ -9,8 +9,8 @@
 #pragma once
 
 #include <OperatorManagement/opm_dtc_impl.h>
-#include <QHash>
-#include <QVector>
+#include <QtCore/QHash>
+#include <QtCore/QVector>
 
 //-------------------------------------------------------------------------------------------------------------
 namespace OperatorManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/settings.h
index ae2d7f829..14ab684dc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/settings.h
@@ -6,8 +6,8 @@
   */
 
 #pragma once
-#include <QString>
-#include <QPair>
+#include <QtCore/QString>
+#include <QtCore/QPair>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/BiteHandling/bite_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/BiteHandling/bite_handler.cpp
index 118f83af7..f058faf3a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/BiteHandling/bite_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/BiteHandling/bite_handler.cpp
@@ -10,7 +10,7 @@
 #include "ParticipantHandling/participant.h"
 #include "ParticipantHandling/participant_donator.h"
 #include "main_handler.h"
-#include <QTimer>
+#include <QtCore/QTimer>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/BiteHandling/bite_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/BiteHandling/bite_handler.h
index a4e9bd2b1..b4eeadde3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/BiteHandling/bite_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/BiteHandling/bite_handler.h
@@ -7,8 +7,8 @@
   */
 #pragma once
 
-#include <QSet>
-#include <QMap>
+#include <QtCore/QSet>
+#include <QtCore/QMap>
 
 #include "dds_handler.h"
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/EquipmentEventHandling/equipment_event_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/EquipmentEventHandling/equipment_event_handler.cpp
index 133b91b33..3b306f5d6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/EquipmentEventHandling/equipment_event_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/EquipmentEventHandling/equipment_event_handler.cpp
@@ -11,7 +11,7 @@
 #include "main_handler.h"
 #include "ParticipantHandling/participant.h"
 
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 
 ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::EquipmentEventHandler(MainHandler *mainHandler, QObject *parent)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/EquipmentEventHandling/equipment_event_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/EquipmentEventHandling/equipment_event_handler.h
index 2c82b2189..fc297187d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/EquipmentEventHandling/equipment_event_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/EquipmentEventHandling/equipment_event_handler.h
@@ -12,7 +12,7 @@
 
 #include <TrainingAreaBase/tab_dtc.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <ngldb/nsqlquery.h>
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ModuleTests/ppm_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ModuleTests/ppm_tests.cpp
index 7eacc5195..e17537df9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ModuleTests/ppm_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ModuleTests/ppm_tests.cpp
@@ -14,8 +14,8 @@
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
 
-#include <QTest>
-#include <QTimer>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>
 
 //--------------------------------------------------------------------------------
 ParticipantManagement::PpmTests::PpmTests(QObject *parent)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/firing_unit_validator.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/firing_unit_validator.h
index 3c265692d..9054b605d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/firing_unit_validator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/firing_unit_validator.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include <Core/core_types.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant.cpp
index b11c3dde2..02a2be261 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant.cpp
@@ -13,7 +13,7 @@
 
 #include <ParticipantManagement/web_socket_handler.h>
 
-#include <QSet>
+#include <QtCore/QSet>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant.h
index b5b8b1978..a6f2f38db 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant.h
@@ -12,7 +12,7 @@
 #include <ParticipantManagement/ppm.hpp>
 #include <TrainingAreaBase/tab.hpp>
 
-#include <QMutex>
+#include <QtCore/QMutex>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler_for_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler_for_exercise.cpp
index b998d1abb..66739c725 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler_for_exercise.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler_for_exercise.cpp
@@ -22,11 +22,11 @@
 #include <ParticipantManagement/ppm_record_replay_plugin.h>
 #include <ngldb/dbtransaction.h>
 
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QTimer>
-#include <QVector>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QTimer>
+#include <QtCore/QVector>
 #include <QtGui/QTransform>
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler_for_exercise.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler_for_exercise.h
index 1278f3757..02ec0f188 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler_for_exercise.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler_for_exercise.h
@@ -15,7 +15,7 @@
 #include <QtCore/QMutex>
 #include <QtCore/QString>
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <ExerciseManagement/exm_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
 #include <ParticipantManagement/ppm_fts.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/unit_position_calculator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/unit_position_calculator.cpp
index 7dda809e2..1a4d34d75 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/unit_position_calculator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/unit_position_calculator.cpp
@@ -9,12 +9,12 @@
 
 #include "unit_position_calculator.h"
 #include "participant_handler.h"
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 #include <LtsUtils/LtsUtilsCore/outdated_position.h>
-#include <QPointF>
-#include <QDateTime>
+#include <QtCore/QPointF>
+#include <QtCore/QDateTime>
 #include <QtConcurrent>
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/unit_position_calculator.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/unit_position_calculator.h
index 9882ae1f7..6edacca6b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/unit_position_calculator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/unit_position_calculator.h
@@ -7,8 +7,8 @@
   */
 #pragma once
 
-#include <QObject>
-#include <QFutureWatcher>
+#include <QtCore/QObject>
+#include <QtCore/QFutureWatcher>
 #include <Core/core.hpp>
 #include <unordered_map>
 #include "participant_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/RecordReplay/ppm_record_replay_plugin_custom.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/RecordReplay/ppm_record_replay_plugin_custom.h
index 4c2c9c831..7e10a97a7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/RecordReplay/ppm_record_replay_plugin_custom.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/RecordReplay/ppm_record_replay_plugin_custom.h
@@ -11,7 +11,7 @@
 #include <TrainingAreaBase/tab_record_replay_plugin_custom.h>
 #include <ParticipantManagement/ppm_dts.h>
 #include <ParticipantManagement/ParticipantHandling/participant_handler.h>
-#include <QFuture>
+#include <QtCore/QFuture>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/handler_target_information.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/handler_target_information.h
index 202d47527..b75e92c78 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/handler_target_information.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/handler_target_information.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "dds_handler.h"
 #include <ParticipantManagement/logger.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/object_target_information.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/object_target_information.cpp
index 49d4f4701..c3ec99fc4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/object_target_information.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/object_target_information.cpp
@@ -9,8 +9,8 @@
 #include "object_target_information.h"
 #include "../main_handler.h"
 
-#include <QJsonDocument>
-#include <QDebug>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QDebug>
 
 
 //------------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler.cpp
index cb5c84e20..652cf7ad6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler.cpp
@@ -11,8 +11,8 @@
 #include "type_handler_global.h"
 #include "main_handler.h"
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler_exercise.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler_exercise.h
index f6e86876a..8a8bc125d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler_exercise.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler_exercise.h
@@ -8,7 +8,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "type_handler.h"
 #include <ParticipantManagement/ppm.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/object_mission_plan.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/object_mission_plan.h
index fe9c55ecd..6d76436ba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/object_mission_plan.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/object_mission_plan.h
@@ -15,7 +15,7 @@
 #include <ParticipantManagement/dds_handler.h>
 #include "logger.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 namespace ParticipantManagement
 {
 namespace UasHandling
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/uas_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/uas_handler.cpp
index c0fbe0d79..70b6f5fb6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/uas_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/uas_handler.cpp
@@ -14,7 +14,7 @@
 #include "main_handler.h"
 #include "ParticipantHandling/participant.h"
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/WebSocketInterface/Messages/client_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/WebSocketInterface/Messages/client_message.cpp
index fe319a085..4f3243f92 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/WebSocketInterface/Messages/client_message.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/WebSocketInterface/Messages/client_message.cpp
@@ -14,7 +14,7 @@
 
 #include <QtCore/QJsonDocument>
 #include <QtCore/QUuid>
-#include <QJsonObject>
+#include <QtCore/QJsonObject>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/WebSocketInterface/Messages/reply_message.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/WebSocketInterface/Messages/reply_message.h
index a21a0e3c1..33a061eec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/WebSocketInterface/Messages/reply_message.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/WebSocketInterface/Messages/reply_message.h
@@ -10,8 +10,8 @@
 
 #include <LtsWebSocket/reply_message.h>
 
-#include <QJsonArray>
-#include <QString>
+#include <QtCore/QJsonArray>
+#include <QtCore/QString>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/WebSocketInterface/json_keys.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/WebSocketInterface/json_keys.h
index 9814681a7..e7b270614 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/WebSocketInterface/json_keys.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/WebSocketInterface/json_keys.h
@@ -8,7 +8,7 @@
   */
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 #include <OcBaseDownload/WebSocketInterface/json_keys.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.cpp
index 5576f1ce0..b3fe0a509 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.cpp
@@ -12,7 +12,7 @@
 
 #include <DDS/Core/pacemaker.h>
 #include <DDS/DTS/generic_dts_impl.h>
-#include <QThread>
+#include <QtCore/QThread>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.h
index b554513d8..43fbc385e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.h
@@ -15,7 +15,7 @@
 #include <ProjectDataManagement/pdm_dtc.h>
 #include "logger.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace Core
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/exercise_time.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/exercise_time.cpp
index 02a560c4f..ee1beb239 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/exercise_time.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/exercise_time.cpp
@@ -9,7 +9,7 @@
 #include "exercise_time.h"
 #include "ppm_dts.h"
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <DDS/DTS/generic_dts_impl.h>
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/exercise_time.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/exercise_time.h
index 5a3071052..1a7802ae2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/exercise_time.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/exercise_time.h
@@ -7,8 +7,8 @@
   */
 #pragma once
 
-#include <QThread>
-#include <QTimer>
+#include <QtCore/QThread>
+#include <QtCore/QTimer>
 
 #include <DDS/Core/core_dts_types.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_common.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_common.cpp
index 7175e2c34..51ae47396 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_common.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_common.cpp
@@ -9,8 +9,8 @@
 #include "ppm_common.h"
 #include <utility>
 
-#include <QVector>
-#include <QDebug>
+#include <QtCore/QVector>
+#include <QtCore/QDebug>
 
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_dtc_impl_custom.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_dtc_impl_custom.cpp
index dbda4df2a..359b6786f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_dtc_impl_custom.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_dtc_impl_custom.cpp
@@ -14,11 +14,11 @@
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <LtsUtilsCore/json_object.h>
 
-#include <QJsonObject>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
 #include <QPolygonF>
-#include <QSet>
-#include <QVector>
+#include <QtCore/QSet>
+#include <QtCore/QVector>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_types.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_types.h
index 6be4119ef..3bcdd762f 100644
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_types.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_types.h
@@ -3,7 +3,7 @@
 // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
 // Für die Migration erstellen wir minimale Typ-Definitionen
 
-#include <QString>
+#include <QtCore/QString>
 #include <ostream>
 #include "ppm_enums.hpp"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/settings.h
index a47740ad3..accebf45a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/settings.h
@@ -6,8 +6,8 @@
   */
 
 #pragma once
-#include <QString>
-#include <QPair>
+#include <QtCore/QString>
+#include <QtCore/QPair>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/web_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/web_socket_handler.cpp
index 24c6376fe..b180bee7b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/web_socket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/web_socket_handler.cpp
@@ -10,8 +10,8 @@
 #include <utility>
 
 #include <QtWebSockets/QWebSocket>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
 #include <ParticipantManagement/ppm.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/web_socket_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/web_socket_handler.h
index 35aacbcc8..9493db266 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/web_socket_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/web_socket_handler.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtWebSockets/QWebSocketServer>
 #include <ParticipantManagement/ppm_common.h>
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/ModuleTests/pre_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/ModuleTests/pre_tests.cpp
index 17c46b735..6445747e6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/ModuleTests/pre_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/ModuleTests/pre_tests.cpp
@@ -11,8 +11,8 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QTest>
+#include <QtCore/QTimer>
+#include <QtTest/QTest>
 
 #include <PresentationManagement/pre_ftc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/ModuleTests/pre_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/ModuleTests/pre_tests.h
index 4e164dd74..55b200ea5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/ModuleTests/pre_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/ModuleTests/pre_tests.h
@@ -26,7 +26,7 @@
 #include <PresentationManagement/logger.h>
 
 #include <DDS/DDSConnector/dds_connector.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace PresentationManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/handler_presentation.h b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/handler_presentation.h
index e63a7124f..8ec038563 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/handler_presentation.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/handler_presentation.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <QMap>
-#include <QSet>
+#include <QtCore/QMap>
+#include <QtCore/QSet>
 
 #include <PresentationManagement/pre_fts.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/initialization.h b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/initialization.h
index 6d76ac750..531fb59d9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/initialization.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/initialization.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <PresentationManagement/pre_db.h>
 
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.h b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.h
index 38e94d1e1..f6eb0af1c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 #include <Core/core_types.h>
 
 #include <PresentationManagement/pre_db.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/settings.h
index 5068a2cb8..6d4d3db1f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/ModuleTests/pdm_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/ModuleTests/pdm_tests.cpp
index f5c167f11..6da1dea07 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/ModuleTests/pdm_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/ModuleTests/pdm_tests.cpp
@@ -10,7 +10,7 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #include <ProjectDataManagement/pdm_dtc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/chargetype_rename.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/chargetype_rename.h
index e4011a429..0f5534f43 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/chargetype_rename.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/chargetype_rename.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include <ProjectDataManagement/pdm_fts.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/logger.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/logger.h
index fda7245c7..61d6ae027 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/logger.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/logger.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #include <NGLLogger/INGLLogger.h>
-#include <QString>
+#include <QtCore/QString>
 #include "svcpdmcommon_export.h"
 
 namespace ProjectDataManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/main_handler.cpp
index 29de893b6..e3d88c472 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/main_handler.cpp
@@ -7,7 +7,7 @@
 
 #include "main_handler.h"
 #include "settings.h"
-#include <QSettings>
+#include <QtCore/QSettings>
 
 #include "convert_db_to_dds.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc_impl_custom.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc_impl_custom.cpp
index c6a816901..aa5e73e41 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc_impl_custom.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc_impl_custom.cpp
@@ -11,12 +11,12 @@
 #include <utility>
 #include "NGLLogger/INGLLogger.h"
 #include "pdm_translation.h"
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QSet>
-#include <QVariant>
-#include <QVector>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QSet>
+#include <QtCore/QVariant>
+#include <QtCore/QVector>
 #include <DDS/DTC/generic_dtc.h>
 #include <DDS/Generic/generic_data_reader.h>
 #include <ProjectDataManagement/pdm_translation.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc_impl_custom.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc_impl_custom.h
index c6d75e167..f3ec707f3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc_impl_custom.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc_impl_custom.h
@@ -8,9 +8,9 @@
  */
 #pragma once
 
-#include <QHash>
-#include <QJsonObject>
-#include <QVector>
+#include <QtCore/QHash>
+#include <QtCore/QJsonObject>
+#include <QtCore/QVector>
 #include <ProjectDataManagement/pdm_dtc_impl.h>
 
 //-------------------------------------------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.cpp
index 0407d2cff..90c9b85d6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.cpp
@@ -9,7 +9,7 @@
 
 #include "pdm_to_string.h"
 #include "pdm_translation.h"
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 namespace ProjectDataManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.h
index 539a54390..a1fa70774 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.h
@@ -8,7 +8,7 @@
 
 #include <ProjectDataManagement/pdm_types.h>
 #include <ProjectDataManagement/pdm_translation.h>
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 namespace ProjectDataManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/settings.h
index 3044df1ff..bf17d2367 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.cpp
index 9d871cb68..716447e4c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.cpp
@@ -1,10 +1,10 @@
 #include "static_pvsan_import.h"
 #include <utility>
 
-#include <QFile>
-#include <QTextStream>
-#include <QDir>
-#include <QSet>
+#include <QtCore/QFile>
+#include <QtCore/QTextStream>
+#include <QtCore/QDir>
+#include <QtCore/QSet>
 #include <ngltools/ngltools_filesystem.h>
 #include <ngldb/dbtransaction.h>
 #include <ngldb/nsqlquery.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.h
index ae9aba06e..ff8d69936 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.h
@@ -12,7 +12,7 @@
 
 #include "logger.h"
 #include <string>
-#include <QString>
+#include <QtCore/QString>
 
 namespace ProjectDataManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.cpp
index 3db64e963..4d1551975 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.cpp
@@ -8,11 +8,11 @@
 #include "translation.h"
 #include <utility>
 #include "dds_handler.h"
-#include <QTimer>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QCryptographicHash>
+#include <QtCore/QTimer>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QCryptographicHash>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 
 namespace ProjectDataManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.h
index 373e50c61..c2ac86bd4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.h
@@ -10,9 +10,9 @@
 #include <ProjectDataManagement/pdm_dts.h>
 #include <ProjectDataManagement/pdm_fts.h>
 
-#include <QObject>
-#include <QJsonObject>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QJsonObject>
+#include <QtCore/QTimer>
 #include "logger.h"
 
 namespace ProjectDataManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer.cpp
index f868223bb..3a767998a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer.cpp
@@ -13,7 +13,7 @@
 #include "settings.h"
 #include <DDS/DDSConnector/dds_connector.h>
 
-#include <QThread>
+#include <QtCore/QThread>
 
 #include <ngldb/dbtransaction.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer.h
index 950c2e607..c537501e6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer.h
@@ -6,9 +6,9 @@
   */
 #pragma once
 
-#include <QObject>
-#include <QTimer>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+#include <QtCore/QVector>
 
 #include <PluginInterfaces/record_replay_plugin.h>
 #include <ngldb/nsqlquery.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer_snapshot.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer_snapshot.cpp
index 468a38c76..c22c42251 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer_snapshot.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer_snapshot.cpp
@@ -9,9 +9,9 @@
 
 #include "logger.h"
 
-#include <QSqlError>
-#include <QTimer>
-#include <QVariant>
+#include <QtSql/QSqlError>
+#include <QtCore/QTimer>
+#include <QtCore/QVariant>
 
 #include <nglsettings/nglsettings_settings.h>
 #include <ngldb/dbtransaction.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer_snapshot.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer_snapshot.h
index 0e04c062a..40ee9069e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer_snapshot.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer_snapshot.h
@@ -6,10 +6,10 @@
   */
 #pragma once
 
-#include <QHash>
-#include <QMutex>
-#include <QThread>
-#include <QVector>
+#include <QtCore/QHash>
+#include <QtCore/QMutex>
+#include <QtCore/QThread>
+#include <QtCore/QVector>
 #include <memory>
 
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/settings.h
index 03ba08fff..ed8404834 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/handler_dynamic_participant_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/handler_dynamic_participant_data.cpp
index 744b9681d..eb19f160c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/handler_dynamic_participant_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/handler_dynamic_participant_data.cpp
@@ -12,7 +12,7 @@
 #include "settings.h"
 #include <ngldb/nsqlquery.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <ProjectDataManagement/pdm_translation.h>
 
 using namespace ReportManagement;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/handler_dynamic_participant_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/handler_dynamic_participant_data.h
index 8dc035234..f281dc3f5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/handler_dynamic_participant_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/handler_dynamic_participant_data.h
@@ -21,8 +21,8 @@
 #include <Proxies/Buildings/bld_dtc.h>
 #include <Proxies/Buildings/bld.hpp>
 
-#include <QObject>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
 
 namespace ReportManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/main_handler.h
index 16626cc04..e7d728828 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/main_handler.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "dds_handler.h"
 #include "handler_dynamic_participant_data.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_charge_administration.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_charge_administration.cpp
index 7a2bd688f..1cf99007f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_charge_administration.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_charge_administration.cpp
@@ -11,7 +11,7 @@
 #include <ngldb/dbtransaction.h>
 #include <ngldb/nsqlquery.h>
 
-#include <QVariant>
+#include <QtCore/QVariant>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_medevac_nine_liner.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_medevac_nine_liner.cpp
index ac3b0285a..3953bde74 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_medevac_nine_liner.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_medevac_nine_liner.cpp
@@ -12,7 +12,7 @@
 #include <ngldb/nsqlquery.h>
 #include <ngldb/dbtransaction.h>
 
-#include <QVariant>
+#include <QtCore/QVariant>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_building_damage.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_building_damage.cpp
index 1f71d70cd..6d97d6b58 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_building_damage.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_building_damage.cpp
@@ -12,7 +12,7 @@
 #include <ngldb/nsqlquery.h>
 #include <ngldb/dbtransaction.h>
 
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 
 using namespace ReportManagement;
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_charge_resupply.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_charge_resupply.cpp
index ec1f5b66a..5ffa55883 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_charge_resupply.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_charge_resupply.cpp
@@ -12,8 +12,8 @@
 #include <ngldb/nsqlquery.h>
 #include <ngldb/dbtransaction.h>
 
-#include <QVariant>
-#include <QSet>
+#include <QtCore/QVariant>
+#include <QtCore/QSet>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.cpp
index e02349856..b9c1d0dcb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.cpp
@@ -15,10 +15,10 @@
 
 #include <ProjectDataManagement/pdm.hpp>
 
-#include <QSet>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QSet>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 #include <DDS/Core/pacemaker.h>
 
 using namespace ReportManagement;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.h
index 742b3ca3d..67be3ae28 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.h
@@ -17,8 +17,8 @@
 #include <ParticipantManagement/ppm.hpp>
 
 #include <QElapsedTimer>
-#include <QMap>
-#include <QObject>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
 
 // ----------------------------------------------------------------------------------------------------------------------
 namespace ReportManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_get_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_get_data.cpp
index b4a8f0fd3..48dea4900 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_get_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_get_data.cpp
@@ -14,10 +14,10 @@
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <ProjectDataManagement/pdm.hpp>
 
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QSet>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QSet>
 #include <ngldb/nsqlquery.h>
 
 using namespace ReportManagement;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_maintenance.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_maintenance.cpp
index c97294aba..046e48dd7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_maintenance.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_maintenance.cpp
@@ -12,7 +12,7 @@
 #include <ngldb/nsqlquery.h>
 #include <ngldb/dbtransaction.h>
 
-#include <QVariant>
+#include <QtCore/QVariant>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_mine_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_mine_area.cpp
index c23cecbcb..abfcb25b1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_mine_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_mine_area.cpp
@@ -11,8 +11,8 @@
 #include <ngldb/nsqlquery.h>
 #include <ngldb/dbtransaction.h>
 
-#include <QPair>
-#include <QVariant>
+#include <QtCore/QPair>
+#include <QtCore/QVariant>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_nbc.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_nbc.cpp
index ac648444e..0053c87f8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_nbc.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_nbc.cpp
@@ -11,7 +11,7 @@
 #include <ngldb/nsqlquery.h>
 #include <ngldb/dbtransaction.h>
 
-#include <QVariant>
+#include <QtCore/QVariant>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_participant_distance.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_participant_distance.cpp
index ec4c67e31..449c4f043 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_participant_distance.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_participant_distance.cpp
@@ -13,7 +13,7 @@
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <QtCore/qmath.h>
-#include <QVariant>
+#include <QtCore/QVariant>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment.cpp
index 2eb3d00d2..cfeb27bd5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment.cpp
@@ -13,7 +13,7 @@
 #include <ngldb/dbtransaction.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 
-#include <QVariant>
+#include <QtCore/QVariant>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment_timeline.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment_timeline.cpp
index fbff4f7b4..61c361ae8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment_timeline.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment_timeline.cpp
@@ -13,8 +13,8 @@
 #include <ngldb/dbtransaction.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 
-#include <QVariant>
-#include <QJsonDocument>
+#include <QtCore/QVariant>
+#include <QtCore/QJsonDocument>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_unit_power.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_unit_power.cpp
index b6283ecc4..cbf11c25d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_unit_power.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_unit_power.cpp
@@ -13,9 +13,9 @@
 #include <ProjectDataManagement/pdm.hpp>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 
-#include <QSet>
-#include <QVector>
-#include <QVariant>
+#include <QtCore/QSet>
+#include <QtCore/QVector>
+#include <QtCore/QVariant>
 
 #include <ngldb/nsqlquery.h>
 #include <ngldb/dbtransaction.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_sanitation_material.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_sanitation_material.cpp
index 60dfccb6f..05216993e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_sanitation_material.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_sanitation_material.cpp
@@ -12,7 +12,7 @@
 #include <ngldb/nsqlquery.h>
 #include <ngldb/dbtransaction.h>
 
-#include <QVariant>
+#include <QtCore/QVariant>
 
 using namespace ReportManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/main_handler.h
index 3a0d9e3f5..d880b1e80 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/main_handler.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "dds_handler.h"
 #include "handler_report_data.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/object_report_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/object_report_info.cpp
index dcf7509c6..2587db43e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/object_report_info.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/object_report_info.cpp
@@ -10,10 +10,10 @@
 #include "dds_handler.h"
 #include "logger.h"
 
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QSet>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QSet>
 
 //------------------------------------------------------------------------------
 namespace ReportManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/object_report_info.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/object_report_info.h
index 12b42bec1..dacae5b57 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/object_report_info.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/object_report_info.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "dds_handler.h"
 #include <Core/core_types.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/ModuleTests/lon_lat2utm_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/ModuleTests/lon_lat2utm_test.cpp
index 1c7dac2ba..4be8f6946 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/ModuleTests/lon_lat2utm_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/ModuleTests/lon_lat2utm_test.cpp
@@ -13,8 +13,8 @@
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 
-#include <QTimer>
-#include <QTest>
+#include <QtCore/QTimer>
+#include <QtTest/QTest>
 
 
 // ------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/ModuleTests/rep_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/ModuleTests/rep_tests.cpp
index 3a32e18ef..93703c4a9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/ModuleTests/rep_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/ModuleTests/rep_tests.cpp
@@ -10,8 +10,8 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QTest>
+#include <QtCore/QTimer>
+#include <QtTest/QTest>
 
 #include <ReportManagement/rep_dtc.h>
 #include <ReportManagement/rep_ftc.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/settings.h
index 4810dc393..32c6ff6be 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/connection.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/connection.cpp
index 106d11fc9..81246f23c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/connection.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/connection.cpp
@@ -11,7 +11,7 @@
 #include "data_writer_task.h"
 
 #if BUILD_RTI
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QElapsedTimer>
 
 #include <DDS/DDSConnector/publisher.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/data_writer_task.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/data_writer_task.h
index 835397500..0fde2075e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/data_writer_task.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/data_writer_task.h
@@ -16,6 +16,8 @@
 
 #if BUILD_RTI
 #include <DDS/Routing/routing_plugin.h>
+#else
+#include "stubs/routing_plugin_stub.h"
 #endif
 
 namespace RoutingService
@@ -35,10 +37,10 @@ public:
   void writeSamples();
 #else
   // Stub methods when BUILD_RTI is disabled
-  void enqueue(void* /*swi*/) override {}
+  void enqueue(SampleWriterInterface* /*swi*/) override {}
   void shutdown() {}
   bool waitForData() { return false; }
-  void *getNextSampleWriter() { return nullptr; }
+  SampleWriterInterface* getNextSampleWriter() { return nullptr; }
   void writeSamples() {}
 #endif
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/main_handler.h
index 13c3d1822..66e7a0300 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/main_handler.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "logger.h"
 #include "partition_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/partition_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/partition_handler.h
index 1a00c2c08..8122fa3b1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/partition_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/partition_handler.h
@@ -9,9 +9,9 @@
 #pragma once
 
 #include <QElapsedTimer>
-#include <QObject>
-#include <QSet>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QSet>
+#include <QtCore/QTimer>
 #include <ExerciseManagement/exm_dtc.h>
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session.h
index da9c9a77d..9e1be4888 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #include <string>
-#include <QString>
+#include <QtCore/QString>
 
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session_handler.cpp
index 15641869a..f79fa4769 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session_handler.cpp
@@ -10,7 +10,7 @@
 #include "session_handler.h"
 #include <LtsPluginManager/lts_plugin_loader.h>
 #include <DDS/Generic/topic_type_plugin.h>
-#include <QVector>
+#include <QtCore/QVector>
 
 #if BUILD_RTI
 namespace RoutingService
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session_handler.h
index 18823c96f..4758a71d8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session_handler.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <QObject>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
 
 #include "rsccommon_export.h"
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.cpp
index 65c588a9a..e45046011 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.cpp
@@ -17,8 +17,8 @@
 #include <DDS/DTC/generic_dtc_impl.h>
 
 #include <QtTest/QTest>
-#include <QVariant>
-#include <QThread>
+#include <QtCore/QVariant>
+#include <QtCore/QThread>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.h
index 3df7aae23..3be6383b9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.h
@@ -8,7 +8,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 // For Topic Exercise
 #include <ServiceManagement/scm_dtc_types.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests_main.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests_main.h
index 1d186e1ff..8cc220555 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests_main.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests_main.h
@@ -8,7 +8,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QSignalSpy>
 #include <ServiceManagement/scm_dts_types.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/Messages/reply_message.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/Messages/reply_message.h
index e3e2f396b..36c908110 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/Messages/reply_message.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/Messages/reply_message.h
@@ -12,8 +12,8 @@
 
 #include <DDS/Core/core.hpp>
 
-#include <QString>
-#include <QMap>
+#include <QtCore/QString>
+#include <QtCore/QMap>
 
 #include <QtCore/QVector>
 #include <QtCore/QJsonObject>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/data_manager.cpp
index 56b4314b6..072f79c15 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/data_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/data_manager.cpp
@@ -11,10 +11,10 @@
 
 #include "main_handler.h"
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QMap>
-#include <QVector>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QMap>
+#include <QtCore/QVector>
 
 namespace ServiceManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group_handler.h
index 309816820..d53b8b254 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group_handler.h
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include <QObject>
-#include <QSet>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QSet>
+#include <QtCore/QVector>
 
 #include "logger.h"
 #include "dds_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/licence_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/licence_handler.cpp
index 7f1923c97..49b992984 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/licence_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/licence_handler.cpp
@@ -9,7 +9,7 @@
 #include "licence_handler.h"
 #include <utility>
 #include "dds_handler.h"
-#include <QFile>
+#include <QtCore/QFile>
 #include <LtsLicence/aes_crypt.h>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/licence_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/licence_handler.h
index c2ce252d6..d9d2e5b5a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/licence_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/licence_handler.h
@@ -10,9 +10,9 @@
 #include "licence_donator.h"
 #include "dds_handler.h"
 #include "logger.h"
-#include <QObject>
-#include <QString>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 #include <LtsLicence/lts_licence.h>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_donator.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_donator.h
index 58a6f24fd..c221a692f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_donator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_donator.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <ServiceManagement/scm.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.cpp
index c13253205..7ce280c90 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.cpp
@@ -9,9 +9,9 @@
 #include "service_handler.h"
 #include <utility>
 
-#include <QCoreApplication>
-#include <QDateTime>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDateTime>
+#include <QtCore/QTimer>
 
 #include "service.h"
 #include "service_process.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.h
index ebb5023d5..21eb0473c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <QSet>
-#include <QVector>
+#include <QtCore/QSet>
+#include <QtCore/QVector>
 
 #include "logger.h"
 #include "service_donator.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/settings.h
index 4f3930d7c..eb2e9d045 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/ModuleTests/srp_dt_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/ModuleTests/srp_dt_tests.cpp
index 0597a754f..e7504ed22 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/ModuleTests/srp_dt_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/ModuleTests/srp_dt_tests.cpp
@@ -12,7 +12,7 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #include <SituationReplay/srp_dtc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/ModuleTests/srp_ft_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/ModuleTests/srp_ft_tests.cpp
index 0226eaea2..ac88444c7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/ModuleTests/srp_ft_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/ModuleTests/srp_ft_tests.cpp
@@ -12,7 +12,7 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #include <SituationReplay/srp_ftc.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/dds_handler.cpp
index 6edb64c1e..41ae2b811 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/dds_handler.cpp
@@ -10,7 +10,7 @@
 
 #include <DDS/DTS/generic_dts_impl.h>
 #include <DDS/QosProfile/DDS_DefaultQos.h>
-#include <QVector>
+#include <QtCore/QVector>
 
 namespace SituationReplay
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay.cpp
index 56353a95a..fad00536e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay.cpp
@@ -13,7 +13,7 @@
 #include <SituationReplay/srp_db.h>
 
 #include <ngldb/nsqlquery.h>
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
 namespace SituationReplay
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay.h
index e9caa2da4..fa9ff45d6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay.h
@@ -8,7 +8,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include <SituationReplay/srp_fts.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay_sqlite.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay_sqlite.h
index 8e8fe98ec..c1e191714 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay_sqlite.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay_sqlite.h
@@ -11,7 +11,7 @@
 #include "situationreplaysqlite_export.h"
 #include <SituationReplay/srp_enums.hpp>
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler_sqlite.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler_sqlite.cpp
index 63cdea865..2f1d81b02 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler_sqlite.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler_sqlite.cpp
@@ -16,12 +16,12 @@
 #include <ngldb/db_service_handler.h>
 #include <ngldb/nsqlquery.h>
 #include <LtsScriptTimeline/track_entry.h>
-#include <QFile>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QFile>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QSet>
-#include <QSqlError>
+#include <QtCore/QSet>
+#include <QtSql/QSqlError>
 
 namespace SituationReplay
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler_sqlite.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler_sqlite.h
index 2cb5434e8..18b705a5c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler_sqlite.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler_sqlite.h
@@ -7,9 +7,9 @@
   */
 #pragma once
 
-#include <QJsonObject>
-#include <QObject>
-#include <QSqlDatabase>
+#include <QtCore/QJsonObject>
+#include <QtCore/QObject>
+#include <QtSql/QSqlDatabase>
 #include <memory>
 
 #include "dds_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.cpp
index 07f9000e2..944a5c440 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.cpp
@@ -11,8 +11,8 @@
 #include "db_reader.h"
 #include "logger.h"
 
-#include <QDateTime>
-#include <QTimer>
+#include <QtCore/QDateTime>
+#include <QtCore/QTimer>
 #include <QElapsedTimer>
 
 namespace SituationReplay
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.h
index 202a91357..445c5cb02 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.h
@@ -7,8 +7,8 @@
   */
 #pragma once
 
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 #include "dds_handler.h"
 #include "db_reader.h"
 #include <Core/core_types.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/settings.h
index 04683748b..e176eb926 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/settings.h
@@ -7,7 +7,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/static_publisher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/static_publisher.cpp
index bd2dcf11d..f1705a141 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/static_publisher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/static_publisher.cpp
@@ -8,9 +8,9 @@
 
 #include "static_publisher.h"
 #include <utility>
-#include <QCryptographicHash>
-#include <QJsonDocument>
-#include <QTimer>
+#include <QtCore/QCryptographicHash>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QTimer>
 
 #include <DDS/DTS/generic_dts_impl.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/static_publisher.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/static_publisher.h
index 1013a5417..5467f1751 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/static_publisher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/static_publisher.h
@@ -8,8 +8,8 @@
 #pragma once
 
 #include "dds_handler.h"
-#include <QSqlDatabase>
-#include <QObject>
+#include <QtSql/QSqlDatabase>
+#include <QtCore/QObject>
 #include <AssetManagement/asm_dts_types.h>
 #include <ExerciseManagement/exm_dts_types.h>
 #include <FileManagement/flm_dts_types.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/dds_handler.h
index 938fe93e4..10205fdec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/dds_handler.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <DDS/DDSConnector/dds_connector.h>
 #include <DDS/Core/core_dtc.h>
 #include <DDS/Core/topic_lock_master.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/handler_sounds.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/handler_sounds.cpp
index e82fa3115..aef1b4b67 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/handler_sounds.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/handler_sounds.cpp
@@ -10,12 +10,12 @@
 #include <utility>
 #include "settings.h"
 #include "dds_handler.h"
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QJsonValue>
-#include <QSet>
-#include <QTimer>
-#include <QNetworkReply>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonValue>
+#include <QtCore/QSet>
+#include <QtCore/QTimer>
+#include <QtNetwork/QNetworkReply>
 #include <LtsUtilsCore/json_object.h>
 
 namespace SoundManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/handler_sounds.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/handler_sounds.h
index 704e539d4..e02bf0cbc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/handler_sounds.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/handler_sounds.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "dds_handler.h"
 #include "logger.h"
 #include <som_db.h>
@@ -20,8 +20,8 @@
 #include <LtsCoordTrans/lts_coord_trans.h>
 
 // HTTP Request
-#include <QNetworkAccessManager>
-#include <QTimer>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtCore/QTimer>
 #include <QEventLoop>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/main_handler.cpp
index d0896bf1a..2a3117f9f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/main_handler.cpp
@@ -14,7 +14,7 @@
 #include "som_db.h"
 #include "settings.h"
 
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
 
 namespace SoundManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/main_handler.h
index fbad37dc3..5a4308046 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/main_handler.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "dds_handler.h"
 #include "handler_sounds.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/settings.h
index e8b7a7f01..7aae2c7e6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/ModuleTests/tgt_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/ModuleTests/tgt_tests.cpp
index 4867a8428..453cb9716 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/ModuleTests/tgt_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/ModuleTests/tgt_tests.cpp
@@ -9,10 +9,10 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
-#include <QDateTime>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 /* ----------------------------------------------------------------------------------
  * Ablauf:
  * ----------------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.cpp
index 269fc1c86..a8631a523 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.cpp
@@ -13,7 +13,7 @@
 
 #include <QtTest/QTest>
 #include <QtTest/QSignalSpy>
-#include <QWeakPointer>
+#include <QtCore/QWeakPointer>
 
 #include <nglapplication/nglapplication.h>
 #include <nglapplication/nglcoreapplication.h>
@@ -21,8 +21,8 @@
 
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
 
-#include <QTimer>
-#include <QFlags>
+#include <QtCore/QTimer>
+#include <QtCore/QFlags>
 #include <iostream>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.h
index 4a1003fff..ce6926181 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.h
@@ -18,7 +18,7 @@
 
 #include <DDS/DDSConnector/dds_connector.h>
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QtTest/QTest>
 
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.h
index 87ce90d3a..7ac33ce9a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <DDS/DDSConnector/dds_connector.h>
 #include <DDS/Core/core_dtc.h>
 #include <DDS/Core/topic_lock_master.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_area.h
index 4c6c7a6e4..f3b35597c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_area.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "dds_handler.h"
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_target.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_target.h
index d3cf1879f..f34329aaf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_target.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_target.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "dds_handler.h"
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_area_assignment.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_area_assignment.h
index 577530526..8848cf2dd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_area_assignment.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_area_assignment.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "dds_handler.h"
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.h
index e6af7ce38..7498e965f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "dds_handler.h"
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/main_handler.cpp
index 4d1e78492..a0731848a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/main_handler.cpp
@@ -13,7 +13,7 @@
 #include <ngldb/db_service_handler.h>
 #include "settings.h"
 
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
 
 namespace TargetManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/main_handler.h
index 5919dc4fa..411a10657 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/main_handler.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "dds_handler.h"
 #include "tgt_db.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/settings.h
index 49bdd545a..540d37dd2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.cpp
index be7bf25c4..95b61ee94 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.cpp
@@ -19,7 +19,7 @@
 #include <ElevationMap/elevation_map.h>
 #include <ElevationMap/line_of_sight_calculation.h>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 #include <QMapIterator>
 
 //------------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.h
index f32ae348f..f03eacfec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.h
@@ -14,7 +14,7 @@
 #include "handler_shootback_target.h"
 #include "handler_target_area_assignment.h"
 
-#include <QMap>
+#include <QtCore/QMap>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/avs_interface.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/avs_interface.cpp
index 02250da16..235e2f9c5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/avs_interface.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/avs_interface.cpp
@@ -9,8 +9,8 @@
 #include "avs_interface.h"
 #include "settings.h"
 
-#include <QTcpSocket>
-#include <QTimer>
+#include <QtNetwork/QTcpSocket>
+#include <QtCore/QTimer>
 #include <QHostInfo>
 #include <ngltools/ngltools_convert.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_infrastructure_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_infrastructure_data.cpp
index b25770473..e0d4dea81 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_infrastructure_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_infrastructure_data.cpp
@@ -11,7 +11,7 @@
 #if BUILD_RTI
 #include "settings.h"
 
-#include <QVector>
+#include <QtCore/QVector>
 
 using namespace VideoOverlayManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.cpp
index 86fae667e..0450c4155 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.cpp
@@ -11,7 +11,7 @@
 #include "handler_participant_data.h"
 #include "settings.h"
 
-#include <QByteArray>
+#include <QtCore/QByteArray>
 
 using namespace VideoOverlayManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.h b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.h
index 65ef4e0a2..23756b90b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #include <QtCore/QObject>
-#include <QSet>
+#include <QtCore/QSet>
 
 #include "avs_interface.h"
 #include "handler_participant_data.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_participant_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_participant_data.cpp
index aeac6ce49..0e6eec30a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_participant_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_participant_data.cpp
@@ -11,7 +11,7 @@
 #if BUILD_RTI
 #include "settings.h"
 
-#include <QSet>
+#include <QtCore/QSet>
 
 using namespace VideoOverlayManagement;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.cpp
index a3fedecec..3059878e2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.cpp
@@ -9,7 +9,7 @@
 #include "main_handler.h"
 #include "settings.h"
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #if BUILD_RTI
 #include <DDS/Core/pacemaker.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.h
index 3cba6d4c0..dd4931312 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #include <QtCore/QObject>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #include "avs_interface.h"
 #include "handler_participant_data.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/settings.h
index 70c66fbc5..359894ed5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/settings.h
@@ -7,7 +7,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/ModuleTests/whg_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/ModuleTests/whg_tests.cpp
index e11226ccf..9d4ece2dd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/ModuleTests/whg_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/ModuleTests/whg_tests.cpp
@@ -11,12 +11,12 @@
 #include <nglsettings/nglsettings_connections.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
 
-#include <QTimer>
-#include <QDateTime>
-#include <QString>
-#include <QVector>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QTimer>
+#include <QtCore/QDateTime>
+#include <QtCore/QString>
+#include <QtCore/QVector>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
 #include <QtNetwork/QHostAddress>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/Messages/reply_message.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/Messages/reply_message.h
index 61e161ee0..a65ddaf9a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/Messages/reply_message.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/Messages/reply_message.h
@@ -12,8 +12,8 @@
 
 #include <DDS/Core/core.hpp>
 
-#include <QString>
-#include <QMap>
+#include <QtCore/QString>
+#include <QtCore/QMap>
 
 #include <QtCore/QVector>
 #include <QtCore/QJsonObject>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.cpp
index e131cccd2..b1c419b09 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.cpp
@@ -20,12 +20,12 @@
 
 #include "main_handler.h"
 
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QMap>
-#include <QSqlRecord>
-#include <QTimer>
-#include <QVector>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QMap>
+#include <QtSql/QSqlRecord>
+#include <QtCore/QTimer>
+#include <QtCore/QVector>
 
 
 namespace WarehouseGuez
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.h
index 0cb548dbc..c5c134e71 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.h
@@ -18,8 +18,8 @@
 
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
 
-#include <QObject>
-#include <QSqlDriver>
+#include <QtCore/QObject>
+#include <QtSql/QSqlDriver>
 
 class NSqlQuery;
 namespace WarehouseGuez
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/bite_data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/bite_data_manager.cpp
index 8453749ce..baa9098fe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/bite_data_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/bite_data_manager.cpp
@@ -17,9 +17,9 @@
 
 #include <nglsettings/nglsettings_connections.h>
 
-#include <QMap>
-#include <QUuid>
-#include <QJsonDocument>
+#include <QtCore/QMap>
+#include <QtCore/QUuid>
+#include <QtCore/QJsonDocument>
 
 namespace WarehouseGuez
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/bite_data_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/bite_data_manager.h
index a48227928..1de7c1719 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/bite_data_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/bite_data_manager.h
@@ -10,9 +10,9 @@
 
 #include <memory>
 
-#include <QHash>
-#include <QSet>
-#include <QTimer>
+#include <QtCore/QHash>
+#include <QtCore/QSet>
+#include <QtCore/QTimer>
 
 #include <WarehouseGuez/WsBiteInterface/Messages/ws_reply_message.h>
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_equipment_type_wh.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_equipment_type_wh.h
index 64287617c..15dfce004 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_equipment_type_wh.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_equipment_type_wh.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QHash>
+#include <QtCore/QHash>
 
 #include "logger.h"
 #include "main_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_injury_model.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_injury_model.h
index eb262cb27..79f433da9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_injury_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_injury_model.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QHash>
+#include <QtCore/QHash>
 
 #include "main_handler.h"
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_types.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_types.h
index dcba3d8c0..ed1edabbe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_types.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_types.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QHash>
+#include <QtCore/QHash>
 
 #include <ParticipantManagement/ppm.hpp>
 #include "main_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/settings.h
index 3958551ec..1e5d6d60e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/main_handler.h
index bd9a3e3f2..c295b14f3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/main_handler.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include "dds_handler.h"
 #include "xxx_db.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/settings.h
index faeebd66a..de814b0b8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/settings.h
@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/handler_xxx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/handler_xxx.cpp
index 17be7e431..dcbc0176a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/handler_xxx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/handler_xxx.cpp
@@ -12,7 +12,7 @@
 #include "yyy_db.h"
 #include "db_handler.h"
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
 namespace YyyYyyYyy
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/handler_xxx.h b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/handler_xxx.h
index 4f3f17542..1f43b5d72 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/handler_xxx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/handler_xxx.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QMap>
+#include <QtCore/QMap>
 
 #include "dds_handler.h"
 #include "logger.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/object_xxx.h b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/object_xxx.h
index 8568f67ce..1abd27b54 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/object_xxx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/object_xxx.h
@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include "dds_handler.h"
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/abstract_display_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/abstract_display_widget.cpp
index 999a7238f..eadb67de8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/abstract_display_widget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/abstract_display_widget.cpp
@@ -9,7 +9,7 @@
  */
 
 #include "abstract_display_widget.h"
-#include <QModelIndex>
+#include <QtCore/QModelIndex>
 
 namespace LtsDataView
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/abstract_display_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/abstract_display_widget.h
index 84961067b..55b4fad1e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/abstract_display_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/abstract_display_widget.h
@@ -11,7 +11,7 @@
 
 #include "lts_data_view_export.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 class QModelIndex;
 
 namespace LtsDataView
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/data_delegate.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/data_delegate.cpp
index 229f53560..74ef2af31 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/data_delegate.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/data_delegate.cpp
@@ -12,7 +12,7 @@
 
 #include <ngltools/ngltools_dtg.h>
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 
 namespace LtsDataView
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/data_delegate.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/data_delegate.h
index 3b969b69a..ca9fbc0ff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/data_delegate.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/data_delegate.h
@@ -9,7 +9,7 @@
  * Created by Mike Wille, NLE, 2020-09-09
  */
 
-#include <QStyledItemDelegate>
+#include <QtWidgets/QStyledItemDelegate>
 
 
 namespace LtsDataView
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/icon_view_delegate.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/icon_view_delegate.cpp
index 49df99a3c..cd00604f7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/icon_view_delegate.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/icon_view_delegate.cpp
@@ -1,10 +1,10 @@
 #include "icon_view_delegate.h"
 
 #include <QGraphicsDropShadowEffect>
-#include <QGraphicsScene>
+#include <QtWidgets/QGraphicsScene>
 #include <QGraphicsPixmapItem>
-#include <QPainter>
-#include <QDebug>
+#include <QtGui/QPainter>
+#include <QtCore/QDebug>
 
 
 namespace LtsDataView
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/icon_view_delegate.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/icon_view_delegate.h
index b39ec29c6..4f2b9872f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/icon_view_delegate.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/icon_view_delegate.h
@@ -2,7 +2,7 @@
 
 #include "abstract_display_widget.h"
 
-#include <QStyledItemDelegate>
+#include <QtWidgets/QStyledItemDelegate>
 
 namespace LtsDataView
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/lts_columns_setting.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/lts_columns_setting.h
index 58e1f73e5..6928f40e8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/lts_columns_setting.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/lts_columns_setting.h
@@ -13,9 +13,9 @@
 
 #include "LtsWidgets/lts_frameless_dialog.h"
 
-#include <QWidget>
-#include <QDialog>
-#include <QAbstractTableModel>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QDialog>
+#include <QtCore/QAbstractTableModel>
 
 namespace Ui {
 class LtsColumnsSetting;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/lts_data_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/lts_data_view.cpp
index 3e9af3675..355d6967d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/lts_data_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/lts_data_view.cpp
@@ -21,20 +21,20 @@
 #include <LtsWidgets/lts_message_dialog.h>
 #include <LtsUtilsSettings/settings.h>
 
-#include <QClipboard>
-#include <QComboBox>
-#include <QFile>
-#include <QFileDialog>
-#include <QKeyEvent>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QStyledItemDelegate>
-#include <QTimer>
+#include <QtGui/QClipboard>
+#include <QtWidgets/QComboBox>
+#include <QtCore/QFile>
+#include <QtWidgets/QFileDialog>
+#include <QtGui/QKeyEvent>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QStyledItemDelegate>
+#include <QtCore/QTimer>
 #include <QScroller>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QDebug>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QDebug>
 
 /// get the list of visual index as they are display
 namespace LtsDataView
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/lts_data_view.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/lts_data_view.h
index 3368df04d..81aec58f0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/lts_data_view.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/lts_data_view.h
@@ -13,9 +13,9 @@
 #include <LtsDataView/lts_data_view_export.h>
 #include <LtsDataView/lts_columns_setting.h>
 
-#include <QWidget>
-#include <QAbstractItemView>
-#include <QLineEdit>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QAbstractItemView>
+#include <QtWidgets/QLineEdit>
 #include <functional> 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/search_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/search_model.cpp
index fde9e8e12..94897ed06 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/search_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/search_model.cpp
@@ -9,9 +9,9 @@
 
 #include "search_model.h"
 
-#include <QFont>
-#include <QGuiApplication>
-#include <QIcon>
+#include <QtGui/QFont>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QIcon>
 #include <QPalette>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/search_model.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/search_model.h
index c15165922..74f7ce09a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/search_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/search_model.h
@@ -11,10 +11,10 @@
 
 #include <LtsDataView/lts_data_view_export.h>
 
-#include <QAbstractItemModel>
-#include <QSet>
-#include <QString>
-#include <QPointer>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QSet>
+#include <QtCore/QString>
+#include <QtCore/QPointer>
 
 
 namespace LtsDataView
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/test.cpp
index 06944a90e..04654e923 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/test.cpp
@@ -11,13 +11,13 @@
 
 #include <lts_data_view.h>
 
-#include <QApplication>
-#include <QDebug>
-#include <QLabel>
-#include <QStandardItem>
-#include <QStandardItemModel>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDebug>
+#include <QtWidgets/QLabel>
+#include <QtGui/QStandardItem>
+#include <QtGui/QStandardItemModel>
 #include <QElapsedTimer>
-#include <QScrollArea>
+#include <QtWidgets/QScrollArea>
 #include <QScroller>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/tree_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/tree_view.cpp
index 220f9b271..f6489e71e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/tree_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/tree_view.cpp
@@ -10,8 +10,8 @@
 
 #include "tree_view.h"
 
-#include <QGuiApplication>
-#include <QKeyEvent>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QKeyEvent>
 
 namespace LtsDataView
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/tree_view.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/tree_view.h
index f20490895..d4490890d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/tree_view.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/tree_view.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 
 namespace LtsDataView
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/tree_view_delegate.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/tree_view_delegate.cpp
index 6bc51fe24..534013ee7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/tree_view_delegate.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/tree_view_delegate.cpp
@@ -2,10 +2,10 @@
 #include "tree_view_delegate.h"
 #include "search_model.h"
 
-#include <QApplication>
-#include <QComboBox>
-#include <QTimer>
-//#include <QDebug>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QComboBox>
+#include <QtCore/QTimer>
+//#include <QtCore/QDebug>
 
 namespace LtsDataView
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/tree_view_delegate.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/tree_view_delegate.h
index 48b6722de..8bb38dfd4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/tree_view_delegate.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/tree_view_delegate.h
@@ -2,8 +2,8 @@
 
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 
-#include <QStyledItemDelegate>
-#include <QStyle>
+#include <QtWidgets/QStyledItemDelegate>
+#include <QtWidgets/QStyle>
 
 
 namespace LtsDataView
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Common/id_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Common/id_handler.h
index 30e99abfc..c832fd649 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Common/id_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Common/id_handler.h
@@ -36,7 +36,7 @@
 #include "situation_map_logging.h"
 
 #include "situation_map_common_export.h"
-#include <QVector>
+#include <QtCore/QVector>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Common/referenced.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Common/referenced.cpp
index d6f869238..8946a026a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Common/referenced.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Common/referenced.cpp
@@ -34,7 +34,7 @@
 
 #include "referenced.h"
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #include <typeinfo>
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Common/resource_path.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Common/resource_path.cpp
index 3ca0ac273..4d2de2817 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Common/resource_path.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Common/resource_path.cpp
@@ -14,8 +14,8 @@
 
 
 // Qt
-#include <QDir>
-#include <QVector>
+#include <QtCore/QDir>
+#include <QtCore/QVector>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Common/resource_path.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Common/resource_path.h
index 42437abc5..9a2fe9651 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Common/resource_path.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Common/resource_path.h
@@ -11,7 +11,7 @@
 #include "situation_map_common_export.h"
 
 // Qt
-#include <QString>
+#include <QtCore/QString>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Common/situation_map_logging.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Common/situation_map_logging.cpp
index 37a7cc7ab..98562bd5b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Common/situation_map_logging.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Common/situation_map_logging.cpp
@@ -8,7 +8,7 @@
 
 #include "situation_map_logging.h"
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QUuid>
+#include <QtCore/QUuid>
 namespace SituationMap
 {
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/abstract_map_object.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/abstract_map_object.h
index 3ec04b26c..89b9b4a1f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/abstract_map_object.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/abstract_map_object.h
@@ -19,9 +19,9 @@
 
 
 // Qt
-#include <QString>
-#include <QColor>
-#include <QList>
+#include <QtCore/QString>
+#include <QtGui/QColor>
+#include <QtCore/QList>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/camera.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/camera.cpp
index 8c333e1d1..0c42864f6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/camera.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/camera.cpp
@@ -11,7 +11,7 @@
 
 
 // Qt
-#include <QJsonObject>
+#include <QtCore/QJsonObject>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/camera.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/camera.h
index 2aecc4d46..b8324e5eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/camera.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/camera.h
@@ -14,7 +14,7 @@
 #include <situation_map_export.h>
 
 // Qt
-#include <QString>
+#include <QtCore/QString>
 
 class QJsonObject;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/coord_translation_functor.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/coord_translation_functor.h
index 5956becb5..5405c486f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/coord_translation_functor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/coord_translation_functor.h
@@ -16,7 +16,7 @@
 
 
 // Qt
-#include <QString>
+#include <QtCore/QString>
 
 
 namespace Esri
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/fill_style.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/fill_style.h
index d8cb66c5c..d67187419 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/fill_style.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/fill_style.h
@@ -14,7 +14,7 @@
 
 
 // Qt
-#include <QColor>
+#include <QtGui/QColor>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/geometry_model_renderer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/geometry_model_renderer.cpp
index ee1a5189a..ccfa84488 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/geometry_model_renderer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/geometry_model_renderer.cpp
@@ -9,8 +9,8 @@
 
 #include "geometry_model_renderer.h"
 
-#include <QFile>
-#include <QTime>
+#include <QtCore/QFile>
+#include <QtCore/QTime>
 
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/geometry_model_renderer.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/geometry_model_renderer.h
index 24a8f3e93..64c34539a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/geometry_model_renderer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/geometry_model_renderer.h
@@ -20,8 +20,8 @@
 
 // Qt
 #include <QElapsedTimer>
-#include <QObject>
-#include <QPointer>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
 
 
 class PESettings;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/grid.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/grid.h
index 7ddff153c..d0072a7cf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/grid.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/grid.h
@@ -10,7 +10,7 @@
 
 #include "situation_map_types.h"
 #include <situation_map_export.h>
-#include <QColor>
+#include <QtGui/QColor>
 
 //----------------------------------------------------------------------------
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/layer_parameter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/layer_parameter.cpp
index 54e7b5f03..ca5f02ef5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/layer_parameter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/layer_parameter.cpp
@@ -11,7 +11,7 @@
 
 
 // Qt
-#include <QJsonObject>
+#include <QtCore/QJsonObject>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/layer_parameter.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/layer_parameter.h
index 8822f9506..dfb6bd185 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/layer_parameter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/layer_parameter.h
@@ -14,8 +14,8 @@
 #include <situation_map_export.h>
 
 // Qt
-#include <QString>
-#include <QUrl>
+#include <QtCore/QString>
+#include <QtCore/QUrl>
 
 class QJsonObject;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/line_style.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/line_style.h
index 43e004cf5..e85616c78 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/line_style.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/line_style.h
@@ -14,7 +14,7 @@
 
 
 // Qt
-#include <QColor>
+#include <QtGui/QColor>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/location_display.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/location_display.h
index 7ef437ba4..04d7928fa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/location_display.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/location_display.h
@@ -10,7 +10,7 @@
 
 #include "situation_map_types.h"
 #include <situation_map_export.h>
-#include <QColor>
+#include <QtGui/QColor>
 
 //----------------------------------------------------------------------------
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map.h
index 44d1dd039..5d1078c30 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map.h
@@ -16,7 +16,7 @@
 #include <Common/ref_pointer.h>
 #include <situation_map_export.h>
 
-#include <QPointer>
+#include <QtCore/QPointer>
 
 // forward
 class QGraphicsView;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_initializer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_initializer.cpp
index bf913ced9..fdceab620 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_initializer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_initializer.cpp
@@ -20,12 +20,12 @@
 
 #include <arcgis/arcgisversion.h>  // This file is created by RME, not ESRI
 
-#include <QCoreApplication>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 #include <QNetworkProxy>
-#include <QMessageBox>
+#include <QtWidgets/QMessageBox>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_initializer.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_initializer.h
index e80ebb9c3..15a73ec37 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_initializer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_initializer.h
@@ -17,8 +17,8 @@
 
 
 // Qt
-#include <QString>
-#include <QJsonObject>
+#include <QtCore/QString>
+#include <QtCore/QJsonObject>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_notifier.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_notifier.h
index 140ef85c7..194a0f636 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_notifier.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_notifier.h
@@ -14,9 +14,9 @@
 
 
 // Qt
-#include <QObject>
-#include <QPointer>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
+#include <QtCore/QTimer>
 
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_settings.cpp
index 4b3877367..45ca09ecd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_settings.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_settings.cpp
@@ -13,7 +13,7 @@
 
 
 //Qt
-#include <QFile>
+#include <QtCore/QFile>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_settings.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_settings.h
index eb59ec5b2..884c58db0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_settings.h
@@ -15,8 +15,8 @@
 #include <Symbology/symbol_dictionary.h>
 
 // Qt
-#include <QString>
-#include <QSettings>
+#include <QtCore/QString>
+#include <QtCore/QSettings>
 
 //----------------------------------------------------------------------------
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/measurement.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/measurement.h
index 2ca94c3fc..5f224b268 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/measurement.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/measurement.h
@@ -13,8 +13,8 @@
 
 
 // Qt
-#include <QPointF>
-#include <QString>
+#include <QtCore/QPointF>
+#include <QtCore/QString>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/object_container.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/object_container.h
index aaba40944..3914d77c7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/object_container.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/object_container.h
@@ -15,8 +15,8 @@
 
 
 // Qt
-#include <QMap>
-#include <QSharedPointer>
+#include <QtCore/QMap>
+#include <QtCore/QSharedPointer>
 
 #include <typeindex>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/object_factory.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/object_factory.cpp
index e559cf099..81feb7e64 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/object_factory.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/object_factory.cpp
@@ -16,7 +16,7 @@
 
 
 // Qt
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/object_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/object_factory.h
index 0c6ece37c..c34c8d6fd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/object_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/object_factory.h
@@ -20,7 +20,7 @@
 
 
 // Qt
-#include <QMap>
+#include <QtCore/QMap>
 
 #include <typeindex>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/object_indicator.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/object_indicator.h
index f1478a5db..11f23cb7f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/object_indicator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/object_indicator.h
@@ -14,7 +14,7 @@
 
 
 // Qt
-#include <QPointF>
+#include <QtCore/QPointF>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/operator_map_settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/operator_map_settings.cpp
index d878639c7..e26539639 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/operator_map_settings.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/operator_map_settings.cpp
@@ -12,9 +12,9 @@
 
 //Qt
 #include <QListIterator>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/operator_map_settings.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/operator_map_settings.h
index 51ad5b88b..40e01e96e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/operator_map_settings.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/operator_map_settings.h
@@ -17,10 +17,10 @@
 
 
 // Qt
-#include <QList>
-#include <QPair>
-#include <QString>
-#include <QVector>
+#include <QtCore/QList>
+#include <QtCore/QPair>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 
 class QJsonObject;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/overlay_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/overlay_handler.h
index 7dbd1426d..b18a5b176 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/overlay_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/overlay_handler.h
@@ -14,7 +14,7 @@
 
 
 // Qt
-#include <QMap>
+#include <QtCore/QMap>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/party_id_to_color_functor.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/party_id_to_color_functor.h
index 48ef55984..8862fbfa8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/party_id_to_color_functor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/party_id_to_color_functor.h
@@ -16,9 +16,9 @@
 
 
 // Qt
-#include <QColor>
-#include <QIcon>
-#include <QTimer>
+#include <QtGui/QColor>
+#include <QtGui/QIcon>
+#include <QtCore/QTimer>
 
 namespace SituationMap
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/pixel_based_textbox_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/pixel_based_textbox_handler.h
index 175664139..248afe179 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/pixel_based_textbox_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/pixel_based_textbox_handler.h
@@ -15,9 +15,9 @@
 
 
 // Qt
-#include <QObject>
-#include <QString>
-#include <QPointF>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QPointF>
 
 class QTextEdit;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/sidc_symbol.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/sidc_symbol.h
index b21d6ac7c..f408f0ba5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/sidc_symbol.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/sidc_symbol.h
@@ -35,7 +35,7 @@
 #include "line_style.h"
 #include "fill_style.h"
 
-#include <QString>
+#include <QtCore/QString>
 
 
 namespace SituationMap
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_types.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_types.h
index 952488a87..60f873b2f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_types.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_types.h
@@ -15,10 +15,10 @@
 
 
 // Qt
-#include <QString>
-#include <QColor>
-#include <QList>
-#include <QPointF>
+#include <QtCore/QString>
+#include <QtGui/QColor>
+#include <QtCore/QList>
+#include <QtCore/QPointF>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.cpp
index 24e153864..5a5a210d9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.cpp
@@ -26,9 +26,9 @@
 
 
 // Qt
-#include <QString>
-#include <QPointF>
-#include <QRect>
+#include <QtCore/QString>
+#include <QtCore/QPointF>
+#include <QtCore/QRect>
 
 #include <sstream>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.h
index a56712ff3..174412c6a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.h
@@ -18,9 +18,9 @@
 
 
 // Qt
-#include <QPointF>
-#include <QSize>
-#include <QRectF>
+#include <QtCore/QPointF>
+#include <QtCore/QSize>
+#include <QtCore/QRectF>
 
 
 #include <iosfwd>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/terrain_profile.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/terrain_profile.h
index 5fa1cd15a..6decb09d2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/terrain_profile.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/terrain_profile.h
@@ -15,8 +15,8 @@
 
 
 // Qt
-#include <QString>
-#include <QPointF>
+#include <QtCore/QString>
+#include <QtCore/QPointF>
 
 
 #include <functional>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/terrain_profile_parameter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/terrain_profile_parameter.cpp
index 182dea5c1..4216eaf9e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/terrain_profile_parameter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/terrain_profile_parameter.cpp
@@ -12,9 +12,9 @@
 
 
 //Qt
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 
 #include <sstream>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/terrain_profile_parameter.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/terrain_profile_parameter.h
index a26d60bae..69f84542d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/terrain_profile_parameter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/terrain_profile_parameter.h
@@ -14,8 +14,8 @@
 
 
 // Qt
-#include <QString>
-#include <QPointF>
+#include <QtCore/QString>
+#include <QtCore/QPointF>
 
 class QJsonObject;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/text_style.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/text_style.h
index 63efbcadf..4d5e1c7a0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/text_style.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/text_style.h
@@ -13,7 +13,7 @@
 #include <situation_map_export.h>
 
 // Qt
-#include <QColor>
+#include <QtGui/QColor>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewpoint2D.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewpoint2D.cpp
index a15d82f6d..73151ed83 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewpoint2D.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewpoint2D.cpp
@@ -11,7 +11,7 @@
 
 
 // Qt
-#include <QJsonObject>
+#include <QtCore/QJsonObject>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewpoint2D.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewpoint2D.h
index 92574727b..f2ad0d9d9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewpoint2D.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewpoint2D.h
@@ -14,7 +14,7 @@
 #include <situation_map_export.h>
 
 // Qt
-#include <QString>
+#include <QtCore/QString>
 
 class QJsonObject;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewshed.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewshed.h
index fe52825f7..b67f444d4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewshed.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewshed.h
@@ -15,9 +15,9 @@
 
 
 // Qt
-#include <QObject>
-#include <QString>
-#include <QPointF>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QPointF>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewshed_parameter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewshed_parameter.cpp
index 176203785..1caf3f56d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewshed_parameter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewshed_parameter.cpp
@@ -12,9 +12,9 @@
 
 
 //Qt
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 
 #include <sstream>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewshed_parameter.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewshed_parameter.h
index 92bbf4641..e6446c4df 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewshed_parameter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewshed_parameter.h
@@ -14,8 +14,8 @@
 #include <MathUtils/math_const.h>
 
 // Qt
-#include <QString>
-#include <QPointF>
+#include <QtCore/QString>
+#include <QtCore/QPointF>
 
 class QJsonObject;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/bulk_renderer.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/bulk_renderer.h
index fecb4b4b5..a758629ed 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/bulk_renderer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/bulk_renderer.h
@@ -13,9 +13,9 @@
 
 
 // Qt
-#include <QSharedPointer>
-#include <QVector>
-#include <QString>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QVector>
+#include <QtCore/QString>
 
 
 // Forward
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/property_result.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/property_result.cpp
index 09f9be5ba..fb6d87f56 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/property_result.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/property_result.cpp
@@ -11,7 +11,7 @@
 
 
 // Qt
-#include <QUuid>
+#include <QtCore/QUuid>
 
 
 namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/property_result.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/property_result.h
index 8c2ae1de1..461c77668 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/property_result.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/property_result.h
@@ -16,7 +16,7 @@
 
 
 // Qt
-#include <QObject>
+#include <QtCore/QObject>
 
 
 // forward
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/result_watcher.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/result_watcher.h
index 1c2831c3d..d2099d118 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/result_watcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/result_watcher.h
@@ -13,8 +13,8 @@
 #include <SymbologyImpl/advanced_symbology_logging.h>
 
 // Qt
-#include <QObject>
-#include <QSharedPointer>
+#include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_builder.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_builder.h
index 718270ee6..fca373e00 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_builder.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_builder.h
@@ -13,7 +13,7 @@
 #include "symbol_dictionary.h"
 
 // Qt
-#include <QString>
+#include <QtCore/QString>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_codec.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_codec.cpp
index 03c17b2b6..7d5aa8623 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_codec.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_codec.cpp
@@ -13,7 +13,7 @@
 #include <SymbologyXML/xml_symbol_codec.h>
 
 // Qt
-#include <QRegExp>
+#include <QtCore/QRegExp>
 
 
 namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_codec.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_codec.h
index c48c2c560..3cbdc18a5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_codec.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_codec.h
@@ -14,8 +14,8 @@
 #include <SymbologyXML/symbol_types.h>
 
 // Qt
-#include <QHash>
-#include <QString>
+#include <QtCore/QHash>
+#include <QtCore/QString>
 #include <QStringRef>
 
 namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_definitions.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_definitions.h
index 36f44330d..6413922c7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_definitions.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/sidc_definitions.h
@@ -14,10 +14,10 @@
 
 
 // Qt
-#include <QString>
-#include <QVector>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 
-#include <QPixmap>
+#include <QtGui/QPixmap>
 
 //----------------------------------------------------------------------------
 namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_data_to_render.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_data_to_render.h
index 8e8f9979a..37ec979e1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_data_to_render.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_data_to_render.h
@@ -14,9 +14,9 @@
 
 
 // Qt
-#include <QString>
-#include <QColor>
-#include <QSet>
+#include <QtCore/QString>
+#include <QtGui/QColor>
+#include <QtCore/QSet>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_dictionary.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_dictionary.cpp
index 38ca7af38..dad98d1da 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_dictionary.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_dictionary.cpp
@@ -16,8 +16,8 @@
 
 
 // Qt
-#include <QCoreApplication>
-#include <QMap>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QMap>
 #include <QProcessEnvironment>
 
 void initResource()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_dictionary.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_dictionary.h
index da89c35af..d6282af9b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_dictionary.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_dictionary.h
@@ -16,9 +16,9 @@
 #include "../SymbologyXML/symbol.h"
 
 // Qt
-#include <QImage>
-#include <QString>
-#include <QStringList>
+#include <QtGui/QImage>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
 
 
 // Forward
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_dictionary_types.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_dictionary_types.h
index aeba00881..db087ad58 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_dictionary_types.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_dictionary_types.h
@@ -15,9 +15,9 @@
 
 
 // Qt
-#include <QColor>
-#include <QImage>
-#include <QPixmap>
+#include <QtGui/QColor>
+#include <QtGui/QImage>
+#include <QtGui/QPixmap>
 
 class QValidator;
 class QUuid;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_properties.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_properties.h
index b9af511ce..d7fef5b14 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_properties.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_properties.h
@@ -14,7 +14,7 @@
 
 
 // Qt
-#include <QStringList>
+#include <QtCore/QStringList>
 
 
 //----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_result.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_result.cpp
index 3460f0efb..1b558c592 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_result.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_result.cpp
@@ -11,10 +11,10 @@
 
 
 // Qt
-#include <QUuid>
-#include <QComboBox>
-#include <QFutureWatcher>
-#include <QTimer>
+#include <QtCore/QUuid>
+#include <QtWidgets/QComboBox>
+#include <QtCore/QFutureWatcher>
+#include <QtCore/QTimer>
 
 
 namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_result.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_result.h
index 960716c8a..68f463517 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_result.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_result.h
@@ -15,12 +15,12 @@
 
 
 // Qt
-#include <QObject>
-#include <QImage>
-#include <QLabel>
-#include <QFuture>
-#include <QSize>
-#include <QBuffer>
+#include <QtCore/QObject>
+#include <QtGui/QImage>
+#include <QtWidgets/QLabel>
+#include <QtCore/QFuture>
+#include <QtCore/QSize>
+#include <QtCore/QBuffer>
 #include <QElapsedTimer>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbology_type.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbology_type.h
index 2c41c36c6..c33e244fd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbology_type.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbology_type.h
@@ -12,8 +12,8 @@
 
 
 // Qt
-#include <QObject>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 
 
 namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.cpp
index e1c123cbb..66224c94b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.cpp
@@ -23,13 +23,13 @@
 
 
 // Qt
-#include <QGuiApplication>
-#include <QString>
-#include <QUuid>
-#include <QByteArray>
-#include <QBuffer>
+#include <QtGui/QGuiApplication>
+#include <QtCore/QString>
+#include <QtCore/QUuid>
+#include <QtCore/QByteArray>
+#include <QtCore/QBuffer>
 #include <QMimeData>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 
 namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.h
index dedc987a4..bc58455c1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.h
@@ -31,8 +31,8 @@
 #include <SymbologyXML/symbol.h>
 
 //Qt
-#include <QObject>
-#include <QPixmap>
+#include <QtCore/QObject>
+#include <QtGui/QPixmap>
 
 namespace AdvancedSymbology
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor.cpp
index 0281f6e64..26faede8a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor.cpp
@@ -23,7 +23,7 @@
 
 // Qt
 #include <QtConcurrent>
-#include <QFuture>
+#include <QtCore/QFuture>
 
 #define CREATE_ESRI_SYMBOL_ON_DEMAND // save time on startup
 // REGG-3483 - EsriDictionaryProcessor::syncTableWithinMainThread verzögert Applikations-Start um mehrere Sekunden
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor.h
index ee76866a8..7d8521007 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor.h
@@ -15,7 +15,7 @@
 
 
 // Qt
-#include <QImage>
+#include <QtGui/QImage>
 
 
 // Esri
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor_app6.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor_app6.cpp
index 8f12bef14..3a3884a31 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor_app6.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor_app6.cpp
@@ -15,7 +15,7 @@
 
 // Qt
 #include <QtConcurrent>
-#include <QFuture>
+#include <QtCore/QFuture>
 
 
 namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor_app6d.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor_app6d.cpp
index 61c0227fc..b57bfddce 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor_app6d.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor_app6d.cpp
@@ -34,7 +34,7 @@
 
 
 // Qt
-#include <QThread>
+#include <QtCore/QThread>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor_mil2525d.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor_mil2525d.cpp
index 13be79ec0..9e9375fed 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor_mil2525d.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor_mil2525d.cpp
@@ -14,7 +14,7 @@
 
 
 // Qt
-#include <QThread>
+#include <QtCore/QThread>
 
 
 namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/symbol_dictionary_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/symbol_dictionary_impl.cpp
index b813a8a0e..65f6ff059 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/symbol_dictionary_impl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/symbol_dictionary_impl.cpp
@@ -42,20 +42,20 @@
 
 
 // Qt
-#include <QHash>
-#include <QStringList>
-#include <QStandardItemModel>
-#include <QTreeView>
-#include <QHBoxLayout>
-#include <QDialog>
-#include <QRegExp>
-#include <QDir>
-#include <QThread>
-#include <QPainter>
-#include <QTime>
+#include <QtCore/QHash>
+#include <QtCore/QStringList>
+#include <QtGui/QStandardItemModel>
+#include <QtWidgets/QTreeView>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QDialog>
+#include <QtCore/QRegExp>
+#include <QtCore/QDir>
+#include <QtCore/QThread>
+#include <QtGui/QPainter>
+#include <QtCore/QTime>
 
 #include <QtConcurrent>
-#include <QFuture>
+#include <QtCore/QFuture>
 
 #include <sstream>
 #include <type_traits>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/symbol_extension_renderer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/symbol_extension_renderer.cpp
index 4c8d46d92..65c80b92e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/symbol_extension_renderer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/symbol_extension_renderer.cpp
@@ -14,7 +14,7 @@
 
 
 // Qt
-#include <QPainter>
+#include <QtGui/QPainter>
 
 #include <iostream>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/symbol_extension_renderer.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/symbol_extension_renderer.h
index 96f9355a0..f347b91eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/symbol_extension_renderer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/symbol_extension_renderer.h
@@ -15,8 +15,8 @@
 // ESRI
 
 // Qt
-#include <QColor>
-#include <QImage>
+#include <QtGui/QColor>
+#include <QtGui/QImage>
 
 
 namespace AdvancedSymbology
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/attribute_data.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/attribute_data.h
index 032d6ea55..c2bc54073 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/attribute_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/attribute_data.h
@@ -8,8 +8,8 @@
 #pragma once
 
 
-#include <QMap>
-#include <QString>
+#include <QtCore/QMap>
+#include <QtCore/QString>
 #include <QStringView>
 
 namespace SymbologyXML
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/pixmap_symbol_cache.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/pixmap_symbol_cache.cpp
index 20bfe4b58..dcb344ec7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/pixmap_symbol_cache.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/pixmap_symbol_cache.cpp
@@ -10,10 +10,10 @@
 #include "symbol_table.h"
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
-#include <QCoreApplication>
-#include <QPainter>
-#include <QGraphicsScene>
-#include <QMap>
+#include <QtCore/QCoreApplication>
+#include <QtGui/QPainter>
+#include <QtWidgets/QGraphicsScene>
+#include <QtCore/QMap>
 
 
 namespace SymbologyXML
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol.cpp
index 1a77c103f..6f5668615 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol.cpp
@@ -15,8 +15,8 @@
 #include <iostream>
 #include <list>
 
-#include <QList>
-#include <QPointF>
+#include <QtCore/QList>
+#include <QtCore/QPointF>
 #include <QTransform>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol.h
index 471bb6f26..6b8a88338 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol.h
@@ -8,10 +8,10 @@
 #pragma once
 
 #include <list>
-#include <QMap>
-#include <QPair>
-#include <QString>
-#include <QRectF>
+#include <QtCore/QMap>
+#include <QtCore/QPair>
+#include <QtCore/QString>
+#include <QtCore/QRectF>
 
 #include <ngltools/ngltools_bitset.h>
 #include <NGLLogger/INGLLogger.h>
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_custom_graphics_item_group.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_custom_graphics_item_group.cpp
index fb140a105..65a89899e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_custom_graphics_item_group.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_custom_graphics_item_group.cpp
@@ -10,7 +10,7 @@
 
 #include "symbol_custom_graphics_item_group.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 
 namespace SymbologyXML {
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_custom_graphics_item_group.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_custom_graphics_item_group.h
index 00ad48c8d..765ab43dd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_custom_graphics_item_group.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_custom_graphics_item_group.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QGraphicsItem>
+#include <QtWidgets/QGraphicsItem>
 
 namespace SymbologyXML {
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_exporter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_exporter.cpp
index 962af7cfa..668ea292d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_exporter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_exporter.cpp
@@ -14,17 +14,17 @@
 // test #include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtDebug>
-#include <QBrush>
-#include <QBuffer>
-#include <QFont>
-#include <QFontDatabase>
+#include <QtGui/QBrush>
+#include <QtCore/QBuffer>
+#include <QtGui/QFont>
+#include <QtGui/QFontDatabase>
 #include <QFontMetrics>
 #include <QGraphicsPathItem>
-#include <QGraphicsScene>
-#include <QMetaType>
-#include <QPainter>
+#include <QtWidgets/QGraphicsScene>
+#include <QtCore/QMetaType>
+#include <QtGui/QPainter>
 #include <QPainterPath>
-#include <QPen>
+#include <QtGui/QPen>
 
 #include <cmath>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_exporter.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_exporter.h
index 0211025b5..640aa36c6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_exporter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_exporter.h
@@ -14,7 +14,7 @@
 #include "primitive.h"
 
 #include <QPainterPath>
-#include <QMap>
+#include <QtCore/QMap>
 
 class QGraphicsItem;
 class QGraphicsItemGroup;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_reader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_reader.cpp
index 5c17872b3..16c342ada 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_reader.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_reader.cpp
@@ -8,8 +8,8 @@
 #include "symbol_reader.h"
 #include "attribute_data.h"
 
-#include <QBuffer>
-#include <QFile>
+#include <QtCore/QBuffer>
+#include <QtCore/QFile>
 #include <QStringView>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_reader.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_reader.h
index 595fca3e5..3bd2623af 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_reader.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_reader.h
@@ -12,9 +12,9 @@
 #include "symbol.h"
 #include "primitive.h"
 
-#include <QColor>
-#include <QString>
-#include <QXmlStreamReader>
+#include <QtGui/QColor>
+#include <QtCore/QString>
+#include <QtCore/QXmlStreamReader>
 
 #include <NGLLogger/INGLLogger.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_types.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_types.h
index e5bfd0205..4a3b1587a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_types.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_types.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <QObject>
-#include <QVector>
-#include <QRectF>
-#include <QColor>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
+#include <QtCore/QRectF>
+#include <QtGui/QColor>
 
 #include "symbology_xml_export.h"
 #include "symbol_id_t.h"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_writer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_writer.cpp
index 65342e7f0..78670d328 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_writer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_writer.cpp
@@ -9,8 +9,8 @@
 #include "primitive.h"
 #include "attribute_data.h"
 
-#include <QFile>
-#include <QXmlStreamWriter>
+#include <QtCore/QFile>
+#include <QtCore/QXmlStreamWriter>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
 namespace SymbologyXML
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_writer.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_writer.h
index ff4b698d9..ae5881ea7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_writer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/symbol_writer.h
@@ -10,7 +10,7 @@
 #include "symbology_xml_export.h"
 #include "symbol.h"
 
-#include <QString>
+#include <QtCore/QString>
 
 #include <NGLLogger/INGLLogger.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CoPrtCnvCentralTelegram.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CoPrtCnvCentralTelegram.cpp
index 535211703..dffa78207 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CoPrtCnvCentralTelegram.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CoPrtCnvCentralTelegram.cpp
@@ -2,7 +2,7 @@
 
 
 #include "CoPrtCnvCentralTelegram.hpp"
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 
 namespace N_CoPrtCnv
 {
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CoPrtCnvTelegramConverterNewIcd.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CoPrtCnvTelegramConverterNewIcd.cpp
index ed27c6471..d0326be85 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CoPrtCnvTelegramConverterNewIcd.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CoPrtCnvTelegramConverterNewIcd.cpp
@@ -5,9 +5,9 @@
 #include "CoPrtCnvTelegramConverter.hpp"
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QLineF>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QLineF>
 #include <TrainingAreaBase/training_area_telegrams.h>
 #include <math.h>
 #include <utility>
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/Console/main.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/Console/main.cpp
index fcdac2bc6..a04437a52 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/Console/main.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/Console/main.cpp
@@ -1,19 +1,19 @@
 
 
-#include <QCoreApplication>
-#include <QStringList>
-#include <QFile>
-#include <QByteArray>
-#include <QDateTime>
-#include <QBuffer>
-#include <QSet>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QStringList>
+#include <QtCore/QFile>
+#include <QtCore/QByteArray>
+#include <QtCore/QDateTime>
+#include <QtCore/QBuffer>
+#include <QtCore/QSet>
 
 #include <CoPrtCnv/CoPrtCnvLogHeader.hpp>
 #include <CoPrtCnv/CoPrtCnvRadioTelegram.hpp>
 #include <CoPrtCnv/CoPrtCnvTelegramConverter.hpp>
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <TrainingAreaBase/training_area_telegrams.h>
 
 static QSet<int> s_eqIds;
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.cpp
index 2b7eb4875..562f6db41 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.cpp
@@ -19,28 +19,28 @@
 #include "LogViewTelegramDialog.hpp"
 #include "LogViewOptionDialog.hpp"
 #include <CoPrtCnv/CoPrtCnvRadioTelegram.hpp>
-#include <QDir>
-#include <QFile>
-#include <QTimer>
-#include <QAction>
-#include <QApplication>
-#include <QCheckBox>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QTimer>
+#include <QtGui/QAction>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QCheckBox>
 #include <QDesktopWidget>
-#include <QFileDialog>
-#include <QGroupBox>
-#include <QHeaderView>
-#include <QJsonArray>
-#include <QLabel>
-#include <QMessageBox>
-#include <QScreen>
-#include <QSortFilterProxyModel>
-#include <QSplitter>
-#include <QStatusBar>
-#include <QTableView>
-#include <QToolBar>
-#include <QToolBox>
-#include <QDateTime>
-#include <QVBoxLayout>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QHeaderView>
+#include <QtCore/QJsonArray>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QMessageBox>
+#include <QtGui/QScreen>
+#include <QtCore/QSortFilterProxyModel>
+#include <QtWidgets/QSplitter>
+#include <QtWidgets/QStatusBar>
+#include <QtWidgets/QTableView>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QToolBox>
+#include <QtCore/QDateTime>
+#include <QtWidgets/QVBoxLayout>
 #include <nglapplication/nglapplication.h>
 
 #include "LogViewInjectionThread.hpp"
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewOptionDialog.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewOptionDialog.cpp
index d159ea971..59edcb395 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewOptionDialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewOptionDialog.cpp
@@ -12,18 +12,18 @@
 
 
 #include "LogViewOptionDialog.hpp"
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QDialogButtonBox>
-#include <QDir>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QFileDialog>
-#include <QIntValidator>
-#include <QLabel>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QRadioButton>
-#include <QVBoxLayout>
+#include <QtCore/QDir>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QFileDialog>
+#include <QtGui/QIntValidator>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QVBoxLayout>
 
 namespace N_LogView
 {
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTabWidget.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTabWidget.cpp
index fe1b5f289..220b7effd 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTabWidget.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTabWidget.cpp
@@ -12,8 +12,8 @@
 
 
 #include "LogViewTabWidget.hpp"
-#include <QFrame>
-#include <QGridLayout>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QGridLayout>
 #include "LogViewField.hpp"
 #include "LogViewTelegram.hpp"
 #include "LogViewTelegramDialog.hpp"
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTableWidget.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTableWidget.cpp
index 26625de34..51c8d4b3d 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTableWidget.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTableWidget.cpp
@@ -14,8 +14,8 @@
 
 #include "LogViewTableWidget.hpp"
 #include "LogViewField.hpp"
-#include <QHeaderView>
-#include <QJsonArray>
+#include <QtWidgets/QHeaderView>
+#include <QtCore/QJsonArray>
 #include "LogViewXdrStandardType.hpp"
 #include "LogViewTelegram.hpp"
 #include "LogViewEnumEdit.hpp"
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.cpp
index cbbafc490..18c265b17 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.cpp
@@ -24,11 +24,11 @@
 #include "LogViewTetraTelegramsParser.hpp"
 
 #include "LogViewField.hpp"
-#include <QDateTime>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QMessageBox>
-#include <QApplication>
+#include <QtCore/QDateTime>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QApplication>
 #include <time.h>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.cpp
index 09fca44ed..86ed665ef 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.cpp
@@ -14,18 +14,18 @@
 #include "LogViewTelegramDialog.hpp"
 #include <utility>
 #include "LogViewTelegram.hpp"
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QDesktopWidget>
-#include <QDir>
-#include <QFileDialog>
-#include <QGroupBox>
-#include <QLabel>
-#include <QMessageBox>
-#include <QPushButton>
-#include <QSettings>
-#include <QScrollArea>
-#include <QTextEdit>
-#include <QVBoxLayout>
+#include <QtCore/QDir>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QPushButton>
+#include <QtCore/QSettings>
+#include <QtWidgets/QScrollArea>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QVBoxLayout>
 #include "LogViewXdrElement.hpp"
 #include "LogViewField.hpp"
 #include "IntegerCalculator.hpp"
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.cpp
index 1a7c37962..ed042e35f 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.cpp
@@ -9,17 +9,17 @@
 #include "LogViewTelegramSelectionDialog.hpp"
 #include <CoPrtCnv/CoPrtCnvHexDumpHelper.hpp>
 
-#include <QAction>
-#include <QDir>
-#include <QFileDialog>
-#include <QHeaderView>
-#include <QIcon>
-#include <QMenu>
-#include <QMessageBox>
-#include <QModelIndex>
-#include <QSettings>
-#include <QTableView>
-#include <QTimer>
+#include <QtGui/QAction>
+#include <QtCore/QDir>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QHeaderView>
+#include <QtGui/QIcon>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMessageBox>
+#include <QtCore/QModelIndex>
+#include <QtCore/QSettings>
+#include <QtWidgets/QTableView>
+#include <QtCore/QTimer>
 
 namespace N_LogView
 {
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramSelectionDialog.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramSelectionDialog.cpp
index eb9c7e506..ba750ccab 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramSelectionDialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramSelectionDialog.cpp
@@ -12,9 +12,9 @@
 
  
 #include "LogViewTelegramSelectionDialog.hpp"
-#include <QLabel>
-#include <QListWidget>
-#include <QVBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QVBoxLayout>
 #include "LogViewXdrType.hpp"
 #include "LogViewXdrParser.hpp"
 #include "LogViewTelegram.hpp"
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.cpp
index 2bcabcdb2..28a9ba2fa 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.cpp
@@ -4,8 +4,8 @@
 #include "LogViewTetraTelegramsParser.hpp"
 #include <utility>
 
-#include <QFile>
-#include <QVector>
+#include <QtCore/QFile>
+#include <QtCore/QVector>
 
 namespace N_LogView
 {
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.cpp
index 6ca8a06b3..ce8fa7ad8 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.cpp
@@ -18,7 +18,7 @@
 #include "LogViewTelegram.hpp"
 #include "LogViewXdrStandardType.hpp"
 #include "IntegerCalculator.hpp"
-#include <QMessageBox>
+#include <QtWidgets/QMessageBox>
 
 namespace N_LogView
 {
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.cpp
index 13767c11f..e4386d2da 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.cpp
@@ -17,15 +17,15 @@
 
 
 #include "LogViewXdrElement.hpp"
-#include <QMessageBox>
+#include <QtWidgets/QMessageBox>
 #include "LogViewXdrStruct.hpp"
 #include "LogViewField.hpp"
 #include "LogViewXdrValue.hpp"
 #include "LogViewXdrType.hpp"
 
-#include <QFile>
-#include <QTextStream>
-#include <QApplication>
+#include <QtCore/QFile>
+#include <QtCore/QTextStream>
+#include <QtWidgets/QApplication>
 
 namespace N_LogView
 {
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/main.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/main.cpp
index c13be4fad..4504ff73d 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/main.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/main.cpp
@@ -1,8 +1,8 @@
 
 
-#include <QCoreApplication>
-#include <QStringList>
-#include <QHostAddress>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QStringList>
+#include <QtNetwork/QHostAddress>
 #include <stdio.h>
 #include <stdlib.h>
 #include "tetra_if.h"
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/tetra_if.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/tetra_if.cpp
index 56a0736c1..370e8cca0 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/tetra_if.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/tetra_if.cpp
@@ -5,13 +5,13 @@
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
-#include <QCoreApplication>
-#include <QDateTime>
-#include <QDir>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDateTime>
+#include <QtCore/QDir>
 #include <QNetworkInterface>
-#include <QStringList>
-#include <QTcpSocket>
-#include <QTimer>
+#include <QtCore/QStringList>
+#include <QtNetwork/QTcpSocket>
+#include <QtCore/QTimer>
 
 #include <CoPrtCnv/CoPrtCnvRadioTelegram.hpp>
 #include <CoPrtCnv/CoPrtCnvTelegramConverter.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/tetra_if.h b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/tetra_if.h
index d63b4272c..52bbf8ac1 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/tetra_if.h
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/tetra_if.h
@@ -1,9 +1,9 @@
 
 
 #pragma once
-#include <QObject>
-#include <QHostAddress>
-#include <QByteArray>
+#include <QtCore/QObject>
+#include <QtNetwork/QHostAddress>
+#include <QtCore/QByteArray>
 
 #include <NGLLogger/INGLLogger.h>
 #include <CoPrtCnv/CoPrtCnvRadioTelegram.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTestAuswertung/main.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTestAuswertung/main.cpp
index 84bb2601d..fb5f60664 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTestAuswertung/main.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTestAuswertung/main.cpp
@@ -1,4 +1,4 @@
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include "mainwindow.h"
 
 int main(int argc, char *argv[])
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTestAuswertung/mainwindow.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTestAuswertung/mainwindow.cpp
index b73b33017..31e2e48ee 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTestAuswertung/mainwindow.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTestAuswertung/mainwindow.cpp
@@ -1,13 +1,13 @@
 #include "mainwindow.h"
 #include <utility>
 #include "ui_mainwindow.h"
-#include <QFileDialog>
-#include <QFile>
+#include <QtWidgets/QFileDialog>
+#include <QtCore/QFile>
 #include <cmath>
-#include <QIntValidator>
-#include <QList>
-#include <QSet>
-#include <QTimer>
+#include <QtGui/QIntValidator>
+#include <QtCore/QList>
+#include <QtCore/QSet>
+#include <QtCore/QTimer>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTestAuswertung/mainwindow.h b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTestAuswertung/mainwindow.h
index e8b60ec56..8df419f23 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTestAuswertung/mainwindow.h
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTestAuswertung/mainwindow.h
@@ -1,9 +1,9 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QMainWindow>
-#include <QDateTime>
-#include <QFile>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QDateTime>
+#include <QtCore/QFile>
 
 namespace Ui
 {
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvApplication.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvApplication.cpp
index fe6a608f6..52f4d3fd5 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvApplication.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvApplication.cpp
@@ -22,8 +22,8 @@
 #include <sys/stat.h>
 #include <stdio.h>
 #include <iostream>
-#include <QCoreApplication>
-#include <QThread>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QThread>
 
 namespace PrtCnv
 {
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvCentralThread.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvCentralThread.cpp
index 89d5394ab..70e602c0d 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvCentralThread.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvCentralThread.cpp
@@ -25,10 +25,10 @@
 #include <CoPrtCnv/CoPrtCnvCentralTelegram.hpp>
 #include <LtsUtils/dds_bitarray.h>
 
-#include <QTimer>
-#include <QCoreApplication>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <time.h>
 #include <TrainingAreaBase/training_area_telegrams.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvInjectionSocket.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvInjectionSocket.cpp
index 4a3b06f86..1a8542739 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvInjectionSocket.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvInjectionSocket.cpp
@@ -17,7 +17,7 @@
 #include <CoPrtCnv/CoPrtCnvCentralTelegram.hpp>
 #include "PrtCnvInjectionThread.hpp"
 #include <QtCore/QByteArray>
-#include <QTcpSocket>
+#include <QtNetwork/QTcpSocket>
 
 namespace PrtCnv
 {
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvRadioThread.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvRadioThread.cpp
index a7052d5e5..2adacbb60 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvRadioThread.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvRadioThread.cpp
@@ -33,9 +33,9 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QStringList>
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
 #include <time.h>
 #include <iostream>
 #include <math.h>
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvThread.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvThread.cpp
index ebd26852b..e562a72e1 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvThread.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvThread.cpp
@@ -12,7 +12,7 @@
 
 
 #include "PrtCnvThread.hpp"
-#include <QThread>
+#include <QtCore/QThread>
 
 namespace PrtCnv
 {
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/TetraTestServer/worker.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/TetraTestServer/worker.cpp
index 935645ce3..70c905abb 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/TetraTestServer/worker.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/TetraTestServer/worker.cpp
@@ -10,8 +10,8 @@
 #include <time.h>
 #include <random>
 #include <iostream>
-#include <QStringList>
-#include <QJsonDocument>
+#include <QtCore/QStringList>
+#include <QtCore/QJsonDocument>
 
 TTWorker::TTWorker(QTcpSocket *socket, const TTSArgs &ttsArgs)
   : m_socket(socket)
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/INGLLogger.h b/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/INGLLogger.h
index dfe0c99a6..23d652a5e 100644
--- a/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/INGLLogger.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/INGLLogger.h
@@ -7,12 +7,12 @@
 
 #pragma once
 
-#include <QList>
-#include <QPointF>
-#include <QRect>
-#include <QRectF>
-#include <QSize>
-#include <QString>
+#include <QtCore/QList>
+#include <QtCore/QPointF>
+#include <QtCore/QRect>
+#include <QtCore/QRectF>
+#include <QtCore/QSize>
+#include <QtCore/QString>
 #include <ngllogger_export.h>
 #include <sstream>
 #include <string>
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/NGLLogger.cpp b/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/NGLLogger.cpp
index 5ccf25b49..96dcc4a3f 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/NGLLogger.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/NGLLogger.cpp
@@ -19,8 +19,8 @@
 #include <mutex>
 #include <unordered_map>
 
-#include <QCoreApplication>
-#include <QFileInfo>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QFileInfo>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/test_ngllogger.cpp b/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/test_ngllogger.cpp
index 2fb106bc7..e203ff7ec 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/test_ngllogger.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/test_ngllogger.cpp
@@ -1,6 +1,6 @@
 #include <NGLLogger/INGLLogger.h>
 #include "NGLLoggerBootstrap.h"
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 int main(int argc, char **argv)
 {
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtlocalpeer.cpp b/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtlocalpeer.cpp
index 50b53fde3..96e0cfb60 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtlocalpeer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtlocalpeer.cpp
@@ -3,13 +3,13 @@
 
 
 #include "qtlocalpeer.h"
-#include <QCoreApplication>
-#include <QDataStream>
-#include <QTime>
-#include <QRegularExpression>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDataStream>
+#include <QtCore/QTime>
+#include <QtCore/QRegularExpression>
 
 #if defined(Q_OS_WIN)
-#include <QLibrary>
+#include <QtCore/QLibrary>
 #include <qt_windows.h>
 typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*);
 static PProcessIdToSessionId pProcessIdToSessionId = 0;
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtlocalpeer.h b/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtlocalpeer.h
index 2c0a558ce..544952ff8 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtlocalpeer.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtlocalpeer.h
@@ -4,9 +4,9 @@
 #ifndef QTLOCALPEER_H
 #define QTLOCALPEER_H
 
-#include <QLocalServer>
-#include <QLocalSocket>
-#include <QDir>
+#include <QtNetwork/QLocalServer>
+#include <QtNetwork/QLocalSocket>
+#include <QtCore/QDir>
 
 #include "qtlockedfile.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtlockedfile.h b/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtlockedfile.h
index 81d50e76f..14c95420d 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtlockedfile.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtlockedfile.h
@@ -4,9 +4,9 @@
 #ifndef QTLOCKEDFILE_H
 #define QTLOCKEDFILE_H
 
-#include <QFile>
+#include <QtCore/QFile>
 #ifdef Q_OS_WIN
-#include <QVector>
+#include <QtCore/QVector>
 #endif
 
 #if defined(Q_OS_WIN)
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtlockedfile_win.cpp b/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtlockedfile_win.cpp
index b4ea7d1a2..2edfcb504 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtlockedfile_win.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtlockedfile_win.cpp
@@ -4,7 +4,7 @@
 #include "qtlockedfile.h"
 #include <utility>
 #include <qt_windows.h>
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
 
 #define MUTEX_PREFIX "QtLockedFile mutex "
 
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtsingleapplication.cpp b/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtsingleapplication.cpp
index d0b3097e6..af633ae8a 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtsingleapplication.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtsingleapplication.cpp
@@ -4,7 +4,7 @@
 
 #include "qtsingleapplication.h"
 #include "qtlocalpeer.h"
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtsingleapplication.h b/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtsingleapplication.h
index 48fac28a2..b380c177d 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtsingleapplication.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtsingleapplication.h
@@ -4,7 +4,7 @@
 #ifndef QTSINGLEAPPLICATION_H
 #define QTSINGLEAPPLICATION_H
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 class QtLocalPeer;
 
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtsinglecoreapplication.h b/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtsinglecoreapplication.h
index af12f39f2..3e35f248f 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtsinglecoreapplication.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/QtSingleApplication/qtsinglecoreapplication.h
@@ -4,7 +4,7 @@
 #ifndef QTSINGLECOREAPPLICATION_H
 #define QTSINGLECOREAPPLICATION_H
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 class QtLocalPeer;
 
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/IWMS2ECC.h b/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/IWMS2ECC.h
index 57414de3d..af0ed3b0d 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/IWMS2ECC.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/IWMS2ECC.h
@@ -2,10 +2,10 @@
 
 #pragma once
 
-#include <QString>
-#include <QMap>
-#include <QSet>
-#include <QMetaType>
+#include <QtCore/QString>
+#include <QtCore/QMap>
+#include <QtCore/QSet>
+#include <QtCore/QMetaType>
 
 class IWMS2ECC
 {
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_equipRequirements.cpp b/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_equipRequirements.cpp
index 77337bf3f..4c8077bc9 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_equipRequirements.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_equipRequirements.cpp
@@ -2,8 +2,8 @@
 
 
 #include "wms_ecc_equipRequirements.h"
-#include <QJsonArray>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
 
 QJsonObject EquipRequirements::toJson() const
 {
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_equipmenttypes.cpp b/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_equipmenttypes.cpp
index 0fedea9ee..d3041e4ab 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_equipmenttypes.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_equipmenttypes.cpp
@@ -2,7 +2,7 @@
 
 
 #include "wms_ecc_equipmenttypes.h"
-#include <QJsonArray>
+#include <QtCore/QJsonArray>
 
 QJsonObject EquipmentTypes::toJson(const IWMS2ECC::EquipmentType &et)
 {
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_equipmenttypes.h b/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_equipmenttypes.h
index c253bab52..7c07bfd64 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_equipmenttypes.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_equipmenttypes.h
@@ -6,7 +6,7 @@
 #include "wms_ecc_ibase.h"
 #include "IWMS2ECC.h"
 
-#include <QJsonObject>
+#include <QtCore/QJsonObject>
 #include <QVariantMap>
 
 class WMS_JSON_DS_EXPORT EquipmentTypes : public IBase
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_exercises.cpp b/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_exercises.cpp
index fe2f27464..3a492c41c 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_exercises.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_exercises.cpp
@@ -2,8 +2,8 @@
 
 
 #include "wms_ecc_exercises.h"
-#include <QJsonArray>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
 
 namespace EXCON
 {
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_playerInfo.cpp b/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_playerInfo.cpp
index bbb2762a9..dd8432b63 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_playerInfo.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_playerInfo.cpp
@@ -2,9 +2,9 @@
 
 
 #include "wms_ecc_playerInfo.h"
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
 
 QJsonObject PlayerInfo::toJson(const IWMS2ECC::PlayerInfo &pi)
 {
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_registration.cpp b/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_registration.cpp
index 13eeb5c22..ba8633e98 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_registration.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_registration.cpp
@@ -2,7 +2,7 @@
 
 
 #include "wms_ecc_registration.h"
-#include <QJsonObject>
+#include <QtCore/QJsonObject>
 
 QJsonObject Registration::toJson() const
 {
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_unregister.cpp b/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_unregister.cpp
index df6eef965..cc3df3944 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_unregister.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/wms_ecc_unregister.cpp
@@ -2,7 +2,7 @@
 
 
 #include "wms_ecc_unregister.h"
-#include <QJsonObject>
+#include <QtCore/QJsonObject>
 
 QJsonObject Unregister::toJson() const
 {
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglapplication.h b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglapplication.h
index 4270ea594..bdfaaf2f0 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglapplication.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglapplication.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include "nglloggerhandler.h"
 
 #ifndef NGLAPPLICATION_EXPORT
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglloggerhandler.h b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglloggerhandler.h
index 8bc47eea0..fd92a8ebf 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglloggerhandler.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/nglloggerhandler.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <QByteArray>
-#include <QString>
+#include <QtCore/QByteArray>
+#include <QtCore/QString>
 
 #ifndef LOGGERHANDLER_EXPORT
 # ifdef BUILD_STATIC_LIBRARIES
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_bzip2iodevice.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_bzip2iodevice.cpp
index 4f790d5be..f9bbcc03e 100644
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_bzip2iodevice.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_bzip2iodevice.cpp
@@ -2,8 +2,8 @@
 
 #include "nglcomp_bzip2iodevice.h"
 
-#include <QIODevice>
-#include <QString>
+#include <QtCore/QIODevice>
+#include <QtCore/QString>
 #include <bzlib.h>
 
 class BZip2IODevice::Private
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_bzip2iodevice.h b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_bzip2iodevice.h
index fa35d926a..8917e6c0a 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_bzip2iodevice.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_bzip2iodevice.h
@@ -6,8 +6,8 @@
 #ifndef BZIP2IODEVICE_H
 #define BZIP2IODEVICE_H
 
-#include <QString>
-#include <QIODevice>
+#include <QtCore/QString>
+#include <QtCore/QIODevice>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_compress.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_compress.cpp
index eb7649eb2..c6c84a1ea 100644
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_compress.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_compress.cpp
@@ -6,14 +6,14 @@
 #include "nglcomp_tarfilter.h"
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QBuffer>
-#include <QCoreApplication>
-#include <QDebug>
-#include <QDir>
-#include <QFileInfo>
-#include <QFutureWatcher>
-#include <QIODevice>
-#include <QStringList>
+#include <QtCore/QBuffer>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QFutureWatcher>
+#include <QtCore/QIODevice>
+#include <QtCore/QStringList>
 #include <QtConcurrent>
 #include <memory>
 #include <utility>
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_compress.h b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_compress.h
index 4ead64b09..c2a021592 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_compress.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_compress.h
@@ -6,11 +6,11 @@
 
 #include <NGLLogger/INGLLogger.h>
 
-#include <QByteArray>
-#include <QFuture>
-#include <QObject>
-#include <QString>
-#include <QVector>
+#include <QtCore/QByteArray>
+#include <QtCore/QFuture>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 
 class QIODevice;
 class TarFilter;
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_tarfilter.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_tarfilter.cpp
index 6353d34f3..42436fdee 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_tarfilter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_tarfilter.cpp
@@ -3,11 +3,11 @@
 
 
 
-#include <QBuffer>
-#include <QFile>
-#include <QIODevice>
-#include <QFileInfo>
-#include <QDateTime>
+#include <QtCore/QBuffer>
+#include <QtCore/QFile>
+#include <QtCore/QIODevice>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDateTime>
 // Use UTF-8 conversions instead of QTextCodec (Qt6)
 
 #include <time.h>
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_tarfilter.h b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_tarfilter.h
index ac2a3b76b..e1477c895 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_tarfilter.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_tarfilter.h
@@ -6,8 +6,8 @@
 #ifndef TARFILTER_H
 #define TARFILTER_H
 
-#include <QString>
-#include <QFile>
+#include <QtCore/QString>
+#include <QtCore/QFile>
 #include <functional>
 
 class QIODevice;
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_test.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_test.cpp
index 112346f9f..a8d454da5 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_test.cpp
@@ -9,7 +9,7 @@
 #include <nglapplication/nglcoreapplication.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
-#include <QtTest>
+#include <QtTest/QtTest>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_test.h b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_test.h
index ad6c18945..0d55d1e94 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_test.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_test.h
@@ -2,11 +2,11 @@
 
 #pragma once
 
-#include <QByteArray>
-#include <QHash>
-#include <QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
 #include <QTemporaryDir>
-#include <QTemporaryFile>
+#include <QtCore/QTemporaryFile>
 
 class nglcomp_test : public QObject
 {
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/ngldb/dbcommon.h b/qt6-after/qt6-migrated-legatus/Z/src/ngldb/dbcommon.h
index 26098cedb..4724915c0 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/ngldb/dbcommon.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/ngldb/dbcommon.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "ngldb_export.h"
-#include <QString>
+#include <QtCore/QString>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglsettings/nglsettings_connections.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglsettings/nglsettings_connections.cpp
index 455f63076..129991c4c 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglsettings/nglsettings_connections.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglsettings/nglsettings_connections.cpp
@@ -2,10 +2,10 @@
 
 #include "nglsettings_connections.h"
 
-#include <QCoreApplication>
-#include <QMap>
-#include <QPair>
-#include <QSettings>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QMap>
+#include <QtCore/QPair>
+#include <QtCore/QSettings>
 #include <QtNetwork/QHostAddress>
 #include <QtNetwork/QHostInfo>
 #include <QtNetwork/QNetworkInterface>
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglsettings/nglsettings_settings.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglsettings/nglsettings_settings.cpp
index a23b90787..7493b455d 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglsettings/nglsettings_settings.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglsettings/nglsettings_settings.cpp
@@ -5,11 +5,11 @@
 
 #include <ngltools/ngltools_filesystem.h>
 
-#include <QCoreApplication>
-#include <QDir>
-#include <QSettings>
-#include <QSize>
-#include <QStandardPaths>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDir>
+#include <QtCore/QSettings>
+#include <QtCore/QSize>
+#include <QtCore/QStandardPaths>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/ngltools/ngltools_convert.cpp b/qt6-after/qt6-migrated-legatus/Z/src/ngltools/ngltools_convert.cpp
index e2bbad214..e58059807 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/ngltools/ngltools_convert.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/ngltools/ngltools_convert.cpp
@@ -1,6 +1,6 @@
 #include "ngltools_convert.h"
 
-#include <QVector>
+#include <QtCore/QVector>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/ngltools/ngltools_convert.h b/qt6-after/qt6-migrated-legatus/Z/src/ngltools/ngltools_convert.h
index 933c93fb4..da6bd2961 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/ngltools/ngltools_convert.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/ngltools/ngltools_convert.h
@@ -5,9 +5,9 @@
 
 #include "ngltools_export.h"
 
-#include <QByteArray>
-#include <QString>
-#include <QVector>
+#include <QtCore/QByteArray>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/ngltools/ngltools_dtg.cpp b/qt6-after/qt6-migrated-legatus/Z/src/ngltools/ngltools_dtg.cpp
index 59c10120b..47697e039 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/ngltools/ngltools_dtg.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/ngltools/ngltools_dtg.cpp
@@ -1,7 +1,7 @@
 #include "ngltools_dtg.h"
 
-#include <QString>
-#include <QDateTime>
+#include <QtCore/QString>
+#include <QtCore/QDateTime>
 #include <QTimeZone>
 
 namespace DTG
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/ngltools/ngltools_dtg.h b/qt6-after/qt6-migrated-legatus/Z/src/ngltools/ngltools_dtg.h
index 0d1c252c2..cc4b0b6d6 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/ngltools/ngltools_dtg.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/ngltools/ngltools_dtg.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QStringList>
+#include <QtCore/QStringList>
 #include "ngltools_export.h"
 
 class QDateTime;
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/ngltools/ngltools_filesystem.cpp b/qt6-after/qt6-migrated-legatus/Z/src/ngltools/ngltools_filesystem.cpp
index c6f79aff3..dd868bf9b 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/ngltools/ngltools_filesystem.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/ngltools/ngltools_filesystem.cpp
@@ -3,9 +3,9 @@
 
 #include "ngltools_filesystem.h"
 
-#include <QCoreApplication>
-#include <QDir>
-#include <QSettings>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDir>
+#include <QtCore/QSettings>
 #include <utility>
 
 namespace NGL
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/ngltools/tests/NGLToolsQtSmokeTest.cpp b/qt6-after/qt6-migrated-legatus/Z/src/ngltools/tests/NGLToolsQtSmokeTest.cpp
index d71671985..921b4eae7 100644
--- a/qt6-after/qt6-migrated-legatus/Z/src/ngltools/tests/NGLToolsQtSmokeTest.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/ngltools/tests/NGLToolsQtSmokeTest.cpp
@@ -1,6 +1,6 @@
-#include <QObject>
-#include <QtTest>
-#include <QDateTime>
+#include <QtCore/QObject>
+#include <QtTest/QtTest>
+#include <QtCore/QDateTime>
 
 #include "ngltools_dtg.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/ngltranslator/ngltranslator.cpp b/qt6-after/qt6-migrated-legatus/Z/src/ngltranslator/ngltranslator.cpp
index 87568a0be..1aa865720 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/ngltranslator/ngltranslator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/ngltranslator/ngltranslator.cpp
@@ -5,15 +5,15 @@
 #include <utility>
 #include "ngltranslator_p.h"
 
-#include <QCoreApplication>
-#include <QDir>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDir>
 #include <QTranslator>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QLibraryInfo>
 #include <QLocale>
-#include <QDebug>
+#include <QtCore/QDebug>
 
 
 namespace NGL
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/ngltranslator/ngltranslator.h b/qt6-after/qt6-migrated-legatus/Z/src/ngltranslator/ngltranslator.h
index 4f2f0a4ad..c5d365a83 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/ngltranslator/ngltranslator.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/ngltranslator/ngltranslator.h
@@ -4,9 +4,9 @@
 #pragma once
 
 #include "ngltranslator_export.h"
-#include <QByteArray>
-#include <QString>
-#include <QVector>
+#include <QtCore/QByteArray>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/ngltranslator/ngltranslator_p.h b/qt6-after/qt6-migrated-legatus/Z/src/ngltranslator/ngltranslator_p.h
index 808f9d0ad..c3bc11238 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/ngltranslator/ngltranslator_p.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/ngltranslator/ngltranslator_p.h
@@ -4,7 +4,7 @@
 
 #include "ngltranslator.h"
 
-#include <QHash>
+#include <QtCore/QHash>
 #include <QTranslator>
 
 namespace NGL
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/ngldialog.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/ngldialog.cpp
index 32f29c23e..7e48d4921 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/ngldialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/ngldialog.cpp
@@ -2,13 +2,13 @@
 
 #include "ngldialog.h"
 
-#include <QApplication>
-#include <QDir>
-#include <QFrame>
-#include <QIcon>
-#include <QKeyEvent>
-#include <QScreen>
-#include <QVBoxLayout>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDir>
+#include <QtWidgets/QFrame>
+#include <QtGui/QIcon>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QScreen>
+#include <QtWidgets/QVBoxLayout>
 #include <ngltools/ngltools_helpevent.h>
 
 #include <time.h>
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/ngldialog.h b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/ngldialog.h
index 06dfce5e0..556cbaaa6 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/ngldialog.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/ngldialog.h
@@ -4,7 +4,7 @@
 
 #include "nglwidgets_export.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include "nglstandardbutton.h"
 
 class NGLWIDGETS_EXPORT NGLDialog : public QDialog
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/ngldialogbuttonbox.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/ngldialogbuttonbox.cpp
index c440f38f2..9d714e6a9 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/ngldialogbuttonbox.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/ngldialogbuttonbox.cpp
@@ -1,8 +1,8 @@
 #include "ngldialogbuttonbox.h"
 
-#include <QAction>
-#include <QHBoxLayout>
-#include <QFrame>
+#include <QtGui/QAction>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QFrame>
 
 NGLDialogButtonBox::NGLDialogButtonBox(QWidget *parent)
   : NGLDialogButtonBox(Qt::Horizontal, parent)
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/ngldialogbuttonbox.h b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/ngldialogbuttonbox.h
index d6910597a..74a3adf1c 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/ngldialogbuttonbox.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/ngldialogbuttonbox.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <QtCore/QMultiMap>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 #include "nglwidgets_export.h"
 #include "nglstandardbutton.h"
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglmainwindow.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglmainwindow.cpp
index cf6630571..c6ba45814 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglmainwindow.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglmainwindow.cpp
@@ -7,9 +7,9 @@
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <QtCore/QLibraryInfo>
 #include <QtCore/QTextStream>
-#include <QGuiApplication>
-#include <QMenu>
-#include <QMenuBar>
+#include <QtGui/QGuiApplication>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMenuBar>
 
 NGLMainWindow::NGLMainWindow(QWidget *parent)
   : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglmainwindow.h b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglmainwindow.h
index c424d7707..21b5b3239 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglmainwindow.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglmainwindow.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <QMainWindow>
-#include <QMap>
-#include <QProcess>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QMap>
+#include <QtCore/QProcess>
 #include "nglwidgets_export.h"
 
 namespace NGL
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfdocument.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfdocument.cpp
index c85f69b7b..93dd73e02 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfdocument.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfdocument.cpp
@@ -3,11 +3,11 @@
 #include "nglpdfpage.h"
 
 #include <QtCore/QUrl>
-#include <QLabel>
-#include <QScrollArea>
-#include <QScrollBar>
-#include <QVBoxLayout>
-#include <QTimer>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QScrollArea>
+#include <QtWidgets/QScrollBar>
+#include <QtWidgets/QVBoxLayout>
+#include <QtCore/QTimer>
 
 #include <iostream>
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfdocument.h b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfdocument.h
index 90f882f2b..7ddaa1e32 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfdocument.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfdocument.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <QWidget>
-#include <QString>
-#include <QVector>
-#include <QPointer>
+#include <QtWidgets/QWidget>
+#include <QtCore/QString>
+#include <QtCore/QVector>
+#include <QtCore/QPointer>
 #include <poppler/qt6/poppler-qt6.h>
 
 #include "nglwidgets_export.h"
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfpage.h b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfpage.h
index 2479a287d..81d4bf9f0 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfpage.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfpage.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <QtCore/QSizeF>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <QtGui/QPixmap>
 #include <poppler/qt6/poppler-qt6.h>
 #include <vector>
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfwidget.h b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfwidget.h
index 5452bade6..faea313f4 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfwidget.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfwidget.h
@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <memory>
 #include <poppler/qt6/poppler-qt6.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglstandardbutton.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglstandardbutton.cpp
index 280db49c1..fae392ac5 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglstandardbutton.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglstandardbutton.cpp
@@ -1,10 +1,10 @@
 
 
 #include "nglstandardbutton.h"
-#include <QMenu>
-#include <QEvent>
-#include <QAction>
-#include <QKeySequence>
+#include <QtWidgets/QMenu>
+#include <QtCore/QEvent>
+#include <QtGui/QAction>
+#include <QtGui/QKeySequence>
 
 NGLStandardButton::NGLStandardButton(QWidget *parent)
   : NGLStandardButton(NoButton, parent)
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglstandardbutton.h b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglstandardbutton.h
index ad403b459..2b6e31fcd 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglstandardbutton.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglstandardbutton.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <QPushButton>
+#include <QtWidgets/QPushButton>
 
 #include "nglwidgets_export.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/ngltreeitem.h b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/ngltreeitem.h
index cadfcf8b7..e427aaa8c 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/ngltreeitem.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/ngltreeitem.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <QIcon>
-#include <QVariant>
-#include <QVector>
+#include <QtGui/QIcon>
+#include <QtCore/QVariant>
+#include <QtCore/QVector>
 
 #include "nglwidgets_export.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/test_nglpdfwidget.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/test_nglpdfwidget.cpp
index 28c9763d7..72de0fc24 100644
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/test_nglpdfwidget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/test_nglpdfwidget.cpp
@@ -1,4 +1,4 @@
-#include <QTest>
+#include <QtTest/QTest>
 #include "nglpdfwidget.h"
 
 class TestPDFWidget : public QObject
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/qsql_informix.cpp b/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/qsql_informix.cpp
index acfd42e42..eeb52e329 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/qsql_informix.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/qsql_informix.cpp
@@ -12,19 +12,19 @@
 #include <math.h>
 
 
-#include <QAtomicInt>
-#include <QDateTime>
-#include <QMutex>
-#include <QSqlError>
-#include <QSqlField>
-#include <QSqlIndex>
-#include <QSqlRecord>
-#include <QSqlQuery>
-#include <QStringList>
-#include <QTextCodec>
-#include <QTimer>
-#include <QVariant>
-#include <QMetaType>
+#include <QtCore/QAtomicInt>
+#include <QtCore/QDateTime>
+#include <QtCore/QMutex>
+#include <QtSql/QSqlError>
+#include <QtSql/QSqlField>
+#include <QtSql/QSqlIndex>
+#include <QtSql/QSqlRecord>
+#include <QtSql/QSqlQuery>
+#include <QtCore/QStringList>
+#include <QtCore/QTextCodec>
+#include <QtCore/QTimer>
+#include <QtCore/QVariant>
+#include <QtCore/QMetaType>
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/qsql_informix_test.cpp b/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/qsql_informix_test.cpp
index 3d4dd4572..5ddc9d526 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/qsql_informix_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/qsql_informix_test.cpp
@@ -1,12 +1,12 @@
 
 
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QtTest/QtTest>
-#include <QDebug>
-#include <QSqlDatabase>
-#include <QSqlQuery>
-#include <QSqlError>
+#include <QtCore/QDebug>
+#include <QtSql/QSqlDatabase>
+#include <QtSql/QSqlQuery>
+#include <QtSql/QSqlError>
 #include <QLocale>
 
 #include "qsql_informix.h"
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/qsql_informix_utils.h b/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/qsql_informix_utils.h
index 10641d624..f9ddcd7a0 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/qsql_informix_utils.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/qsql_informix_utils.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QString>
-#include <QStringList>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
 
 #ifndef Q_EXPORT_SQLDRIVER_INFORMIX
 # ifdef MAKE_QSQL_INFORMIX_LIB
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/tcpserver/cbi_recvfile.h b/qt6-after/qt6-migrated-legatus/Z/src/tcpserver/cbi_recvfile.h
index 3a6d29a5d..e7bce7200 100644
--- a/qt6-after/qt6-migrated-legatus/Z/src/tcpserver/cbi_recvfile.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/tcpserver/cbi_recvfile.h
@@ -5,8 +5,8 @@
 #include "commandinterface.h"
 #include "tcpserver_export.h"
 
-#include <QMap>
-#include <QPair>
+#include <QtCore/QMap>
+#include <QtCore/QPair>
 
 class QIODevice;
 
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/tcpserver/commandinterface.h b/qt6-after/qt6-migrated-legatus/Z/src/tcpserver/commandinterface.h
index c0e7aeba6..88bd046bb 100644
--- a/qt6-after/qt6-migrated-legatus/Z/src/tcpserver/commandinterface.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/tcpserver/commandinterface.h
@@ -4,9 +4,9 @@
 
 #include "tcpserver_export.h"
 
-#include <QObject>
-#include <QString>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 
 class QAbstractSocket;
 class QByteArray;
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/tcpserver/tcpserver.h b/qt6-after/qt6-migrated-legatus/Z/src/tcpserver/tcpserver.h
index a58043469..9e03c9c76 100644
--- a/qt6-after/qt6-migrated-legatus/Z/src/tcpserver/tcpserver.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/tcpserver/tcpserver.h
@@ -4,7 +4,7 @@
 
 #include "tcpserver_export.h"
 
-#include <QTcpServer>
+#include <QtNetwork/QTcpServer>
 
 class WorkerInstance;
 class CommandInterface;
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/tcpserver/workerbase.h b/qt6-after/qt6-migrated-legatus/Z/src/tcpserver/workerbase.h
index e9132d4e0..090858f79 100644
--- a/qt6-after/qt6-migrated-legatus/Z/src/tcpserver/workerbase.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/tcpserver/workerbase.h
@@ -4,10 +4,10 @@
 
 #include "tcpserver_export.h"
 
-#include <QByteArray>
-#include <QMap>
-#include <QObject>
-#include <QPointer>
+#include <QtCore/QByteArray>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
 
 class QAbstractSocket;
 class CommandInterface;
diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/aes_handler.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/aes_handler.h
index 8d915a211..cf936beb9 100755
--- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/aes_handler.h
+++ b/qt6-after/qt6-migrated-legatus/include/AdlerJson/aes_handler.h
@@ -13,10 +13,10 @@
 #include "logger.h"
 #include "main_dispatcher.h"
 #include "telegrams.h"
-#include <QDateTime>
-#include <QHash>
-#include <QObject>
-#include <QUrl>
+#include <QtCore/QDateTime>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
+#include <QtCore/QUrl>
 #include <AreaEffectSimulation/aes_dtc.h>
 #include <AreaEffectSimulation/aes_ftc.h>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/asm_handler.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/asm_handler.h
index bf2059721..b8ee09015 100755
--- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/asm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/include/AdlerJson/asm_handler.h
@@ -12,7 +12,7 @@
 #include <AssetManagement/asm_dtc.h>
 #include <AssetManagement/asm_ftc.h>
 #include "main_dispatcher.h"
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace AssetManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/flm_handler.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/flm_handler.h
index 2062e6d92..b463fadb3 100755
--- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/flm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/include/AdlerJson/flm_handler.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "logger.h"
-#include <QObject>
+#include <QtCore/QObject>
 #include <FileManagement/flm_ftc.h>
 #include <NotificationManagement/nom_ftc.h>
 #include <NotificationManagement/nom_ftc_types.h>
diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_dispatcher.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_dispatcher.h
index 35b63ecfa..197cd296e 100755
--- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_dispatcher.h
@@ -9,9 +9,9 @@
 
 #pragma once
 
-#include <QHash>
-#include <QObject>
-#include <QVector>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 #include <QtWebSockets/QWebSocket>
 #include <Core/core_types.h> // tr_lts
 #include <TrainingAreaBase/tab_plugin_interface.h>
diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_handler_rx.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_handler_rx.h
index eac0642b7..30f2b2ebf 100755
--- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_handler_rx.h
+++ b/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_handler_rx.h
@@ -12,8 +12,8 @@
 #include <TrainingAreaBase/recv_from_tab.h>
 #include <TrainingAreaBase/tx_mixin.h>
 #include <TrainingAreaBase/tab_plugin_interface.h>
-#include <QObject>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 #include <memory>
 #include "logger.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_handler_tx.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_handler_tx.h
index d6ce9d4a2..b44149414 100755
--- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_handler_tx.h
+++ b/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_handler_tx.h
@@ -17,7 +17,7 @@
 #include <TrainingAreaBase/send_to_tab.h>
 #include <TrainingAreaBase/recv_from_tab.h>
 #include <TrainingAreaBase/tab_plugin_interface.h>
-#include <QHash>
+#include <QtCore/QHash>
 
 class QWebSocket;
 class PpmHandler;
diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/main_dispatcher.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/main_dispatcher.h
index d7fc593e0..816e3f9ed 100755
--- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/main_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/include/AdlerJson/main_dispatcher.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 #include <Core/core_types.h> // tr_lts
 #include <TrainingAreaBase/dds_handler.h>
diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/pdm_handler.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/pdm_handler.h
index 80a300737..e424f4143 100755
--- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/pdm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/include/AdlerJson/pdm_handler.h
@@ -15,10 +15,10 @@
 #include <ProjectDataManagement/pdm.hpp>
 #include <ProjectDataManagement/pdm_dtc.h>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
-#include <QObject>
-#include <QHash>
-#include <QUrl>
-#include <QDateTime>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtCore/QUrl>
+#include <QtCore/QDateTime>
 
 namespace AdlerJson
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/plugin.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/plugin.h
index 1fd8ade24..2f83bf260 100755
--- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/include/AdlerJson/plugin.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "TrainingAreaBase/dds_handler.h"
-#include <QObject>
+#include <QtCore/QObject>
 #include <TrainingAreaBase/tab_plugin_interface.h>
 
 namespace AdlerJson
diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/ppm_handler.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/ppm_handler.h
index d68913d23..f23c927e9 100755
--- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/ppm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/include/AdlerJson/ppm_handler.h
@@ -16,11 +16,11 @@
 #include <ParticipantManagement/ppm.hpp>
 #include <ParticipantManagement/ppm_ftc.h>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
-#include <QTimer>
-#include <QObject>
-#include <QHash>
-#include <QUrl>
-#include <QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QHash>
+#include <QtCore/QUrl>
+#include <QtCore/QDateTime>
 #include <telegrams.h>
 
 namespace AdlerJson
diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/saa_interface.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/saa_interface.h
index 39feda77e..69eb9f959 100755
--- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/saa_interface.h
+++ b/qt6-after/qt6-migrated-legatus/include/AdlerJson/saa_interface.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 #include <AdlerJson/telegrams.h>
 #include "ppm_handler.h"
 #include "aes_handler.h"
diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/settings.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/settings.h
index 0045f1db7..d3fda37c7 100755
--- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/settings.h
+++ b/qt6-after/qt6-migrated-legatus/include/AdlerJson/settings.h
@@ -7,8 +7,8 @@
   */
 #pragma once
 
-#include <QString>
-#include <QJsonObject>
+#include <QtCore/QString>
+#include <QtCore/QJsonObject>
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/telegrams.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/telegrams.h
index 49f41d3a9..e7317bf22 100755
--- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/telegrams.h
+++ b/qt6-after/qt6-migrated-legatus/include/AdlerJson/telegrams.h
@@ -1,12 +1,12 @@
 #pragma once
 #include "saatelegrams_export.h"
-#include <QChar>
-#include <QDateTime>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QString>
-#include <QUuid>
-#include <QVector>
+#include <QtCore/QChar>
+#include <QtCore/QDateTime>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QString>
+#include <QtCore/QUuid>
+#include <QtCore/QVector>
 
 #include <ProjectDataManagement/pdm_enums.hpp>
 
diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/ws_handler.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/ws_handler.h
index 4e692c826..8d42ce1ee 100755
--- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/ws_handler.h
+++ b/qt6-after/qt6-migrated-legatus/include/AdlerJson/ws_handler.h
@@ -5,7 +5,7 @@
 
 #include <TrainingAreaBase/training_area_telegrams.h>
 #include <QtWebSockets/QWebSocketServer>
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 
 
diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/ws_interface.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/ws_interface.h
index 68919373e..4d4bb3370 100755
--- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/ws_interface.h
+++ b/qt6-after/qt6-migrated-legatus/include/AdlerJson/ws_interface.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <qobjectdefs.h>
 
 namespace TrainingAreaBase {
diff --git a/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_dtc.h b/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_dtc.h
index 1c8d806b0..d09b626b3 100644
--- a/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_dtc.h
+++ b/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_dtc.h
@@ -8,7 +8,7 @@
 #include <optional>
 #include <string>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "LtsUtils/LtsUtilsCore/data_modification_enum.h"
 #include "ProjectDataManagement/pdm_types.h"
diff --git a/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_translation.h b/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_translation.h
index 0e1b878d7..8cc17b835 100644
--- a/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_translation.h
+++ b/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_translation.h
@@ -3,7 +3,7 @@
 // Translation Helper für AlarmManagement Module
 // Wrapper für QObject::tr() in nicht-QObject Klassen
 
-#include <QString>
+#include <QtCore/QString>
 #include "svcalmcommon_export.h"
 
 namespace AlarmManagement
diff --git a/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_types.h b/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_types.h
index 03ce4cfbc..27b090ab5 100644
--- a/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_types.h
+++ b/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_types.h
@@ -3,7 +3,7 @@
 // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
 // Für die Migration erstellen wir minimale Typ-Definitionen
 
-#include <QString>
+#include <QtCore/QString>
 #include "almcommon_export.h"
 
 namespace AlarmManagement
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQmlCppTemplate300_0_0/main.cpp b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQmlCppTemplate300_0_0/main.cpp
index 5d4e7f477..e295cc113 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQmlCppTemplate300_0_0/main.cpp
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQmlCppTemplate300_0_0/main.cpp
@@ -19,12 +19,12 @@
 #include "MapQuickView.h"
 @endif
 
-#include <QDir>
-#include <QGuiApplication>
+#include <QtCore/QDir>
+#include <QtGui/QGuiApplication>
 @if %{ThreeDSample}
-#include <QSurfaceFormat>
+#include <QtGui/QSurfaceFormat>
 @endif
-#include <QQmlApplicationEngine>
+#include <QtQml/QQmlApplicationEngine>
 
 //------------------------------------------------------------------------------
 
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQmlCppTemplate300_0_0/template.cpp b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQmlCppTemplate300_0_0/template.cpp
index 82d4f0f36..e17cfea9c 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQmlCppTemplate300_0_0/template.cpp
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQmlCppTemplate300_0_0/template.cpp
@@ -21,7 +21,7 @@
 #include "SceneViewTypes.h"
 #include "Surface.h"
 
-#include <QUrl>
+#include <QtCore/QUrl>
 @else
 #include "Map.h"
 #include "MapTypes.h"
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQmlCppTemplate300_0_0/template.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQmlCppTemplate300_0_0/template.h
index d1541f546..f42e49e04 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQmlCppTemplate300_0_0/template.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQmlCppTemplate300_0_0/template.h
@@ -23,7 +23,7 @@ namespace Esri::ArcGISRuntime {
 @endif
 } // namespace Esri::ArcGISRuntime
 
-#include <QObject>
+#include <QtCore/QObject>
 
 @if %{ThreeDSample}
 Q_MOC_INCLUDE("%{JS: ( '%{GeoViewType}' === 'globalScene' ? 'SceneQuickView' : 'LocalSceneQuickView' )}.h")
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQtTemplate300_0_0/main.cpp b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQtTemplate300_0_0/main.cpp
index 035bbab2b..844feeeba 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQtTemplate300_0_0/main.cpp
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQtTemplate300_0_0/main.cpp
@@ -11,11 +11,11 @@
 //
 
 // Qt headers
-#include <QApplication>
-#include <QMessageBox>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMessageBox>
 
 @if %{ThreeDSample}
-#include <QSurfaceFormat>
+#include <QtGui/QSurfaceFormat>
 @endif
 
 #include "ArcGISRuntimeEnvironment.h"
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQtTemplate300_0_0/template.cpp b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQtTemplate300_0_0/template.cpp
index 1c7d6c410..33dbfaa6d 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQtTemplate300_0_0/template.cpp
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQtTemplate300_0_0/template.cpp
@@ -23,7 +23,7 @@
 #include %{JS: ( '%{GeoViewType}' === 'globalScene' ? '"SceneGraphicsView.h"' : '"LocalSceneWidget.h"' )}
 #include "Surface.h"
 
-#include <QUrl>
+#include <QtCore/QUrl>
 @else
 #include "Map.h"
 #include "MapGraphicsView.h"
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQtTemplate300_0_0/template.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQtTemplate300_0_0/template.h
index 3701d5a50..8e9eba7aa 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQtTemplate300_0_0/template.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/ideintegration/ArcGISRuntimeQtTemplate300_0_0/template.h
@@ -22,7 +22,7 @@ namespace Esri::ArcGISRuntime {
 @endif
 } // namespace Esri::ArcGISRuntime
 
-#include <QMainWindow>
+#include <QtWidgets/QMainWindow>
 
 class %{CN} : public QMainWindow
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AggregateFieldListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AggregateFieldListModel.h
index 12f6b429d..fded87ffd 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AggregateFieldListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AggregateFieldListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 namespace QRTImpl
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AnalysisListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AnalysisListModel.h
index 1cc66bf3a..2476e8c7b 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AnalysisListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AnalysisListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AnalysisOverlayListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AnalysisOverlayListModel.h
index 08b5e49fd..2db721d7b 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AnalysisOverlayListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AnalysisOverlayListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AnalysisTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AnalysisTypes.h
index 84841c294..a50eb0d13 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AnalysisTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AnalysisTypes.h
@@ -25,7 +25,7 @@
 #define QRT_AnalysisTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DELCARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DELCARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ArcGISFeature.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ArcGISFeature.h
index 95692d14e..50c237909 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ArcGISFeature.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ArcGISFeature.h
@@ -29,7 +29,7 @@
 #include "Loadable.h"
 
 // Qt headers
-#include <QPointer>
+#include <QtCore/QPointer>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ArcGISFeatureListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ArcGISFeatureListModel.h
index 6bf59c58d..aa09f9e95 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ArcGISFeatureListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ArcGISFeatureListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ArcGISSublayerListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ArcGISSublayerListModel.h
index 3e209f8c7..dd25c3798 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ArcGISSublayerListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ArcGISSublayerListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AttachmentListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AttachmentListModel.h
index 283c83de1..04b7d92cb 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AttachmentListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AttachmentListModel.h
@@ -25,8 +25,8 @@
 #define QRT_AttachmentListModel_H
 
 // Qt headers
-#include <QAbstractListModel>
-#include <QFuture>
+#include <QtCore/QAbstractListModel>
+#include <QtCore/QFuture>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AttributeListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AttributeListModel.h
index 431d6b3ef..25b581daf 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AttributeListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/AttributeListModel.h
@@ -25,7 +25,7 @@
 #define QRT_AttributeListModel_H
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Authentication/ArcGISAuthenticationChallengeHandler.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Authentication/ArcGISAuthenticationChallengeHandler.h
index 82266e609..25c9ba067 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Authentication/ArcGISAuthenticationChallengeHandler.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Authentication/ArcGISAuthenticationChallengeHandler.h
@@ -25,7 +25,7 @@
 #define QRT_ArcGISAuthenticationChallengeHandler_H
 
 // Qt headers
-#include <QObject>
+#include <QtCore/QObject>
 
 // STL headers
 #include <functional>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Authentication/AuthenticationTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Authentication/AuthenticationTypes.h
index 79a160a5f..8d1b6fa11 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Authentication/AuthenticationTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Authentication/AuthenticationTypes.h
@@ -25,7 +25,7 @@
 #define QRT_AuthenticationTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DELCARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DELCARE_METATYPE
 
 namespace Esri::ArcGISRuntime::Authentication
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Authentication/NetworkAuthenticationChallenge.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Authentication/NetworkAuthenticationChallenge.h
index 0832d37db..515bcf3cf 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Authentication/NetworkAuthenticationChallenge.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Authentication/NetworkAuthenticationChallenge.h
@@ -28,7 +28,7 @@
 #include "Object.h"
 
 // Qt headers
-#include <QNetworkReply>
+#include <QtNetwork/QNetworkReply>
 
 // STL headers
 #include <optional>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Authentication/NetworkAuthenticationChallengeHandler.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Authentication/NetworkAuthenticationChallengeHandler.h
index fcf854560..5fce8cc7c 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Authentication/NetworkAuthenticationChallengeHandler.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Authentication/NetworkAuthenticationChallengeHandler.h
@@ -25,7 +25,7 @@
 #define QRT_NetworkAuthenticationChallengeHandler_H
 
 // Qt headers
-#include <QObject>
+#include <QtCore/QObject>
 
 // STL headers
 #include <functional>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/BasemapListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/BasemapListModel.h
index c7819a289..ac44fb8d8 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/BasemapListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/BasemapListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/BookmarkListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/BookmarkListModel.h
index 46306af46..4c10ed098 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/BookmarkListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/BookmarkListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/BuildingFilterBlockListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/BuildingFilterBlockListModel.h
index 82b27543f..0ca89548d 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/BuildingFilterBlockListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/BuildingFilterBlockListModel.h
@@ -29,7 +29,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 Q_MOC_INCLUDE("Error.h")
 
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/BuildingFilterListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/BuildingFilterListModel.h
index 1ee81becb..54464e0f0 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/BuildingFilterListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/BuildingFilterListModel.h
@@ -29,7 +29,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 Q_MOC_INCLUDE("Error.h")
 
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/BuildingSublayerListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/BuildingSublayerListModel.h
index aa77b4e8b..b062b49af 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/BuildingSublayerListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/BuildingSublayerListModel.h
@@ -28,8 +28,8 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
-#include <QList>
+#include <QtCore/QAbstractListModel>
+#include <QtCore/QList>
 
 Q_MOC_INCLUDE("Error.h")
 
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ClassBreakListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ClassBreakListModel.h
index 4b08b8afd..bdd6797df 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ClassBreakListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ClassBreakListModel.h
@@ -29,7 +29,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ClassificationInfo.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ClassificationInfo.h
index 4de0d299c..d6d3aea07 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ClassificationInfo.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ClassificationInfo.h
@@ -28,7 +28,7 @@
 #include "Object.h"
 
 // Qt headers
-#include <QVariant>
+#include <QtCore/QVariant>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ClosestFacilityParameters.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ClosestFacilityParameters.h
index f62a74d71..9959669eb 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ClosestFacilityParameters.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ClosestFacilityParameters.h
@@ -25,7 +25,7 @@
 #define QRT_ClosestFacilityParameters_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ClosestFacilityResult.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ClosestFacilityResult.h
index 4051015c8..92a2abbb0 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ClosestFacilityResult.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ClosestFacilityResult.h
@@ -25,7 +25,7 @@
 #define QRT_ClosestFacilityResult_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/CodedValueDescriptionListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/CodedValueDescriptionListModel.h
index 131c990f9..e311dae01 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/CodedValueDescriptionListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/CodedValueDescriptionListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/CoreTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/CoreTypes.h
index 4e88cd84c..30d94513a 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/CoreTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/CoreTypes.h
@@ -25,8 +25,8 @@
 #define QRT_CoreTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
-#include <QNetworkRequest> // for QNetworkRequest::CacheLoadControl::*
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
+#include <QtNetwork/QNetworkRequest> // for QNetworkRequest::CacheLoadControl::*
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/DirectionManeuverListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/DirectionManeuverListModel.h
index 7c8ce7ef2..aec28baed 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/DirectionManeuverListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/DirectionManeuverListModel.h
@@ -25,7 +25,7 @@
 #define QRT_DirectionManeuverListModel_H
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/DisplayFilterListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/DisplayFilterListModel.h
index e8b683873..54a59cb2a 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/DisplayFilterListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/DisplayFilterListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Distance.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Distance.h
index b2a86e00c..56b4903c3 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Distance.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Distance.h
@@ -25,7 +25,7 @@
 #define QRT_Distance_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/DistanceCompositeSceneSymbol.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/DistanceCompositeSceneSymbol.h
index b38305f77..513ec4782 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/DistanceCompositeSceneSymbol.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/DistanceCompositeSceneSymbol.h
@@ -30,7 +30,7 @@
 #include "Symbol.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Domain.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Domain.h
index 7e4ba24a0..fdbff7440 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Domain.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Domain.h
@@ -28,7 +28,7 @@
 #include "JsonSerializable.h"
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/DownloadPreplannedOfflineMapParameters.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/DownloadPreplannedOfflineMapParameters.h
index d8943de9f..2d163d147 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/DownloadPreplannedOfflineMapParameters.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/DownloadPreplannedOfflineMapParameters.h
@@ -25,7 +25,7 @@
 #define QRT_DownloadPreplannedOfflineMapParameters_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/DynamicEntityDataSource.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/DynamicEntityDataSource.h
index f5ba42835..0f4ecd18e 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/DynamicEntityDataSource.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/DynamicEntityDataSource.h
@@ -29,7 +29,7 @@
 #include "Object.h"
 
 // Qt headers
-#include <QFuture>
+#include <QtCore/QFuture>
 
 // STL headers
 #include <atomic>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ElevationSourceListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ElevationSourceListModel.h
index c2e9b26bb..d01ccd4c4 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ElevationSourceListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ElevationSourceListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Envelope.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Envelope.h
index da94663e3..d4ba97aa5 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Envelope.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Envelope.h
@@ -29,7 +29,7 @@
 #include "GeometryTypes.h"
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Error.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Error.h
index c88c9a023..4c89ae207 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Error.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Error.h
@@ -28,7 +28,7 @@
 #include "ErrorTypes.h"
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 #include <QtContainerFwd> // for QVariantMap
 
 // STL headers
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ErrorException.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ErrorException.h
index d18b7038f..f889f3e37 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ErrorException.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ErrorException.h
@@ -28,7 +28,7 @@
 #include "Error.h"
 
 // Qt headers
-#include <QException>
+#include <QtCore/QException>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ErrorTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ErrorTypes.h
index a42b39a4d..4cb84bb52 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ErrorTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ErrorTypes.h
@@ -28,7 +28,7 @@
 #include "Deprecated.h"
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ExportTileCacheParameters.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ExportTileCacheParameters.h
index 04068c068..aceb33760 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ExportTileCacheParameters.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ExportTileCacheParameters.h
@@ -25,7 +25,7 @@
 #define QRT_ExportTileCacheParameters_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ExportVectorTilesParameters.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ExportVectorTilesParameters.h
index 231308858..a2c11bccd 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ExportVectorTilesParameters.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ExportVectorTilesParameters.h
@@ -25,7 +25,7 @@
 #define QRT_ExportVectorTilesParameters_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ExpressionTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ExpressionTypes.h
index 0aa56ae6c..e8ded9dff 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ExpressionTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ExpressionTypes.h
@@ -25,7 +25,7 @@
 #define QRT_ExpressionTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/FeatureCollectionTableListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/FeatureCollectionTableListModel.h
index 6022a66ab..f154fc6e1 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/FeatureCollectionTableListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/FeatureCollectionTableListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/FeatureFormsTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/FeatureFormsTypes.h
index 03e115298..8aa8432fd 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/FeatureFormsTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/FeatureFormsTypes.h
@@ -25,7 +25,7 @@
 #define QRT_FeatureFormsTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DELCARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DELCARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/FeatureTableListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/FeatureTableListModel.h
index fe29f8b3d..c31ce7221 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/FeatureTableListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/FeatureTableListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/FieldDescriptionListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/FieldDescriptionListModel.h
index d7d7d008d..0f10ffe57 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/FieldDescriptionListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/FieldDescriptionListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GenerateGeodatabaseParameters.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GenerateGeodatabaseParameters.h
index f5cd37143..3d0abd4dd 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GenerateGeodatabaseParameters.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GenerateGeodatabaseParameters.h
@@ -25,7 +25,7 @@
 #define QRT_GenerateGeodatabaseParameters_H
 
 // Qt headers
-#include <QMetaType>
+#include <QtCore/QMetaType>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GenerateOfflineMapParameters.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GenerateOfflineMapParameters.h
index 1ea54c5d3..37ab02142 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GenerateOfflineMapParameters.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GenerateOfflineMapParameters.h
@@ -25,7 +25,7 @@
 #define QRT_GenerateOfflineMapParameters_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeoView.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeoView.h
index 4cb9ef45f..77cb4dcc6 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeoView.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeoView.h
@@ -25,7 +25,7 @@
 #define QRT_GeoView_H
 
 // Qt headers
-#include <QObject>
+#include <QtCore/QObject>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeocodeParameters.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeocodeParameters.h
index 43390012d..6efc5ebc7 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeocodeParameters.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeocodeParameters.h
@@ -25,7 +25,7 @@
 #define QRT_GeocodeParameters_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeocodeResult.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeocodeResult.h
index 2d5c70607..03abe6de8 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeocodeResult.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeocodeResult.h
@@ -25,7 +25,7 @@
 #define QRT_GeocodeResult_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeodatabaseTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeodatabaseTypes.h
index c74bd1947..a7a88842d 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeodatabaseTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeodatabaseTypes.h
@@ -25,7 +25,7 @@
 #define QRT_GeodatabaseTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeometricEffectListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeometricEffectListModel.h
index 9676a8440..a7de6a217 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeometricEffectListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeometricEffectListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Geometry.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Geometry.h
index b653a05da..412c0ede1 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Geometry.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Geometry.h
@@ -28,7 +28,7 @@
 #include "JsonSerializable.h"
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeometryEditorTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeometryEditorTypes.h
index 2df96e556..6b4a3e1ea 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeometryEditorTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeometryEditorTypes.h
@@ -25,7 +25,7 @@
 #define QRT_GeometryEditorTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeometryTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeometryTypes.h
index fe01ad021..4c806387f 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeometryTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeometryTypes.h
@@ -25,8 +25,8 @@
 #define QRT_GeometryTypes_H
 
 // Qt headers
-#include <QFlag>
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QFlag>
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeoprocessingTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeoprocessingTypes.h
index 6cdae8434..45b55f8ed 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeoprocessingTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeoprocessingTypes.h
@@ -25,7 +25,7 @@
 #define QRT_GeoprocessingTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeotriggerListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeotriggerListModel.h
index 7527f6d1a..a35ce3e6e 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeotriggerListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeotriggerListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeotriggersTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeotriggersTypes.h
index 6bc45b195..241ef514f 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeotriggersTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GeotriggersTypes.h
@@ -25,7 +25,7 @@
 #define QRT_GeotriggersTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GraphicListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GraphicListModel.h
index aca6cb705..1a4f24773 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GraphicListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GraphicListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GraphicsOverlayListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GraphicsOverlayListModel.h
index 0834a53d0..4d9cff6ce 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GraphicsOverlayListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/GraphicsOverlayListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/HydrographyTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/HydrographyTypes.h
index a93af2684..55c7c3aea 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/HydrographyTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/HydrographyTypes.h
@@ -25,7 +25,7 @@
 #define QRT_HydrographyTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ImageOverlayListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ImageOverlayListModel.h
index b704cf89e..1f5ffd80d 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ImageOverlayListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ImageOverlayListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ImmutablePortalItemListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ImmutablePortalItemListModel.h
index 648ecf22d..0bd47d0e8 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ImmutablePortalItemListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ImmutablePortalItemListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/IndoorsTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/IndoorsTypes.h
index 00b8ec926..fcbf26407 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/IndoorsTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/IndoorsTypes.h
@@ -25,7 +25,7 @@
 #define QRT_IndoorsTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DELCARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DELCARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Item.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Item.h
index 6e2259a03..8eaec9b9e 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Item.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Item.h
@@ -31,7 +31,7 @@
 #include <memory>
 
 // Qt header
-#include <QImage>
+#include <QtGui/QImage>
 
 template<typename T>
 class QFuture;
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/KmlGeometryListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/KmlGeometryListModel.h
index bd100c59b..700708b16 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/KmlGeometryListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/KmlGeometryListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/KmlNodeListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/KmlNodeListModel.h
index 7000cdc5c..79a98a062 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/KmlNodeListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/KmlNodeListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LabelDefinitionListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LabelDefinitionListModel.h
index 1ba3ee662..b5c5beca7 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LabelDefinitionListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LabelDefinitionListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LabelStackSeparatorListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LabelStackSeparatorListModel.h
index 4bfda8619..1889f4081 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LabelStackSeparatorListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LabelStackSeparatorListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LabelingTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LabelingTypes.h
index ee0b0a066..bba0de059 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LabelingTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LabelingTypes.h
@@ -25,7 +25,7 @@
 #define QRT_LabelingTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LayerListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LayerListModel.h
index e8a665196..65d152bc9 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LayerListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LayerListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LegendInfoListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LegendInfoListModel.h
index 896b711cc..4af919e8b 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LegendInfoListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LegendInfoListModel.h
@@ -28,9 +28,9 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
-#include <QFuture>
-#include <QFutureWatcher>
+#include <QtCore/QAbstractListModel>
+#include <QtCore/QFuture>
+#include <QtCore/QFutureWatcher>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LicenseInfo.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LicenseInfo.h
index b9322c73c..87eeeb571 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LicenseInfo.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LicenseInfo.h
@@ -28,7 +28,7 @@
 #include "JsonSerializable.h"
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LocalFeatureEditIterator.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LocalFeatureEditIterator.h
index 332f11562..cc94b2985 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LocalFeatureEditIterator.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LocalFeatureEditIterator.h
@@ -25,7 +25,7 @@
 #define QRT_LocalFeatureEditIterator_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LocalServer/LocalServerTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LocalServer/LocalServerTypes.h
index c9ee69949..0130e97b5 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LocalServer/LocalServerTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LocalServer/LocalServerTypes.h
@@ -25,7 +25,7 @@
 #define QRT_LocalServerTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Location.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Location.h
index 70107a611..a38300192 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Location.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Location.h
@@ -25,7 +25,7 @@
 #define QRT_Location_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LocatorAttribute.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LocatorAttribute.h
index 7fc5f4540..221e64c24 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LocatorAttribute.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/LocatorAttribute.h
@@ -25,7 +25,7 @@
 #define QRT_LocatorAttribute_H
 
 // Qt headers
-#include <QMetaType> // for QMetaType::Type
+#include <QtCore/QMetaType> // for QMetaType::Type
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/MapGraphicsView.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/MapGraphicsView.h
index 136b1c194..123921f76 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/MapGraphicsView.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/MapGraphicsView.h
@@ -34,7 +34,7 @@
 #error "MapGraphicsView is not supported on this platform."
 #endif
 
-#include <QGraphicsView>
+#include <QtWidgets/QGraphicsView>
 
 class QRectF;
 class QHoverEvent;
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/MapQuickView.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/MapQuickView.h
index 484bdf6ee..521a21b65 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/MapQuickView.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/MapQuickView.h
@@ -29,7 +29,7 @@
 #include "NativeQuickItem.h"
 
 // Qt headers
-#include <QQuickFramebufferObject>
+#include <QtQuick/QQuickFramebufferObject>
 
 Q_MOC_INCLUDE("IdentifyGraphicsOverlayResult.h")
 Q_MOC_INCLUDE("IdentifyLayerResult.h")
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/MapTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/MapTypes.h
index e8a6ef85b..760ad5c2f 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/MapTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/MapTypes.h
@@ -28,7 +28,7 @@
 #include "Deprecated.h"
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/MapViewTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/MapViewTypes.h
index 892d8867c..cb50c8f44 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/MapViewTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/MapViewTypes.h
@@ -25,8 +25,8 @@
 #define QRT_MapViewTypes_H
 
 // Qt headers
-#include <QFlags> // for Q_DECLARE_FLAGS
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QFlags> // for Q_DECLARE_FLAGS
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/NativeQuickItem.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/NativeQuickItem.h
index f7012df81..45c4addb1 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/NativeQuickItem.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/NativeQuickItem.h
@@ -25,7 +25,7 @@
 #define NativeQuickItem_H
 
 // Qt headers
-#include <QQuickItem>
+#include <QtQuick/QQuickItem>
 
 namespace QRTImpl
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/NativeWidget.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/NativeWidget.h
index 993297553..19884fea8 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/NativeWidget.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/NativeWidget.h
@@ -25,8 +25,8 @@
 #define QRT_NativeWidget_H
 
 // Qt headers
-#include <QPixmap>
-#include <QWidget>
+#include <QtGui/QPixmap>
+#include <QtWidgets/QWidget>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/NavigationTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/NavigationTypes.h
index a2ac238ad..94aaec20c 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/NavigationTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/NavigationTypes.h
@@ -25,7 +25,7 @@
 #define QRT_NavigationTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/NetworkAnalystTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/NetworkAnalystTypes.h
index a6933dfe8..4ce31d361 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/NetworkAnalystTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/NetworkAnalystTypes.h
@@ -25,7 +25,7 @@
 #define QRT_NetworkAnalystTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/NetworkRequestProgress.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/NetworkRequestProgress.h
index 96509f75a..42fc009e6 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/NetworkRequestProgress.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/NetworkRequestProgress.h
@@ -25,7 +25,7 @@
 #define QRT_NetworkRequestProgress_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Object.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Object.h
index ef176506d..c36d3f8f7 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Object.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Object.h
@@ -25,7 +25,7 @@
 #define QRT_Object_H
 
 // Qt headers
-#include <QObject> // IWYU pragma: export
+#include <QtCore/QObject> // IWYU pragma: export
 
 namespace QRTImpl
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/OfflineMapCapabilities.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/OfflineMapCapabilities.h
index b0bda0624..3208f1ad0 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/OfflineMapCapabilities.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/OfflineMapCapabilities.h
@@ -25,7 +25,7 @@
 #define QRT_OfflineMapCapabilities_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/OfflineMapSyncParameters.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/OfflineMapSyncParameters.h
index f0cf7fda4..c3588c25b 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/OfflineMapSyncParameters.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/OfflineMapSyncParameters.h
@@ -28,7 +28,7 @@
 #include "OfflineMapItemInfo.h"
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/OfflineMapTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/OfflineMapTypes.h
index af25fa26d..7803cda62 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/OfflineMapTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/OfflineMapTypes.h
@@ -25,7 +25,7 @@
 #define QRT_OfflineMapTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PopupFieldListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PopupFieldListModel.h
index 5803aa57c..fc20ea973 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PopupFieldListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PopupFieldListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PopupMediaListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PopupMediaListModel.h
index 52ce25ff1..675fbb385 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PopupMediaListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PopupMediaListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PopupTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PopupTypes.h
index 448808b4d..7ca8b7a2a 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PopupTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PopupTypes.h
@@ -25,7 +25,7 @@
 #define QRT_PopupTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalFolder.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalFolder.h
index f95be73bd..9282c2b05 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalFolder.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalFolder.h
@@ -25,7 +25,7 @@
 #define QRT_PortalFolder_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalFolderListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalFolderListModel.h
index a3e2143d9..36560757d 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalFolderListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalFolderListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalGroupListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalGroupListModel.h
index 6de0bac05..a4e736046 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalGroupListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalGroupListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalItemCommentListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalItemCommentListModel.h
index a708a214f..7d1c244c0 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalItemCommentListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalItemCommentListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalItemListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalItemListModel.h
index 50a8bf85a..744ec7b8c 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalItemListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalItemListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalPrivilegeListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalPrivilegeListModel.h
index a0f1e35c2..d2c89d133 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalPrivilegeListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalPrivilegeListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalQueryParametersForItems.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalQueryParametersForItems.h
index 0b9e308ae..9f452ad4e 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalQueryParametersForItems.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalQueryParametersForItems.h
@@ -28,7 +28,7 @@
 #include "PortalQueryParameters.h"
 
 // Qt headers
-#include <QString> // for ' = QString()'
+#include <QtCore/QString> // for ' = QString()'
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalResult.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalResult.h
index 66153d4a4..daa717580 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalResult.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalResult.h
@@ -25,7 +25,7 @@
 #define QRT_PortalResult_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalTypes.h
index 0e32e1b26..f72e16b59 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PortalTypes.h
@@ -25,7 +25,7 @@
 #define QRT_PortalTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PreplannedMapAreaListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PreplannedMapAreaListModel.h
index 3758554ba..a2ae9f382 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PreplannedMapAreaListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/PreplannedMapAreaListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/RasterTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/RasterTypes.h
index 85e01ddb7..fd2a29e0d 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/RasterTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/RasterTypes.h
@@ -25,7 +25,7 @@
 #define QRT_RasterTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/RealTimeTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/RealTimeTypes.h
index 8e268b1bd..f4f27964a 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/RealTimeTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/RealTimeTypes.h
@@ -25,7 +25,7 @@
 #define RealTimeTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DELCARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DELCARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ReductionTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ReductionTypes.h
index 358c8428b..6af9ec2df 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ReductionTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ReductionTypes.h
@@ -25,7 +25,7 @@
 #define QRT_ReductionTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DELCARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DELCARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/RequestConfiguration.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/RequestConfiguration.h
index fbd0a53f9..4f5de92fc 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/RequestConfiguration.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/RequestConfiguration.h
@@ -25,7 +25,7 @@
 #define QRT_RequestConfiguration_H
 
 // Qt headers
-#include <QMap> // for ' = QMap<>()'
+#include <QtCore/QMap> // for ' = QMap<>()'
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/RouteResult.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/RouteResult.h
index 6b7795ea8..377c8ebea 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/RouteResult.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/RouteResult.h
@@ -25,7 +25,7 @@
 #define QRT_RouteResult_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/RouteTracker.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/RouteTracker.h
index fcd3309e6..b3f9dc662 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/RouteTracker.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/RouteTracker.h
@@ -28,7 +28,7 @@
 #include "Object.h"
 
 // Qt headers
-#include <QMutex>
+#include <QtCore/QMutex>
 
 // STL headers
 #include <functional>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ScaleRangeDisplayFilterListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ScaleRangeDisplayFilterListModel.h
index 5e5354f00..ccadecd13 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ScaleRangeDisplayFilterListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ScaleRangeDisplayFilterListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SceneGraphicsView.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SceneGraphicsView.h
index 6e63ffcaa..2c56e6a22 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SceneGraphicsView.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SceneGraphicsView.h
@@ -34,7 +34,7 @@
 #error "SceneGraphicsView is not supported on this platform."
 #endif
 
-#include <QGraphicsView>
+#include <QtWidgets/QGraphicsView>
 
 class QRectF;
 class QHoverEvent;
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SceneQuickView.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SceneQuickView.h
index 21c950481..389baa6d8 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SceneQuickView.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SceneQuickView.h
@@ -29,7 +29,7 @@
 #include "SceneView.h"
 
 // Qt headers
-#include <QQuickFramebufferObject>
+#include <QtQuick/QQuickFramebufferObject>
 
 Q_MOC_INCLUDE("CalloutData.h")
 
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SceneViewTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SceneViewTypes.h
index 8fc70fca0..70b3cef7e 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SceneViewTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SceneViewTypes.h
@@ -25,7 +25,7 @@
 #define QRT_SceneViewTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ServiceAreaParameters.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ServiceAreaParameters.h
index fcce36797..ad40dc448 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ServiceAreaParameters.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ServiceAreaParameters.h
@@ -25,7 +25,7 @@
 #define QRT_ServiceAreaParameters_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ServiceAreaResult.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ServiceAreaResult.h
index a338aed96..e25e0a4ce 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ServiceAreaResult.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ServiceAreaResult.h
@@ -25,7 +25,7 @@
 #define QRT_ServiceAreaResult_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ServiceGeodatabase.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ServiceGeodatabase.h
index 20cc7c1ac..aa9c15f47 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ServiceGeodatabase.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ServiceGeodatabase.h
@@ -30,7 +30,7 @@
 #include "SharedTemplateSource.h"
 
 // Qt headers
-#include <QFuture>
+#include <QtCore/QFuture>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ServiceTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ServiceTypes.h
index cb7a7b4b5..81b16fc6c 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ServiceTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/ServiceTypes.h
@@ -25,7 +25,7 @@
 #define QRT_ServiceTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SpatialReference.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SpatialReference.h
index 3768b7319..e452a1f72 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SpatialReference.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SpatialReference.h
@@ -28,7 +28,7 @@
 #include "JsonSerializable.h"
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SubtypeSublayerListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SubtypeSublayerListModel.h
index d6f4d0e38..9a53f672f 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SubtypeSublayerListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SubtypeSublayerListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SubtypeSubtableListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SubtypeSubtableListModel.h
index b89394c00..157f5bcec 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SubtypeSubtableListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SubtypeSubtableListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 Q_MOC_INCLUDE("Error.h")
 
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SuggestListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SuggestListModel.h
index b0840e01b..5974db099 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SuggestListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SuggestListModel.h
@@ -25,7 +25,7 @@
 #define QRT_SuggestListModel_H
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Symbol.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Symbol.h
index 41a32dd74..9c45a6827 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Symbol.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/Symbol.h
@@ -29,7 +29,7 @@
 #include "Object.h"
 
 // Qt headers
-#include <QColor> // for ' = QColor()'
+#include <QtGui/QColor> // for ' = QColor()'
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SymbolLayerListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SymbolLayerListModel.h
index 61580ed9a..5ea61adde 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SymbolLayerListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SymbolLayerListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SymbolListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SymbolListModel.h
index 91efb27d2..713cf9410 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SymbolListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SymbolListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SymbolStyleSearchParameters.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SymbolStyleSearchParameters.h
index 44312f888..e657810fc 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SymbolStyleSearchParameters.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SymbolStyleSearchParameters.h
@@ -25,7 +25,7 @@
 #define QRT_SymbolStyleSearchParameters_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SymbolStyleSearchResultListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SymbolStyleSearchResultListModel.h
index 6788d84bd..6273e7d14 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SymbolStyleSearchResultListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SymbolStyleSearchResultListModel.h
@@ -25,7 +25,7 @@
 #define QRT_SymbolStyleSearchResultListModel_H
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SymbolTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SymbolTypes.h
index 7881eeb2a..f505469c7 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SymbolTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SymbolTypes.h
@@ -25,7 +25,7 @@
 #define QRT_SymbolTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SyncGeodatabaseParameters.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SyncGeodatabaseParameters.h
index d74d902d4..ae9c7a1fc 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SyncGeodatabaseParameters.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/SyncGeodatabaseParameters.h
@@ -25,7 +25,7 @@
 #define QRT_SyncGeodatabaseParameters_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/TaskTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/TaskTypes.h
index d25365aa1..c827314a9 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/TaskTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/TaskTypes.h
@@ -25,7 +25,7 @@
 #define QRT_TaskTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UniqueValueListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UniqueValueListModel.h
index df77f2726..ee80839fe 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UniqueValueListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UniqueValueListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityAssetTypeListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityAssetTypeListModel.h
index 5b3180d33..41bedb943 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityAssetTypeListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityAssetTypeListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityAssociationListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityAssociationListModel.h
index 872a69bcf..cb706453a 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityAssociationListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityAssociationListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 namespace QRTImpl
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityNetworkListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityNetworkListModel.h
index daf70d7cf..32dfd8aad 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityNetworkListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityNetworkListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityNetworkTypes.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityNetworkTypes.h
index 3d958018c..f4c97f448 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityNetworkTypes.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityNetworkTypes.h
@@ -25,7 +25,7 @@
 #define QRT_UtilityNetworkTypes_H
 
 // Qt headers
-#include <QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
 
 namespace Esri::ArcGISRuntime
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityPropagatorListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityPropagatorListModel.h
index e3fd4bd55..7a25bc66b 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityPropagatorListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityPropagatorListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityTraceFunctionBarrierListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityTraceFunctionBarrierListModel.h
index a909473e5..a24606dc6 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityTraceFunctionBarrierListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityTraceFunctionBarrierListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityTraceFunctionListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityTraceFunctionListModel.h
index 3b6d9df4a..d8c88050c 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityTraceFunctionListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityTraceFunctionListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityTraceResultListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityTraceResultListModel.h
index d91f06f7a..e73d57a52 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityTraceResultListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/UtilityTraceResultListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/VectorMarkerSymbolElementListModel.h b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/VectorMarkerSymbolElementListModel.h
index 89e26d1c2..a936bb4d0 100644
--- a/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/VectorMarkerSymbolElementListModel.h
+++ b/qt6-after/qt6-migrated-legatus/include/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/include/VectorMarkerSymbolElementListModel.h
@@ -28,7 +28,7 @@
 #include "Iterable.h"
 
 // Qt headers
-#include <QAbstractListModel>
+#include <QtCore/QAbstractListModel>
 
 // STL headers
 #include <memory>
diff --git a/qt6-after/qt6-migrated-legatus/include/AreaEffectSimulation/aes_dtc.h b/qt6-after/qt6-migrated-legatus/include/AreaEffectSimulation/aes_dtc.h
index 039081472..c56275594 100644
--- a/qt6-after/qt6-migrated-legatus/include/AreaEffectSimulation/aes_dtc.h
+++ b/qt6-after/qt6-migrated-legatus/include/AreaEffectSimulation/aes_dtc.h
@@ -8,7 +8,7 @@
 #include <ostream>
 #include <string>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "LtsUtils/LtsUtilsCore/data_modification_enum.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/ava_types.h b/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/ava_types.h
index 65b28eed7..9829ba79b 100644
--- a/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/ava_types.h
+++ b/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/ava_types.h
@@ -5,12 +5,12 @@
 
 #pragma once
 
-#include <QMetaType>
+#include <QtCore/QMetaType>
 #include "svcavmcommon_export.h"
-#include <QString>
-#include <QStringList>
-#include <QVector>
-#include <QPair>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVector>
+#include <QtCore/QPair>
 #include <chrono>
 #include <cstdint>
 
diff --git a/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/avm_translation.h b/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/avm_translation.h
index e8738f8e4..942a90f02 100644
--- a/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/avm_translation.h
+++ b/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/avm_translation.h
@@ -8,7 +8,7 @@
 #ifndef AVM_TRANSLATION_H
 #define AVM_TRANSLATION_H
 
-#include <QString>
+#include <QtCore/QString>
 #include "avm_enums.hpp"
 
 namespace AudioVideoManagement {
diff --git a/qt6-after/qt6-migrated-legatus/include/Core/core_types.h b/qt6-after/qt6-migrated-legatus/include/Core/core_types.h
index 3f1da0c51..db5b76f4e 100644
--- a/qt6-after/qt6-migrated-legatus/include/Core/core_types.h
+++ b/qt6-after/qt6-migrated-legatus/include/Core/core_types.h
@@ -9,7 +9,7 @@
 
 #include <string>
 #include <vector>
-#include <QString>
+#include <QtCore/QString>
 
 namespace Core
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/DDS/Core/core_dtc_types.h b/qt6-after/qt6-migrated-legatus/include/DDS/Core/core_dtc_types.h
index 952d062bd..d89197274 100644
--- a/qt6-after/qt6-migrated-legatus/include/DDS/Core/core_dtc_types.h
+++ b/qt6-after/qt6-migrated-legatus/include/DDS/Core/core_dtc_types.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace IDL
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/ExerciseEventManagement/eem_types.h b/qt6-after/qt6-migrated-legatus/include/ExerciseEventManagement/eem_types.h
index b2b2071f1..0cbaa483f 100644
--- a/qt6-after/qt6-migrated-legatus/include/ExerciseEventManagement/eem_types.h
+++ b/qt6-after/qt6-migrated-legatus/include/ExerciseEventManagement/eem_types.h
@@ -6,8 +6,8 @@
 #pragma once
 
 #include <ExerciseEventManagement/eem_export.h>
-#include <QString>
-#include <QDateTime>
+#include <QtCore/QString>
+#include <QtCore/QDateTime>
 #include <memory>
 
 namespace ExerciseEventManagement
diff --git a/qt6-after/qt6-migrated-legatus/include/ExerciseManagement/exm_dtc.h b/qt6-after/qt6-migrated-legatus/include/ExerciseManagement/exm_dtc.h
index 21dfc2c91..f166c5382 100644
--- a/qt6-after/qt6-migrated-legatus/include/ExerciseManagement/exm_dtc.h
+++ b/qt6-after/qt6-migrated-legatus/include/ExerciseManagement/exm_dtc.h
@@ -6,8 +6,8 @@
 #include "exm_exercise.h"
 #include "ParticipantManagement/ppm_enums.hpp"
 
-#include <QObject>
-#include <QList>
+#include <QtCore/QObject>
+#include <QtCore/QList>
 #include <functional>
 
 namespace ExerciseManagement
diff --git a/qt6-after/qt6-migrated-legatus/include/ExerciseManagement/exm_exercise.h b/qt6-after/qt6-migrated-legatus/include/ExerciseManagement/exm_exercise.h
index 3f0cb3f1f..25867e12b 100644
--- a/qt6-after/qt6-migrated-legatus/include/ExerciseManagement/exm_exercise.h
+++ b/qt6-after/qt6-migrated-legatus/include/ExerciseManagement/exm_exercise.h
@@ -3,7 +3,7 @@
 // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
 // Für die Migration erstellen wir minimale Typ-Definitionen
 
-#include <QString>
+#include <QtCore/QString>
 #include <ostream>
 #include "exmcommon_export.h"
 #include "exm_enums.hpp"
diff --git a/qt6-after/qt6-migrated-legatus/include/FilterManagement/flt_dts.h b/qt6-after/qt6-migrated-legatus/include/FilterManagement/flt_dts.h
index b0a41e59d..c75b330a3 100644
--- a/qt6-after/qt6-migrated-legatus/include/FilterManagement/flt_dts.h
+++ b/qt6-after/qt6-migrated-legatus/include/FilterManagement/flt_dts.h
@@ -9,8 +9,8 @@
 #pragma once
 
 #include <memory>
-#include <QString>
-#include <QDateTime>
+#include <QtCore/QString>
+#include <QtCore/QDateTime>
 #if BUILD_RTI
 #include <rti/core/SampleIdentity.hpp>
 #include <DDS/DDSConnector/dds_connector.h>
diff --git a/qt6-after/qt6-migrated-legatus/include/FilterManagement/flt_ftc.h b/qt6-after/qt6-migrated-legatus/include/FilterManagement/flt_ftc.h
index cb23f6676..0878d532b 100644
--- a/qt6-after/qt6-migrated-legatus/include/FilterManagement/flt_ftc.h
+++ b/qt6-after/qt6-migrated-legatus/include/FilterManagement/flt_ftc.h
@@ -9,9 +9,9 @@
 #pragma once
 
 #include <memory>
-#include <QString>
-#include <QMap>
-#include <QJsonObject>
+#include <QtCore/QString>
+#include <QtCore/QMap>
+#include <QtCore/QJsonObject>
 #include <Core/core_types.h>
 #include <Core/core_enums.hpp>
 #include <Services/AreaEffectSimulation/aes.hpp>
diff --git a/qt6-after/qt6-migrated-legatus/include/FilterManagement/flt_fts.h b/qt6-after/qt6-migrated-legatus/include/FilterManagement/flt_fts.h
index 32e170f89..de00130dd 100644
--- a/qt6-after/qt6-migrated-legatus/include/FilterManagement/flt_fts.h
+++ b/qt6-after/qt6-migrated-legatus/include/FilterManagement/flt_fts.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <QString>
-#include <QDateTime>
+#include <QtCore/QString>
+#include <QtCore/QDateTime>
 #if BUILD_RTI
 #include <rti/core/SampleIdentity.hpp>
 #endif
diff --git a/qt6-after/qt6-migrated-legatus/include/FilterManagement/logger.h b/qt6-after/qt6-migrated-legatus/include/FilterManagement/logger.h
index 7fe315dde..31938f43c 100644
--- a/qt6-after/qt6-migrated-legatus/include/FilterManagement/logger.h
+++ b/qt6-after/qt6-migrated-legatus/include/FilterManagement/logger.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <NGLLogger/INGLLogger.h>
-#include <QString>
+#include <QtCore/QString>
 
 namespace FilterManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_dtc.h b/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_dtc.h
index 177c6ed51..24576bf6d 100644
--- a/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_dtc.h
+++ b/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_dtc.h
@@ -9,9 +9,9 @@
 #include <ParticipantManagement/ppm.hpp>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
 
-#include <QObject>
-#include <QList>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QList>
+#include <QtCore/QMap>
 #include <functional>
 #include <memory>
 
diff --git a/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_nasat_aircraft.h b/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_nasat_aircraft.h
index e6b7ae0c7..bd4e49aac 100644
--- a/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_nasat_aircraft.h
+++ b/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_nasat_aircraft.h
@@ -3,7 +3,7 @@
 // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
 // Für die Migration erstellen wir minimale Typ-Definitionen
 
-#include <QString>
+#include <QtCore/QString>
 #include "gna_export.h"
 
 namespace GuezNasat
diff --git a/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_translation.h b/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_translation.h
index e1fb27a8c..338e78557 100644
--- a/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_translation.h
+++ b/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_translation.h
@@ -10,8 +10,8 @@
 
 // filename: gna_translation.h
 
-#include <QString>
-#include <QObject>
+#include <QtCore/QString>
+#include <QtCore/QObject>
 #include "svcgnacommon_export.h"
 
 namespace GuezNasat
diff --git a/qt6-after/qt6-migrated-legatus/include/MarkerManagement/mrk_dtc.h b/qt6-after/qt6-migrated-legatus/include/MarkerManagement/mrk_dtc.h
index 0f4c1764c..379ecca8b 100644
--- a/qt6-after/qt6-migrated-legatus/include/MarkerManagement/mrk_dtc.h
+++ b/qt6-after/qt6-migrated-legatus/include/MarkerManagement/mrk_dtc.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "LtsUtils/LtsUtilsCore/data_modification_enum.h"
 #include "mrk_marker.h"
diff --git a/qt6-after/qt6-migrated-legatus/include/MarkerManagement/mrk_marker.h b/qt6-after/qt6-migrated-legatus/include/MarkerManagement/mrk_marker.h
index 8c71077b0..dc718028c 100644
--- a/qt6-after/qt6-migrated-legatus/include/MarkerManagement/mrk_marker.h
+++ b/qt6-after/qt6-migrated-legatus/include/MarkerManagement/mrk_marker.h
@@ -3,7 +3,7 @@
 // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
 // Für die Migration erstellen wir minimale Typ-Definitionen
 
-#include <QString>
+#include <QtCore/QString>
 #include <vector>
 #include "mrkcommon_export.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/include/NGLLogger/INGLLogger.h b/qt6-after/qt6-migrated-legatus/include/NGLLogger/INGLLogger.h
index dfe0c99a6..23d652a5e 100644
--- a/qt6-after/qt6-migrated-legatus/include/NGLLogger/INGLLogger.h
+++ b/qt6-after/qt6-migrated-legatus/include/NGLLogger/INGLLogger.h
@@ -7,12 +7,12 @@
 
 #pragma once
 
-#include <QList>
-#include <QPointF>
-#include <QRect>
-#include <QRectF>
-#include <QSize>
-#include <QString>
+#include <QtCore/QList>
+#include <QtCore/QPointF>
+#include <QtCore/QRect>
+#include <QtCore/QRectF>
+#include <QtCore/QSize>
+#include <QtCore/QString>
 #include <ngllogger_export.h>
 #include <sstream>
 #include <string>
diff --git a/qt6-after/qt6-migrated-legatus/include/OperatorManagement/opm_ftc.h b/qt6-after/qt6-migrated-legatus/include/OperatorManagement/opm_ftc.h
index 2ef651116..f5c6ff045 100644
--- a/qt6-after/qt6-migrated-legatus/include/OperatorManagement/opm_ftc.h
+++ b/qt6-after/qt6-migrated-legatus/include/OperatorManagement/opm_ftc.h
@@ -5,8 +5,8 @@
 // This file is part of FilterManagement which is excluded from build
 // For non-FilterManagement builds, we provide this stub
 
-#include <QString>
-#include <QObject>
+#include <QtCore/QString>
+#include <QtCore/QObject>
 
 // Forward declarations and stubs for FTC (Filter/Translation/Conversion)
 // Actual implementation is in FilterManagement plugin
diff --git a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_translation.h b/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_translation.h
index cce087d18..7a206602f 100644
--- a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_translation.h
+++ b/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_translation.h
@@ -3,7 +3,7 @@
 // Translation Helper für ParticipantManagement Module
 // Wrapper für QObject::tr() in nicht-QObject Klassen
 
-#include <QString>
+#include <QtCore/QString>
 #include "ppmcommon_export.h"
 
 namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_types.h b/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_types.h
index 6be4119ef..3bcdd762f 100644
--- a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_types.h
+++ b/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_types.h
@@ -3,7 +3,7 @@
 // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
 // Für die Migration erstellen wir minimale Typ-Definitionen
 
-#include <QString>
+#include <QtCore/QString>
 #include <ostream>
 #include "ppm_enums.hpp"
 
diff --git a/qt6-after/qt6-migrated-legatus/include/PresentationManagement/pre_dtc.h b/qt6-after/qt6-migrated-legatus/include/PresentationManagement/pre_dtc.h
index 343356cf3..c962b3ebc 100644
--- a/qt6-after/qt6-migrated-legatus/include/PresentationManagement/pre_dtc.h
+++ b/qt6-after/qt6-migrated-legatus/include/PresentationManagement/pre_dtc.h
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include <QList>
-#include <QObject>
-#include <QString>
+#include <QtCore/QList>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 #include <functional>
 #include <memory>
 
diff --git a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_types.h b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_types.h
index faea22c0b..5d1e21259 100644
--- a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_types.h
+++ b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_types.h
@@ -3,7 +3,7 @@
 // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
 // Für die Migration erstellen wir minimale Typ-Definitionen
 
-#include <QString>
+#include <QtCore/QString>
 #include "pdm_export.h"
 
 namespace ProjectDataManagement
diff --git a/qt6-after/qt6-migrated-legatus/include/Viewer/SituationMap/ElevationMap/elevation_map_manager.h b/qt6-after/qt6-migrated-legatus/include/Viewer/SituationMap/ElevationMap/elevation_map_manager.h
index 2b82ea715..695353530 100644
--- a/qt6-after/qt6-migrated-legatus/include/Viewer/SituationMap/ElevationMap/elevation_map_manager.h
+++ b/qt6-after/qt6-migrated-legatus/include/Viewer/SituationMap/ElevationMap/elevation_map_manager.h
@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include <QObject>
-#include <QStringList>
-#include <QRectF>
-#include <QPointF>
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
+#include <QtCore/QRectF>
+#include <QtCore/QPointF>
 #include <vector>
 
 // QPoint3D ist bereits in LtsUtilsCore/qpoint3d.h definiert
diff --git a/qt6-after/qt6-migrated-legatus/include/nglapplication/nglapplication.h b/qt6-after/qt6-migrated-legatus/include/nglapplication/nglapplication.h
index 14a3f09e5..acc2c6aa0 100755
--- a/qt6-after/qt6-migrated-legatus/include/nglapplication/nglapplication.h
+++ b/qt6-after/qt6-migrated-legatus/include/nglapplication/nglapplication.h
@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include "nglloggerhandler.h"
 
 #ifndef NGLAPPLICATION_EXPORT
diff --git a/qt6-after/qt6-migrated-legatus/include/nglapplication/nglloggerhandler.h b/qt6-after/qt6-migrated-legatus/include/nglapplication/nglloggerhandler.h
index 89ea5834f..69b854060 100755
--- a/qt6-after/qt6-migrated-legatus/include/nglapplication/nglloggerhandler.h
+++ b/qt6-after/qt6-migrated-legatus/include/nglapplication/nglloggerhandler.h
@@ -7,8 +7,8 @@
   */
 #pragma once
 
-#include <QByteArray>
-#include <QString>
+#include <QtCore/QByteArray>
+#include <QtCore/QString>
 
 #ifndef LOGGERHANDLER_EXPORT
 # ifdef BUILD_STATIC_LIBRARIES
diff --git a/qt6-after/qt6-migrated-legatus/src/AlarmManagement/alm_translation.cpp b/qt6-after/qt6-migrated-legatus/src/AlarmManagement/alm_translation.cpp
index 349030787..1bbb9793c 100644
--- a/qt6-after/qt6-migrated-legatus/src/AlarmManagement/alm_translation.cpp
+++ b/qt6-after/qt6-migrated-legatus/src/AlarmManagement/alm_translation.cpp
@@ -1,5 +1,5 @@
 #include "alm_translation.h"
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace AlarmManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/src/ParticipantManagement/ppm_translation.cpp b/qt6-after/qt6-migrated-legatus/src/ParticipantManagement/ppm_translation.cpp
index e2682790d..7a705c92f 100644
--- a/qt6-after/qt6-migrated-legatus/src/ParticipantManagement/ppm_translation.cpp
+++ b/qt6-after/qt6-migrated-legatus/src/ParticipantManagement/ppm_translation.cpp
@@ -1,5 +1,5 @@
 #include "ppm_translation.h"
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace ParticipantManagement
 {
diff --git a/qt6-after/qt6-migrated-legatus/tests/test_event.cpp b/qt6-after/qt6-migrated-legatus/tests/test_event.cpp
index 12740242f..6296db3ba 100644
--- a/qt6-after/qt6-migrated-legatus/tests/test_event.cpp
+++ b/qt6-after/qt6-migrated-legatus/tests/test_event.cpp
@@ -1,7 +1,7 @@
 #include "Lts/Common/LtsTimelineClassic/Event.h"
 
-#include <QColor>
-#include <QJsonObject>
+#include <QtGui/QColor>
+#include <QtCore/QJsonObject>
 #include <gtest/gtest.h>
 
 namespace LtsTimelineClassic
diff --git a/qt6-after/qt6-migrated-legatus/tests/test_eventdelegate.cpp b/qt6-after/qt6-migrated-legatus/tests/test_eventdelegate.cpp
index 17d5e2128..ffd01db90 100644
--- a/qt6-after/qt6-migrated-legatus/tests/test_eventdelegate.cpp
+++ b/qt6-after/qt6-migrated-legatus/tests/test_eventdelegate.cpp
@@ -1,6 +1,6 @@
 #include "Lts/Common/LtsTimelineClassic/EventDelegate.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <gtest/gtest.h>
 
 namespace LtsTimelineClassic
diff --git a/qt6-after/qt6-migrated-legatus/tests/test_eventgraphic.cpp b/qt6-after/qt6-migrated-legatus/tests/test_eventgraphic.cpp
index de933c793..c0202d756 100644
--- a/qt6-after/qt6-migrated-legatus/tests/test_eventgraphic.cpp
+++ b/qt6-after/qt6-migrated-legatus/tests/test_eventgraphic.cpp
@@ -1,8 +1,8 @@
 #include "Lts/Common/LtsTimelineClassic/Event.h"
 #include "Lts/Common/LtsTimelineClassic/EventGraphic.h"
 
-#include <QPainter>
-#include <QRect>
+#include <QtGui/QPainter>
+#include <QtCore/QRect>
 #include <gtest/gtest.h>
 
 namespace LtsTimelineClassic
diff --git a/qt6-after/qt6-migrated-legatus/tests/test_eventtools.cpp b/qt6-after/qt6-migrated-legatus/tests/test_eventtools.cpp
index 27575e932..7cbad64e3 100644
--- a/qt6-after/qt6-migrated-legatus/tests/test_eventtools.cpp
+++ b/qt6-after/qt6-migrated-legatus/tests/test_eventtools.cpp
@@ -2,8 +2,8 @@
 #include "Lts/Common/LtsTimelineClassic/EventGraphic.h"
 #include "Lts/Common/LtsTimelineClassic/EventTools.h"
 
-#include <QPainter>
-#include <QPixmap>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
 #include <gtest/gtest.h>
 
 namespace LtsTimelineClassic
diff --git a/qt6-after/qt6-migrated-legatus/tests/test_item.cpp b/qt6-after/qt6-migrated-legatus/tests/test_item.cpp
index 7a7a6131e..a5f697a06 100644
--- a/qt6-after/qt6-migrated-legatus/tests/test_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/tests/test_item.cpp
@@ -1,6 +1,6 @@
 #include "Lts/Common/LtsTimelineClassic/Item.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <gtest/gtest.h>
 
 namespace LtsTimelineClassic
diff --git a/qt6-after/qt6-migrated-legatus/tests/test_lts_app_descriptor.cpp b/qt6-after/qt6-migrated-legatus/tests/test_lts_app_descriptor.cpp
index cd1869d36..c2e149d35 100644
--- a/qt6-after/qt6-migrated-legatus/tests/test_lts_app_descriptor.cpp
+++ b/qt6-after/qt6-migrated-legatus/tests/test_lts_app_descriptor.cpp
@@ -1,9 +1,9 @@
 #include "Lts/Common/LtsAppDescriptor/lts_app_descriptor.h"
 
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QString>
-#include <QStringList>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
 #include <QtTest/QtTest>
 
 namespace LtsAppDescriptor
diff --git a/qt6-after/qt6-migrated-legatus/tests/test_lts_app_descriptor_editor.cpp b/qt6-after/qt6-migrated-legatus/tests/test_lts_app_descriptor_editor.cpp
index eacf1afe4..8103a797a 100644
--- a/qt6-after/qt6-migrated-legatus/tests/test_lts_app_descriptor_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/tests/test_lts_app_descriptor_editor.cpp
@@ -1,6 +1,6 @@
 #include "lts_app_descriptor_editor.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QtTest/QtTest>
 
 class TestLtsAppDescriptorEditor : public QObject
diff --git a/qt6-after/qt6-migrated-legatus/tests/test_ltswidgets_qt6.cpp b/qt6-after/qt6-migrated-legatus/tests/test_ltswidgets_qt6.cpp
index 51bbdeeea..e0434feb0 100644
--- a/qt6-after/qt6-migrated-legatus/tests/test_ltswidgets_qt6.cpp
+++ b/qt6-after/qt6-migrated-legatus/tests/test_ltswidgets_qt6.cpp
@@ -9,12 +9,12 @@
  * 4. QStyleOption::initFrom() usage
  */
 
-#include <QApplication>
-#include <QComboBox>
-#include <QPushButton>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QPushButton>
 #include <QRandomGenerator>
 #include <QStyleOption>
-#include <QWheelEvent>
+#include <QtGui/QWheelEvent>
 #include <gtest/gtest.h>
 
 // Ensure QApplication is initialized for widget tests
diff --git a/qt6-after/qt6-migrated-legatus/tests/test_migration_stubs.cpp b/qt6-after/qt6-migrated-legatus/tests/test_migration_stubs.cpp
index 55ca30434..06dd16ff5 100644
--- a/qt6-after/qt6-migrated-legatus/tests/test_migration_stubs.cpp
+++ b/qt6-after/qt6-migrated-legatus/tests/test_migration_stubs.cpp
@@ -8,7 +8,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <QString>
+#include <QtCore/QString>
 
 // Test that the test framework is working
 TEST(MigrationStubs, TestFrameworkWorks)
diff --git a/qt6-after/qt6-migrated-legatus/tests/test_passiveeventcontainer.cpp b/qt6-after/qt6-migrated-legatus/tests/test_passiveeventcontainer.cpp
index 5132e4aaa..7807adb95 100644
--- a/qt6-after/qt6-migrated-legatus/tests/test_passiveeventcontainer.cpp
+++ b/qt6-after/qt6-migrated-legatus/tests/test_passiveeventcontainer.cpp
@@ -3,8 +3,8 @@
 #include "Lts/Common/LtsTimelineClassic/EventTools.h"
 #include "Lts/Common/LtsTimelineClassic/PassiveEventContainer.h"
 
-#include <QPainter>
-#include <QPixmap>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
 #include <QStyleOptionViewItem>
 #include <gtest/gtest.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/tests/test_qt6_api_migrations.cpp b/qt6-after/qt6-migrated-legatus/tests/test_qt6_api_migrations.cpp
index be31f8af2..8d68d0755 100644
--- a/qt6-after/qt6-migrated-legatus/tests/test_qt6_api_migrations.cpp
+++ b/qt6-after/qt6-migrated-legatus/tests/test_qt6_api_migrations.cpp
@@ -11,14 +11,14 @@
  * 6. QXmlStreamWriter UTF-8 handling (no setCodec needed)
  */
 
-#include <QBuffer>
-#include <QList>
-#include <QMap>
+#include <QtCore/QBuffer>
+#include <QtCore/QList>
+#include <QtCore/QMap>
 #include <QMultiMap>
-#include <QString>
+#include <QtCore/QString>
 #include <QStringView>
-#include <QVariant>
-#include <QXmlStreamWriter>
+#include <QtCore/QVariant>
+#include <QtCore/QXmlStreamWriter>
 #include <QtGui/QFont>
 #include <QtGui/QFontMetricsF>
 #include <QtGui/QGuiApplication>
diff --git a/qt6-after/qt6-migrated-legatus/tests/test_qt6_compatibility.cpp b/qt6-after/qt6-migrated-legatus/tests/test_qt6_compatibility.cpp
index 4d216b81c..528c8a9a3 100644
--- a/qt6-after/qt6-migrated-legatus/tests/test_qt6_compatibility.cpp
+++ b/qt6-after/qt6-migrated-legatus/tests/test_qt6_compatibility.cpp
@@ -8,11 +8,11 @@
  * 3. Qt6 APIs function correctly
  */
 
-#include <QChar>
+#include <QtCore/QChar>
 #include <QRandomGenerator>
-#include <QString>
+#include <QtCore/QString>
 #include <QStringView>
-#include <QVector>
+#include <QtCore/QVector>
 #include <gtest/gtest.h>
 
 // Test 1: QRandomGenerator basic functionality
diff --git a/qt6-after/qt6-migrated-legatus/tests/test_testtimelinemodel.cpp b/qt6-after/qt6-migrated-legatus/tests/test_testtimelinemodel.cpp
index 6251a57d3..349213441 100644
--- a/qt6-after/qt6-migrated-legatus/tests/test_testtimelinemodel.cpp
+++ b/qt6-after/qt6-migrated-legatus/tests/test_testtimelinemodel.cpp
@@ -1,9 +1,9 @@
 #include "Lts/Common/LtsTimelineClassic/Event.h"
 #include "Lts/Common/LtsTimelineClassic/TestTimelineModel.h"
 
-#include <QColor>
-#include <QJsonObject>
-#include <QStringList>
+#include <QtGui/QColor>
+#include <QtCore/QJsonObject>
+#include <QtCore/QStringList>
 #include <gtest/gtest.h>
 
 namespace LtsTimelineClassic
diff --git a/qt6-after/qt6-migrated-legatus/tests/test_timelineheaderview.cpp b/qt6-after/qt6-migrated-legatus/tests/test_timelineheaderview.cpp
index fe22d74b3..463140a7d 100644
--- a/qt6-after/qt6-migrated-legatus/tests/test_timelineheaderview.cpp
+++ b/qt6-after/qt6-migrated-legatus/tests/test_timelineheaderview.cpp
@@ -1,6 +1,6 @@
 #include "Lts/Common/LtsTimelineClassic/TimelineHeaderView.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <gtest/gtest.h>
 
 namespace LtsTimelineClassic
diff --git a/qt6-after/qt6-migrated-legatus/tests/test_timelineindicator.cpp b/qt6-after/qt6-migrated-legatus/tests/test_timelineindicator.cpp
index 3a322c9ed..63236b3d5 100644
--- a/qt6-after/qt6-migrated-legatus/tests/test_timelineindicator.cpp
+++ b/qt6-after/qt6-migrated-legatus/tests/test_timelineindicator.cpp
@@ -1,6 +1,6 @@
 #include "Lts/Common/LtsTimelineClassic/TimelineIndicator.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <gtest/gtest.h>
 
 namespace LtsTimelineClassic
diff --git a/qt6-after/qt6-migrated-legatus/tests/test_timelineview.cpp b/qt6-after/qt6-migrated-legatus/tests/test_timelineview.cpp
index c40f0ddaf..7a2020c87 100644
--- a/qt6-after/qt6-migrated-legatus/tests/test_timelineview.cpp
+++ b/qt6-after/qt6-migrated-legatus/tests/test_timelineview.cpp
@@ -1,6 +1,6 @@
 #include "Lts/Common/LtsTimelineClassic/TimelineView.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <gtest/gtest.h>
 
 namespace LtsTimelineClassic
diff --git a/qt6-after/qt6-migrated-legatus/tests/test_timelinewidget.cpp b/qt6-after/qt6-migrated-legatus/tests/test_timelinewidget.cpp
index f324e22d7..8d74cfe13 100644
--- a/qt6-after/qt6-migrated-legatus/tests/test_timelinewidget.cpp
+++ b/qt6-after/qt6-migrated-legatus/tests/test_timelinewidget.cpp
@@ -1,6 +1,6 @@
 #include "Lts/Common/LtsTimelineClassic/TimelineWidget.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <gtest/gtest.h>
 
 namespace LtsTimelineClassic