shiboken6: Clean up includes

Remove unused includes from headers; add includes to sources where
needed.

Change-Id: I05efd95a9340eaf42cc5d606e2aef97acdaf83c7
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

57 files changed, 66 insertions, 65 deletions

diff --git a/sources/shiboken6/ApiExtractor/abstractmetaargument.cpp b/sources/shiboken6/ApiExtractor/abstractmetaargument.cpp
index a34cfde9f..bd6a80434 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetaargument.cpp
+++ b/sources/shiboken6/ApiExtractor/abstractmetaargument.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "abstractmetaargument.h"
+#include "abstractmetatype.h"
 #include "documentation.h"
 
 #include "qtcompat.h"
@@ -57,6 +58,11 @@ const AbstractMetaType &AbstractMetaArgument::modifiedType() const
     return d->m_modifiedType;
 }
 
+bool AbstractMetaArgument::isTypeModified() const
+{
+    return modifiedType() != type();
+}
+
 bool AbstractMetaArgument::isModifiedRemoved() const
 {
     return d->m_modifiedRemoved;
diff --git a/sources/shiboken6/ApiExtractor/abstractmetaargument.h b/sources/shiboken6/ApiExtractor/abstractmetaargument.h
index ef68b8687..1e5e32613 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetaargument.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetaargument.h
@@ -4,15 +4,11 @@
 #ifndef ABSTRACTMETAARGUMENT_H
 #define ABSTRACTMETAARGUMENT_H
 
-#include "abstractmetalang_typedefs.h"
-#include "abstractmetatype.h"
-#include "typesystem_enums.h"
-#include "typesystem_typedefs.h"
-
 #include <QtCore/QSharedDataPointer>
 
 QT_FORWARD_DECLARE_CLASS(QDebug)
 
+class AbstractMetaType;
 class AbstractMetaArgumentData;
 class Documentation;
 
@@ -31,7 +27,7 @@ public:
     void setType(const AbstractMetaType &type);
     void setModifiedType(const AbstractMetaType &type);
     const AbstractMetaType &modifiedType() const;
-    bool isTypeModified() const { return modifiedType() != type(); }
+    bool isTypeModified() const;
 
     bool isModifiedRemoved() const;
     void setModifiedRemoved(bool v);
diff --git a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp
index 498d2eeaa..9cb9e6fba 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp
@@ -2,9 +2,11 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "abstractmetabuilder_p.h"
+#include "abstractmetaargument.h"
 #include "abstractmetaenum.h"
 #include "abstractmetafield.h"
 #include "abstractmetafunction.h"
+#include "abstractmetatype.h"
 #include "addedfunction.h"
 #include "graph.h"
 #include "exception.h"
diff --git a/sources/shiboken6/ApiExtractor/abstractmetabuilder_p.h b/sources/shiboken6/ApiExtractor/abstractmetabuilder_p.h
index a64ae68b3..33047a82a 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetabuilder_p.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetabuilder_p.h
@@ -10,7 +10,6 @@
 #include "abstractmetalang.h"
 #include "abstractmetatype.h"
 #include "include.h"
-#include "modifications.h"
 #include "typeparser.h"
 
 #include <QtCore/QFileInfo>
diff --git a/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp b/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp
index 9768b85d1..09d08743b 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp
+++ b/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "abstractmetafunction.h"
+#include "abstractmetaargument.h"
 #include "abstractmetabuilder.h"
 #include "abstractmetalang.h"
 #include "abstractmetalang_helpers.h"
@@ -13,7 +14,6 @@
 #include "messages.h"
 #include "codesnip.h"
 #include "modifications.h"
-#include "propertyspec.h"
 #include "reporthandler.h"
 #include "sourcelocation.h"
 #include "typedatabase.h"
diff --git a/sources/shiboken6/ApiExtractor/abstractmetafunction.h b/sources/shiboken6/ApiExtractor/abstractmetafunction.h
index d9d9cc2b8..4b0033a73 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetafunction.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetafunction.h
@@ -6,9 +6,9 @@
 
 #include "abstractmetalang_enums.h"
 #include "abstractmetalang_typedefs.h"
-#include "abstractmetaargument.h"
 #include "typesystem_enums.h"
 #include "typesystem_typedefs.h"
+#include "parser/codemodel_enums.h"
 
 #include <QtCore/QScopedPointer>
 
diff --git a/sources/shiboken6/ApiExtractor/abstractmetalang.cpp b/sources/shiboken6/ApiExtractor/abstractmetalang.cpp
index 33ed659c0..6e02d6c57 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetalang.cpp
+++ b/sources/shiboken6/ApiExtractor/abstractmetalang.cpp
@@ -3,9 +3,12 @@
 
 #include "abstractmetalang.h"
 #include "abstractmetalang_helpers.h"
+#include "abstractmetaargument.h"
 #include "abstractmetaenum.h"
 #include "abstractmetafunction.h"
+#include "abstractmetatype.h"
 #include "abstractmetafield.h"
+#include "parser/codemodel.h"
 #include "documentation.h"
 #include "messages.h"
 #include "modifications.h"
diff --git a/sources/shiboken6/ApiExtractor/abstractmetalang.h b/sources/shiboken6/ApiExtractor/abstractmetalang.h
index 10543381a..6dc2cdfd6 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetalang.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetalang.h
@@ -7,7 +7,6 @@
 #include "abstractmetalang_enums.h"
 #include "abstractmetalang_typedefs.h"
 #include "enclosingclassmixin.h"
-#include "typesystem_enums.h"
 #include "typesystem_typedefs.h"
 
 #include <QtCore/qobjectdefs.h>
diff --git a/sources/shiboken6/ApiExtractor/abstractmetatype.cpp b/sources/shiboken6/ApiExtractor/abstractmetatype.cpp
index b6bd00d18..8a10c6cff 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetatype.cpp
+++ b/sources/shiboken6/ApiExtractor/abstractmetatype.cpp
@@ -7,9 +7,9 @@
 #include "messages.h"
 #include "typedatabase.h"
 #include "containertypeentry.h"
-#include "parser/codemodel.h"
 
 #include "qtcompat.h"
+#include "typeinfo.h"
 
 #ifndef QT_NO_DEBUG_STREAM
 #  include <QtCore/QDebug>
diff --git a/sources/shiboken6/ApiExtractor/apiextractor.cpp b/sources/shiboken6/ApiExtractor/apiextractor.cpp
index c7611a5a0..e56b8b222 100644
--- a/sources/shiboken6/ApiExtractor/apiextractor.cpp
+++ b/sources/shiboken6/ApiExtractor/apiextractor.cpp
@@ -12,7 +12,6 @@
 #include "abstractmetalang.h"
 #include "codesnip.h"
 #include "exception.h"
-#include "fileout.h"
 #include "modifications.h"
 #include "reporthandler.h"
 #include "typedatabase.h"
@@ -22,7 +21,6 @@
 #include "smartpointertypeentry.h"
 #include "typedefentry.h"
 #include "typesystemtypeentry.h"
-#include "valuetypeentry.h"
 
 #include "qtcompat.h"
 
diff --git a/sources/shiboken6/ApiExtractor/apiextractor.h b/sources/shiboken6/ApiExtractor/apiextractor.h
index fd84f6870..5fa540693 100644
--- a/sources/shiboken6/ApiExtractor/apiextractor.h
+++ b/sources/shiboken6/ApiExtractor/apiextractor.h
@@ -5,7 +5,6 @@
 #define APIEXTRACTOR_H
 
 #include "abstractmetalang_typedefs.h"
-#include "abstractmetatype.h"
 #include "apiextractorflags.h"
 #include "header_paths.h"
 #include "clangparser/compilersupport.h"
diff --git a/sources/shiboken6/ApiExtractor/apiextractorresult.h b/sources/shiboken6/ApiExtractor/apiextractorresult.h
index 8dd3383bf..d683b54fe 100644
--- a/sources/shiboken6/ApiExtractor/apiextractorresult.h
+++ b/sources/shiboken6/ApiExtractor/apiextractorresult.h
@@ -4,13 +4,10 @@
 #ifndef APIEXTRACTORRESULT_H
 #define APIEXTRACTORRESULT_H
 
-#include "abstractmetalang.h"
 #include "apiextractorflags.h"
-#include "abstractmetaenum.h"
 #include "abstractmetatype.h"
-#include "typesystem_typedefs.h"
+#include "abstractmetalang_typedefs.h"
 
-#include <QtCore/QHash>
 #include <QtCore/QExplicitlySharedDataPointer>
 
 #include <optional>
diff --git a/sources/shiboken6/ApiExtractor/complextypeentry.h b/sources/shiboken6/ApiExtractor/complextypeentry.h
index 3e9aa17d6..b87adedc0 100644
--- a/sources/shiboken6/ApiExtractor/complextypeentry.h
+++ b/sources/shiboken6/ApiExtractor/complextypeentry.h
@@ -5,6 +5,8 @@
 #define COMPLEXTYPEENTRY_H
 
 #include "typesystem.h"
+#include "typesystem_enums.h"
+#include "typesystem_typedefs.h"
 #include "pymethoddefentry.h"
 
 #include <QtCore/QSet>
diff --git a/sources/shiboken6/ApiExtractor/customconversion.h b/sources/shiboken6/ApiExtractor/customconversion.h
index 6dedc52fb..a9c1e0adf 100644
--- a/sources/shiboken6/ApiExtractor/customconversion.h
+++ b/sources/shiboken6/ApiExtractor/customconversion.h
@@ -4,7 +4,6 @@
 #ifndef CUSTOMCONVERSION_H
 #define CUSTOMCONVERSION_H
 
-#include "typesystem_enums.h"
 #include "typesystem_typedefs.h"
 
 #include <QtCore/QList>
diff --git a/sources/shiboken6/ApiExtractor/docparser.cpp b/sources/shiboken6/ApiExtractor/docparser.cpp
index 4ea770e60..4745e675d 100644
--- a/sources/shiboken6/ApiExtractor/docparser.cpp
+++ b/sources/shiboken6/ApiExtractor/docparser.cpp
@@ -1,11 +1,11 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
 #include "docparser.h"
-#include "classdocumentation.h"
-#include "abstractmetaenum.h"
-#include "abstractmetafield.h"
+#include "abstractmetaargument.h"
 #include "abstractmetafunction.h"
 #include "abstractmetalang.h"
+#include "abstractmetatype.h"
 #include "messages.h"
 #include "modifications.h"
 #include "reporthandler.h"
diff --git a/sources/shiboken6/ApiExtractor/doxygenparser.cpp b/sources/shiboken6/ApiExtractor/doxygenparser.cpp
index 23c56ae1f..a6c712946 100644
--- a/sources/shiboken6/ApiExtractor/doxygenparser.cpp
+++ b/sources/shiboken6/ApiExtractor/doxygenparser.cpp
@@ -2,10 +2,12 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "doxygenparser.h"
+#include "abstractmetaargument.h"
 #include "abstractmetalang.h"
 #include "abstractmetafield.h"
 #include "abstractmetafunction.h"
 #include "abstractmetaenum.h"
+#include "abstractmetatype.h"
 #include "documentation.h"
 #include "messages.h"
 #include "modifications.h"
diff --git a/sources/shiboken6/ApiExtractor/enumtypeentry.h b/sources/shiboken6/ApiExtractor/enumtypeentry.h
index f575de956..60e16a113 100644
--- a/sources/shiboken6/ApiExtractor/enumtypeentry.h
+++ b/sources/shiboken6/ApiExtractor/enumtypeentry.h
@@ -5,6 +5,7 @@
 #define ENUMTYPEENTRY_H
 
 #include "typesystem.h"
+#include "typesystem_enums.h"
 
 class EnumTypeEntryPrivate;
 class EnumValueTypeEntry;
diff --git a/sources/shiboken6/ApiExtractor/functiontypeentry.h b/sources/shiboken6/ApiExtractor/functiontypeentry.h
index 3d7399931..a2da28645 100644
--- a/sources/shiboken6/ApiExtractor/functiontypeentry.h
+++ b/sources/shiboken6/ApiExtractor/functiontypeentry.h
@@ -5,6 +5,7 @@
 #define FUNCTIONTYPEENTRY_H
 
 #include "typesystem.h"
+#include "typesystem_enums.h"
 
 class FunctionTypeEntryPrivate;
 
diff --git a/sources/shiboken6/ApiExtractor/header_paths.h b/sources/shiboken6/ApiExtractor/header_paths.h
index ca00a5360..af4a768e8 100644
--- a/sources/shiboken6/ApiExtractor/header_paths.h
+++ b/sources/shiboken6/ApiExtractor/header_paths.h
@@ -6,7 +6,6 @@
 
 #include <QtCore/QByteArray>
 #include <QtCore/QList>
-#include <QtCore/QString>
 
 enum class HeaderType
 {
diff --git a/sources/shiboken6/ApiExtractor/messages.h b/sources/shiboken6/ApiExtractor/messages.h
index 4edab4b44..0c09f4bc1 100644
--- a/sources/shiboken6/ApiExtractor/messages.h
+++ b/sources/shiboken6/ApiExtractor/messages.h
@@ -8,9 +8,7 @@
 #include "parser/codemodel_fwd.h"
 #include "typesystem_typedefs.h"
 
-#include <QtCore/QMap>
 #include <QtCore/QString>
-#include <QtCore/QList>
 
 class EnumTypeEntry;
 class FunctionTypeEntry;
diff --git a/sources/shiboken6/ApiExtractor/modifications.cpp b/sources/shiboken6/ApiExtractor/modifications.cpp
index 0d12fa056..b0b5881fb 100644
--- a/sources/shiboken6/ApiExtractor/modifications.cpp
+++ b/sources/shiboken6/ApiExtractor/modifications.cpp
@@ -3,13 +3,11 @@
 
 #include "modifications.h"
 #include "codesnip.h"
-#include "exception.h"
-#include "typedatabase.h"
-#include "typesystem.h"
 
 #include "qtcompat.h"
 
 #include <QtCore/QDebug>
+#include <QtCore/QRegularExpression>
 
 #include <algorithm>
 #include <limits>
diff --git a/sources/shiboken6/ApiExtractor/propertyspec.cpp b/sources/shiboken6/ApiExtractor/propertyspec.cpp
index 54ac6fdab..c9eca3fad 100644
--- a/sources/shiboken6/ApiExtractor/propertyspec.cpp
+++ b/sources/shiboken6/ApiExtractor/propertyspec.cpp
@@ -5,9 +5,9 @@
 #include "abstractmetalang.h"
 #include "abstractmetabuilder_p.h"
 #include "abstractmetatype.h"
-#include "codemodel.h"
 #include "messages.h"
 #include "complextypeentry.h"
+#include "typeinfo.h"
 
 #include "qtcompat.h"
 
diff --git a/sources/shiboken6/ApiExtractor/pythontypeentry.h b/sources/shiboken6/ApiExtractor/pythontypeentry.h
index f1d12e6fd..2e0fbda97 100644
--- a/sources/shiboken6/ApiExtractor/pythontypeentry.h
+++ b/sources/shiboken6/ApiExtractor/pythontypeentry.h
@@ -5,6 +5,7 @@
 #define PYTHONTYPEENTRY_H
 
 #include "customtypenentry.h"
+#include "typesystem_enums.h"
 
 class PythonTypeEntry : public CustomTypeEntry
 {
diff --git a/sources/shiboken6/ApiExtractor/qtdocparser.cpp b/sources/shiboken6/ApiExtractor/qtdocparser.cpp
index 7f189b5ad..1be0235db 100644
--- a/sources/shiboken6/ApiExtractor/qtdocparser.cpp
+++ b/sources/shiboken6/ApiExtractor/qtdocparser.cpp
@@ -3,10 +3,11 @@
 
 #include "qtdocparser.h"
 #include "classdocumentation.h"
+#include "abstractmetaargument.h"
 #include "abstractmetaenum.h"
-#include "abstractmetafield.h"
 #include "abstractmetafunction.h"
 #include "abstractmetalang.h"
+#include "abstractmetatype.h"
 #include "documentation.h"
 #include "modifications.h"
 #include "messages.h"
diff --git a/sources/shiboken6/ApiExtractor/reporthandler.cpp b/sources/shiboken6/ApiExtractor/reporthandler.cpp
index 1fbd36bf4..a6cc50911 100644
--- a/sources/shiboken6/ApiExtractor/reporthandler.cpp
+++ b/sources/shiboken6/ApiExtractor/reporthandler.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "reporthandler.h"
-#include "typesystem.h"
 #include "typedatabase.h"
 
 #include "qtcompat.h"
diff --git a/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp b/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp
index 17a6c5e2e..2dc6e2cab 100644
--- a/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp
@@ -4,6 +4,7 @@
 #include "testabstractmetaclass.h"
 #include "abstractmetabuilder.h"
 #include "testutil.h"
+#include <abstractmetaargument.h>
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
 #include <usingmember.h>
diff --git a/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.cpp b/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.cpp
index 0b210583f..ba4e86088 100644
--- a/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.cpp
@@ -3,8 +3,10 @@
 
 #include "testabstractmetatype.h"
 #include "testutil.h"
+#include <abstractmetaargument.h>
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
+#include <abstractmetatype.h>
 #include <typesystem.h>
 #include <parser/codemodel.h>
 #include <typeparser.h>
diff --git a/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp b/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp
index db4c9a167..c91358211 100644
--- a/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp
@@ -3,8 +3,10 @@
 
 #include "testaddfunction.h"
 #include "testutil.h"
+#include <abstractmetaargument.h>
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
+#include <abstractmetatype.h>
 #include <codesnip.h>
 #include <addedfunction.h>
 #include <addedfunction_p.h>
diff --git a/sources/shiboken6/ApiExtractor/tests/testarrayargument.cpp b/sources/shiboken6/ApiExtractor/tests/testarrayargument.cpp
index 0afbcb38f..1a02674ea 100644
--- a/sources/shiboken6/ApiExtractor/tests/testarrayargument.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testarrayargument.cpp
@@ -3,9 +3,11 @@
 
 #include "testarrayargument.h"
 #include "testutil.h"
+#include <abstractmetaargument.h>
 #include <abstractmetaenum.h>
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
+#include <abstractmetatype.h>
 #include <primitivetypeentry.h>
 #include <parser/enumvalue.h>
 
diff --git a/sources/shiboken6/ApiExtractor/tests/testconversionoperator.cpp b/sources/shiboken6/ApiExtractor/tests/testconversionoperator.cpp
index a03220b0a..f7d4b0673 100644
--- a/sources/shiboken6/ApiExtractor/tests/testconversionoperator.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testconversionoperator.cpp
@@ -5,6 +5,7 @@
 #include "testutil.h"
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
+#include <abstractmetatype.h>
 #include <typesystem.h>
 
 #include <qtcompat.h>
diff --git a/sources/shiboken6/ApiExtractor/tests/testenum.cpp b/sources/shiboken6/ApiExtractor/tests/testenum.cpp
index 9fd413ddc..0d0bdda90 100644
--- a/sources/shiboken6/ApiExtractor/tests/testenum.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testenum.cpp
@@ -3,6 +3,7 @@
 
 #include "testenum.h"
 #include "testutil.h"
+#include <abstractmetaargument.h>
 #include <abstractmetaenum.h>
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
diff --git a/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp b/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp
index f600c3ea9..ad5262418 100644
--- a/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp
@@ -3,8 +3,10 @@
 
 #include "testimplicitconversions.h"
 #include "testutil.h"
+#include <abstractmetaargument.h>
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
+#include <abstractmetatype.h>
 #include <complextypeentry.h>
 #include <QtTest/QTest>
 
diff --git a/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp b/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp
index 837564051..e9167bb35 100644
--- a/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp
@@ -3,9 +3,11 @@
 
 #include "testmodifyfunction.h"
 #include "testutil.h"
+#include <abstractmetaargument.h>
 #include <abstractmetabuilder_p.h>
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
+#include <abstractmetatype.h>
 #include <modifications.h>
 #include <typesystem.h>
 
diff --git a/sources/shiboken6/ApiExtractor/tests/testnestedtypes.cpp b/sources/shiboken6/ApiExtractor/tests/testnestedtypes.cpp
index 7f827d5aa..5b0fb954d 100644
--- a/sources/shiboken6/ApiExtractor/tests/testnestedtypes.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testnestedtypes.cpp
@@ -5,6 +5,7 @@
 #include "testutil.h"
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
+#include <abstractmetatype.h>
 #include <codesnip.h>
 #include <modifications.h>
 #include <complextypeentry.h>
diff --git a/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.cpp b/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.cpp
index 7d72aa7c7..4c277ef89 100644
--- a/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testnumericaltypedef.cpp
@@ -4,8 +4,10 @@
 #include "testnumericaltypedef.h"
 #include <QtTest/QTest>
 #include "testutil.h"
+#include <abstractmetaargument.h>
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
+#include <abstractmetatype.h>
 #include <typesystem.h>
 
 void TestNumericalTypedef::testNumericalTypedef()
diff --git a/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp b/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp
index e82c398c4..34edbb795 100644
--- a/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp
@@ -4,8 +4,10 @@
 #include "testreferencetopointer.h"
 #include <QtTest/QTest>
 #include "testutil.h"
+#include <abstractmetaargument.h>
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
+#include <abstractmetatype.h>
 #include <typesystem.h>
 
 void TestReferenceToPointer::testReferenceToPointerArgument()
diff --git a/sources/shiboken6/ApiExtractor/tests/testremoveimplconv.cpp b/sources/shiboken6/ApiExtractor/tests/testremoveimplconv.cpp
index e7c183586..9efa0d343 100644
--- a/sources/shiboken6/ApiExtractor/tests/testremoveimplconv.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testremoveimplconv.cpp
@@ -4,8 +4,10 @@
 #include "testremoveimplconv.h"
 #include "testutil.h"
 #include <QtTest/QTest>
+#include <abstractmetaargument.h>
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
+#include <abstractmetatype.h>
 #include <complextypeentry.h>
 
 // When a constructor able to trigger implicity conversions is removed
diff --git a/sources/shiboken6/ApiExtractor/tests/testresolvetype.cpp b/sources/shiboken6/ApiExtractor/tests/testresolvetype.cpp
index 8b8f02a8f..d5fcee2d1 100644
--- a/sources/shiboken6/ApiExtractor/tests/testresolvetype.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testresolvetype.cpp
@@ -3,6 +3,7 @@
 
 #include "testresolvetype.h"
 #include "testutil.h"
+#include <abstractmetaargument.h>
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
 #include <abstractmetatype.h>
diff --git a/sources/shiboken6/ApiExtractor/tests/testreverseoperators.cpp b/sources/shiboken6/ApiExtractor/tests/testreverseoperators.cpp
index 90c613f96..440055233 100644
--- a/sources/shiboken6/ApiExtractor/tests/testreverseoperators.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testreverseoperators.cpp
@@ -4,6 +4,7 @@
 #include "testreverseoperators.h"
 #include <QtTest/QTest>
 #include "testutil.h"
+#include <abstractmetaargument.h>
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
 #include <typesystem.h>
diff --git a/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp b/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp
index ddd134306..24e07052f 100644
--- a/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp
@@ -3,9 +3,11 @@
 
 #include "testtemplates.h"
 #include "testutil.h"
+#include <abstractmetaargument.h>
 #include <abstractmetafield.h>
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
+#include <abstractmetatype.h>
 #include <complextypeentry.h>
 #include <containertypeentry.h>
 
diff --git a/sources/shiboken6/ApiExtractor/tests/testvoidarg.cpp b/sources/shiboken6/ApiExtractor/tests/testvoidarg.cpp
index 56d70336a..255a33953 100644
--- a/sources/shiboken6/ApiExtractor/tests/testvoidarg.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testvoidarg.cpp
@@ -4,6 +4,7 @@
 #include "testvoidarg.h"
 #include <QtTest/QTest>
 #include "testutil.h"
+#include <abstractmetaargument.h>
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
 #include <typesystem.h>
diff --git a/sources/shiboken6/ApiExtractor/typedatabase.cpp b/sources/shiboken6/ApiExtractor/typedatabase.cpp
index 91fcc0f91..e0b1219a9 100644
--- a/sources/shiboken6/ApiExtractor/typedatabase.cpp
+++ b/sources/shiboken6/ApiExtractor/typedatabase.cpp
@@ -4,17 +4,12 @@
 #include "typedatabase.h"
 #include "abstractmetatype.h"
 #include "addedfunction.h"
-#include "exception.h"
 #include "messages.h"
 #include "typesystemparser_p.h"
-#include "arraytypeentry.h"
 #include "complextypeentry.h"
 #include "constantvaluetypeentry.h"
 #include "containertypeentry.h"
-#include "customconversion.h"
 #include "customtypenentry.h"
-#include "enumtypeentry.h"
-#include "enumvaluetypeentry.h"
 #include "flagstypeentry.h"
 #include "functiontypeentry.h"
 #include "namespacetypeentry.h"
@@ -22,10 +17,8 @@
 #include "primitivetypeentry.h"
 #include "pythontypeentry.h"
 #include "smartpointertypeentry.h"
-#include "templateargumententry.h"
 #include "typedefentry.h"
 #include "typesystemtypeentry.h"
-#include "valuetypeentry.h"
 #include "varargstypeentry.h"
 #include "voidtypeentry.h"
 #include "conditionalstreamreader.h"
diff --git a/sources/shiboken6/ApiExtractor/typedatabase.h b/sources/shiboken6/ApiExtractor/typedatabase.h
index 0ea7097be..38a47856a 100644
--- a/sources/shiboken6/ApiExtractor/typedatabase.h
+++ b/sources/shiboken6/ApiExtractor/typedatabase.h
@@ -6,7 +6,6 @@
 
 #include "include.h"
 #include "typedatabase_typedefs.h"
-#include "typesystem_enums.h"
 #include "typesystem_typedefs.h"
 
 #include <QtCore/QRegularExpression>
diff --git a/sources/shiboken6/ApiExtractor/typeparser.h b/sources/shiboken6/ApiExtractor/typeparser.h
index 8e81435b2..97634b5db 100644
--- a/sources/shiboken6/ApiExtractor/typeparser.h
+++ b/sources/shiboken6/ApiExtractor/typeparser.h
@@ -4,8 +4,6 @@
 #ifndef TYPEPARSER_H
 #define TYPEPARSER_H
 
-#include "parser/codemodel_enums.h"
-
 #include <QtCore/QString>
 
 class TypeInfo;
diff --git a/sources/shiboken6/ApiExtractor/typesystem.cpp b/sources/shiboken6/ApiExtractor/typesystem.cpp
index ebae04a73..35025e36a 100644
--- a/sources/shiboken6/ApiExtractor/typesystem.cpp
+++ b/sources/shiboken6/ApiExtractor/typesystem.cpp
@@ -7,7 +7,6 @@
 #include "complextypeentry.h"
 #include "constantvaluetypeentry.h"
 #include "containertypeentry.h"
-#include "customconversion.h"
 #include "customtypenentry.h"
 #include "enumtypeentry.h"
 #include "enumvaluetypeentry.h"
@@ -27,7 +26,6 @@
 #include "abstractmetatype.h"
 #include "typedatabase.h"
 #include "modifications.h"
-#include "messages.h"
 #include "sourcelocation.h"
 
 #include "qtcompat.h"
diff --git a/sources/shiboken6/ApiExtractor/typesystem.h b/sources/shiboken6/ApiExtractor/typesystem.h
index e83f03b67..c3304d630 100644
--- a/sources/shiboken6/ApiExtractor/typesystem.h
+++ b/sources/shiboken6/ApiExtractor/typesystem.h
@@ -4,10 +4,9 @@
 #ifndef TYPESYSTEM_H
 #define TYPESYSTEM_H
 
-#include "typesystem_enums.h"
-#include "typesystem_typedefs.h"
 #include "include.h"
 
+#include <QtCore/qobjectdefs.h>
 #include <QtCore/QString>
 #include <QtCore/QScopedPointer>
 
diff --git a/sources/shiboken6/ApiExtractor/typesystem_typedefs.h b/sources/shiboken6/ApiExtractor/typesystem_typedefs.h
index 89081b9ea..f09b76d69 100644
--- a/sources/shiboken6/ApiExtractor/typesystem_typedefs.h
+++ b/sources/shiboken6/ApiExtractor/typesystem_typedefs.h
@@ -4,10 +4,8 @@
 #ifndef TYPESYSTEM_TYPEDEFS_H
 #define TYPESYSTEM_TYPEDEFS_H
 
-#include <QtCore/QHash>
 #include <QtCore/QList>
 #include <QtCore/QSharedPointer>
-#include <QtCore/QList>
 
 class CodeSnip;
 class DocModification;
diff --git a/sources/shiboken6/ApiExtractor/typesystemparser.cpp b/sources/shiboken6/ApiExtractor/typesystemparser.cpp
index c4225423c..aa2349725 100644
--- a/sources/shiboken6/ApiExtractor/typesystemparser.cpp
+++ b/sources/shiboken6/ApiExtractor/typesystemparser.cpp
@@ -5,9 +5,6 @@
 #include "addedfunction.h"
 #include "codesnip.h"
 #include "enumtypeentry.h"
-#include "enumvaluetypeentry.h"
-#include "arraytypeentry.h"
-#include "constantvaluetypeentry.h"
 #include "containertypeentry.h"
 #include "customconversion.h"
 #include "customtypenentry.h"
@@ -18,7 +15,6 @@
 #include "objecttypeentry.h"
 #include "primitivetypeentry.h"
 #include "smartpointertypeentry.h"
-#include "templateargumententry.h"
 #include "typedefentry.h"
 #include "typesystemtypeentry.h"
 #include "valuetypeentry.h"
diff --git a/sources/shiboken6/ApiExtractor/typesystemtypeentry.h b/sources/shiboken6/ApiExtractor/typesystemtypeentry.h
index 25efec9cb..a861381b1 100644
--- a/sources/shiboken6/ApiExtractor/typesystemtypeentry.h
+++ b/sources/shiboken6/ApiExtractor/typesystemtypeentry.h
@@ -5,6 +5,8 @@
 #define TYPESYSTEMTYPEENTRY_H
 
 #include "typesystem.h"
+#include "typesystem_enums.h"
+#include "typesystem_typedefs.h"
 
 class TypeSystemTypeEntry : public TypeEntry
 {
diff --git a/sources/shiboken6/ApiExtractor/usingmember.h b/sources/shiboken6/ApiExtractor/usingmember.h
index d908da0cd..ed362688d 100644
--- a/sources/shiboken6/ApiExtractor/usingmember.h
+++ b/sources/shiboken6/ApiExtractor/usingmember.h
@@ -5,7 +5,7 @@
 #define USINGMEMBER_H
 
 #include "abstractmetalang_typedefs.h"
-#include "parser/codemodel.h"
+#include "parser/codemodel_enums.h"
 
 QT_FORWARD_DECLARE_CLASS(QDebug)
 
diff --git a/sources/shiboken6/generator/generator.cpp b/sources/shiboken6/generator/generator.cpp
index b4d6cfab5..348d25425 100644
--- a/sources/shiboken6/generator/generator.cpp
+++ b/sources/shiboken6/generator/generator.cpp
@@ -3,14 +3,13 @@
 
 #include "generator.h"
 #include "apiextractorresult.h"
-#include "ctypenames.h"
+#include "abstractmetaargument.h"
+#include "abstractmetaenum.h"
 #include "abstractmetafunction.h"
 #include "abstractmetalang.h"
-#include "parser/codemodel.h"
 #include "messages.h"
 #include "reporthandler.h"
 #include "fileout.h"
-#include "apiextractor.h"
 #include "arraytypeentry.h"
 #include "enumtypeentry.h"
 #include "enumvaluetypeentry.h"
diff --git a/sources/shiboken6/generator/generator.h b/sources/shiboken6/generator/generator.h
index 1d1a0caeb..9d60f1f1a 100644
--- a/sources/shiboken6/generator/generator.h
+++ b/sources/shiboken6/generator/generator.h
@@ -6,9 +6,7 @@
 
 #include <abstractmetatype.h>
 #include <typedatabase_typedefs.h>
-#include <QtCore/QObject>
 #include <QtCore/QSharedPointer>
-#include <QtCore/QTextStream>
 #include <QtCore/QList>
 
 #include <optional>
diff --git a/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp
index a684db831..c1e206362 100644
--- a/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp
+++ b/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp
@@ -4,6 +4,7 @@
 #include "qtdocgenerator.h"
 #include "codesnip.h"
 #include "exception.h"
+#include "abstractmetaargument.h"
 #include "apiextractorresult.h"
 #include "qtxmltosphinx.h"
 #include "rstformat.h"
diff --git a/sources/shiboken6/generator/qtdoc/qtxmltosphinx.cpp b/sources/shiboken6/generator/qtdoc/qtxmltosphinx.cpp
index 6a358e0c9..e386ea46c 100644
--- a/sources/shiboken6/generator/qtdoc/qtxmltosphinx.cpp
+++ b/sources/shiboken6/generator/qtdoc/qtxmltosphinx.cpp
@@ -12,6 +12,7 @@
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
+#include <QtCore/QHash>
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QRegularExpression>
 #include <QtCore/QXmlStreamReader>
diff --git a/sources/shiboken6/generator/qtdoc/qtxmltosphinx.h b/sources/shiboken6/generator/qtdoc/qtxmltosphinx.h
index bb58c0878..e3efde412 100644
--- a/sources/shiboken6/generator/qtdoc/qtxmltosphinx.h
+++ b/sources/shiboken6/generator/qtdoc/qtxmltosphinx.h
@@ -6,14 +6,10 @@
 
 #include <textstream.h>
 
-#include "qtcompat.h"
-
-#include <QtCore/QHash>
 #include <QtCore/QList>
 #include <QtCore/QScopedPointer>
 #include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
-#include <QtCore/QTextStream>
 
 QT_BEGIN_NAMESPACE
 class QDebug;
diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.h b/sources/shiboken6/generator/shiboken/cppgenerator.h
index 5edc34e1f..49caf0b84 100644
--- a/sources/shiboken6/generator/shiboken/cppgenerator.h
+++ b/sources/shiboken6/generator/shiboken/cppgenerator.h
@@ -7,7 +7,7 @@
 #include "shibokengenerator.h"
 #include "abstractmetalang_enums.h"
 #include "include.h"
-#include "modifications.h"
+#include "typesystem_typedefs.h"
 
 #include <QtCore/QFlags>
 #include <QtCore/QSharedPointer>
diff --git a/sources/shiboken6/generator/shiboken/headergenerator.cpp b/sources/shiboken6/generator/shiboken/headergenerator.cpp
index 21d5c8f6e..f1da83ed6 100644
--- a/sources/shiboken6/generator/shiboken/headergenerator.cpp
+++ b/sources/shiboken6/generator/shiboken/headergenerator.cpp
@@ -3,13 +3,13 @@
 
 #include "headergenerator.h"
 #include <apiextractorresult.h>
+#include <abstractmetaargument.h>
 #include <abstractmetaenum.h>
 #include <abstractmetafield.h>
 #include <abstractmetafunction.h>
 #include <abstractmetalang.h>
 #include <abstractmetalang_helpers.h>
 #include <codesnip.h>
-#include <modifications.h>
 #include <typedatabase.h>
 #include <reporthandler.h>
 #include <textstream.h>
@@ -22,8 +22,6 @@
 #include "typedefentry.h"
 #include "typesystemtypeentry.h"
 
-#include "parser/codemodel.h"
-
 #include "qtcompat.h"
 
 #include <algorithm>