Fix include conventions

Reorder includes such that local includes are first, followed
by Qt and C/C++ system includes.

Pick-to: 6.3 6.2
Change-Id: Ib801d34de7242befce4be429bfb099ccabe1f987
Reviewed-by: Cristian Maureira-Fredes <[email protected]>

60 files changed, 122 insertions, 110 deletions

diff --git a/sources/pyside6/PySide6/QtCore/glue/qeasingcurve_glue.cpp b/sources/pyside6/PySide6/QtCore/glue/qeasingcurve_glue.cpp
index 552191955..62ff4489e 100644
--- a/sources/pyside6/PySide6/QtCore/glue/qeasingcurve_glue.cpp
+++ b/sources/pyside6/PySide6/QtCore/glue/qeasingcurve_glue.cpp
@@ -40,7 +40,8 @@
 #include <sbkpython.h>
 #include <shiboken.h>
 #include <pysideweakref.h>
-#include <QEasingCurve>
+
+#include <QtCore/QEasingCurve>
 
 #include "glue/qeasingcurve_glue.h"
 
diff --git a/sources/pyside6/PySide6/QtCore/glue/qeasingcurve_glue.h b/sources/pyside6/PySide6/QtCore/glue/qeasingcurve_glue.h
index f6c80fa99..e3bf5fac0 100644
--- a/sources/pyside6/PySide6/QtCore/glue/qeasingcurve_glue.h
+++ b/sources/pyside6/PySide6/QtCore/glue/qeasingcurve_glue.h
@@ -41,7 +41,7 @@
 #define __QEASINGCURVE_GLUE__
 
 #include <sbkpython.h>
-#include <QEasingCurve>
+#include <QtCore/QEasingCurve>
 
 class PySideEasingCurveFunctor
 {
diff --git a/sources/pyside6/libpyside/pysideclassinfo_p.h b/sources/pyside6/libpyside/pysideclassinfo_p.h
index 22d34036b..90de8101b 100644
--- a/sources/pyside6/libpyside/pysideclassinfo_p.h
+++ b/sources/pyside6/libpyside/pysideclassinfo_p.h
@@ -41,11 +41,13 @@
 #define PYSIDE_CLASSINFO_P_H
 
 #include <sbkpython.h>
-#include <QMetaObject>
+
 #include "pysideclassdecorator_p.h"
 #include "pysideclassinfo.h"
 #include "pysideclassinfo.h"
 
+#include <QtCore/QMetaObject>
+
 struct PySideClassInfo;
 
 extern "C"
diff --git a/sources/pyside6/libpyside/pysideproperty_p.h b/sources/pyside6/libpyside/pysideproperty_p.h
index 456bf8f6b..fbb4f7cb1 100644
--- a/sources/pyside6/libpyside/pysideproperty_p.h
+++ b/sources/pyside6/libpyside/pysideproperty_p.h
@@ -41,11 +41,13 @@
 #define PYSIDE_QPROPERTY_P_H
 
 #include <sbkpython.h>
-#include <QtCore/QByteArray>
-#include <QMetaObject>
+
 #include "pysideproperty.h"
 #include <pysidemacros.h>
 
+#include <QtCore/QByteArray>
+#include <QtCore/QMetaObject>
+
 struct PySideProperty;
 
 class PYSIDE_API PySidePropertyPrivate
diff --git a/sources/pyside6/libpysideqml/pysideqmlattached_p.h b/sources/pyside6/libpysideqml/pysideqmlattached_p.h
index 7305ec6f5..80fa62c3b 100644
--- a/sources/pyside6/libpysideqml/pysideqmlattached_p.h
+++ b/sources/pyside6/libpysideqml/pysideqmlattached_p.h
@@ -42,7 +42,7 @@
 
 #include <sbkpython.h>
 
-#include <QSharedPointer>
+#include <QtCore/QSharedPointer>
 
 namespace PySide::Qml {
 struct QmlExtensionInfo;
diff --git a/sources/pyside6/tests/pysidetest/testview.cpp b/sources/pyside6/tests/pysidetest/testview.cpp
index 110a87ac2..10474ed88 100644
--- a/sources/pyside6/tests/pysidetest/testview.cpp
+++ b/sources/pyside6/tests/pysidetest/testview.cpp
@@ -28,10 +28,10 @@
 
 #include "testview.h"
 
-#include <QDebug>
-#include <QWidget>
-#include <QAbstractListModel>
-#include <QAbstractItemDelegate>
+#include <QtCore/QDebug>
+#include <QtCore/QAbstractListModel>
+#include <QtWidgets/QAbstractItemDelegate>
+#include <QtWidgets/QWidget>
 
 QVariant
 TestView::getData()
diff --git a/sources/shiboken6/ApiExtractor/abstractmetabuilder.h b/sources/shiboken6/ApiExtractor/abstractmetabuilder.h
index 089554be4..69cd759af 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetabuilder.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetabuilder.h
@@ -36,7 +36,7 @@
 
 #include "clangparser/compilersupport.h"
 
-#include <QFileInfoList>
+#include <QtCore/QFileInfoList>
 
 #include <optional>
 
diff --git a/sources/shiboken6/ApiExtractor/apiextractor.cpp b/sources/shiboken6/ApiExtractor/apiextractor.cpp
index 24a2c9190..212e35722 100644
--- a/sources/shiboken6/ApiExtractor/apiextractor.cpp
+++ b/sources/shiboken6/ApiExtractor/apiextractor.cpp
@@ -29,29 +29,24 @@
 #include "apiextractor.h"
 #include "apiextractorresult.h"
 #include "abstractmetaargument.h"
+#include "abstractmetabuilder.h"
+#include "abstractmetaenum.h"
 #include "abstractmetafield.h"
 #include "abstractmetafunction.h"
 #include "abstractmetalang.h"
-#include "modifications.h"
-
 #include "exception.h"
-
-#include <QDir>
-#include <QDebug>
-#include <QTemporaryFile>
-#include <algorithm>
-#include <iostream>
-#include <iterator>
-
-#include "reporthandler.h"
-#include "typesystem.h"
 #include "fileout.h"
-#include "abstractmetabuilder.h"
-#include "abstractmetaenum.h"
+#include "modifications.h"
+#include "reporthandler.h"
 #include "typedatabase.h"
 #include "typesystem.h"
 
+#include <QtCore/QDir>
+#include <QtCore/QDebug>
+#include <QtCore/QTemporaryFile>
+
 #include <algorithm>
+#include <iostream>
 #include <iterator>
 
 struct InstantiationCollectContext
diff --git a/sources/shiboken6/ApiExtractor/apiextractor.h b/sources/shiboken6/ApiExtractor/apiextractor.h
index aa7d44d98..a29cf525e 100644
--- a/sources/shiboken6/ApiExtractor/apiextractor.h
+++ b/sources/shiboken6/ApiExtractor/apiextractor.h
@@ -34,8 +34,9 @@
 #include "apiextractorflags.h"
 #include "header_paths.h"
 #include "clangparser/compilersupport.h"
-#include <QFileInfoList>
-#include <QStringList>
+
+#include <QtCore/QFileInfoList>
+#include <QtCore/QStringList>
 
 #include <optional>
 
diff --git a/sources/shiboken6/ApiExtractor/docparser.cpp b/sources/shiboken6/ApiExtractor/docparser.cpp
index 397544e0c..debb521e3 100644
--- a/sources/shiboken6/ApiExtractor/docparser.cpp
+++ b/sources/shiboken6/ApiExtractor/docparser.cpp
@@ -36,10 +36,11 @@
 #include "reporthandler.h"
 #include "typesystem.h"
 #include "xmlutils.h"
+
+#include <QtCore/QBuffer>
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QTextStream>
-#include <QBuffer>
 
 #include <cstdlib>
 #ifdef HAVE_LIBXSLT
diff --git a/sources/shiboken6/ApiExtractor/exception.h b/sources/shiboken6/ApiExtractor/exception.h
index 36e94638a..f2727af21 100644
--- a/sources/shiboken6/ApiExtractor/exception.h
+++ b/sources/shiboken6/ApiExtractor/exception.h
@@ -29,7 +29,7 @@
 #ifndef EXCEPTION_H
 #define EXCEPTION_H
 
-#include <QString>
+#include <QtCore/QString>
 
 #include <string>
 #include <exception>
diff --git a/sources/shiboken6/ApiExtractor/header_paths.h b/sources/shiboken6/ApiExtractor/header_paths.h
index 0c25702ef..9356cb722 100644
--- a/sources/shiboken6/ApiExtractor/header_paths.h
+++ b/sources/shiboken6/ApiExtractor/header_paths.h
@@ -29,9 +29,9 @@
 #ifndef HEADER_PATHS_H
 #define HEADER_PATHS_H
 
-#include <QByteArray>
-#include <QList>
-#include <QString>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QString>
 
 enum class HeaderType
 {
diff --git a/sources/shiboken6/ApiExtractor/include.cpp b/sources/shiboken6/ApiExtractor/include.cpp
index ea31d000a..6273d0e58 100644
--- a/sources/shiboken6/ApiExtractor/include.cpp
+++ b/sources/shiboken6/ApiExtractor/include.cpp
@@ -28,10 +28,11 @@
 
 #include "include.h"
 #include "textstream.h"
-#include <QDebug>
-#include <QDir>
-#include <QTextStream>
-#include <QHash>
+
+#include <QtCore/QDebug>
+#include <QtCore/QDir>
+#include <QtCore/QHash>
+#include <QtCore/QTextStream>
 
 QString Include::toString() const
 {
diff --git a/sources/shiboken6/ApiExtractor/include.h b/sources/shiboken6/ApiExtractor/include.h
index 405a8e3fb..13819fc48 100644
--- a/sources/shiboken6/ApiExtractor/include.h
+++ b/sources/shiboken6/ApiExtractor/include.h
@@ -29,8 +29,8 @@
 #ifndef INCLUDE_H
 #define INCLUDE_H
 
-#include <QString>
-#include <QList>
+#include <QtCore/QString>
+#include <QtCore/QList>
 
 QT_BEGIN_NAMESPACE
 class QTextStream;
diff --git a/sources/shiboken6/ApiExtractor/qtdocparser.cpp b/sources/shiboken6/ApiExtractor/qtdocparser.cpp
index ee6df92ca..bd4e96e6f 100644
--- a/sources/shiboken6/ApiExtractor/qtdocparser.cpp
+++ b/sources/shiboken6/ApiExtractor/qtdocparser.cpp
@@ -41,7 +41,7 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QFile>
-#include <QUrl>
+#include <QtCore/QUrl>
 
 enum { debugFunctionSearch = 0 };
 
diff --git a/sources/shiboken6/ApiExtractor/reporthandler.h b/sources/shiboken6/ApiExtractor/reporthandler.h
index 21f0e8933..59079bff3 100644
--- a/sources/shiboken6/ApiExtractor/reporthandler.h
+++ b/sources/shiboken6/ApiExtractor/reporthandler.h
@@ -29,8 +29,8 @@
 #ifndef REPORTHANDLER_H
 #define REPORTHANDLER_H
 
-#include <QLoggingCategory>
-#include <QString>
+#include <QtCore/QLoggingCategory>
+#include <QtCore/QString>
 
 Q_DECLARE_LOGGING_CATEGORY(lcShiboken)
 Q_DECLARE_LOGGING_CATEGORY(lcShibokenDoc)
diff --git a/sources/shiboken6/ApiExtractor/sourcelocation.h b/sources/shiboken6/ApiExtractor/sourcelocation.h
index 630a841d8..da27062c3 100644
--- a/sources/shiboken6/ApiExtractor/sourcelocation.h
+++ b/sources/shiboken6/ApiExtractor/sourcelocation.h
@@ -29,7 +29,7 @@
 #ifndef SOURCE_LOCATION_H
 #define SOURCE_LOCATION_H
 
-#include <QString>
+#include <QtCore/QString>
 
 QT_FORWARD_DECLARE_CLASS(QDebug)
 QT_FORWARD_DECLARE_CLASS(QTextStream)
diff --git a/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.h b/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.h
index ab171d6b7..b0d9becfe 100644
--- a/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.h
+++ b/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.h
@@ -29,7 +29,7 @@
 #ifndef TESTABSTRACTMETACLASS_H
 #define TESTABSTRACTMETACLASS_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class AbstractMetaBuilder;
 
diff --git a/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.h b/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.h
index b39a27a54..a94d48fd8 100644
--- a/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.h
+++ b/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.h
@@ -29,7 +29,7 @@
 #ifndef TESTABSTRACTMETATYPE_H
 #define TESTABSTRACTMETATYPE_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestAbstractMetaType : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testaddfunction.h b/sources/shiboken6/ApiExtractor/tests/testaddfunction.h
index 195633030..7c1853bea 100644
--- a/sources/shiboken6/ApiExtractor/tests/testaddfunction.h
+++ b/sources/shiboken6/ApiExtractor/tests/testaddfunction.h
@@ -28,7 +28,7 @@
 
 #ifndef TESTADDFUNCTION_H
 #define TESTADDFUNCTION_H
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestAddFunction : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testarrayargument.h b/sources/shiboken6/ApiExtractor/tests/testarrayargument.h
index 2e58ae6ee..44ad8c7cd 100644
--- a/sources/shiboken6/ApiExtractor/tests/testarrayargument.h
+++ b/sources/shiboken6/ApiExtractor/tests/testarrayargument.h
@@ -28,7 +28,7 @@
 
 #ifndef TESTARRAYARGUMENT_H
 #define TESTARRAYARGUMENT_H
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestArrayArgument : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testcodeinjection.cpp b/sources/shiboken6/ApiExtractor/tests/testcodeinjection.cpp
index 6173a968b..bd0835426 100644
--- a/sources/shiboken6/ApiExtractor/tests/testcodeinjection.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testcodeinjection.cpp
@@ -27,15 +27,16 @@
 ****************************************************************************/
 
 #include "testcodeinjection.h"
-#include <QFileInfo>
-#include <QDir>
-#include <QtTest/QTest>
 #include "testutil.h"
 #include <abstractmetalang.h>
 #include <modifications.h>
 #include <textstream.h>
 #include <typesystem.h>
 
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtTest/QTest>
+
 void TestCodeInjections::testReadFile_data()
 {
     QTest::addColumn<QString>("filePath");
diff --git a/sources/shiboken6/ApiExtractor/tests/testcodeinjection.h b/sources/shiboken6/ApiExtractor/tests/testcodeinjection.h
index 473ddb13f..ce39897ba 100644
--- a/sources/shiboken6/ApiExtractor/tests/testcodeinjection.h
+++ b/sources/shiboken6/ApiExtractor/tests/testcodeinjection.h
@@ -29,7 +29,7 @@
 #ifndef TESTCODEINJECTIONS_H
 #define TESTCODEINJECTIONS_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class AbstractMetaBuilder;
 
diff --git a/sources/shiboken6/ApiExtractor/tests/testcontainer.h b/sources/shiboken6/ApiExtractor/tests/testcontainer.h
index 44e6636aa..ed8effaab 100644
--- a/sources/shiboken6/ApiExtractor/tests/testcontainer.h
+++ b/sources/shiboken6/ApiExtractor/tests/testcontainer.h
@@ -28,7 +28,7 @@
 
 #ifndef TESTCONTAINER_H
 #define TESTCONTAINER_H
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestContainer : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testconversionoperator.h b/sources/shiboken6/ApiExtractor/tests/testconversionoperator.h
index b571a57a0..8425a6fab 100644
--- a/sources/shiboken6/ApiExtractor/tests/testconversionoperator.h
+++ b/sources/shiboken6/ApiExtractor/tests/testconversionoperator.h
@@ -28,7 +28,7 @@
 
 #ifndef TESTCONVERSIONOPERATOR_H
 #define TESTCONVERSIONOPERATOR_H
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestConversionOperator : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testconversionruletag.cpp b/sources/shiboken6/ApiExtractor/tests/testconversionruletag.cpp
index 1f244bd83..040ece5d8 100644
--- a/sources/shiboken6/ApiExtractor/tests/testconversionruletag.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testconversionruletag.cpp
@@ -27,12 +27,13 @@
 ****************************************************************************/
 
 #include "testconversionruletag.h"
-#include <QtTest/QTest>
 #include "testutil.h"
 #include <abstractmetalang.h>
 #include <typesystem.h>
-#include <QFile>
-#include <QTemporaryFile>
+
+#include <QtCore/QFile>
+#include <QtCore/QTemporaryFile>
+#include <QtTest/QTest>
 
 void TestConversionRuleTag::testConversionRuleTagWithFile()
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testconversionruletag.h b/sources/shiboken6/ApiExtractor/tests/testconversionruletag.h
index 894bd3d71..ffe12ce44 100644
--- a/sources/shiboken6/ApiExtractor/tests/testconversionruletag.h
+++ b/sources/shiboken6/ApiExtractor/tests/testconversionruletag.h
@@ -28,7 +28,8 @@
 
 #ifndef TESTCONVERSIONRULE_H
 #define TESTCONVERSIONRULE_H
-#include <QObject>
+
+#include <QtCore/QObject>
 
 class TestConversionRuleTag : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testctorinformation.h b/sources/shiboken6/ApiExtractor/tests/testctorinformation.h
index ee655d450..b60f43d2a 100644
--- a/sources/shiboken6/ApiExtractor/tests/testctorinformation.h
+++ b/sources/shiboken6/ApiExtractor/tests/testctorinformation.h
@@ -29,7 +29,7 @@
 #ifndef TESTCTORINFORMATION_H
 #define TESTCTORINFORMATION_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class AbstractMetaBuilder;
 
diff --git a/sources/shiboken6/ApiExtractor/tests/testdroptypeentries.h b/sources/shiboken6/ApiExtractor/tests/testdroptypeentries.h
index d163b594d..b42c0a563 100644
--- a/sources/shiboken6/ApiExtractor/tests/testdroptypeentries.h
+++ b/sources/shiboken6/ApiExtractor/tests/testdroptypeentries.h
@@ -29,7 +29,7 @@
 #ifndef TESTDROPTYPEENTRIES_H
 #define TESTDROPTYPEENTRIES_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestDropTypeEntries : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testdtorinformation.h b/sources/shiboken6/ApiExtractor/tests/testdtorinformation.h
index 0a57dd8d1..5b9190c97 100644
--- a/sources/shiboken6/ApiExtractor/tests/testdtorinformation.h
+++ b/sources/shiboken6/ApiExtractor/tests/testdtorinformation.h
@@ -29,7 +29,7 @@
 #ifndef TESTDTORINFORMATION_H
 #define TESTDTORINFORMATION_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class AbstractMetaBuilder;
 
diff --git a/sources/shiboken6/ApiExtractor/tests/testenum.h b/sources/shiboken6/ApiExtractor/tests/testenum.h
index 20dbac79f..ce4fa3e18 100644
--- a/sources/shiboken6/ApiExtractor/tests/testenum.h
+++ b/sources/shiboken6/ApiExtractor/tests/testenum.h
@@ -28,7 +28,8 @@
 
 #ifndef TESTENUM_H
 #define TESTENUM_H
-#include <QObject>
+
+#include <QtCore/QObject>
 
 class TestEnum : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testextrainclude.h b/sources/shiboken6/ApiExtractor/tests/testextrainclude.h
index 33c5377c7..7419bd2ed 100644
--- a/sources/shiboken6/ApiExtractor/tests/testextrainclude.h
+++ b/sources/shiboken6/ApiExtractor/tests/testextrainclude.h
@@ -29,7 +29,7 @@
 #ifndef TESTEXTRAINCLUDE_H
 #define TESTEXTRAINCLUDE_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestExtraInclude : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testfunctiontag.h b/sources/shiboken6/ApiExtractor/tests/testfunctiontag.h
index d68499cd9..1ad4c4cd6 100644
--- a/sources/shiboken6/ApiExtractor/tests/testfunctiontag.h
+++ b/sources/shiboken6/ApiExtractor/tests/testfunctiontag.h
@@ -28,7 +28,8 @@
 
 #ifndef TESTFUNCTIONTAG_H
 #define TESTFUNCTIONTAG_H
-#include <QObject>
+
+#include <QtCore/QObject>
 
 class TestFunctionTag : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.h b/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.h
index da8ae4597..57a8ac956 100644
--- a/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.h
+++ b/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.h
@@ -29,7 +29,7 @@
 #ifndef TESTIMPLICITCONVERSIONS_H
 #define TESTIMPLICITCONVERSIONS_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class AbstractMetaBuilder;
 
diff --git a/sources/shiboken6/ApiExtractor/tests/testinserttemplate.h b/sources/shiboken6/ApiExtractor/tests/testinserttemplate.h
index 99b171933..ee0d33b49 100644
--- a/sources/shiboken6/ApiExtractor/tests/testinserttemplate.h
+++ b/sources/shiboken6/ApiExtractor/tests/testinserttemplate.h
@@ -29,7 +29,7 @@
 #ifndef TESTINSERTTEMPLATE_H
 #define TESTINSERTTEMPLATE_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestInsertTemplate : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp b/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp
index f8c36b72b..a2708cabd 100644
--- a/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp
@@ -27,10 +27,6 @@
 ****************************************************************************/
 
 #include "testmodifydocumentation.h"
-
-#include <QCoreApplication>
-#include <QtCore/QTemporaryDir>
-#include <QtTest/QTest>
 #include "testutil.h"
 #include <abstractmetalang.h>
 #include <documentation.h>
@@ -38,6 +34,10 @@
 #include <typesystem.h>
 #include <qtdocparser.h>
 
+#include <QtCore/QCoreApplication>
+#include <QtCore/QTemporaryDir>
+#include <QtTest/QTest>
+
 void TestModifyDocumentation::testModifyDocumentation()
 {
     const char* cppCode ="struct B { void b(); }; class A {};\n";
diff --git a/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.h b/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.h
index 6428a5697..afa8be369 100644
--- a/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.h
+++ b/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.h
@@ -29,7 +29,7 @@
 #ifndef TESTMODIFYDOCUMENTATION_H
 #define TESTMODIFYDOCUMENTATION_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestModifyDocumentation : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.h b/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.h
index a9a13a82b..31279de72 100644
--- a/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.h
+++ b/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.h
@@ -29,7 +29,7 @@
 #ifndef TESTABSTRACTMETACLASS_H
 #define TESTABSTRACTMETACLASS_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestModifyFunction : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testmultipleinheritance.h b/sources/shiboken6/ApiExtractor/tests/testmultipleinheritance.h
index 5ee8a21ea..71f0c5725 100644
--- a/sources/shiboken6/ApiExtractor/tests/testmultipleinheritance.h
+++ b/sources/shiboken6/ApiExtractor/tests/testmultipleinheritance.h
@@ -29,7 +29,7 @@
 #ifndef TESTMULTIPLEINHERITANCE_H
 #define TESTMULTIPLEINHERITANCE_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class AbstractMetaBuilder;
 
diff --git a/sources/shiboken6/ApiExtractor/tests/testnamespace.h b/sources/shiboken6/ApiExtractor/tests/testnamespace.h
index 5153a28a3..086d69202 100644
--- a/sources/shiboken6/ApiExtractor/tests/testnamespace.h
+++ b/sources/shiboken6/ApiExtractor/tests/testnamespace.h
@@ -29,7 +29,7 @@
 #ifndef TESTNAMESPACE_H
 #define TESTNAMESPACE_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 // The class is named 'NamespaceTest' to avoid clashes with Qt COIN using
 // '-qtnamespace TestNamespace'.
diff --git a/sources/shiboken6/ApiExtractor/tests/testnestedtypes.h b/sources/shiboken6/ApiExtractor/tests/testnestedtypes.h
index a870511ff..5afc81716 100644
--- a/sources/shiboken6/ApiExtractor/tests/testnestedtypes.h
+++ b/sources/shiboken6/ApiExtractor/tests/testnestedtypes.h
@@ -28,7 +28,8 @@
 
 #ifndef TESTNESTEDTYPES_H
 #define TESTNESTEDTYPES_H
-#include <QObject>
+
+#include <QtCore/QObject>
 
 class TestNestedTypes : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.h b/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.h
index e4e051077..ecbb8a13d 100644
--- a/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.h
+++ b/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.h
@@ -29,7 +29,7 @@
 #ifndef TESTNUMERICALTYPEDEF_H
 #define TESTNUMERICALTYPEDEF_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestNumericalTypedef : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testprimitivetypetag.h b/sources/shiboken6/ApiExtractor/tests/testprimitivetypetag.h
index ee5f5159f..97366eb4d 100644
--- a/sources/shiboken6/ApiExtractor/tests/testprimitivetypetag.h
+++ b/sources/shiboken6/ApiExtractor/tests/testprimitivetypetag.h
@@ -29,7 +29,7 @@
 #ifndef TESTPRIMITIVETYPETAG_H
 #define TESTPRIMITIVETYPETAG_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestPrimitiveTypeTag : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testrefcounttag.h b/sources/shiboken6/ApiExtractor/tests/testrefcounttag.h
index 4acbddcfc..5d28327f4 100644
--- a/sources/shiboken6/ApiExtractor/tests/testrefcounttag.h
+++ b/sources/shiboken6/ApiExtractor/tests/testrefcounttag.h
@@ -29,7 +29,7 @@
 #ifndef TESTREFCOUNTTAG_H
 #define TESTREFCOUNTTAG_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestRefCountTag : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.h b/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.h
index 0f717b55d..935f45173 100644
--- a/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.h
+++ b/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.h
@@ -29,7 +29,7 @@
 #ifndef TESTREFERENCETOPOINTER_H
 #define TESTREFERENCETOPOINTER_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestReferenceToPointer : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testremovefield.h b/sources/shiboken6/ApiExtractor/tests/testremovefield.h
index 8b52cc32f..7e7ec2733 100644
--- a/sources/shiboken6/ApiExtractor/tests/testremovefield.h
+++ b/sources/shiboken6/ApiExtractor/tests/testremovefield.h
@@ -29,7 +29,7 @@
 #ifndef TESTREMOVEFIELD_H
 #define TESTREMOVEFIELD_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestRemoveField : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testremoveimplconv.h b/sources/shiboken6/ApiExtractor/tests/testremoveimplconv.h
index 9e96dc2e9..870aef4f4 100644
--- a/sources/shiboken6/ApiExtractor/tests/testremoveimplconv.h
+++ b/sources/shiboken6/ApiExtractor/tests/testremoveimplconv.h
@@ -29,7 +29,7 @@
 #ifndef TESTREMOVEIMPLCONV_H
 #define TESTREMOVEIMPLCONV_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestRemoveImplConv : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testremoveoperatormethod.h b/sources/shiboken6/ApiExtractor/tests/testremoveoperatormethod.h
index 23c3e5144..1f2740f6f 100644
--- a/sources/shiboken6/ApiExtractor/tests/testremoveoperatormethod.h
+++ b/sources/shiboken6/ApiExtractor/tests/testremoveoperatormethod.h
@@ -29,7 +29,7 @@
 #ifndef TESTREMOVEOPERATORMETHOD_H
 #define TESTREMOVEOPERATORMETHOD_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestRemoveOperatorMethod : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testresolvetype.h b/sources/shiboken6/ApiExtractor/tests/testresolvetype.h
index 0263ff2b0..c4c06fbba 100644
--- a/sources/shiboken6/ApiExtractor/tests/testresolvetype.h
+++ b/sources/shiboken6/ApiExtractor/tests/testresolvetype.h
@@ -29,7 +29,7 @@
 #ifndef TESTRESOLVETYPE_H
 #define TESTRESOLVETYPE_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestResolveType : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testreverseoperators.h b/sources/shiboken6/ApiExtractor/tests/testreverseoperators.h
index ba3b43cfb..ebc2400a6 100644
--- a/sources/shiboken6/ApiExtractor/tests/testreverseoperators.h
+++ b/sources/shiboken6/ApiExtractor/tests/testreverseoperators.h
@@ -28,7 +28,7 @@
 
 #ifndef TESTREVERSEOPERATORS_H
 #define TESTREVERSEOPERATORS_H
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestReverseOperators : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp b/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp
index 20f22bc09..e920d4b89 100644
--- a/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp
@@ -27,15 +27,16 @@
 ****************************************************************************/
 
 #include "testtemplates.h"
-#include <QtTest/QTest>
-#include <QtCore/QTextStream>
-#include <QTemporaryFile>
 #include "testutil.h"
 #include <abstractmetafield.h>
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
 #include <typesystem.h>
 
+#include <QtCore/QTemporaryFile>
+#include <QtCore/QTextStream>
+#include <QtTest/QTest>
+
 void TestTemplates::testTemplateWithNamespace()
 {
     const char cppCode[] = R"CPP(
diff --git a/sources/shiboken6/ApiExtractor/tests/testtemplates.h b/sources/shiboken6/ApiExtractor/tests/testtemplates.h
index c96e7fe4a..1e563c6cb 100644
--- a/sources/shiboken6/ApiExtractor/tests/testtemplates.h
+++ b/sources/shiboken6/ApiExtractor/tests/testtemplates.h
@@ -29,7 +29,7 @@
 #ifndef TESTTEMPLATES_H
 #define TESTTEMPLATES_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestTemplates : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testtoposort.h b/sources/shiboken6/ApiExtractor/tests/testtoposort.h
index 012156dc9..88c0f3d56 100644
--- a/sources/shiboken6/ApiExtractor/tests/testtoposort.h
+++ b/sources/shiboken6/ApiExtractor/tests/testtoposort.h
@@ -29,7 +29,7 @@
 #ifndef TESTTOPOSORT_H
 #define TESTTOPOSORT_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestTopoSort : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testtyperevision.h b/sources/shiboken6/ApiExtractor/tests/testtyperevision.h
index 3832c3883..da97224b8 100644
--- a/sources/shiboken6/ApiExtractor/tests/testtyperevision.h
+++ b/sources/shiboken6/ApiExtractor/tests/testtyperevision.h
@@ -29,7 +29,7 @@
 #ifndef TESTTYPEREVISION_H
 #define TESTTYPEREVISION_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestTypeRevision : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testvaluetypedefaultctortag.h b/sources/shiboken6/ApiExtractor/tests/testvaluetypedefaultctortag.h
index 244181707..fe806d57d 100644
--- a/sources/shiboken6/ApiExtractor/tests/testvaluetypedefaultctortag.h
+++ b/sources/shiboken6/ApiExtractor/tests/testvaluetypedefaultctortag.h
@@ -29,7 +29,7 @@
 #ifndef TESTVALUETYPEDEFAULTCTORTAG_H
 #define TESTVALUETYPEDEFAULTCTORTAG_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestValueTypeDefaultCtorTag : public QObject
 {
diff --git a/sources/shiboken6/ApiExtractor/tests/testvoidarg.h b/sources/shiboken6/ApiExtractor/tests/testvoidarg.h
index 44d90d075..805576178 100644
--- a/sources/shiboken6/ApiExtractor/tests/testvoidarg.h
+++ b/sources/shiboken6/ApiExtractor/tests/testvoidarg.h
@@ -28,7 +28,7 @@
 
 #ifndef TESTVOIDARG_H
 #define TESTVOIDARG_H
-#include <QObject>
+#include <QtCore/QObject>
 
 class TestVoidArg : public QObject
 {
diff --git a/sources/shiboken6/generator/generator.cpp b/sources/shiboken6/generator/generator.cpp
index d4de3a899..d8f930d8e 100644
--- a/sources/shiboken6/generator/generator.cpp
+++ b/sources/shiboken6/generator/generator.cpp
@@ -37,13 +37,13 @@
 #include "fileout.h"
 #include "apiextractor.h"
 #include "typesystem.h"
+#include <typedatabase.h>
 
+#include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
 #include <QtCore/QRegularExpression>
-#include <QDebug>
-#include <typedatabase.h>
 
 static const char ENABLE_PYSIDE_EXTENSIONS[] = "enable-pyside-extensions";
 static const char AVOID_PROTECTED_HACK[] = "avoid-protected-hack";
diff --git a/sources/shiboken6/generator/main.cpp b/sources/shiboken6/generator/main.cpp
index bafdf8cc3..ce1e15d35 100644
--- a/sources/shiboken6/generator/main.cpp
+++ b/sources/shiboken6/generator/main.cpp
@@ -26,25 +26,27 @@
 **
 ****************************************************************************/
 
-#include <QCoreApplication>
-#include <QLibrary>
-#include <QtCore/QFile>
-#include <QtCore/QDir>
-#include <QtCore/QVariant>
-#include <iostream>
+#include "shibokenconfig.h"
+#include "cppgenerator.h"
+#include "generator.h"
+#include "headergenerator.h"
+#include "qtdocgenerator.h"
+
 #include <apiextractor.h>
 #include <apiextractorresult.h>
 #include <fileout.h>
+#include <messages.h>
 #include <reporthandler.h>
 #include <typedatabase.h>
-#include <messages.h>
-#include "generator.h"
-#include "shibokenconfig.h"
-#include "cppgenerator.h"
-#include "headergenerator.h"
-#include "qtdocgenerator.h"
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QLibrary>
+#include <QtCore/QVariant>
 
 #include <exception>
+#include <iostream>
 
 static const QChar clangOptionsSplitter = u',';
 static const QChar keywordsSplitter = u',';
diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.cpp b/sources/shiboken6/generator/shiboken/cppgenerator.cpp
index 457a28189..041b1c92b 100644
--- a/sources/shiboken6/generator/shiboken/cppgenerator.cpp
+++ b/sources/shiboken6/generator/shiboken/cppgenerator.cpp
@@ -26,8 +26,6 @@
 **
 ****************************************************************************/
 
-#include <memory>
-
 #include "cppgenerator.h"
 #include "headergenerator.h"
 #include "apiextractor.h"
@@ -50,15 +48,16 @@
 #include <typedatabase.h>
 #include <parser/enumvalue.h>
 
+#include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QMetaObject>
+#include <QtCore/QMetaType>
 #include <QtCore/QRegularExpression>
 #include <QtCore/QTextStream>
-#include <QtCore/QDebug>
-#include <QMetaType>
 
 #include <algorithm>
 #include <cstring>
+#include <memory>
 
 static const char CPP_ARG0[] = "cppArg0";
 const char *CppGenerator::PYTHON_TO_CPPCONVERSION_STRUCT = "Shiboken::Conversions::PythonToCppConversion";
diff --git a/sources/shiboken6/tests/test_generator/dummygentest.cpp b/sources/shiboken6/tests/test_generator/dummygentest.cpp
index 40ca6c7c5..42a3b3c5b 100644
--- a/sources/shiboken6/tests/test_generator/dummygentest.cpp
+++ b/sources/shiboken6/tests/test_generator/dummygentest.cpp
@@ -29,9 +29,10 @@
 #include "dummygentest.h"
 #include "dummygenerator.h"
 #include "dummygentestconfig.h"
-#include <QTemporaryFile>
+
+#include <QtCore/QProcess>
+#include <QtCore/QTemporaryFile>
 #include <QtTest/QTest>
-#include <QProcess>
 
 #define GENERATED_CONTENTS  "// Generated code for class: Dummy"