QtQml: Remove unused includes in qml, final part

Drop unnecessary includes detected by clangd-iwyu.
Add new includes due to the transitive includes. Also, some of the
includes were detected as unused even if they were actually in use.
In those cases, use angular brackets instead of "" which deceives
the tool not to complain.

Affected subfolders: JsRuntime, Qml

Fixes: QTBUG-106473
Change-Id: I483da15d42a8e3ce6cd3b654909665fff3075d6b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

46 files changed, 19 insertions, 125 deletions

diff --git a/src/qml/jsruntime/qv4numberobject.cpp b/src/qml/jsruntime/qv4numberobject.cpp
index ce1a492cea..d744e569f5 100644
--- a/src/qml/jsruntime/qv4numberobject.cpp
+++ b/src/qml/jsruntime/qv4numberobject.cpp
@@ -3,7 +3,6 @@
 
 #include "qv4numberobject_p.h"
 #include "qv4runtime_p.h"
-#include "qv4string_p.h"
 
 #include <QtCore/qnumeric.h>
 #include <QtCore/qmath.h>
diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp
index a160998242..77325580d3 100644
--- a/src/qml/jsruntime/qv4object.cpp
+++ b/src/qml/jsruntime/qv4object.cpp
@@ -2,16 +2,12 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qv4object_p.h"
-#include "qv4objectproto_p.h"
 #include "qv4stringobject_p.h"
 #include "qv4argumentsobject_p.h"
 #include <private/qv4mm_p.h>
 #include "qv4lookup_p.h"
 #include "qv4scopedvalue_p.h"
 #include "qv4memberdata_p.h"
-#include "qv4objectiterator_p.h"
-#include "qv4identifierhash_p.h"
-#include "qv4string_p.h"
 #include "qv4identifiertable_p.h"
 #include "qv4jscall_p.h"
 #include "qv4symbol_p.h"
diff --git a/src/qml/jsruntime/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h
index 11174f7cb3..0f67af8913 100644
--- a/src/qml/jsruntime/qv4object_p.h
+++ b/src/qml/jsruntime/qv4object_p.h
@@ -21,7 +21,6 @@
 #include "qv4scopedvalue_p.h"
 #include "qv4value_p.h"
 #include "qv4internalclass_p.h"
-#include "qv4string_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qml/jsruntime/qv4objectiterator.cpp b/src/qml/jsruntime/qv4objectiterator.cpp
index 75e75e91ad..90eb326d65 100644
--- a/src/qml/jsruntime/qv4objectiterator.cpp
+++ b/src/qml/jsruntime/qv4objectiterator.cpp
@@ -2,12 +2,9 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 #include "qv4objectiterator_p.h"
 #include "qv4object_p.h"
-#include "qv4stringobject_p.h"
-#include "qv4identifierhash_p.h"
-#include "qv4argumentsobject_p.h"
-#include "qv4string_p.h"
 #include "qv4iterator_p.h"
 #include "qv4propertykey_p.h"
+#include <QtQml/private/qv4functionobject_p.h>
 
 using namespace QV4;
 
diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp
index 15dff2f4cc..e7f96a12ba 100644
--- a/src/qml/jsruntime/qv4objectproto.cpp
+++ b/src/qml/jsruntime/qv4objectproto.cpp
@@ -7,10 +7,7 @@
 #include "qv4argumentsobject_p.h"
 #include <private/qv4mm_p.h>
 #include "qv4scopedvalue_p.h"
-#include "qv4runtime_p.h"
 #include "qv4objectiterator_p.h"
-#include "qv4string_p.h"
-#include "qv4jscall_p.h"
 #include "qv4symbol_p.h"
 #include "qv4propertykey_p.h"
 
diff --git a/src/qml/jsruntime/qv4profiling_p.h b/src/qml/jsruntime/qv4profiling_p.h
index ee0213d89a..61937e85ab 100644
--- a/src/qml/jsruntime/qv4profiling_p.h
+++ b/src/qml/jsruntime/qv4profiling_p.h
@@ -15,7 +15,7 @@
 // We mean it.
 //
 
-#include "qv4global_p.h"
+#include <QtQml/private/qv4global_p.h>
 #include "qv4engine_p.h"
 #include "qv4function_p.h"
 
diff --git a/src/qml/jsruntime/qv4reflect.cpp b/src/qml/jsruntime/qv4reflect.cpp
index abcc60726a..a24064b29a 100644
--- a/src/qml/jsruntime/qv4reflect.cpp
+++ b/src/qml/jsruntime/qv4reflect.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qv4reflect_p.h"
-#include "qv4symbol_p.h"
 #include "qv4runtimeapi_p.h"
 #include "qv4objectproto_p.h"
 #include "qv4propertykey_p.h"
diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp
index 365593e207..1b62717efc 100644
--- a/src/qml/jsruntime/qv4regexpobject.cpp
+++ b/src/qml/jsruntime/qv4regexpobject.cpp
@@ -2,9 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qv4regexpobject_p.h"
-#include "qv4objectproto_p.h"
 #include "qv4regexp_p.h"
-#include "qv4stringobject_p.h"
 #include <private/qv4mm_p.h>
 #include "qv4scopedvalue_p.h"
 #include "qv4jscall_p.h"
diff --git a/src/qml/jsruntime/qv4regexpobject_p.h b/src/qml/jsruntime/qv4regexpobject_p.h
index 2f278f70a7..e99b64fec6 100644
--- a/src/qml/jsruntime/qv4regexpobject_p.h
+++ b/src/qml/jsruntime/qv4regexpobject_p.h
@@ -14,14 +14,10 @@
 // We mean it.
 //
 
-#include "qv4runtime_p.h"
 #include "qv4engine_p.h"
 #include "qv4context_p.h"
 #include "qv4functionobject_p.h"
-#include "qv4string_p.h"
 #include "qv4managed_p.h"
-#include "qv4property_p.h"
-#include "qv4objectiterator_p.h"
 #include "qv4regexp_p.h"
 
 #include <QtCore/QString>
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp
index 71892454d2..f1f26ee53a 100644
--- a/src/qml/jsruntime/qv4runtime.cpp
+++ b/src/qml/jsruntime/qv4runtime.cpp
@@ -5,15 +5,10 @@
 #include "qv4runtime_p.h"
 #include "qv4engine_p.h"
 #include "qv4object_p.h"
-#include "qv4objectproto_p.h"
 #include "qv4globalobject_p.h"
-#include "qv4stringobject_p.h"
 #include "qv4argumentsobject_p.h"
-#include "qv4objectiterator_p.h"
-#include "qv4dateobject_p.h"
 #include "qv4lookup_p.h"
 #include "qv4function_p.h"
-#include "qv4numberobject_p.h"
 #include "qv4regexp_p.h"
 #include "qv4regexpobject_p.h"
 #include "private/qlocale_tools_p.h"
@@ -28,6 +23,7 @@
 #include "qv4qobjectwrapper_p.h"
 #include "qv4symbol_p.h"
 #include "qv4generatorobject_p.h"
+#include <QtQml/private/qv4math_p.h>
 
 #include <QtCore/QDebug>
 #include <cassert>
diff --git a/src/qml/jsruntime/qv4runtime_p.h b/src/qml/jsruntime/qv4runtime_p.h
index 1ec5edf315..40994633f0 100644
--- a/src/qml/jsruntime/qv4runtime_p.h
+++ b/src/qml/jsruntime/qv4runtime_p.h
@@ -16,7 +16,6 @@
 
 #include "qv4global_p.h"
 #include "qv4value_p.h"
-#include "qv4math_p.h"
 #include "qv4runtimeapi_p.h"
 #include <QtCore/qnumeric.h>
 
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp
index 122c30611b..c72e1c4e19 100644
--- a/src/qml/jsruntime/qv4script.cpp
+++ b/src/qml/jsruntime/qv4script.cpp
@@ -3,13 +3,10 @@
 
 #include "qv4script_p.h"
 #include <private/qv4mm_p.h>
-#include "qv4functionobject_p.h"
 #include "qv4function_p.h"
 #include "qv4context_p.h"
 #include "qv4debugging_p.h"
-#include "qv4profiling_p.h"
 #include "qv4scopedvalue_p.h"
-#include "qv4jscall_p.h"
 
 #include <private/qqmljsengine_p.h>
 #include <private/qqmljslexer_p.h>
diff --git a/src/qml/jsruntime/qv4sequenceobject.cpp b/src/qml/jsruntime/qv4sequenceobject.cpp
index 4dc15009c9..6ed27d9d02 100644
--- a/src/qml/jsruntime/qv4sequenceobject.cpp
+++ b/src/qml/jsruntime/qv4sequenceobject.cpp
@@ -10,8 +10,6 @@
 #include <private/qqmlengine_p.h>
 #include <private/qv4scopedvalue_p.h>
 #include <private/qv4jscall_p.h>
-#include "qv4runtime_p.h"
-#include "qv4objectiterator_p.h"
 #include <private/qqmlmetatype_p.h>
 #include <private/qqmltype_p_p.h>
 
diff --git a/src/qml/jsruntime/qv4sparsearray.cpp b/src/qml/jsruntime/qv4sparsearray.cpp
index 5dcdef1247..656c496a2a 100644
--- a/src/qml/jsruntime/qv4sparsearray.cpp
+++ b/src/qml/jsruntime/qv4sparsearray.cpp
@@ -2,10 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qv4sparsearray_p.h"
-#include "qv4runtime_p.h"
-#include "qv4object_p.h"
-#include "qv4functionobject_p.h"
-#include "qv4scopedvalue_p.h"
 #include <stdlib.h>
 
 #ifdef QT_QMAP_DEBUG
diff --git a/src/qml/jsruntime/qv4string.cpp b/src/qml/jsruntime/qv4string.cpp
index df9fab76d8..118382d5dc 100644
--- a/src/qml/jsruntime/qv4string.cpp
+++ b/src/qml/jsruntime/qv4string.cpp
@@ -5,8 +5,7 @@
 #include "qv4value_p.h"
 #include "qv4identifiertable_p.h"
 #include "qv4runtime_p.h"
-#include "qv4objectproto_p.h"
-#include "qv4stringobject_p.h"
+#include <QtQml/private/qv4mm_p.h>
 #include <QtCore/QHash>
 #include <QtCore/private/qnumeric_p.h>
 
diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp
index 07fd16ee4e..614171503e 100644
--- a/src/qml/jsruntime/qv4stringobject.cpp
+++ b/src/qml/jsruntime/qv4stringobject.cpp
@@ -5,7 +5,6 @@
 #include "qv4stringobject_p.h"
 #include "qv4regexp_p.h"
 #include "qv4regexpobject_p.h"
-#include "qv4objectproto_p.h"
 #include <private/qv4mm_p.h>
 #include "qv4scopedvalue_p.h"
 #include "qv4symbol_p.h"
@@ -15,6 +14,7 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QDebug>
 #include <QtCore/QStringList>
+#include <QtQml/private/qv4runtime_p.h>
 
 #include <cassert>
 
diff --git a/src/qml/jsruntime/qv4typedarray.cpp b/src/qml/jsruntime/qv4typedarray.cpp
index 4961a63e8b..938675b2a6 100644
--- a/src/qml/jsruntime/qv4typedarray.cpp
+++ b/src/qml/jsruntime/qv4typedarray.cpp
@@ -4,8 +4,6 @@
 #include "qv4typedarray_p.h"
 #include "qv4arrayiterator_p.h"
 #include "qv4arraybuffer_p.h"
-#include "qv4string_p.h"
-#include "qv4jscall_p.h"
 #include "qv4symbol_p.h"
 #include "qv4runtime_p.h"
 #include <QtCore/qatomic.h>
diff --git a/src/qml/jsruntime/qv4urlobject.cpp b/src/qml/jsruntime/qv4urlobject.cpp
index 7f4a078d13..8b6db439e2 100644
--- a/src/qml/jsruntime/qv4urlobject.cpp
+++ b/src/qml/jsruntime/qv4urlobject.cpp
@@ -3,7 +3,6 @@
 
 #include "qv4arrayiterator_p.h"
 #include "qv4urlobject_p.h"
-#include "qv4stringobject_p.h"
 
 #include <QtCore/QUrl>
 
diff --git a/src/qml/jsruntime/qv4variantobject.cpp b/src/qml/jsruntime/qv4variantobject.cpp
index c1b66fef94..478ad773b5 100644
--- a/src/qml/jsruntime/qv4variantobject.cpp
+++ b/src/qml/jsruntime/qv4variantobject.cpp
@@ -3,7 +3,6 @@
 
 #include "qv4variantobject_p.h"
 #include "qv4functionobject_p.h"
-#include "qv4objectproto_p.h"
 #include <private/qqmlvaluetypewrapper_p.h>
 #include <private/qv4qobjectwrapper_p.h>
 
diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp
index 8eb1503e28..fa699b0e5e 100644
--- a/src/qml/jsruntime/qv4vme_moth.cpp
+++ b/src/qml/jsruntime/qv4vme_moth.cpp
@@ -24,6 +24,7 @@
 #include <private/qv4alloca_p.h>
 #include <private/qqmljavascriptexpression_p.h>
 #include <private/qv4qmlcontext_p.h>
+#include <QtQml/private/qv4runtime_p.h>
 #include <iostream>
 
 #if QT_CONFIG(qml_jit)
diff --git a/src/qml/qml/qqmlapplicationengine.cpp b/src/qml/qml/qqmlapplicationengine.cpp
index df8c64dab0..113d56e7fa 100644
--- a/src/qml/qml/qqmlapplicationengine.cpp
+++ b/src/qml/qml/qqmlapplicationengine.cpp
@@ -7,7 +7,7 @@
 #include <QQmlComponent>
 #include "qqmlapplicationengine.h"
 #include "qqmlapplicationengine_p.h"
-#include "qqmlfileselector.h"
+#include <QtQml/private/qqmlfileselector_p.h>
 
 #include <memory>
 
diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp
index 5689438e03..d009381394 100644
--- a/src/qml/qml/qqmlbinding.cpp
+++ b/src/qml/qml/qqmlbinding.cpp
@@ -3,9 +3,7 @@
 
 #include "qqmlbinding_p.h"
 
-#include "qqml.h"
 #include "qqmlcontext.h"
-#include "qqmlinfo.h"
 #include "qqmldata_p.h"
 
 #include <private/qqmldebugserviceinterfaces_p.h>
diff --git a/src/qml/qml/qqmlbinding_p.h b/src/qml/qml/qqmlbinding_p.h
index d544670264..08e61a7aef 100644
--- a/src/qml/qml/qqmlbinding_p.h
+++ b/src/qml/qml/qqmlbinding_p.h
@@ -15,12 +15,8 @@
 // We mean it.
 //
 
-#include "qqml.h"
-#include "qqmlpropertyvaluesource.h"
-#include "qqmlexpression.h"
 #include "qqmlproperty.h"
 #include "qqmlscriptstring.h"
-#include "qqmlproperty_p.h"
 
 #include <QtCore/QObject>
 #include <QtCore/QMetaProperty>
diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp
index 965271bb45..da81244f18 100644
--- a/src/qml/qml/qqmlboundsignal.cpp
+++ b/src/qml/qml/qqmlboundsignal.cpp
@@ -6,10 +6,6 @@
 #include <private/qmetaobject_p.h>
 #include <private/qmetaobjectbuilder_p.h>
 #include "qqmlengine_p.h"
-#include "qqmlexpression_p.h"
-#include "qqmlcontext_p.h"
-#include "qqml.h"
-#include "qqmlcontext.h"
 #include "qqmlglobal_p.h"
 #include <private/qqmlprofiler_p.h>
 #include <private/qqmldebugconnector_p.h>
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index beb3f0efe0..e2819d40a8 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -5,12 +5,10 @@
 #include "qqmlcomponent_p.h"
 #include "qqmlcomponentattached_p.h"
 
-#include "qqmlcontext_p.h"
 #include "qqmlengine_p.h"
 #include "qqmlvme_p.h"
 #include "qqml.h"
 #include "qqmlengine.h"
-#include "qqmlbinding_p.h"
 #include "qqmlincubator.h"
 #include "qqmlincubator_p.h"
 #include <private/qqmljavascriptexpression_p.h>
diff --git a/src/qml/qml/qqmlcomponent_p.h b/src/qml/qml/qqmlcomponent_p.h
index d4a1e10f12..c01421ff88 100644
--- a/src/qml/qml/qqmlcomponent_p.h
+++ b/src/qml/qml/qqmlcomponent_p.h
@@ -18,10 +18,7 @@
 #include "qqmlcomponent.h"
 
 #include "qqmlengine_p.h"
-#include "qqmltypeloader_p.h"
-#include "qqmlvme_p.h"
 #include "qqmlerror.h"
-#include "qqml.h"
 #include <private/qqmlobjectcreator_p.h>
 #include <private/qqmltypedata_p.h>
 #include <private/qqmlguardedcontextdata_p.h>
diff --git a/src/qml/qml/qqmlcustomparser_p.h b/src/qml/qml/qqmlcustomparser_p.h
index 98a9f21ae9..fc0a814af6 100644
--- a/src/qml/qml/qqmlcustomparser_p.h
+++ b/src/qml/qml/qqmlcustomparser_p.h
@@ -15,8 +15,8 @@
 // We mean it.
 //
 
-#include "qqmlerror.h"
-#include "qqmlbinding_p.h"
+#include <QtQml/qqmlerror.h>
+#include <QtQml/private/qqmlbinding_p.h>
 #include <private/qv4compileddata_p.h>
 
 #include <QtCore/qbytearray.h>
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 4e12ab93d8..de9ccefd5c 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -3,25 +3,16 @@
 
 #include "qqmlengine_p.h"
 #include "qqmlengine.h"
-#include "qqmlcomponentattached_p.h"
 
 #include "qqmlcontext_p.h"
 #include "qqml.h"
 #include "qqmlcontext.h"
-#include "qqmlexpression.h"
-#include "qqmlcomponent.h"
-#include "qqmlvme_p.h"
-#include "qqmlstringconverters_p.h"
 #include "qqmlscriptstring.h"
 #include "qqmlglobal_p.h"
-#include "qqmlcomponent_p.h"
-#include "qqmlextensioninterface.h"
-#include "qqmllist_p.h"
-#include "qqmltypenamecache_p.h"
 #include "qqmlnotifier_p.h"
 #include "qqmlincubator.h"
 #include "qqmlabstracturlinterceptor.h"
-#include "qqmlsourcecoordinate_p.h"
+
 #include <private/qqmldirparser_p.h>
 #include <private/qqmlboundsignal_p.h>
 #include <private/qqmljsdiagnosticmessage_p.h>
@@ -37,6 +28,9 @@
 #include <QtCore/qthread.h>
 #include <private/qthread_p.h>
 #include <private/qqmlscriptdata_p.h>
+#include <QtQml/private/qqmlcomponentattached_p.h>
+#include <QtQml/private/qqmlsourcecoordinate_p.h>
+#include <QtQml/private/qqmlcomponent_p.h>
 
 #if QT_CONFIG(qml_network)
 #include "qqmlnetworkaccessmanagerfactory.h"
diff --git a/src/qml/qml/qqmlerror.cpp b/src/qml/qml/qqmlerror.cpp
index 66192ff06c..f15f7a474e 100644
--- a/src/qml/qml/qqmlerror.cpp
+++ b/src/qml/qml/qqmlerror.cpp
@@ -3,7 +3,6 @@
 
 #include "qqmlerror.h"
 #include "qqmlfile.h"
-#include "qqmlsourcecoordinate_p.h"
 #include <private/qqmljsdiagnosticmessage_p.h>
 
 #include <QtCore/qdebug.h>
diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp
index 00e1f5ce59..ecece668d3 100644
--- a/src/qml/qml/qqmlexpression.cpp
+++ b/src/qml/qml/qqmlexpression.cpp
@@ -4,9 +4,7 @@
 #include "qqmlexpression.h"
 #include "qqmlexpression_p.h"
 
-#include "qqmlglobal_p.h"
 #include "qqmlengine_p.h"
-#include "qqmlcontext_p.h"
 #include "qqmlscriptstring_p.h"
 #include "qqmlbinding_p.h"
 #include <private/qqmlsourcecoordinate_p.h>
diff --git a/src/qml/qml/qqmlincubator.cpp b/src/qml/qml/qqmlincubator.cpp
index f832dbc572..afd265516a 100644
--- a/src/qml/qml/qqmlincubator.cpp
+++ b/src/qml/qml/qqmlincubator.cpp
@@ -5,7 +5,6 @@
 #include "qqmlcomponent.h"
 #include "qqmlincubator_p.h"
 
-#include "qqmlexpression_p.h"
 #include "qqmlobjectcreator_p.h"
 #include <private/qqmlcomponent_p.h>
 
diff --git a/src/qml/qml/qqmlinfo.cpp b/src/qml/qml/qqmlinfo.cpp
index 56d1a85265..37eba4bfe9 100644
--- a/src/qml/qml/qqmlinfo.cpp
+++ b/src/qml/qml/qqmlinfo.cpp
@@ -4,8 +4,6 @@
 #include "qqmlinfo.h"
 
 #include "qqmldata_p.h"
-#include "qqmlcontext.h"
-#include "qqmlcontext_p.h"
 #include "qqmlmetatype_p.h"
 #include "qqmlengine_p.h"
 #include "qqmlsourcecoordinate_p.h"
diff --git a/src/qml/qml/qqmllist.cpp b/src/qml/qml/qqmllist.cpp
index 49fcc9bc0e..5fd077c7c1 100644
--- a/src/qml/qml/qqmllist.cpp
+++ b/src/qml/qml/qqmllist.cpp
@@ -3,8 +3,7 @@
 
 #include "qqmllist.h"
 #include "qqmllist_p.h"
-#include "qqmlengine_p.h"
-#include "qqmlproperty_p.h"
+#include <QtQml/private/qqmlproperty_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp
index cd356271a9..039544b1f2 100644
--- a/src/qml/qml/qqmllocale.cpp
+++ b/src/qml/qml/qqmllocale.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qqmllocale_p.h"
-#include "qqmlengine_p.h"
 #include <private/qqmlcontext_p.h>
 #include <QtCore/qnumeric.h>
 #include <QtCore/qdatetime.h>
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp
index a2407134ba..1bea403dda 100644
--- a/src/qml/qml/qqmlobjectcreator.cpp
+++ b/src/qml/qml/qqmlobjectcreator.cpp
@@ -25,6 +25,7 @@
 #include <private/qv4generatorobject_p.h>
 #include <private/qv4resolvedtypereference_p.h>
 #include <private/qqmlpropertybinding_p.h>
+#include <QtQml/private/qqmlvme_p.h>
 
 #include <QScopedValueRollback>
 
diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp
index 6925af297f..402c23bb28 100644
--- a/src/qml/qml/qqmlproperty.cpp
+++ b/src/qml/qml/qqmlproperty.cpp
@@ -4,25 +4,22 @@
 #include "qqmlproperty.h"
 #include "qqmlproperty_p.h"
 
-#include "qqml.h"
-#include "qqmlbinding_p.h"
 #include "qqmlboundsignal_p.h"
 #include "qqmlcontext.h"
-#include "qqmlcontext_p.h"
 #include "qqmlboundsignal_p.h"
 #include "qqmlengine.h"
 #include "qqmlengine_p.h"
 #include "qqmldata_p.h"
 #include "qqmlstringconverters_p.h"
-#include "qqmllist_p.h"
+
 #include "qqmlvmemetaobject_p.h"
-#include "qqmlexpression_p.h"
 #include "qqmlvaluetypeproxybinding_p.h"
 #include <private/qjsvalue_p.h>
 #include <private/qv4functionobject_p.h>
 #include <private/qv4qobjectwrapper_p.h>
 #include <private/qqmlbuiltinfunctions_p.h>
 #include <private/qqmlirbuilder_p.h>
+#include <QtQml/private/qqmllist_p.h>
 
 #include <QStringList>
 #include <QVector>
diff --git a/src/qml/qml/qqmlpropertyvalueinterceptor.cpp b/src/qml/qml/qqmlpropertyvalueinterceptor.cpp
index 9a0d0f4c10..17d43a1271 100644
--- a/src/qml/qml/qqmlpropertyvalueinterceptor.cpp
+++ b/src/qml/qml/qqmlpropertyvalueinterceptor.cpp
@@ -3,8 +3,6 @@
 
 #include "qqmlpropertyvalueinterceptor_p.h"
 
-#include "qqml.h"
-
 QT_BEGIN_NAMESPACE
 
 /*!
diff --git a/src/qml/qml/qqmlpropertyvaluesource.cpp b/src/qml/qml/qqmlpropertyvaluesource.cpp
index 571805d8d0..558b36de09 100644
--- a/src/qml/qml/qqmlpropertyvaluesource.cpp
+++ b/src/qml/qml/qqmlpropertyvaluesource.cpp
@@ -3,8 +3,6 @@
 
 #include "qqmlpropertyvaluesource.h"
 
-#include "qqml.h"
-
 QT_BEGIN_NAMESPACE
 
 /*!
diff --git a/src/qml/qml/qqmlproxymetaobject_p.h b/src/qml/qml/qqmlproxymetaobject_p.h
index 84befb2c42..6238dff4d1 100644
--- a/src/qml/qml/qqmlproxymetaobject_p.h
+++ b/src/qml/qml/qqmlproxymetaobject_p.h
@@ -17,7 +17,6 @@
 
 #include <private/qtqmlglobal_p.h>
 #include <private/qmetaobjectbuilder_p.h>
-#include "qqml.h"
 
 #include <QtCore/QMetaObject>
 #include <QtCore/QObject>
diff --git a/src/qml/qml/qqmltypenamecache.cpp b/src/qml/qml/qqmltypenamecache.cpp
index bf270cef7d..3823bf139f 100644
--- a/src/qml/qml/qqmltypenamecache.cpp
+++ b/src/qml/qml/qqmltypenamecache.cpp
@@ -3,8 +3,6 @@
 
 #include "qqmltypenamecache_p.h"
 
-#include "qqmlengine_p.h"
-
 QT_BEGIN_NAMESPACE
 
 void QQmlTypeNameCache::add(const QHashedString &name, const QUrl &url, const QHashedString &nameSpace)
diff --git a/src/qml/qml/qqmlvaluetype_p.h b/src/qml/qml/qqmlvaluetype_p.h
index 6b7df3f1b9..89a35495ad 100644
--- a/src/qml/qml/qqmlvaluetype_p.h
+++ b/src/qml/qml/qqmlvaluetype_p.h
@@ -15,9 +15,7 @@
 // We mean it.
 //
 
-#include "qqml.h"
-#include "qqmlproperty.h"
-#include "qqmlproperty_p.h"
+#include <QtQml/private/qqmlproperty_p.h>
 
 #include <private/qqmlnullablevalue_p.h>
 #include <private/qmetatype_p.h>
diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp
index bd6f17ca2b..3b9bf80940 100644
--- a/src/qml/qml/qqmlvme.cpp
+++ b/src/qml/qml/qqmlvme.cpp
@@ -3,29 +3,10 @@
 
 #include "qqmlvme_p.h"
 
-#include "qqmlboundsignal_p.h"
-#include "qqmlstringconverters_p.h"
 #include <private/qmetaobjectbuilder_p.h>
-#include "qqmldata_p.h"
-#include "qqml.h"
-#include "qqmlinfo.h"
-#include "qqmlcustomparser_p.h"
 #include "qqmlengine.h"
-#include "qqmlcontext.h"
-#include "qqmlcomponent.h"
-#include "qqmlcomponentattached_p.h"
-#include "qqmlbinding_p.h"
-#include "qqmlengine_p.h"
-#include "qqmlcomponent_p.h"
-#include "qqmlvmemetaobject_p.h"
-#include "qqmlcontext_p.h"
-#include "qqmlglobal_p.h"
 #include <private/qfinitestack_p.h>
-#include "qqmlscriptstring.h"
-#include "qqmlscriptstring_p.h"
-#include "qqmlpropertyvalueinterceptor_p.h"
-#include "qqmlvaluetypeproxybinding_p.h"
-#include "qqmlexpression_p.h"
+#include <QtQml/private/qqmlcomponent_p.h>
 
 #include <QStack>
 #include <QPointF>
diff --git a/src/qml/qml/qqmlvme_p.h b/src/qml/qml/qqmlvme_p.h
index f6209960ef..d5b2329395 100644
--- a/src/qml/qml/qqmlvme_p.h
+++ b/src/qml/qml/qqmlvme_p.h
@@ -15,7 +15,6 @@
 // We mean it.
 //
 
-#include "qqmlerror.h"
 #include <private/qrecursionwatcher_p.h>
 
 #include <QtCore/QStack>
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp
index a24287b04c..59dbfdf5f1 100644
--- a/src/qml/qml/qqmlvmemetaobject.cpp
+++ b/src/qml/qml/qqmlvmemetaobject.cpp
@@ -4,13 +4,7 @@
 
 #include "qqmlvmemetaobject_p.h"
 
-
-#include "qqml.h"
 #include <private/qqmlrefcount_p.h>
-#include "qqmlexpression.h"
-#include "qqmlexpression_p.h"
-#include "qqmlcontext_p.h"
-#include "qqmlbinding_p.h"
 #include "qqmlpropertyvalueinterceptor_p.h"
 #include <qqmlinfo.h>
 
diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h
index 64402cbc32..8bcb42e671 100644
--- a/src/qml/qml/qqmlvmemetaobject_p.h
+++ b/src/qml/qml/qqmlvmemetaobject_p.h
@@ -16,8 +16,6 @@
 // We mean it.
 //
 
-#include "qqml.h"
-
 #include <QtCore/QMetaObject>
 #include <QtCore/QBitArray>
 #include <QtCore/QPair>
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index 4d3ba7df24..144c1a73b8 100644
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -7,7 +7,6 @@
 #include "qqmlengine_p.h"
 #include <private/qqmlrefcount_p.h>
 #include "qqmlengine_p.h"
-#include "qqmlexpression_p.h"
 #include "qqmlglobal_p.h"
 #include <private/qv4domerrors_p.h>
 #include <private/qv4engine_p.h>