From f0e035774cafbcbd0ccd425f9b5e459a1eef4b77 Mon Sep 17 00:00:00 2001
From: Robert Brock <robert.brock@kdab.com>
Date: Mon, 6 Feb 2017 12:12:03 +0000
Subject: Coding convention fix for Src/Quick3D

Reordering the header includes to comply with Qt coding conventions

Task-number: QTBUG-56185
Change-Id: I60008858a4975621b9159d909908b6bba2f98f14
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 src/quick3d/quick3d/items/quick3dentity.cpp         |  1 +
 src/quick3d/quick3d/items/quick3dentity_p.h         |  3 ++-
 src/quick3d/quick3d/items/quick3dentityloader.cpp   |  6 +++---
 src/quick3d/quick3d/items/quick3dentityloader_p.h   |  5 ++---
 src/quick3d/quick3d/items/quick3dentityloader_p_p.h |  5 ++---
 src/quick3d/quick3d/items/quick3dnode.cpp           |  3 ++-
 src/quick3d/quick3d/items/quick3dnode_p.h           |  3 ++-
 .../quick3d/items/quick3dnodeinstantiator.cpp       | 10 +++++-----
 .../quick3d/items/quick3dnodeinstantiator_p.h       |  3 ++-
 src/quick3d/quick3d/qqmlaspectengine.cpp            |  7 ++++---
 src/quick3d/quick3d/qqmlaspectengine.h              |  2 +-
 src/quick3d/quick3d/qqmlaspectengine_p.h            |  5 +++--
 src/quick3d/quick3d/qquaternionanimation.cpp        |  1 +
 src/quick3d/quick3d/qquaternionanimation_p.h        |  3 ++-
 src/quick3d/quick3d/qt3dquick_global.cpp            | 13 +++++++------
 src/quick3d/quick3d/qt3dquicknodefactory.cpp        |  1 +
 src/quick3d/quick3d/qt3dquicknodefactory_p.h        |  3 ++-
 src/quick3d/quick3d/qt3dquickvaluetypes_p.h         | 10 +++++-----
 src/quick3d/quick3dextras/qt3dquickwindow.cpp       | 21 ++++++++++-----------
 src/quick3d/quick3dextras/qt3dquickwindow.h         |  4 ++--
 src/quick3d/quick3dinput/items/quick3daction.cpp    |  2 +-
 src/quick3d/quick3dinput/items/quick3daction_p.h    |  5 +++--
 src/quick3d/quick3dinput/items/quick3daxis.cpp      |  2 +-
 src/quick3d/quick3dinput/items/quick3daxis_p.h      |  7 ++++---
 .../quick3dinput/items/quick3dinputchord.cpp        |  2 +-
 .../quick3dinput/items/quick3dinputchord_p.h        |  5 +++--
 .../quick3dinput/items/quick3dinputsequence.cpp     |  2 +-
 .../quick3dinput/items/quick3dinputsequence_p.h     |  5 +++--
 .../quick3dinput/items/quick3dlogicaldevice.cpp     |  2 +-
 .../quick3dinput/items/quick3dlogicaldevice_p.h     |  5 +++--
 .../quick3dinput/items/quick3dphysicaldevice.cpp    |  2 +-
 .../quick3dinput/items/quick3dphysicaldevice_p.h    |  7 ++++---
 src/quick3d/quick3dinput/qt3dquickinput_global.cpp  |  4 ++--
 .../quick3dinput/qt3dquickinputnodefactory.cpp      |  2 +-
 .../quick3dinput/qt3dquickinputnodefactory_p.h      |  3 ++-
 src/quick3d/quick3drender/items/quick3dbuffer.cpp   |  6 +++---
 src/quick3d/quick3drender/items/quick3dbuffer_p.h   |  3 ++-
 src/quick3d/quick3drender/items/quick3deffect.cpp   |  3 ++-
 src/quick3d/quick3drender/items/quick3deffect_p.h   |  5 +++--
 src/quick3d/quick3drender/items/quick3dgeometry.cpp |  2 +-
 src/quick3d/quick3drender/items/quick3dgeometry_p.h |  5 +++--
 .../quick3drender/items/quick3dlayerfilter.cpp      |  3 ++-
 .../quick3drender/items/quick3dlayerfilter_p.h      |  5 +++--
 src/quick3d/quick3drender/items/quick3dmaterial.cpp |  3 ++-
 src/quick3d/quick3drender/items/quick3dmaterial_p.h |  5 +++--
 .../quick3drender/items/quick3dparameter.cpp        |  6 +++---
 .../quick3drender/items/quick3dparameter_p.h        |  3 ++-
 .../quick3drender/items/quick3dparameter_p_p.h      |  4 ++--
 .../quick3drender/items/quick3drenderpass.cpp       |  2 +-
 .../quick3drender/items/quick3drenderpass_p.h       |  5 +++--
 .../quick3drender/items/quick3drenderpassfilter.cpp |  2 +-
 .../quick3drender/items/quick3drenderpassfilter_p.h |  7 ++++---
 .../items/quick3drendertargetoutput.cpp             |  2 +-
 .../items/quick3drendertargetoutput_p.h             |  5 +++--
 .../items/quick3drendertargetselector.cpp           |  2 +-
 .../items/quick3drendertargetselector_p.h           |  7 ++++---
 src/quick3d/quick3drender/items/quick3dscene.cpp    |  2 +-
 src/quick3d/quick3drender/items/quick3dscene_p.h    |  5 +++--
 .../quick3drender/items/quick3dshaderdata.cpp       |  8 ++++----
 .../quick3drender/items/quick3dshaderdata_p.h       |  8 ++++----
 .../quick3drender/items/quick3dshaderdataarray.cpp  |  4 ++--
 .../quick3drender/items/quick3dshaderdataarray_p.h  |  3 ++-
 src/quick3d/quick3drender/items/quick3dstateset.cpp |  2 +-
 src/quick3d/quick3drender/items/quick3dstateset_p.h |  5 +++--
 .../quick3drender/items/quick3dtechnique.cpp        |  2 +-
 .../quick3drender/items/quick3dtechnique_p.h        |  5 +++--
 .../quick3drender/items/quick3dtechniquefilter.cpp  |  2 +-
 .../quick3drender/items/quick3dtechniquefilter_p.h  |  7 ++++---
 src/quick3d/quick3drender/items/quick3dtexture.cpp  |  5 +++--
 src/quick3d/quick3drender/items/quick3dtexture_p.h  |  6 +++---
 src/quick3d/quick3drender/items/quick3dviewport.cpp |  2 +-
 src/quick3d/quick3drender/items/quick3dviewport_p.h |  3 ++-
 .../quick3drender/qt3dquickrender_global.cpp        |  4 ++--
 .../quick3drender/qt3dquickrendernodefactory.cpp    |  2 +-
 .../quick3drender/qt3dquickrendernodefactory_p.h    |  3 ++-
 75 files changed, 182 insertions(+), 145 deletions(-)

(limited to 'src')

diff --git a/src/quick3d/quick3d/items/quick3dentity.cpp b/src/quick3d/quick3d/items/quick3dentity.cpp
index ebc92e843..643c0a49d 100644
--- a/src/quick3d/quick3d/items/quick3dentity.cpp
+++ b/src/quick3d/quick3d/items/quick3dentity.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "quick3dentity_p.h"
+
 #include <Qt3DCore/qcomponent.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick3d/quick3d/items/quick3dentity_p.h b/src/quick3d/quick3d/items/quick3dentity_p.h
index eb716a0c3..d8b107896 100644
--- a/src/quick3d/quick3d/items/quick3dentity_p.h
+++ b/src/quick3d/quick3d/items/quick3dentity_p.h
@@ -51,8 +51,9 @@
 // We mean it.
 //
 
-#include <QQmlListProperty>
 #include <Qt3DCore/qentity.h>
+#include <QtQml/QQmlListProperty>
+
 #include <Qt3DQuick/private/quick3dnode_p.h>
 #include <Qt3DQuick/private/qt3dquick_global_p.h>
 
diff --git a/src/quick3d/quick3d/items/quick3dentityloader.cpp b/src/quick3d/quick3d/items/quick3dentityloader.cpp
index 9c82db7ad..de33f00de 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader.cpp
+++ b/src/quick3d/quick3d/items/quick3dentityloader.cpp
@@ -39,9 +39,9 @@
 
 #include "quick3dentityloader_p_p.h"
 
-#include <QQmlContext>
-#include <QQmlEngine>
-#include <QQmlIncubator>
+#include <QtQml/QQmlContext>
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlIncubator>
 
 #include <QtQml/private/qqmlengine_p.h>
 
diff --git a/src/quick3d/quick3d/items/quick3dentityloader_p.h b/src/quick3d/quick3d/items/quick3dentityloader_p.h
index 5721af115..423d7f81c 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader_p.h
+++ b/src/quick3d/quick3d/items/quick3dentityloader_p.h
@@ -51,10 +51,9 @@
 // We mean it.
 //
 
-#include <QObject>
-#include <QUrl>
-
 #include <Qt3DCore/QEntity>
+#include <QtCore/QObject>
+#include <QtCore/QUrl>
 
 #include <Qt3DQuick/private/qt3dquick_global_p.h>
 
diff --git a/src/quick3d/quick3d/items/quick3dentityloader_p_p.h b/src/quick3d/quick3d/items/quick3dentityloader_p_p.h
index 235870933..d297ddf6f 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader_p_p.h
+++ b/src/quick3d/quick3d/items/quick3dentityloader_p_p.h
@@ -51,11 +51,10 @@
 // We mean it.
 //
 
-#include "quick3dentityloader_p.h"
-
-#include <QQmlComponent>
+#include <QtQml/QQmlComponent>
 
 #include <Qt3DCore/private/qentity_p.h>
+#include <Qt3DQuick/private/quick3dentityloader_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3d/items/quick3dnode.cpp b/src/quick3d/quick3d/items/quick3dnode.cpp
index 3761f8d64..fb91f4ae0 100644
--- a/src/quick3d/quick3d/items/quick3dnode.cpp
+++ b/src/quick3d/quick3d/items/quick3dnode.cpp
@@ -38,7 +38,8 @@
 ****************************************************************************/
 
 #include "quick3dnode_p.h"
-#include <QDebug>
+
+#include <QtCore/QDebug>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3d/items/quick3dnode_p.h b/src/quick3d/quick3d/items/quick3dnode_p.h
index 9798d0d4c..640a58149 100644
--- a/src/quick3d/quick3d/items/quick3dnode_p.h
+++ b/src/quick3d/quick3d/items/quick3dnode_p.h
@@ -51,8 +51,9 @@
 // We mean it.
 //
 
-#include <QQmlListProperty>
 #include <Qt3DCore/qnode.h>
+#include <QtQml/QQmlListProperty>
+
 #include <Qt3DQuick/private/qt3dquick_global_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
index ce69e471a..5012ce263 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
@@ -42,13 +42,13 @@
 
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlComponent>
-#include <QtQml/QQmlInfo>
 #include <QtQml/QQmlError>
-#include <QtQml/private/qqmlobjectmodel_p.h>
+#include <QtQml/QQmlInfo>
+
+#include <Qt3DCore/private/qnode_p.h>
+#include <QtQml/private/qqmlchangeset_p.h>
 #include <QtQml/private/qqmldelegatemodel_p.h>
-#include <private/qnode_p.h>
-#include <private/qqmlchangeset_p.h>
-#include <private/qqmlobjectmodel_p.h>
+#include <QtQml/private/qqmlobjectmodel_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
index d861fc2fe..fd7a1d83d 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
@@ -52,11 +52,12 @@
 // We mean it.
 //
 
-#include <Qt3DQuick/private/qt3dquick_global_p.h>
 #include <Qt3DCore/qnode.h>
 #include <QtQml/qqmlcomponent.h>
 #include <QtQml/qqmlparserstatus.h>
 
+#include <Qt3DQuick/private/qt3dquick_global_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
diff --git a/src/quick3d/quick3d/qqmlaspectengine.cpp b/src/quick3d/quick3d/qqmlaspectengine.cpp
index 4b694d26e..912c71fb3 100644
--- a/src/quick3d/quick3d/qqmlaspectengine.cpp
+++ b/src/quick3d/quick3d/qqmlaspectengine.cpp
@@ -38,10 +38,11 @@
 ****************************************************************************/
 
 #include "qqmlaspectengine_p.h"
-#include <QQmlComponent>
-#include <QQmlContext>
-#include <QDebug>
+
 #include <Qt3DCore/qentity.h>
+#include <QtCore/QDebug>
+#include <QtQml/QQmlComponent>
+#include <QtQml/QQmlContext>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3d/qqmlaspectengine.h b/src/quick3d/quick3d/qqmlaspectengine.h
index c85cbb8ea..a7b09ec8a 100644
--- a/src/quick3d/quick3d/qqmlaspectengine.h
+++ b/src/quick3d/quick3d/qqmlaspectengine.h
@@ -40,9 +40,9 @@
 #ifndef QT3D_QUICK_QQMLASPECTENGINE_H
 #define QT3D_QUICK_QQMLASPECTENGINE_H
 
-#include <QQmlEngine>
 #include <Qt3DCore/QAspectEngine>
 #include <Qt3DQuick/qt3dquick_global.h>
+#include <QtQml/QQmlEngine>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3d/qqmlaspectengine_p.h b/src/quick3d/quick3d/qqmlaspectengine_p.h
index f9343ae68..960ecb344 100644
--- a/src/quick3d/quick3d/qqmlaspectengine_p.h
+++ b/src/quick3d/quick3d/qqmlaspectengine_p.h
@@ -53,8 +53,9 @@
 
 #include <Qt3DQuick/qt3dquick_global.h>
 #include <Qt3DQuick/qqmlaspectengine.h>
-#include <private/qobject_p.h>
-#include <QScopedPointer>
+#include <QtCore/QScopedPointer>
+
+#include <QtCore/private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3d/qquaternionanimation.cpp b/src/quick3d/quick3d/qquaternionanimation.cpp
index 25cad523b..adccf4d97 100644
--- a/src/quick3d/quick3d/qquaternionanimation.cpp
+++ b/src/quick3d/quick3d/qquaternionanimation.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qquaternionanimation_p.h"
+
 #include <QtQuick/private/qquickanimation_p_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick3d/quick3d/qquaternionanimation_p.h b/src/quick3d/quick3d/qquaternionanimation_p.h
index 3c5f092c4..172d3bc85 100644
--- a/src/quick3d/quick3d/qquaternionanimation_p.h
+++ b/src/quick3d/quick3d/qquaternionanimation_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
+#include <QtGui/qquaternion.h>
+
 #include <Qt3DQuick/private/qt3dquick_global_p.h>
 #include <QtQuick/private/qquickanimation_p.h>
-#include <QtGui/qquaternion.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3d/qt3dquick_global.cpp b/src/quick3d/quick3d/qt3dquick_global.cpp
index f25aae268..97be0b636 100644
--- a/src/quick3d/quick3d/qt3dquick_global.cpp
+++ b/src/quick3d/quick3d/qt3dquick_global.cpp
@@ -38,12 +38,13 @@
 ****************************************************************************/
 
 #include "qt3dquick_global_p.h"
-#include "qt3dquicknodefactory_p.h"
-#include <private/qqmlglobal_p.h>
-#include <private/qt3dquickvaluetypes_p.h>
-#include <private/qv8engine_p.h>
-#include <private/qv4engine_p.h>
-#include <private/qv4object_p.h>
+
+#include <Qt3DQuick/private/qt3dquicknodefactory_p.h>
+#include <Qt3DQuick/private/qt3dquickvaluetypes_p.h>
+#include <QtQml/private/qqmlglobal_p.h>
+#include <QtQml/private/qv4engine_p.h>
+#include <QtQml/private/qv4object_p.h>
+#include <QtQml/private/qv8engine_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3d/qt3dquicknodefactory.cpp b/src/quick3d/quick3d/qt3dquicknodefactory.cpp
index 923793506..a8c021754 100644
--- a/src/quick3d/quick3d/qt3dquicknodefactory.cpp
+++ b/src/quick3d/quick3d/qt3dquicknodefactory.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qt3dquicknodefactory_p.h"
+
 #include <QtQml/private/qqmlmetatype_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick3d/quick3d/qt3dquicknodefactory_p.h b/src/quick3d/quick3d/qt3dquicknodefactory_p.h
index 4dd455461..6c074da04 100644
--- a/src/quick3d/quick3d/qt3dquicknodefactory_p.h
+++ b/src/quick3d/quick3d/qt3dquicknodefactory_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
-#include <Qt3DCore/private/qabstractnodefactory_p.h>
 #include <QtCore/qhash.h>
 
+#include <Qt3DCore/private/qabstractnodefactory_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QQmlType;
diff --git a/src/quick3d/quick3d/qt3dquickvaluetypes_p.h b/src/quick3d/quick3d/qt3dquickvaluetypes_p.h
index ed80d0426..46500b935 100644
--- a/src/quick3d/quick3d/qt3dquickvaluetypes_p.h
+++ b/src/quick3d/quick3d/qt3dquickvaluetypes_p.h
@@ -52,15 +52,15 @@
 // We mean it.
 //
 
-#include <private/qt3dquick_global_p.h>
-#include <private/qqmlvaluetype_p.h>
-
 #include <QtGui/QColor>
+#include <QtGui/QMatrix4x4>
+#include <QtGui/QQuaternion>
 #include <QtGui/QVector2D>
 #include <QtGui/QVector3D>
 #include <QtGui/QVector4D>
-#include <QtGui/QQuaternion>
-#include <QtGui/QMatrix4x4>
+
+#include <Qt3DQuick/private/qt3dquick_global_p.h>
+#include <QtQml/private/qqmlvaluetype_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.cpp b/src/quick3d/quick3dextras/qt3dquickwindow.cpp
index 8a7921d8e..0849fb661 100644
--- a/src/quick3d/quick3dextras/qt3dquickwindow.cpp
+++ b/src/quick3d/quick3dextras/qt3dquickwindow.cpp
@@ -48,22 +48,21 @@
 **
 ****************************************************************************/
 
-#include <Qt3DQuickExtras/qt3dquickwindow.h>
+#include <Qt3DInput/qinputaspect.h>
+#include <Qt3DInput/qinputsettings.h>
+#include <Qt3DLogic/qlogicaspect.h>
 #include <Qt3DQuick/QQmlAspectEngine>
+#include <Qt3DQuickExtras/qt3dquickwindow.h>
 #include <Qt3DRender/qcamera.h>
 #include <Qt3DRender/qrenderaspect.h>
 #include <Qt3DRender/qrendersurfaceselector.h>
-#include <Qt3DRender/private/qrendersurfaceselector_p.h>
-#include <Qt3DInput/qinputaspect.h>
-#include <Qt3DInput/qinputsettings.h>
-#include <Qt3DLogic/qlogicaspect.h>
-
-#include <QQmlContext>
-#include <qqmlincubator.h>
-#include <QGuiApplication>
-#include <QScreen>
-
+#include <QtGui/QGuiApplication>
+#include <QtGui/QScreen>
 #include <QtGui/qopenglcontext.h>
+#include <QtQml/QQmlContext>
+#include <QtQml/qqmlincubator.h>
+
+#include <Qt3DRender/private/qrendersurfaceselector_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.h b/src/quick3d/quick3dextras/qt3dquickwindow.h
index a8703093e..1b4d3fabf 100644
--- a/src/quick3d/quick3dextras/qt3dquickwindow.h
+++ b/src/quick3d/quick3dextras/qt3dquickwindow.h
@@ -52,9 +52,9 @@
 #define QT3DEXTRAS_QUICK_QT3DQUICKWINDOW_H
 
 #include <Qt3DQuickExtras/qt3dquickextras_global.h>
-#include <QQuickWindow>
+#include <QtCore/QUrl>
 #include <QtCore/qpointer.h>
-#include <QUrl>
+#include <QtQuick/QQuickWindow>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3dinput/items/quick3daction.cpp b/src/quick3d/quick3dinput/items/quick3daction.cpp
index b3b99e504..33752c6e0 100644
--- a/src/quick3d/quick3dinput/items/quick3daction.cpp
+++ b/src/quick3d/quick3dinput/items/quick3daction.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "quick3daction_p.h"
+#include <Qt3DQuickInput/private/quick3daction_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3dinput/items/quick3daction_p.h b/src/quick3d/quick3dinput/items/quick3daction_p.h
index 8394f9c48..86e52eb33 100644
--- a/src/quick3d/quick3dinput/items/quick3daction_p.h
+++ b/src/quick3d/quick3dinput/items/quick3daction_p.h
@@ -51,10 +51,11 @@
 // We mean it.
 //
 
-#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h>
 #include <Qt3DInput/QAction>
 #include <Qt3DInput/QAbstractActionInput>
-#include <QQmlListProperty>
+#include <QtQml/QQmlListProperty>
+
+#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3dinput/items/quick3daxis.cpp b/src/quick3d/quick3dinput/items/quick3daxis.cpp
index 2857e4c48..966aa250d 100644
--- a/src/quick3d/quick3dinput/items/quick3daxis.cpp
+++ b/src/quick3d/quick3dinput/items/quick3daxis.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "quick3daxis_p.h"
+#include <Qt3DQuickInput/private/quick3daxis_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3dinput/items/quick3daxis_p.h b/src/quick3d/quick3dinput/items/quick3daxis_p.h
index 400bd5ea0..58ba32ae7 100644
--- a/src/quick3d/quick3dinput/items/quick3daxis_p.h
+++ b/src/quick3d/quick3dinput/items/quick3daxis_p.h
@@ -51,10 +51,11 @@
 // We mean it.
 //
 
-#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h>
-#include <Qt3DInput/QAxis>
 #include <Qt3DInput/QAbstractAxisInput>
-#include <QQmlListProperty>
+#include <Qt3DInput/QAxis>
+#include <QtQml/QQmlListProperty>
+
+#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3dinput/items/quick3dinputchord.cpp b/src/quick3d/quick3dinput/items/quick3dinputchord.cpp
index 0d214a5ec..16a5e8181 100644
--- a/src/quick3d/quick3dinput/items/quick3dinputchord.cpp
+++ b/src/quick3d/quick3dinput/items/quick3dinputchord.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dinputchord_p.h"
+#include <Qt3DQuickInput/private/quick3dinputchord_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3dinput/items/quick3dinputchord_p.h b/src/quick3d/quick3dinput/items/quick3dinputchord_p.h
index d9759b856..3380fefa4 100644
--- a/src/quick3d/quick3dinput/items/quick3dinputchord_p.h
+++ b/src/quick3d/quick3dinput/items/quick3dinputchord_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
-#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h>
 #include <Qt3DInput/qinputchord.h>
-#include <QQmlListProperty>
+#include <QtQml/QQmlListProperty>
+
+#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp b/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp
index 02539443e..4f4eed9d3 100644
--- a/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp
+++ b/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dinputsequence_p.h"
+#include <Qt3DQuickInput/private/quick3dinputsequence_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3dinput/items/quick3dinputsequence_p.h b/src/quick3d/quick3dinput/items/quick3dinputsequence_p.h
index ccf872675..aea671f12 100644
--- a/src/quick3d/quick3dinput/items/quick3dinputsequence_p.h
+++ b/src/quick3d/quick3dinput/items/quick3dinputsequence_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
-#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h>
 #include <Qt3DInput/qinputsequence.h>
-#include <QQmlListProperty>
+#include <QtQml/QQmlListProperty>
+
+#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp b/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp
index 72be7e7ac..50218dd25 100644
--- a/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp
+++ b/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dlogicaldevice_p.h"
+#include <Qt3DQuickInput/private/quick3dlogicaldevice_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h b/src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h
index 5b3b36039..050d81ab8 100644
--- a/src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h
+++ b/src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h
@@ -51,11 +51,12 @@
 // We mean it.
 //
 
-#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h>
 #include <Qt3DInput/QAxis>
 #include <Qt3DInput/QAction>
 #include <Qt3DInput/QLogicalDevice>
-#include <QQmlListProperty>
+#include <QtQml/QQmlListProperty>
+
+#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp b/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp
index ead311135..5c8d55b54 100644
--- a/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp
+++ b/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dphysicaldevice_p.h"
+#include <Qt3DQuickInput/private/quick3dphysicaldevice_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3dinput/items/quick3dphysicaldevice_p.h b/src/quick3d/quick3dinput/items/quick3dphysicaldevice_p.h
index 9a97d152c..b4c96ac14 100644
--- a/src/quick3d/quick3dinput/items/quick3dphysicaldevice_p.h
+++ b/src/quick3d/quick3dinput/items/quick3dphysicaldevice_p.h
@@ -51,11 +51,12 @@
 // We mean it.
 //
 
-#include <QObject>
-#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h>
 #include <Qt3DInput/qabstractphysicaldevice.h>
 #include <Qt3DInput/qaxissetting.h>
-#include <QQmlListProperty>
+#include <QtCore/QObject>
+#include <QtQml/QQmlListProperty>
+
+#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3dinput/qt3dquickinput_global.cpp b/src/quick3d/quick3dinput/qt3dquickinput_global.cpp
index dd84f9fa4..724a5db86 100644
--- a/src/quick3d/quick3dinput/qt3dquickinput_global.cpp
+++ b/src/quick3d/quick3dinput/qt3dquickinput_global.cpp
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "qt3dquickinput_global_p.h"
-#include "qt3dquickinputnodefactory_p.h"
+#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h>
+#include <Qt3DQuickInput/private/qt3dquickinputnodefactory_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp b/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp
index 8f9fe81ec..b158e30d5 100644
--- a/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp
+++ b/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qt3dquickinputnodefactory_p.h"
+#include <Qt3DQuickInput/private/qt3dquickinputnodefactory_p.h>
 #include <QtQml/private/qqmlmetatype_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h b/src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h
index 3473cf038..f4d4aee27 100644
--- a/src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h
+++ b/src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
-#include <Qt3DCore/private/qabstractnodefactory_p.h>
 #include <QtCore/qhash.h>
 
+#include <Qt3DCore/private/qabstractnodefactory_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QQmlType;
diff --git a/src/quick3d/quick3drender/items/quick3dbuffer.cpp b/src/quick3d/quick3drender/items/quick3dbuffer.cpp
index 5701adf07..c2496e6d0 100644
--- a/src/quick3d/quick3drender/items/quick3dbuffer.cpp
+++ b/src/quick3d/quick3drender/items/quick3dbuffer.cpp
@@ -37,10 +37,10 @@
 **
 ****************************************************************************/
 
-#include <QJSValue>
-#include <QQmlEngine>
+#include <QtQml/QJSValue>
+#include <QtQml/QQmlEngine>
 
-#include "quick3dbuffer_p.h"
+#include <Qt3DQuickRender/private/quick3dbuffer_p.h>
 #include <QtQml/private/qqmlengine_p.h>
 #include <QtQml/private/qjsvalue_p.h>
 #include <QtQml/private/qv4typedarray_p.h>
diff --git a/src/quick3d/quick3drender/items/quick3dbuffer_p.h b/src/quick3d/quick3drender/items/quick3dbuffer_p.h
index c5cb39cdf..d67ccf5af 100644
--- a/src/quick3d/quick3drender/items/quick3dbuffer_p.h
+++ b/src/quick3d/quick3drender/items/quick3dbuffer_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
-#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/QBuffer>
 
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QQmlEngine;
diff --git a/src/quick3d/quick3drender/items/quick3deffect.cpp b/src/quick3d/quick3drender/items/quick3deffect.cpp
index 9d4ce934a..fa82c6eff 100644
--- a/src/quick3d/quick3drender/items/quick3deffect.cpp
+++ b/src/quick3d/quick3drender/items/quick3deffect.cpp
@@ -37,9 +37,10 @@
 **
 ****************************************************************************/
 
-#include "quick3deffect_p.h"
 #include <Qt3DRender/qeffect.h>
 
+#include <Qt3DQuickRender/private/quick3deffect_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
diff --git a/src/quick3d/quick3drender/items/quick3deffect_p.h b/src/quick3d/quick3drender/items/quick3deffect_p.h
index 50152e2af..3b778563d 100644
--- a/src/quick3d/quick3drender/items/quick3deffect_p.h
+++ b/src/quick3d/quick3drender/items/quick3deffect_p.h
@@ -51,10 +51,11 @@
 // We mean it.
 //
 
-#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
-#include <QQmlListProperty>
 #include <Qt3DRender/qeffect.h>
 #include <Qt3DRender/qtechnique.h>
+#include <QtQml/QQmlListProperty>
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dgeometry.cpp b/src/quick3d/quick3drender/items/quick3dgeometry.cpp
index 84c02d7c9..3f70ea572 100644
--- a/src/quick3d/quick3drender/items/quick3dgeometry.cpp
+++ b/src/quick3d/quick3drender/items/quick3dgeometry.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dgeometry_p.h"
+#include <Qt3DQuickRender/private/quick3dgeometry_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dgeometry_p.h b/src/quick3d/quick3drender/items/quick3dgeometry_p.h
index 4c020b0e2..6bf7faf58 100644
--- a/src/quick3d/quick3drender/items/quick3dgeometry_p.h
+++ b/src/quick3d/quick3drender/items/quick3dgeometry_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
-#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
-#include <QQmlListProperty>
 #include <Qt3DRender/QGeometry>
+#include <QtQml/QQmlListProperty>
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp b/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp
index 6f7efcd23..951b4f82f 100644
--- a/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp
@@ -37,9 +37,10 @@
 **
 ****************************************************************************/
 
-#include "quick3dlayerfilter_p.h"
 #include <Qt3DRender/qtexture.h>
 
+#include <Qt3DQuickRender/private/quick3dlayerfilter_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
diff --git a/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h b/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h
index b2e7e2d11..f59be2787 100644
--- a/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h
+++ b/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h
@@ -51,10 +51,11 @@
 // We mean it.
 //
 
-#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/qlayerfilter.h>
 #include <Qt3DRender/qlayer.h>
-#include <QQmlListProperty>
+#include <QtQml/QQmlListProperty>
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dmaterial.cpp b/src/quick3d/quick3drender/items/quick3dmaterial.cpp
index 50b064bc2..3dfbec83e 100644
--- a/src/quick3d/quick3drender/items/quick3dmaterial.cpp
+++ b/src/quick3d/quick3drender/items/quick3dmaterial.cpp
@@ -37,9 +37,10 @@
 **
 ****************************************************************************/
 
-#include "quick3dmaterial_p.h"
 #include <Qt3DRender/qtexture.h>
 
+#include <Qt3DQuickRender/private/quick3dmaterial_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
diff --git a/src/quick3d/quick3drender/items/quick3dmaterial_p.h b/src/quick3d/quick3drender/items/quick3dmaterial_p.h
index 48b60df62..646e3b154 100644
--- a/src/quick3d/quick3drender/items/quick3dmaterial_p.h
+++ b/src/quick3d/quick3drender/items/quick3dmaterial_p.h
@@ -51,10 +51,11 @@
 // We mean it.
 //
 
-#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/qmaterial.h>
 #include <Qt3DRender/qparameter.h>
-#include <QQmlListProperty>
+#include <QtQml/QQmlListProperty>
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dparameter.cpp b/src/quick3d/quick3drender/items/quick3dparameter.cpp
index 783f152c1..2ef95a4d4 100644
--- a/src/quick3d/quick3drender/items/quick3dparameter.cpp
+++ b/src/quick3d/quick3drender/items/quick3dparameter.cpp
@@ -37,10 +37,10 @@
 **
 ****************************************************************************/
 
-#include <QJSValue>
-#include <QJSValueIterator>
+#include <QtQml/QJSValue>
+#include <QtQml/QJSValueIterator>
 
-#include "quick3dparameter_p_p.h"
+#include <Qt3DQuickRender/private/quick3dparameter_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dparameter_p.h b/src/quick3d/quick3drender/items/quick3dparameter_p.h
index 60493973d..948df22a7 100644
--- a/src/quick3d/quick3drender/items/quick3dparameter_p.h
+++ b/src/quick3d/quick3drender/items/quick3dparameter_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
-#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/qparameter.h>
 
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
diff --git a/src/quick3d/quick3drender/items/quick3dparameter_p_p.h b/src/quick3d/quick3drender/items/quick3dparameter_p_p.h
index 0432642f3..2e680b852 100644
--- a/src/quick3d/quick3drender/items/quick3dparameter_p_p.h
+++ b/src/quick3d/quick3drender/items/quick3dparameter_p_p.h
@@ -51,10 +51,10 @@
 // We mean it.
 //
 
-#include "quick3dparameter_p.h"
-
+#include <Qt3DQuickRender/private/quick3dparameter_p.h>
 #include <Qt3DRender/private/qparameter_p.h>
 
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
diff --git a/src/quick3d/quick3drender/items/quick3drenderpass.cpp b/src/quick3d/quick3drender/items/quick3drenderpass.cpp
index d5f16fab6..7bd50a0d5 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpass.cpp
+++ b/src/quick3d/quick3drender/items/quick3drenderpass.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include "quick3drenderpass_p.h"
+#include <Qt3DQuickRender/private/quick3drenderpass_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3drenderpass_p.h b/src/quick3d/quick3drender/items/quick3drenderpass_p.h
index 6ac940e23..c9d2fce59 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpass_p.h
+++ b/src/quick3d/quick3drender/items/quick3drenderpass_p.h
@@ -52,9 +52,10 @@
 // We mean it.
 //
 
-#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/qrenderpass.h>
-#include <QQmlListProperty>
+#include <QtQml/QQmlListProperty>
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
index 8b51a79ef..0a8fa8a3a 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "quick3drenderpassfilter_p.h"
+#include <Qt3DQuickRender/private/quick3drenderpassfilter_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h b/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h
index 3acd32270..cab75f4a6 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h
+++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h
@@ -51,11 +51,12 @@
 // We mean it.
 //
 
-#include <Qt3DQuick/private/quick3dnode_p.h>
-#include <Qt3DRender/qrenderpassfilter.h>
 #include <Qt3DRender/qfilterkey.h>
+#include <Qt3DRender/qrenderpassfilter.h>
+#include <QtQml/QQmlListProperty>
+
+#include <Qt3DQuick/private/quick3dnode_p.h>
 #include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
-#include <QQmlListProperty>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
index e3b40243a..024789a4c 100644
--- a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
+++ b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "quick3drendertargetoutput_p.h"
+#include <Qt3DQuickRender/private/quick3drendertargetoutput_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h b/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h
index 5a2c8ea54..7626a2db7 100644
--- a/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h
+++ b/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h
@@ -51,10 +51,11 @@
 // We mean it.
 //
 
-#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/qrendertarget.h>
 #include <Qt3DRender/qrendertargetoutput.h>
-#include <QQmlListProperty>
+#include <QtQml/QQmlListProperty>
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp b/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp
index b61c7ed12..1ace5950a 100644
--- a/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp
+++ b/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "quick3drendertargetselector_p.h"
+#include <Qt3DQuickRender/private/quick3drendertargetselector_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h b/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h
index a24a6a71f..610ea1a49 100644
--- a/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h
+++ b/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h
@@ -51,11 +51,12 @@
 // We mean it.
 //
 
-#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/qrendertargetoutput.h>
 #include <Qt3DRender/qrendertargetselector.h>
-#include <QQmlListProperty>
-#include <QVariantList>
+#include <QtCore/QVariantList>
+#include <QtQml/QQmlListProperty>
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dscene.cpp b/src/quick3d/quick3drender/items/quick3dscene.cpp
index 4062904f2..af4f44f0e 100644
--- a/src/quick3d/quick3drender/items/quick3dscene.cpp
+++ b/src/quick3d/quick3drender/items/quick3dscene.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dscene_p.h"
+#include <Qt3DQuickRender/private/quick3dscene_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dscene_p.h b/src/quick3d/quick3drender/items/quick3dscene_p.h
index 60c2d2ab5..a7173a6c7 100644
--- a/src/quick3d/quick3drender/items/quick3dscene_p.h
+++ b/src/quick3d/quick3drender/items/quick3dscene_p.h
@@ -51,10 +51,11 @@
 // We mean it.
 //
 
-#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
-#include <Qt3DQuick/private/quick3dentity_p.h>
 #include <Qt3DRender/qsceneloader.h>
 
+#include <Qt3DQuick/private/quick3dentity_p.h>
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
index dbf351695..97af27925 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
+++ b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
@@ -37,11 +37,11 @@
 **
 ****************************************************************************/
 
-#include <Qt3DQuickRender/private/quick3dshaderdataarray_p.h>
-#include <QMetaProperty>
+#include <QtCore/QMetaProperty>
 
-#include "quick3dshaderdata_p.h"
-#include <private/qshaderdata_p.h>
+#include <Qt3DQuickRender/private/quick3dshaderdataarray_p.h>
+#include <Qt3DQuickRender/private/quick3dshaderdata_p.h>
+#include <Qt3DRender/private/qshaderdata_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdata_p.h b/src/quick3d/quick3drender/items/quick3dshaderdata_p.h
index 15e127b78..207096149 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdata_p.h
+++ b/src/quick3d/quick3drender/items/quick3dshaderdata_p.h
@@ -51,11 +51,11 @@
 // We mean it.
 //
 
-#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
-#include <Qt3DRender/qshaderdata.h>
+#include <QtQml/QJSValue>
+#include <QtQml/QJSValueIterator>
 
-#include <QJSValue>
-#include <QJSValueIterator>
+#include <Qt3DRender/qshaderdata.h>
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
index 21dd2525a..9dac7bbc6 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
+++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "quick3dshaderdataarray_p.h"
-#include <private/qshaderdata_p.h>
+#include <Qt3DQuickRender/private/quick3dshaderdataarray_p.h>
+#include <Qt3DRender/private/qshaderdata_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h
index 9d33df208..162f402aa 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h
+++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h
@@ -52,9 +52,10 @@
 //
 
 #include <Qt3DCore/qnode.h>
+#include <QtQml/QQmlListProperty>
+
 #include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DQuickRender/private/quick3dshaderdata_p.h>
-#include <QQmlListProperty>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dstateset.cpp b/src/quick3d/quick3drender/items/quick3dstateset.cpp
index d7d74e5ad..468364493 100644
--- a/src/quick3d/quick3drender/items/quick3dstateset.cpp
+++ b/src/quick3d/quick3drender/items/quick3dstateset.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dstateset_p.h"
+#include <Qt3DQuickRender/private/quick3dstateset_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dstateset_p.h b/src/quick3d/quick3drender/items/quick3dstateset_p.h
index 4bb9b6cec..b2e63c066 100644
--- a/src/quick3d/quick3drender/items/quick3dstateset_p.h
+++ b/src/quick3d/quick3drender/items/quick3dstateset_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
-#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/qrenderstateset.h>
-#include <QQmlListProperty>
+#include <QtQml/QQmlListProperty>
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dtechnique.cpp b/src/quick3d/quick3drender/items/quick3dtechnique.cpp
index 123050645..0a15c9f7e 100644
--- a/src/quick3d/quick3drender/items/quick3dtechnique.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtechnique.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dtechnique_p.h"
+#include <Qt3DQuickRender/private/quick3dtechnique_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dtechnique_p.h b/src/quick3d/quick3drender/items/quick3dtechnique_p.h
index 203befcb7..9cdfdfefe 100644
--- a/src/quick3d/quick3drender/items/quick3dtechnique_p.h
+++ b/src/quick3d/quick3drender/items/quick3dtechnique_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
-#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
+#include <QtQml/QQmlListProperty>
 #include <Qt3DRender/qtechnique.h>
-#include <QQmlListProperty>
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
index b27d46c31..2019093c9 100644
--- a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dtechniquefilter_p.h"
+#include <Qt3DQuickRender/private/quick3dtechniquefilter_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h
index 27d637e23..2b10bc108 100644
--- a/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h
+++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h
@@ -51,11 +51,12 @@
 // We mean it.
 //
 
-#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
-#include <Qt3DRender/qtechniquefilter.h>
 #include <Qt3DRender/qfilterkey.h>
+#include <Qt3DRender/qtechniquefilter.h>
+#include <QtQml/QQmlListProperty>
+
 #include <Qt3DQuick/private/quick3dnode_p.h>
-#include <QQmlListProperty>
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dtexture.cpp b/src/quick3d/quick3drender/items/quick3dtexture.cpp
index 9c528996c..7627a3283 100644
--- a/src/quick3d/quick3drender/items/quick3dtexture.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtexture.cpp
@@ -37,8 +37,9 @@
 **
 ****************************************************************************/
 
-#include "quick3dtexture_p.h"
-#include <QDebug>
+#include <QtCore/QDebug>
+
+#include <Qt3DQuickRender/private/quick3dtexture_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dtexture_p.h b/src/quick3d/quick3drender/items/quick3dtexture_p.h
index a1e2ad6b8..6b0430211 100644
--- a/src/quick3d/quick3drender/items/quick3dtexture_p.h
+++ b/src/quick3d/quick3drender/items/quick3dtexture_p.h
@@ -51,11 +51,11 @@
 // We mean it.
 //
 
-#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
-#include <Qt3DQuick/private/quick3dnode_p.h>
 #include <Qt3DRender/qtexture.h>
+#include <QtCore/QUrl>
 
-#include <QUrl>
+#include <Qt3DQuick/private/quick3dnode_p.h>
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dviewport.cpp b/src/quick3d/quick3drender/items/quick3dviewport.cpp
index 5d490018f..3b4bf33f5 100644
--- a/src/quick3d/quick3drender/items/quick3dviewport.cpp
+++ b/src/quick3d/quick3drender/items/quick3dviewport.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dviewport_p.h"
+#include <Qt3DQuickRender/private/quick3dviewport_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dviewport_p.h b/src/quick3d/quick3drender/items/quick3dviewport_p.h
index 877900365..adf0c983f 100644
--- a/src/quick3d/quick3drender/items/quick3dviewport_p.h
+++ b/src/quick3d/quick3drender/items/quick3dviewport_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
+#include <Qt3DRender/qviewport.h>
+
 #include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DQuick/private/quick3dnode_p.h>
-#include <Qt3DRender/qviewport.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/qt3dquickrender_global.cpp b/src/quick3d/quick3drender/qt3dquickrender_global.cpp
index 0706185fe..bf7d68e71 100644
--- a/src/quick3d/quick3drender/qt3dquickrender_global.cpp
+++ b/src/quick3d/quick3drender/qt3dquickrender_global.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-#include "qt3dquickrender_global_p.h"
-#include "qt3dquickrendernodefactory_p.h"
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
+#include <Qt3DQuickRender/private/qt3dquickrendernodefactory_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp b/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp
index 2d9456d12..f57451379 100644
--- a/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp
+++ b/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qt3dquickrendernodefactory_p.h"
+#include <Qt3DQuickRender/private/qt3dquickrendernodefactory_p.h>
 #include <QtQml/private/qqmlmetatype_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h b/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h
index 863a97f0b..6068124e5 100644
--- a/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h
+++ b/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
-#include <Qt3DCore/private/qabstractnodefactory_p.h>
 #include <QtCore/qhash.h>
 
+#include <Qt3DCore/private/qabstractnodefactory_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QQmlType;
-- 
cgit v1.2.3