Fixes includes to comply with coding conventions for Src/Core

Reordering the header includes to comply with Qt coding conventions

Task-number: QTBUG-56185
Change-Id: I3943678c183c4ef46d403e0fff878c3cad964dfa
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

112 files changed, 358 insertions, 288 deletions

diff --git a/src/core/aspects/aspectcommanddebugger.cpp b/src/core/aspects/aspectcommanddebugger.cpp
index 6bb93c827..0b837052f 100644
--- a/src/core/aspects/aspectcommanddebugger.cpp
+++ b/src/core/aspects/aspectcommanddebugger.cpp
@@ -40,11 +40,13 @@
 #ifdef QT3D_JOBS_RUN_STATS
 
 #include "aspectcommanddebugger_p.h"
+
 #include <Qt3DCore/qaspectengine.h>
+#include <QtNetwork/QTcpSocket>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+
 #include <Qt3DCore/private/qabstractaspect_p.h>
-#include <QTcpSocket>
-#include <QJsonDocument>
-#include <QJsonObject>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp
index c049d3503..d24a74485 100644
--- a/src/core/aspects/qabstractaspect.cpp
+++ b/src/core/aspects/qabstractaspect.cpp
@@ -38,15 +38,17 @@
 ****************************************************************************/
 
 #include "qabstractaspect.h"
-#include "qentity.h"
-#include <Qt3DCore/private/qaspectmanager_p.h>
-#include <private/qabstractaspect_p.h>
-#include <Qt3DCore/private/qaspectjobmanager_p.h>
-#include <private/qchangearbiter_p.h>
-#include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/private/qnodevisitor_p.h>
+#include "qabstractaspect_p.h"
+
+#include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
+
 #include <Qt3DCore/private/corelogging_p.h>
+#include <Qt3DCore/private/qaspectjobmanager_p.h>
+#include <Qt3DCore/private/qaspectmanager_p.h>
+#include <Qt3DCore/private/qchangearbiter_p.h>
+#include <Qt3DCore/private/qnodevisitor_p.h>
+#include <Qt3DCore/private/qscene_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h
index 86938d2d2..962006708 100644
--- a/src/core/aspects/qabstractaspect.h
+++ b/src/core/aspects/qabstractaspect.h
@@ -40,10 +40,10 @@
 #ifndef QT3DCORE_QABSTRACTASPECT_H
 #define QT3DCORE_QABSTRACTASPECT_H
 
-#include <QObject>
-#include <QSharedPointer>
 #include <Qt3DCore/qt3dcore_global.h>
 #include <Qt3DCore/qnodeid.h>
+#include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/aspects/qabstractaspect_p.h b/src/core/aspects/qabstractaspect_p.h
index 53b01cc40..e64970649 100644
--- a/src/core/aspects/qabstractaspect_p.h
+++ b/src/core/aspects/qabstractaspect_p.h
@@ -51,14 +51,15 @@
 // We mean it.
 //
 
-#include <private/qobject_p.h>
-#include <private/qaspectjobproviderinterface_p.h>
-#include <private/qbackendnode_p.h>
-#include <private/qbackendnodefactory_p.h>
-#include <private/qsceneobserverinterface_p.h>
-#include <private/qt3dcore_global_p.h>
-#include <Qt3DCore/qnodedestroyedchange.h>
 #include <Qt3DCore/qabstractaspect.h>
+#include <Qt3DCore/qnodedestroyedchange.h>
+
+#include <Qt3DCore/private/qaspectjobproviderinterface_p.h>
+#include <Qt3DCore/private/qbackendnode_p.h>
+#include <Qt3DCore/private/qbackendnodefactory_p.h>
+#include <Qt3DCore/private/qsceneobserverinterface_p.h>
+#include <Qt3DCore/private/qt3dcore_global_p.h>
+#include <QtCore/private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp
index 15f975332..d33fe76f9 100644
--- a/src/core/aspects/qaspectengine.cpp
+++ b/src/core/aspects/qaspectengine.cpp
@@ -38,27 +38,26 @@
 ****************************************************************************/
 
 #include "qaspectengine.h"
+#include "qaspectengine_p.h"
+
+#include <Qt3DCore/qabstractaspect.h>
+#include <Qt3DCore/qcomponent.h>
+#include <Qt3DCore/qentity.h>
+#include <Qt3DCore/qnode.h>
+#include <QtCore/QMetaObject>
 
-#include "qabstractaspect.h"
-#include "qaspectthread_p.h"
-#include "qaspectmanager_p.h"
-#include "qchangearbiter_p.h"
-#include "qabstractaspect.h"
-#include "qnode.h"
 #include <Qt3DCore/private/corelogging_p.h>
-#include <QMetaObject>
-#include <private/qpostman_p.h>
-#include <private/qscene_p.h>
-#include <private/qaspectengine_p.h>
-#include <private/qnode_p.h>
-#include <private/qnodevisitor_p.h>
-#include <private/qscene_p.h>
-#include "qentity.h"
-#include "qcomponent.h"
+#include <Qt3DCore/private/qaspectthread_p.h>
+#include <Qt3DCore/private/qaspectmanager_p.h>
+#include <Qt3DCore/private/aspectcommanddebugger_p.h>
+#include <Qt3DCore/private/qchangearbiter_p.h>
 #include <Qt3DCore/private/qeventfilterservice_p.h>
+#include <Qt3DCore/private/qnode_p.h>
+#include <Qt3DCore/private/qnodevisitor_p.h>
 #include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
+#include <Qt3DCore/private/qpostman_p.h>
+#include <Qt3DCore/private/qscene_p.h>
 #include <Qt3DCore/private/qservicelocator_p.h>
-#include <Qt3DCore/private/aspectcommanddebugger_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/aspects/qaspectengine.h b/src/core/aspects/qaspectengine.h
index 6de5df42c..28b15046b 100644
--- a/src/core/aspects/qaspectengine.h
+++ b/src/core/aspects/qaspectengine.h
@@ -40,10 +40,9 @@
 #ifndef QT3DCORE_QASPECTENGINE_H
 #define QT3DCORE_QASPECTENGINE_H
 
-#include <QObject>
-#include <QVector>
-
 #include <Qt3DCore/qt3dcore_global.h>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/aspects/qaspectengine_p.h b/src/core/aspects/qaspectengine_p.h
index 10b3536df..c2211dce1 100644
--- a/src/core/aspects/qaspectengine_p.h
+++ b/src/core/aspects/qaspectengine_p.h
@@ -51,11 +51,12 @@
 // We mean it.
 //
 
-#include <private/qobject_p.h>
 #include <Qt3DCore/qnodecreatedchange.h>
-#include <Qt3DCore/private/qaspectfactory_p.h>
 #include <QtCore/qsharedpointer.h>
 
+#include <Qt3DCore/private/qaspectfactory_p.h>
+#include <QtCore/private/qobject_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
diff --git a/src/core/aspects/qaspectfactory.cpp b/src/core/aspects/qaspectfactory.cpp
index 3135e1653..94e04b34d 100644
--- a/src/core/aspects/qaspectfactory.cpp
+++ b/src/core/aspects/qaspectfactory.cpp
@@ -39,11 +39,9 @@
 
 #include "qaspectfactory_p.h"
 
-#include <QtGlobal>
-
-#include <QDebug>
-
 #include <Qt3DCore/QAbstractAspect>
+#include <QtCore/QDebug>
+#include <QtCore/QtGlobal>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/aspects/qaspectfactory_p.h b/src/core/aspects/qaspectfactory_p.h
index 9e2bedaaa..67b5e0b9d 100644
--- a/src/core/aspects/qaspectfactory_p.h
+++ b/src/core/aspects/qaspectfactory_p.h
@@ -51,8 +51,8 @@
 // We mean it.
 //
 
-#include <QHash>
-#include <QStringList>
+#include <QtCore/QHash>
+#include <QtCore/QStringList>
 
 #include <Qt3DCore/private/qt3dcore_global_p.h>
 
diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp
index 98fb982df..5ccc89b9e 100644
--- a/src/core/aspects/qaspectmanager.cpp
+++ b/src/core/aspects/qaspectmanager.cpp
@@ -38,27 +38,27 @@
 ****************************************************************************/
 
 #include "qaspectmanager_p.h"
-#include "qabstractaspect.h"
-#include "qabstractaspect_p.h"
-#include "qchangearbiter_p.h"
-// TODO Make the kind of job manager configurable (e.g. ThreadWeaver vs Intel TBB)
-#include "qaspectjobmanager_p.h"
-#include "qabstractaspectjobmanager_p.h"
-#include "qentity.h"
 
-#include <Qt3DCore/private/qservicelocator_p.h>
+#include <Qt3DCore/qabstractaspect.h>
+#include <Qt3DCore/qentity.h>
+#include <QtCore/QEventLoop>
+#include <QtCore/QThread>
+#include <QtCore/QWaitCondition>
+#include <QtGui/QSurface>
 
-#include <Qt3DCore/private/qaspectjob_p.h>
-#include <Qt3DCore/private/qthreadpooler_p.h>
-#include <Qt3DCore/private/qtickclockservice_p.h>
 #include <Qt3DCore/private/corelogging_p.h>
+#include <Qt3DCore/private/qabstractaspect_p.h>
+#include <Qt3DCore/private/qabstractaspectjobmanager_p.h>
+#include <Qt3DCore/private/qabstractframeadvanceservice_p.h>
+// TODO Make the kind of job manager configurable (e.g. ThreadWeaver vs Intel TBB)
+#include <Qt3DCore/private/qaspectjobmanager_p.h>
+#include <Qt3DCore/private/qaspectjob_p.h>
+#include <Qt3DCore/private/qchangearbiter_p.h>
 #include <Qt3DCore/private/qscheduler_p.h>
+#include <Qt3DCore/private/qservicelocator_p.h>
+#include <Qt3DCore/private/qthreadpooler_p.h>
 #include <Qt3DCore/private/qtickclock_p.h>
-#include <Qt3DCore/private/qabstractframeadvanceservice_p.h>
-#include <QEventLoop>
-#include <QThread>
-#include <QWaitCondition>
-#include <QSurface>
+#include <Qt3DCore/private/qtickclockservice_p.h>
 
 #if defined(QT3D_CORE_JOB_TIMING)
 #include <QElapsedTimer>
diff --git a/src/core/aspects/qaspectmanager_p.h b/src/core/aspects/qaspectmanager_p.h
index e4795516c..1c87738ed 100644
--- a/src/core/aspects/qaspectmanager_p.h
+++ b/src/core/aspects/qaspectmanager_p.h
@@ -51,13 +51,14 @@
 // We mean it.
 //
 
-#include <QObject>
 #include <Qt3DCore/qnodecreatedchange.h>
+#include <QtCore/QObject>
+#include <QtCore/QScopedPointer>
+#include <QtCore/QSemaphore>
+#include <QtCore/QVariant>
+#include <QtCore/QVector>
+
 #include <Qt3DCore/private/qt3dcore_global_p.h>
-#include <QVector>
-#include <QScopedPointer>
-#include <QVariant>
-#include <QSemaphore>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/aspects/qaspectthread.cpp b/src/core/aspects/qaspectthread.cpp
index 9e6961901..31715b04e 100644
--- a/src/core/aspects/qaspectthread.cpp
+++ b/src/core/aspects/qaspectthread.cpp
@@ -38,10 +38,11 @@
 ****************************************************************************/
 
 #include "qaspectthread_p.h"
-#include "qaspectmanager_p.h"
 
+#include <QtCore/QMutexLocker>
+
+#include <Qt3DCore/private/qaspectmanager_p.h>
 #include <Qt3DCore/private/corelogging_p.h>
-#include <QMutexLocker>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/aspects/qaspectthread_p.h b/src/core/aspects/qaspectthread_p.h
index dc508b271..91fb363c5 100644
--- a/src/core/aspects/qaspectthread_p.h
+++ b/src/core/aspects/qaspectthread_p.h
@@ -51,10 +51,10 @@
 // We mean it.
 //
 
-#include <QThread>
 #include <Qt3DCore/qt3dcore_global.h>
-
 #include <QtCore/QSemaphore>
+#include <QtCore/QThread>
+
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/changes/qcomponentaddedchange.cpp b/src/core/changes/qcomponentaddedchange.cpp
index 985567849..e00c4ffab 100644
--- a/src/core/changes/qcomponentaddedchange.cpp
+++ b/src/core/changes/qcomponentaddedchange.cpp
@@ -39,9 +39,11 @@
 
 #include "qcomponentaddedchange.h"
 #include "qcomponentaddedchange_p.h"
+
 #include <Qt3DCore/qcomponent.h>
 #include <Qt3DCore/qentity.h>
-#include <private/qnode_p.h>
+
+#include <Qt3DCore/private/qnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/changes/qcomponentaddedchange_p.h b/src/core/changes/qcomponentaddedchange_p.h
index 99550c92f..5eb453363 100644
--- a/src/core/changes/qcomponentaddedchange_p.h
+++ b/src/core/changes/qcomponentaddedchange_p.h
@@ -51,10 +51,11 @@
 // We mean it.
 //
 
-#include <Qt3DCore/private/qt3dcore_global_p.h>
-#include <private/qscenechange_p.h>
 #include <Qt3DCore/qnodeid.h>
 
+#include <Qt3DCore/private/qscenechange_p.h>
+#include <Qt3DCore/private/qt3dcore_global_p.h>
+
 struct QMetaObject;
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/changes/qcomponentremovedchange.cpp b/src/core/changes/qcomponentremovedchange.cpp
index 30863cd89..5e5dfa5aa 100644
--- a/src/core/changes/qcomponentremovedchange.cpp
+++ b/src/core/changes/qcomponentremovedchange.cpp
@@ -39,9 +39,11 @@
 
 #include "qcomponentremovedchange.h"
 #include "qcomponentremovedchange_p.h"
+
 #include <Qt3DCore/qcomponent.h>
 #include <Qt3DCore/qentity.h>
-#include <private/qnode_p.h>
+
+#include <Qt3DCore/private/qnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/changes/qcomponentremovedchange_p.h b/src/core/changes/qcomponentremovedchange_p.h
index ff5c71f84..5284c7bbd 100644
--- a/src/core/changes/qcomponentremovedchange_p.h
+++ b/src/core/changes/qcomponentremovedchange_p.h
@@ -51,10 +51,11 @@
 // We mean it.
 //
 
-#include <Qt3DCore/private/qt3dcore_global_p.h>
-#include <private/qscenechange_p.h>
 #include <Qt3DCore/qnodeid.h>
 
+#include <Qt3DCore/private/qscenechange_p.h>
+#include <Qt3DCore/private/qt3dcore_global_p.h>
+
 struct QMetaObject;
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/changes/qdynamicpropertyupdatedchange_p.h b/src/core/changes/qdynamicpropertyupdatedchange_p.h
index 729ae44d0..c71c2a71a 100644
--- a/src/core/changes/qdynamicpropertyupdatedchange_p.h
+++ b/src/core/changes/qdynamicpropertyupdatedchange_p.h
@@ -51,10 +51,11 @@
 // We mean it.
 //
 
-#include <private/qpropertyupdatedchangebase_p.h>
 #include <QtCore/qbytearray.h>
 #include <QtCore/qvariant.h>
 
+#include <Qt3DCore/private/qpropertyupdatedchangebase_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
diff --git a/src/core/changes/qnodecreatedchange.cpp b/src/core/changes/qnodecreatedchange.cpp
index a77721cdc..34ca939d7 100644
--- a/src/core/changes/qnodecreatedchange.cpp
+++ b/src/core/changes/qnodecreatedchange.cpp
@@ -36,7 +36,9 @@
 
 #include "qnodecreatedchange.h"
 #include "qnodecreatedchange_p.h"
+
 #include <Qt3DCore/qnode.h>
+
 #include <Qt3DCore/private/qnode_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/changes/qnodecreatedchange.h b/src/core/changes/qnodecreatedchange.h
index 4b5e70b82..85444e00c 100644
--- a/src/core/changes/qnodecreatedchange.h
+++ b/src/core/changes/qnodecreatedchange.h
@@ -37,9 +37,8 @@
 #ifndef QT3DCORE_QNODECREATEDCHANGE_H
 #define QT3DCORE_QNODECREATEDCHANGE_H
 
-#include <Qt3DCore/qt3dcore_global.h>
 #include <Qt3DCore/qscenechange.h>
-
+#include <Qt3DCore/qt3dcore_global.h>
 #include <QtCore/qsharedpointer.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/changes/qnodecreatedchange_p.h b/src/core/changes/qnodecreatedchange_p.h
index 75969e461..cb1470970 100644
--- a/src/core/changes/qnodecreatedchange_p.h
+++ b/src/core/changes/qnodecreatedchange_p.h
@@ -48,10 +48,11 @@
 // We mean it.
 //
 
-#include <Qt3DCore/private/qt3dcore_global_p.h>
-#include <private/qscenechange_p.h>
 #include <Qt3DCore/qnodeid.h>
 
+#include <Qt3DCore/private/qscenechange_p.h>
+#include <Qt3DCore/private/qt3dcore_global_p.h>
+
 struct QMetaObject;
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/changes/qnodedestroyedchange.h b/src/core/changes/qnodedestroyedchange.h
index 348fda23f..11a54f8e2 100644
--- a/src/core/changes/qnodedestroyedchange.h
+++ b/src/core/changes/qnodedestroyedchange.h
@@ -37,8 +37,8 @@
 #ifndef QT3DCORE_QNODEDESTROYEDCHANGE_H
 #define QT3DCORE_QNODEDESTROYEDCHANGE_H
 
-#include <Qt3DCore/qscenechange.h>
 #include <Qt3DCore/qnode.h>
+#include <Qt3DCore/qscenechange.h>
 #include <QtCore/qsharedpointer.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/changes/qnodedestroyedchange_p.h b/src/core/changes/qnodedestroyedchange_p.h
index 999976431..081ca858f 100644
--- a/src/core/changes/qnodedestroyedchange_p.h
+++ b/src/core/changes/qnodedestroyedchange_p.h
@@ -48,9 +48,10 @@
 // We mean it.
 //
 
-#include <private/qscenechange_p.h>
 #include <Qt3DCore/qnode.h>
 
+#include <Qt3DCore/private/qscenechange_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
diff --git a/src/core/changes/qpropertynodeaddedchange.cpp b/src/core/changes/qpropertynodeaddedchange.cpp
index 66b5c70d3..390a170b6 100644
--- a/src/core/changes/qpropertynodeaddedchange.cpp
+++ b/src/core/changes/qpropertynodeaddedchange.cpp
@@ -39,6 +39,7 @@
 
 #include "qpropertynodeaddedchange.h"
 #include "qpropertynodeaddedchange_p.h"
+
 #include <Qt3DCore/private/qnode_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/changes/qpropertynodeaddedchange_p.h b/src/core/changes/qpropertynodeaddedchange_p.h
index 01340ae8c..2930867ea 100644
--- a/src/core/changes/qpropertynodeaddedchange_p.h
+++ b/src/core/changes/qpropertynodeaddedchange_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
-#include <private/qstaticpropertyvalueaddedchangebase_p.h>
 #include <Qt3DCore/qnode.h>
 
+#include <Qt3DCore/private/qstaticpropertyvalueaddedchangebase_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
diff --git a/src/core/changes/qpropertynoderemovedchange.cpp b/src/core/changes/qpropertynoderemovedchange.cpp
index a7b4e95f3..a0f342d0b 100644
--- a/src/core/changes/qpropertynoderemovedchange.cpp
+++ b/src/core/changes/qpropertynoderemovedchange.cpp
@@ -39,6 +39,7 @@
 
 #include "qpropertynoderemovedchange.h"
 #include "qpropertynoderemovedchange_p.h"
+
 #include <Qt3DCore/private/qnode_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/changes/qpropertynoderemovedchange_p.h b/src/core/changes/qpropertynoderemovedchange_p.h
index 6cd23661b..0145cc507 100644
--- a/src/core/changes/qpropertynoderemovedchange_p.h
+++ b/src/core/changes/qpropertynoderemovedchange_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
-#include <private/qstaticpropertyvalueremovedchangebase_p.h>
 #include <Qt3DCore/qnode.h>
 
+#include <Qt3DCore/private/qstaticpropertyvalueremovedchangebase_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
diff --git a/src/core/changes/qpropertyupdatedchange_p.h b/src/core/changes/qpropertyupdatedchange_p.h
index f985120c9..ad908a8c4 100644
--- a/src/core/changes/qpropertyupdatedchange_p.h
+++ b/src/core/changes/qpropertyupdatedchange_p.h
@@ -51,8 +51,9 @@
 // We mean it.
 //
 
-#include <private/qstaticpropertyupdatedchangebase_p.h>
-#include <QVariant>
+#include <QtCore/QVariant>
+
+#include <Qt3DCore/private/qstaticpropertyupdatedchangebase_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/changes/qpropertyupdatedchangebase_p.h b/src/core/changes/qpropertyupdatedchangebase_p.h
index 314b1ea15..a8bc537c1 100644
--- a/src/core/changes/qpropertyupdatedchangebase_p.h
+++ b/src/core/changes/qpropertyupdatedchangebase_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <private/qscenechange_p.h>
+#include <Qt3DCore/private/qscenechange_p.h>
 #include <Qt3DCore/private/qt3dcore_global_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/changes/qpropertyvalueaddedchange_p.h b/src/core/changes/qpropertyvalueaddedchange_p.h
index 538a591a1..edd59489f 100644
--- a/src/core/changes/qpropertyvalueaddedchange_p.h
+++ b/src/core/changes/qpropertyvalueaddedchange_p.h
@@ -51,10 +51,11 @@
 // We mean it.
 //
 
-#include <private/qstaticpropertyvalueaddedchangebase_p.h>
-#include <Qt3DCore/private/qt3dcore_global_p.h>
 #include <QtCore/qvariant.h>
 
+#include <Qt3DCore/private/qstaticpropertyvalueaddedchangebase_p.h>
+#include <Qt3DCore/private/qt3dcore_global_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
diff --git a/src/core/changes/qpropertyvalueaddedchangebase.cpp b/src/core/changes/qpropertyvalueaddedchangebase.cpp
index 26dcd5555..3c9929496 100644
--- a/src/core/changes/qpropertyvalueaddedchangebase.cpp
+++ b/src/core/changes/qpropertyvalueaddedchangebase.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qpropertyvalueaddedchangebase.h"
+
 #include "qpropertyvalueaddedchangebase_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/changes/qpropertyvalueaddedchangebase_p.h b/src/core/changes/qpropertyvalueaddedchangebase_p.h
index 405b2ad3f..be92e2d5b 100644
--- a/src/core/changes/qpropertyvalueaddedchangebase_p.h
+++ b/src/core/changes/qpropertyvalueaddedchangebase_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <private/qscenechange_p.h>
+#include <Qt3DCore/private/qscenechange_p.h>
 #include <Qt3DCore/private/qt3dcore_global_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/changes/qpropertyvalueremovedchange.cpp b/src/core/changes/qpropertyvalueremovedchange.cpp
index 6e8a1f817..9d420abc0 100644
--- a/src/core/changes/qpropertyvalueremovedchange.cpp
+++ b/src/core/changes/qpropertyvalueremovedchange.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qpropertyvalueremovedchange.h"
+
 #include "qpropertyvalueremovedchange_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/changes/qpropertyvalueremovedchange_p.h b/src/core/changes/qpropertyvalueremovedchange_p.h
index 82644b76c..b4e86bc9e 100644
--- a/src/core/changes/qpropertyvalueremovedchange_p.h
+++ b/src/core/changes/qpropertyvalueremovedchange_p.h
@@ -51,10 +51,11 @@
 // We mean it.
 //
 
-#include <private/qstaticpropertyvalueremovedchangebase_p.h>
-#include <Qt3DCore/private/qt3dcore_global_p.h>
 #include <QtCore/qvariant.h>
 
+#include <Qt3DCore/private/qstaticpropertyvalueremovedchangebase_p.h>
+#include <Qt3DCore/private/qt3dcore_global_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
diff --git a/src/core/changes/qpropertyvalueremovedchangebase.cpp b/src/core/changes/qpropertyvalueremovedchangebase.cpp
index 8115d6e22..71213019c 100644
--- a/src/core/changes/qpropertyvalueremovedchangebase.cpp
+++ b/src/core/changes/qpropertyvalueremovedchangebase.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qpropertyvalueremovedchangebase.h"
+
 #include "qpropertyvalueremovedchangebase_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/changes/qpropertyvalueremovedchangebase_p.h b/src/core/changes/qpropertyvalueremovedchangebase_p.h
index e4c4be640..f9c1b4009 100644
--- a/src/core/changes/qpropertyvalueremovedchangebase_p.h
+++ b/src/core/changes/qpropertyvalueremovedchangebase_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <private/qscenechange_p.h>
+#include <Qt3DCore/private/qscenechange_p.h>
 #include <Qt3DCore/private/qt3dcore_global_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/changes/qscenechange.cpp b/src/core/changes/qscenechange.cpp
index 959518904..df15e239d 100644
--- a/src/core/changes/qscenechange.cpp
+++ b/src/core/changes/qscenechange.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qscenechange.h"
+
 #include "qscenechange_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/changes/qscenechange.h b/src/core/changes/qscenechange.h
index 4555983e2..378c2f676 100644
--- a/src/core/changes/qscenechange.h
+++ b/src/core/changes/qscenechange.h
@@ -40,9 +40,9 @@
 #ifndef QT3DCORE_QSCENECHANGE_H
 #define QT3DCORE_QSCENECHANGE_H
 
-#include <Qt3DCore/qt3dcore_global.h>
-#include <QSharedPointer>
 #include <Qt3DCore/qnodeid.h>
+#include <Qt3DCore/qt3dcore_global.h>
+#include <QtCore/QSharedPointer>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/changes/qscenechange_p.h b/src/core/changes/qscenechange_p.h
index 80ce4eaa5..cd0194b01 100644
--- a/src/core/changes/qscenechange_p.h
+++ b/src/core/changes/qscenechange_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
-#include <QtGlobal>
-#include <Qt3DCore/private/qt3dcore_global_p.h>
 #include <Qt3DCore/qscenechange.h>
+#include <QtCore/QtGlobal>
+
+#include <Qt3DCore/private/qt3dcore_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/changes/qstaticpropertyupdatedchangebase.cpp b/src/core/changes/qstaticpropertyupdatedchangebase.cpp
index 409d80add..d065dbf0b 100644
--- a/src/core/changes/qstaticpropertyupdatedchangebase.cpp
+++ b/src/core/changes/qstaticpropertyupdatedchangebase.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qstaticpropertyupdatedchangebase.h"
+
 #include "qstaticpropertyupdatedchangebase_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/changes/qstaticpropertyupdatedchangebase_p.h b/src/core/changes/qstaticpropertyupdatedchangebase_p.h
index c81df4076..3f76e2f56 100644
--- a/src/core/changes/qstaticpropertyupdatedchangebase_p.h
+++ b/src/core/changes/qstaticpropertyupdatedchangebase_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <private/qpropertyupdatedchangebase_p.h>
+#include <Qt3DCore/private/qpropertyupdatedchangebase_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/changes/qstaticpropertyvalueaddedchangebase.cpp b/src/core/changes/qstaticpropertyvalueaddedchangebase.cpp
index 4fb658459..efd2c0165 100644
--- a/src/core/changes/qstaticpropertyvalueaddedchangebase.cpp
+++ b/src/core/changes/qstaticpropertyvalueaddedchangebase.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qstaticpropertyvalueaddedchangebase.h"
+
 #include "qstaticpropertyvalueaddedchangebase_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/changes/qstaticpropertyvalueaddedchangebase_p.h b/src/core/changes/qstaticpropertyvalueaddedchangebase_p.h
index 7a614c0d1..cd995d739 100644
--- a/src/core/changes/qstaticpropertyvalueaddedchangebase_p.h
+++ b/src/core/changes/qstaticpropertyvalueaddedchangebase_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <private/qpropertyvalueaddedchangebase_p.h>
+#include <Qt3DCore/private/qpropertyvalueaddedchangebase_p.h>
 #include <Qt3DCore/private/qt3dcore_global_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/changes/qstaticpropertyvalueremovedchangebase_p.h b/src/core/changes/qstaticpropertyvalueremovedchangebase_p.h
index 47f43f745..ac4e1d875 100644
--- a/src/core/changes/qstaticpropertyvalueremovedchangebase_p.h
+++ b/src/core/changes/qstaticpropertyvalueremovedchangebase_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <private/qpropertyvalueremovedchangebase_p.h>
+#include <Qt3DCore/private/qpropertyvalueremovedchangebase_p.h>
 #include <Qt3DCore/private/qt3dcore_global_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/corelogging_p.h b/src/core/corelogging_p.h
index 7fc3fff55..5ddd6ea73 100644
--- a/src/core/corelogging_p.h
+++ b/src/core/corelogging_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QLoggingCategory>
+#include <QtCore/QLoggingCategory>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/jobs/dependencyhandler.cpp b/src/core/jobs/dependencyhandler.cpp
index dcea66a62..fe95a33f8 100644
--- a/src/core/jobs/dependencyhandler.cpp
+++ b/src/core/jobs/dependencyhandler.cpp
@@ -37,10 +37,10 @@
 **
 ****************************************************************************/
 
-#include <iterator>
-
 #include "dependencyhandler_p.h"
 
+#include <iterator>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
diff --git a/src/core/jobs/dependencyhandler_p.h b/src/core/jobs/dependencyhandler_p.h
index abaa8e55f..dec18312c 100644
--- a/src/core/jobs/dependencyhandler_p.h
+++ b/src/core/jobs/dependencyhandler_p.h
@@ -51,11 +51,11 @@
 // We mean it.
 //
 
-#include "task_p.h"
-
 #include <QtCore/QMutex>
 #include <QtCore/QVector>
 
+#include <Qt3DCore/private/task_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
diff --git a/src/core/jobs/qabstractaspectjobmanager_p.h b/src/core/jobs/qabstractaspectjobmanager_p.h
index 32e6e499e..5c4e9f699 100644
--- a/src/core/jobs/qabstractaspectjobmanager_p.h
+++ b/src/core/jobs/qabstractaspectjobmanager_p.h
@@ -51,9 +51,8 @@
 // We mean it.
 //
 
-#include <QObject>
-
 #include <Qt3DCore/qaspectjob.h>
+#include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/jobs/qaspectjob.cpp b/src/core/jobs/qaspectjob.cpp
index 59f48e9bf..6016bd273 100644
--- a/src/core/jobs/qaspectjob.cpp
+++ b/src/core/jobs/qaspectjob.cpp
@@ -39,7 +39,8 @@
 
 #include "qaspectjob.h"
 #include "qaspectjob_p.h"
-#include <QByteArray>
+
+#include <QtCore/QByteArray>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/jobs/qaspectjob.h b/src/core/jobs/qaspectjob.h
index b2e5e587c..398cd88d1 100644
--- a/src/core/jobs/qaspectjob.h
+++ b/src/core/jobs/qaspectjob.h
@@ -41,8 +41,8 @@
 #define QT3DCORE_QASPECTJOB_H
 
 #include <Qt3DCore/qt3dcore_global.h>
-#include <QSharedPointer>
-#include <QVector>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QVector>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/jobs/qaspectjob_p.h b/src/core/jobs/qaspectjob_p.h
index c54240a4e..fdf39b8b6 100644
--- a/src/core/jobs/qaspectjob_p.h
+++ b/src/core/jobs/qaspectjob_p.h
@@ -51,7 +51,8 @@
 // We mean it.
 //
 
-#include <QWeakPointer>
+#include <QtCore/QWeakPointer>
+
 #include <Qt3DCore/private/qt3dcore_global_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/jobs/qaspectjobmanager.cpp b/src/core/jobs/qaspectjobmanager.cpp
index f2a71412d..468d904b4 100644
--- a/src/core/jobs/qaspectjobmanager.cpp
+++ b/src/core/jobs/qaspectjobmanager.cpp
@@ -38,16 +38,17 @@
 ****************************************************************************/
 
 #include "qaspectjobmanager_p.h"
-#include "task_p.h"
-#include "qthreadpooler_p.h"
-#include "dependencyhandler_p.h"
-
-#include <QAtomicInt>
-#include <QDebug>
-#include <QThread>
-#include <QCoreApplication>
+
+#include <QtCore/QAtomicInt>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+#include <QtCore/QThread>
 #include <QtCore/QFuture>
 
+#include <Qt3DCore/private/dependencyhandler_p.h>
+#include <Qt3DCore/private/qthreadpooler_p.h>
+#include <Qt3DCore/private/task_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
diff --git a/src/core/jobs/qaspectjobmanager_p.h b/src/core/jobs/qaspectjobmanager_p.h
index 5b7f27ad6..6fbf03d22 100644
--- a/src/core/jobs/qaspectjobmanager_p.h
+++ b/src/core/jobs/qaspectjobmanager_p.h
@@ -51,12 +51,11 @@
 // We mean it.
 //
 
-#include <private/qabstractaspectjobmanager_p.h>
-#include <Qt3DCore/private/qt3dcore_global_p.h>
-
 #include <Qt3DCore/qaspectjob.h>
+#include <QtCore/QVector>
 
-#include <QVector>
+#include <Qt3DCore/private/qabstractaspectjobmanager_p.h>
+#include <Qt3DCore/private/qt3dcore_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/jobs/qaspectjobproviderinterface_p.h b/src/core/jobs/qaspectjobproviderinterface_p.h
index 1e2166ace..29b44b3c1 100644
--- a/src/core/jobs/qaspectjobproviderinterface_p.h
+++ b/src/core/jobs/qaspectjobproviderinterface_p.h
@@ -51,10 +51,10 @@
 // We mean it.
 //
 
-#include <Qt3DCore/private/qt3dcore_global_p.h>
 #include <Qt3DCore/qaspectjob.h>
+#include <QtCore/QVector>
 
-#include <QVector>
+#include <Qt3DCore/private/qt3dcore_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/jobs/qthreadpooler.cpp b/src/core/jobs/qthreadpooler.cpp
index 35e2df2a1..14a1bee2f 100644
--- a/src/core/jobs/qthreadpooler.cpp
+++ b/src/core/jobs/qthreadpooler.cpp
@@ -38,14 +38,15 @@
 ****************************************************************************/
 
 #include "qthreadpooler_p.h"
-#include "dependencyhandler_p.h"
 
-#include <QDebug>
+#include <QtCore/QDebug>
+
+#include <Qt3DCore/private/dependencyhandler_p.h>
 
 #ifdef QT3D_JOBS_RUN_STATS
-#include <QFile>
-#include <QThreadStorage>
-#include <QDateTime>
+#include <QtCore/QFile>
+#include <QtCore/QThreadStorage>
+#include <QtCore/QDateTime>
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/jobs/qthreadpooler_p.h b/src/core/jobs/qthreadpooler_p.h
index 47b28e639..9d632a696 100644
--- a/src/core/jobs/qthreadpooler_p.h
+++ b/src/core/jobs/qthreadpooler_p.h
@@ -51,17 +51,18 @@
 // We mean it.
 //
 
-#include "task_p.h"
-#include "dependencyhandler_p.h"
-#include "qaspectjob_p.h"
+#include <QtCore/QFuture>
+#include <QtCore/QFutureInterface>
 #include <QtCore/QObject>
 #include <QtCore/QSharedPointer>
-#include <QtCore/QFutureInterface>
-#include <QtCore/QFuture>
-#include <QThreadPool>
+#include <QtCore/QThreadPool>
+
+#include <Qt3DCore/private/dependencyhandler_p.h>
+#include <Qt3DCore/private/qaspectjob_p.h>
+#include <Qt3DCore/private/task_p.h>
 
 #ifdef QT3D_JOBS_RUN_STATS
-#include <QElapsedTimer>
+#include <QtCore/QElapsedTimer>
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/jobs/task.cpp b/src/core/jobs/task.cpp
index 45da858f4..0edee4db9 100644
--- a/src/core/jobs/task.cpp
+++ b/src/core/jobs/task.cpp
@@ -38,12 +38,13 @@
 ****************************************************************************/
 
 #include "task_p.h"
-#include "dependencyhandler_p.h"
-#include "qthreadpooler_p.h"
 
-#include <QMutexLocker>
-#include <QElapsedTimer>
-#include <QDebug>
+#include <QtCore/QDebug>
+#include <QtCore/QElapsedTimer>
+#include <QtCore/QMutexLocker>
+
+#include <Qt3DCore/private/dependencyhandler_p.h>
+#include <Qt3DCore/private/qthreadpooler_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/jobs/task_p.h b/src/core/jobs/task_p.h
index 593d7d7ad..8193abaf6 100644
--- a/src/core/jobs/task_p.h
+++ b/src/core/jobs/task_p.h
@@ -51,13 +51,12 @@
 // We mean it.
 //
 
-#include "qaspectjobmanager_p.h"
-
-#include <QtCore/QtGlobal>
-#include <QtCore/QThread>
+#include <QtCore/QRunnable>
 #include <QtCore/QSharedPointer>
+#include <QtCore/QThread>
+#include <QtCore/QtGlobal>
 
-#include <QtCore/QRunnable>
+#include <Qt3DCore/private/qaspectjobmanager_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/nodes/propertychangehandler_p.h b/src/core/nodes/propertychangehandler_p.h
index e91df5016..4bcfdef75 100644
--- a/src/core/nodes/propertychangehandler_p.h
+++ b/src/core/nodes/propertychangehandler_p.h
@@ -52,12 +52,11 @@
 //
 
 #include <Qt3DCore/qt3dcore_global.h>
-
-#include <QObject>
-#include <QHash>
-#include <QVector>
-#include <QMetaMethod>
-#include <QDebug>
+#include <QtCore/QDebug>
+#include <QtCore/QHash>
+#include <QtCore/QMetaMethod>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/nodes/qabstractnodefactory_p.h b/src/core/nodes/qabstractnodefactory_p.h
index bb7533e94..dbe0adffe 100644
--- a/src/core/nodes/qabstractnodefactory_p.h
+++ b/src/core/nodes/qabstractnodefactory_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
-#include <Qt3DCore/private/qt3dcore_global_p.h>
 #include <Qt3DCore/qnode.h>
 
+#include <Qt3DCore/private/qt3dcore_global_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
diff --git a/src/core/nodes/qbackendnode.cpp b/src/core/nodes/qbackendnode.cpp
index 6970794b8..e3963b202 100644
--- a/src/core/nodes/qbackendnode.cpp
+++ b/src/core/nodes/qbackendnode.cpp
@@ -39,9 +39,11 @@
 
 #include "qbackendnode.h"
 #include "qbackendnode_p.h"
-#include "qaspectengine.h"
-#include "qnode.h"
-#include "qpropertyupdatedchange.h"
+
+#include <Qt3DCore/qaspectengine.h>
+#include <Qt3DCore/qnode.h>
+#include <Qt3DCore/qpropertyupdatedchange.h>
+
 #include <Qt3DCore/private/corelogging_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/nodes/qbackendnode.h b/src/core/nodes/qbackendnode.h
index 39114034d..d2cae5696 100644
--- a/src/core/nodes/qbackendnode.h
+++ b/src/core/nodes/qbackendnode.h
@@ -40,10 +40,10 @@
 #ifndef QT3DCORE_QBACKENDNODE_H
 #define QT3DCORE_QBACKENDNODE_H
 
-#include <Qt3DCore/qt3dcore_global.h>
-#include <Qt3DCore/qscenechange.h>
 #include <Qt3DCore/qnodecreatedchange.h>
 #include <Qt3DCore/qnodeid.h>
+#include <Qt3DCore/qscenechange.h>
+#include <Qt3DCore/qt3dcore_global.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/nodes/qbackendnode_p.h b/src/core/nodes/qbackendnode_p.h
index 6cddfad11..6940f5623 100644
--- a/src/core/nodes/qbackendnode_p.h
+++ b/src/core/nodes/qbackendnode_p.h
@@ -51,13 +51,13 @@
 // We mean it.
 //
 
+#include <Qt3DCore/qbackendnode.h>
 #include <Qt3DCore/qnodeid.h>
+
+#include <Qt3DCore/private/qlockableobserverinterface_p.h>
 #include <Qt3DCore/private/qobservableinterface_p.h>
 #include <Qt3DCore/private/qobserverinterface_p.h>
 #include <Qt3DCore/private/qt3dcore_global_p.h>
-#include <Qt3DCore/qbackendnode.h>
-#include <Qt3DCore/private/qlockableobserverinterface_p.h>
-#include <Qt3DCore/private/qt3dcore_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/nodes/qcomponent.cpp b/src/core/nodes/qcomponent.cpp
index 32bab14d0..93597087e 100644
--- a/src/core/nodes/qcomponent.cpp
+++ b/src/core/nodes/qcomponent.cpp
@@ -39,10 +39,12 @@
 
 #include "qcomponent.h"
 #include "qcomponent_p.h"
-#include "qentity.h"
-#include "qentity_p.h"
-#include "qscene_p.h"
+
 #include <Qt3DCore/qpropertyupdatedchange.h>
+#include <Qt3DCore/qentity.h>
+
+#include <Qt3DCore/private/qentity_p.h>
+#include <Qt3DCore/private/qscene_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/nodes/qcomponent_p.h b/src/core/nodes/qcomponent_p.h
index 74cef1629..6c7c3c89d 100644
--- a/src/core/nodes/qcomponent_p.h
+++ b/src/core/nodes/qcomponent_p.h
@@ -51,8 +51,8 @@
 // We mean it.
 //
 
-#include <private/qnode_p.h>
-#include <private/qt3dcore_global_p.h>
+#include <Qt3DCore/private/qnode_p.h>
+#include <Qt3DCore/private/qt3dcore_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/nodes/qdestructionidandtypecollector_p.h b/src/core/nodes/qdestructionidandtypecollector_p.h
index 3e5fd9138..8557c27f0 100644
--- a/src/core/nodes/qdestructionidandtypecollector_p.h
+++ b/src/core/nodes/qdestructionidandtypecollector_p.h
@@ -48,8 +48,8 @@
 // We mean it.
 //
 
-#include <Qt3DCore/private/qnodevisitor_p.h>
 #include <Qt3DCore/private/qentity_p.h>
+#include <Qt3DCore/private/qnodevisitor_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/nodes/qentity.cpp b/src/core/nodes/qentity.cpp
index b28898c60..9bc41f8cc 100644
--- a/src/core/nodes/qentity.cpp
+++ b/src/core/nodes/qentity.cpp
@@ -39,17 +39,18 @@
 
 #include "qentity.h"
 #include "qentity_p.h"
-#include "qcomponent.h"
-#include "qcomponent_p.h"
 
-#include <Qt3DCore/private/qscene_p.h>
+#include <Qt3DCore/qcomponent.h>
 #include <Qt3DCore/qcomponentaddedchange.h>
 #include <Qt3DCore/qcomponentremovedchange.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qnodecreatedchange.h>
+#include <Qt3DCore/qpropertyupdatedchange.h>
+#include <QtCore/QMetaObject>
+#include <QtCore/QMetaProperty>
+
 #include <Qt3DCore/private/corelogging_p.h>
-#include <QMetaObject>
-#include <QMetaProperty>
+#include <Qt3DCore/private/qcomponent_p.h>
+#include <Qt3DCore/private/qscene_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/nodes/qentity.h b/src/core/nodes/qentity.h
index a7f492a96..978f84ebe 100644
--- a/src/core/nodes/qentity.h
+++ b/src/core/nodes/qentity.h
@@ -42,8 +42,7 @@
 
 #include <Qt3DCore/qnode.h>
 #include <Qt3DCore/qt3dcore_global.h>
-
-#include <QMetaType>
+#include <QtCore/QMetaType>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/nodes/qentity_p.h b/src/core/nodes/qentity_p.h
index a9dfb9b0d..60c8c0bda 100644
--- a/src/core/nodes/qentity_p.h
+++ b/src/core/nodes/qentity_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
+#include <Qt3DCore/qentity.h>
+
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qt3dcore_global_p.h>
-#include "qentity.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp
index 8e7261be0..290080c59 100644
--- a/src/core/nodes/qnode.cpp
+++ b/src/core/nodes/qnode.cpp
@@ -40,25 +40,26 @@
 #include "qnode.h"
 #include "qnode_p.h"
 
-#include <Qt3DCore/qentity.h>
+#include <Qt3DCore/QComponent>
+#include <Qt3DCore/qaspectengine.h>
 #include <Qt3DCore/qdynamicpropertyupdatedchange.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
+#include <Qt3DCore/qentity.h>
+#include <Qt3DCore/qnodedestroyedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qpropertynoderemovedchange.h>
-#include <Qt3DCore/qnodedestroyedchange.h>
-#include <Qt3DCore/qaspectengine.h>
-#include <Qt3DCore/private/qdestructionidandtypecollector_p.h>
-#include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/private/qpostman_p.h>
-#include <QEvent>
-#include <QChildEvent>
-#include <QMetaObject>
-#include <QMetaProperty>
-#include <QtCore/private/qmetaobject_p.h>
-#include <Qt3DCore/QComponent>
+#include <Qt3DCore/qpropertyupdatedchange.h>
+#include <QtCore/QChildEvent>
+#include <QtCore/QEvent>
+#include <QtCore/QMetaObject>
+#include <QtCore/QMetaProperty>
+
 #include <Qt3DCore/private/corelogging_p.h>
+#include <Qt3DCore/private/qdestructionidandtypecollector_p.h>
 #include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
 #include <Qt3DCore/private/qnodevisitor_p.h>
+#include <Qt3DCore/private/qpostman_p.h>
+#include <Qt3DCore/private/qscene_p.h>
+#include <QtCore/private/qmetaobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/nodes/qnode.h b/src/core/nodes/qnode.h
index cadcc7d5c..2cb645279 100644
--- a/src/core/nodes/qnode.h
+++ b/src/core/nodes/qnode.h
@@ -40,11 +40,11 @@
 #ifndef QT3DCORE_QNODE_H
 #define QT3DCORE_QNODE_H
 
-#include <QObject>
-#include <Qt3DCore/qt3dcore_global.h>
+#include <Qt3DCore/qnodecreatedchange.h>
 #include <Qt3DCore/qnodeid.h>
 #include <Qt3DCore/qscenechange.h>
-#include <Qt3DCore/qnodecreatedchange.h>
+#include <Qt3DCore/qt3dcore_global.h>
+#include <QtCore/QObject>
 
 #define Q_NODE_NULLPTR static_cast<Qt3DCore::QNode *>(nullptr)
 
diff --git a/src/core/nodes/qnode_p.h b/src/core/nodes/qnode_p.h
index a90011128..a95b909d7 100644
--- a/src/core/nodes/qnode_p.h
+++ b/src/core/nodes/qnode_p.h
@@ -51,13 +51,15 @@
 // We mean it.
 //
 
-#include <private/qobject_p.h>
 #include <Qt3DCore/qnode.h>
-#include <Qt3DCore/private/qobservableinterface_p.h>
+
+#include <functional>
+
+#include <Qt3DCore/private/propertychangehandler_p.h>
 #include <Qt3DCore/private/qchangearbiter_p.h>
+#include <Qt3DCore/private/qobservableinterface_p.h>
 #include <Qt3DCore/private/qt3dcore_global_p.h>
-#include "propertychangehandler_p.h"
-#include <functional>
+#include <QtCore/private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/nodes/qnodecreatedchangegenerator.cpp b/src/core/nodes/qnodecreatedchangegenerator.cpp
index c350c866a..d91949fb1 100644
--- a/src/core/nodes/qnodecreatedchangegenerator.cpp
+++ b/src/core/nodes/qnodecreatedchangegenerator.cpp
@@ -35,6 +35,7 @@
 ****************************************************************************/
 
 #include "qnodecreatedchangegenerator_p.h"
+
 #include <Qt3DCore/private/qnodevisitor_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/nodes/qnodecreatedchangegenerator_p.h b/src/core/nodes/qnodecreatedchangegenerator_p.h
index f00241b39..42c2847cc 100644
--- a/src/core/nodes/qnodecreatedchangegenerator_p.h
+++ b/src/core/nodes/qnodecreatedchangegenerator_p.h
@@ -48,12 +48,13 @@
 // We mean it.
 //
 
-#include <Qt3DCore/qt3dcore_global.h>
 #include <Qt3DCore/qnode.h>
 #include <Qt3DCore/qnodecreatedchange.h>
-#include <Qt3DCore/private/qnode_p.h>
+#include <Qt3DCore/qt3dcore_global.h>
 #include <QtCore/qvector.h>
 
+#include <Qt3DCore/private/qnode_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
diff --git a/src/core/nodes/qnodeid.cpp b/src/core/nodes/qnodeid.cpp
index f41627734..17bc4e8e1 100644
--- a/src/core/nodes/qnodeid.cpp
+++ b/src/core/nodes/qnodeid.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qnodeid.h"
+#include <Qt3DCore/qnodeid.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/nodes/qnodeid.h b/src/core/nodes/qnodeid.h
index 7e8b1c97c..a00559df3 100644
--- a/src/core/nodes/qnodeid.h
+++ b/src/core/nodes/qnodeid.h
@@ -41,7 +41,7 @@
 #define QT3DCORE_QNODEID_H
 
 #include <Qt3DCore/qt3dcore_global.h>
-#include <QDebug>
+#include <QtCore/QDebug>
 #include <QtCore/QHashFunctions>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/nodes/qnodevisitor_p.h b/src/core/nodes/qnodevisitor_p.h
index 3637293f5..15bfa90db 100644
--- a/src/core/nodes/qnodevisitor_p.h
+++ b/src/core/nodes/qnodevisitor_p.h
@@ -51,9 +51,9 @@
 // We mean it.
 //
 
-#include <Qt3DCore/qt3dcore_global.h>
-#include <Qt3DCore/qnode.h>
 #include <Qt3DCore/qentity.h>
+#include <Qt3DCore/qnode.h>
+#include <Qt3DCore/qt3dcore_global.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/qbackendnodefactory_p.h b/src/core/qbackendnodefactory_p.h
index 9f2afb16d..46e68266f 100644
--- a/src/core/qbackendnodefactory_p.h
+++ b/src/core/qbackendnodefactory_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
-#include <Qt3DCore/private/qt3dcore_global_p.h>
 #include <Qt3DCore/qnodecreatedchange.h>
 
+#include <Qt3DCore/private/qt3dcore_global_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
diff --git a/src/core/qchangearbiter.cpp b/src/core/qchangearbiter.cpp
index 3bd3f69e8..683a7cfa0 100644
--- a/src/core/qchangearbiter.cpp
+++ b/src/core/qchangearbiter.cpp
@@ -38,17 +38,18 @@
 ****************************************************************************/
 
 #include "qchangearbiter_p.h"
-#include "qcomponent.h"
-#include "qabstractaspectjobmanager_p.h"
 
-#include "qsceneobserverinterface_p.h"
-#include <Qt3DCore/private/qscene_p.h>
+#include <Qt3DCore/qcomponent.h>
+#include <QtCore/QMutexLocker>
+#include <QtCore/QReadLocker>
+#include <QtCore/QThread>
+#include <QtCore/QWriteLocker>
+
 #include <Qt3DCore/private/corelogging_p.h>
-#include <QMutexLocker>
-#include <QReadLocker>
-#include <QThread>
-#include <QWriteLocker>
-#include <private/qpostman_p.h>
+#include <Qt3DCore/private/qabstractaspectjobmanager_p.h>
+#include <Qt3DCore/private/qpostman_p.h>
+#include <Qt3DCore/private/qscene_p.h>
+#include <Qt3DCore/private/qsceneobserverinterface_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/qchangearbiter_p.h b/src/core/qchangearbiter_p.h
index e3fdcad9b..98a5f36e0 100644
--- a/src/core/qchangearbiter_p.h
+++ b/src/core/qchangearbiter_p.h
@@ -51,16 +51,17 @@
 // We mean it.
 //
 
-#include <QObject>
-#include <QFlags>
-#include <QReadWriteLock>
-#include <QVariant>
-#include <QVector>
-#include <QPair>
-#include <QThreadStorage>
-#include <QMutex>
 #include <Qt3DCore/qnodeid.h>
 #include <Qt3DCore/qscenechange.h>
+#include <QtCore/QFlags>
+#include <QtCore/QMutex>
+#include <QtCore/QObject>
+#include <QtCore/QPair>
+#include <QtCore/QReadWriteLock>
+#include <QtCore/QThreadStorage>
+#include <QtCore/QVariant>
+#include <QtCore/QVector>
+
 #include <Qt3DCore/private/qlockableobserverinterface_p.h>
 #include <Qt3DCore/private/qt3dcore_global_p.h>
 
diff --git a/src/core/qobservableinterface_p.h b/src/core/qobservableinterface_p.h
index e867f1b84..8b92168ff 100644
--- a/src/core/qobservableinterface_p.h
+++ b/src/core/qobservableinterface_p.h
@@ -52,7 +52,8 @@
 //
 
 #include <Qt3DCore/qscenechange.h>
-#include <private/qt3dcore_global_p.h>
+
+#include <Qt3DCore/private/qt3dcore_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/qpostman.cpp b/src/core/qpostman.cpp
index ac78450c6..ef21325c5 100644
--- a/src/core/qpostman.cpp
+++ b/src/core/qpostman.cpp
@@ -38,12 +38,14 @@
 ****************************************************************************/
 
 #include "qpostman_p.h"
-#include <private/qobject_p.h>
+
+#include <Qt3DCore/qnode.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/private/qscene_p.h>
+
 #include <Qt3DCore/private/qlockableobserverinterface_p.h>
-#include <Qt3DCore/qnode.h>
 #include <Qt3DCore/private/qnode_p.h>
+#include <Qt3DCore/private/qscene_p.h>
+#include <QtCore/private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/qscene.cpp b/src/core/qscene.cpp
index 42c3a2bc8..5fc280a5e 100644
--- a/src/core/qscene.cpp
+++ b/src/core/qscene.cpp
@@ -38,12 +38,14 @@
 ****************************************************************************/
 
 #include "qscene_p.h"
-#include <QHash>
-#include <QReadLocker>
+
 #include <Qt3DCore/qnode.h>
+#include <QtCore/QHash>
+#include <QtCore/QReadLocker>
+
 #include <Qt3DCore/private/qlockableobserverinterface_p.h>
-#include <Qt3DCore/private/qobservableinterface_p.h>
 #include <Qt3DCore/private/qnode_p.h>
+#include <Qt3DCore/private/qobservableinterface_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/qscene_p.h b/src/core/qscene_p.h
index 6b4009538..b19408b2f 100644
--- a/src/core/qscene_p.h
+++ b/src/core/qscene_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
-#include <Qt3DCore/private/qt3dcore_global_p.h>
+#include <QtCore/QScopedPointer>
+
 #include <Qt3DCore/private/qobservableinterface_p.h>
-#include <QScopedPointer>
+#include <Qt3DCore/private/qt3dcore_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/qsceneobserverinterface_p.h b/src/core/qsceneobserverinterface_p.h
index 77b1c3626..f183ab571 100644
--- a/src/core/qsceneobserverinterface_p.h
+++ b/src/core/qsceneobserverinterface_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
-#include <Qt3DCore/private/qt3dcore_global_p.h>
 #include <Qt3DCore/qscenechange.h>
 
+#include <Qt3DCore/private/qt3dcore_global_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
diff --git a/src/core/qscheduler.cpp b/src/core/qscheduler.cpp
index 1df6d2607..c24ff431e 100644
--- a/src/core/qscheduler.cpp
+++ b/src/core/qscheduler.cpp
@@ -39,10 +39,11 @@
 
 #include "qscheduler_p.h"
 
-#include "qabstractaspect.h"
-#include "qabstractaspect_p.h"
-#include "qaspectmanager_p.h"
-#include "qabstractaspectjobmanager_p.h"
+#include <Qt3DCore/qabstractaspect.h>
+
+#include <Qt3DCore/private/qabstractaspect_p.h>
+#include <Qt3DCore/private/qaspectmanager_p.h>
+#include <Qt3DCore/private/qabstractaspectjobmanager_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/qscheduler_p.h b/src/core/qscheduler_p.h
index 9d0f99ccb..9b1685e54 100644
--- a/src/core/qscheduler_p.h
+++ b/src/core/qscheduler_p.h
@@ -40,8 +40,8 @@
 #ifndef QT3DCORE_QSCHEDULER_P_H
 #define QT3DCORE_QSCHEDULER_P_H
 
-#include <QObject>
 #include <Qt3DCore/qt3dcore_global.h>
+#include <QtCore/QObject>
 
 //
 //  W A R N I N G
diff --git a/src/core/qtickclock.cpp b/src/core/qtickclock.cpp
index 4dfb29f1b..38ed07925 100644
--- a/src/core/qtickclock.cpp
+++ b/src/core/qtickclock.cpp
@@ -39,8 +39,9 @@
 
 #include "qtickclock_p.h"
 
+#include <QtCore/QThread>
+
 #include <Qt3DCore/private/corelogging_p.h>
-#include <QThread>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/qtickclock_p.h b/src/core/qtickclock_p.h
index b19417173..2b6686745 100644
--- a/src/core/qtickclock_p.h
+++ b/src/core/qtickclock_p.h
@@ -52,8 +52,7 @@
 //
 
 #include <Qt3DCore/qt3dcore_global.h>
-
-#include <QElapsedTimer>
+#include <QtCore/QElapsedTimer>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/resources/qboundedcircularbuffer_p.h b/src/core/resources/qboundedcircularbuffer_p.h
index f879a4a6f..22299d7da 100644
--- a/src/core/resources/qboundedcircularbuffer_p.h
+++ b/src/core/resources/qboundedcircularbuffer_p.h
@@ -51,12 +51,12 @@
 // We mean it.
 //
 
-#include <Qt3DCore/private/qcircularbuffer_p.h>
+#include <QtCore/QReadWriteLock>
+#include <QtCore/QReadLocker>
+#include <QtCore/QSemaphore>
+#include <QtCore/QtGlobal>
 
-#include <QReadWriteLock>
-#include <QReadLocker>
-#include <QSemaphore>
-#include <QtGlobal>
+#include <Qt3DCore/private/qcircularbuffer_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/resources/qcircularbuffer_p.h b/src/core/resources/qcircularbuffer_p.h
index 08665f4b5..e10b7236d 100644
--- a/src/core/resources/qcircularbuffer_p.h
+++ b/src/core/resources/qcircularbuffer_p.h
@@ -51,21 +51,23 @@
 // We mean it.
 //
 
+#include <Qt3DCore/qt3dcore_global.h>
+#include <QtCore/QtGlobal>
 #include <QtCore/qlist.h>
 #include <QtCore/qpair.h>
 #include <QtCore/qshareddata.h>
 #include <QtCore/qvector.h>
 
 #include <algorithm>
-#ifdef Q_COMPILER_INITIALIZER_LISTS
-# include <initializer_list>
-#endif
 #include <iterator>
 #include <limits>
 #include <memory>
 #include <new>
-#include <QtGlobal>
-#include <Qt3DCore/qt3dcore_global.h>
+
+
+#ifdef Q_COMPILER_INITIALIZER_LISTS
+# include <initializer_list>
+#endif
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/resources/qframeallocator_p.h b/src/core/resources/qframeallocator_p.h
index cd0fa504c..b3ded0760 100644
--- a/src/core/resources/qframeallocator_p.h
+++ b/src/core/resources/qframeallocator_p.h
@@ -56,9 +56,10 @@
 #include <valgrind/memcheck.h>
 #endif
 
-#include <QDebug>
-#include <QScopedPointer>
-#include <QVector>
+#include <QtCore/QDebug>
+#include <QtCore/QScopedPointer>
+#include <QtCore/QVector>
+
 #include <Qt3DCore/private/qt3dcore_global_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/resources/qhandlemanager_p.h b/src/core/resources/qhandlemanager_p.h
index b41fc75b1..0c3609bb9 100644
--- a/src/core/resources/qhandlemanager_p.h
+++ b/src/core/resources/qhandlemanager_p.h
@@ -51,12 +51,12 @@
 // We mean it.
 //
 
-#include <QtGlobal>
 #include <Qt3DCore/qt3dcore_global.h>
-#include "qhandle_p.h"
-
+#include <QtCore/QtGlobal>
 #include <QtCore/QVector>
 
+#include <Qt3DCore/private/qhandle_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
diff --git a/src/core/resources/qresourcemanager_p.h b/src/core/resources/qresourcemanager_p.h
index 1b79434fd..8ddc1c0a4 100644
--- a/src/core/resources/qresourcemanager_p.h
+++ b/src/core/resources/qresourcemanager_p.h
@@ -51,14 +51,15 @@
 // We mean it.
 //
 
-#include <QtGlobal>
-#include <QReadWriteLock>
-#include <QReadLocker>
-#include <QMutex>
-#include <QHash>
 #include <Qt3DCore/qt3dcore_global.h>
-#include "qhandle_p.h"
-#include "qhandlemanager_p.h"
+#include <QtCore/QHash>
+#include <QtCore/QMutex>
+#include <QtCore/QReadLocker>
+#include <QtCore/QReadWriteLock>
+#include <QtCore/QtGlobal>
+
+#include <Qt3DCore/private/qhandle_p.h>
+#include <Qt3DCore/private/qhandlemanager_p.h>
 
 // Silence complaints about unreferenced local variables in
 // ArrayAllocatingPolicy::deallocateBuckets() when the compiler
diff --git a/src/core/services/nullservices_p.h b/src/core/services/nullservices_p.h
index ed7bd3a39..f75c6abc1 100644
--- a/src/core/services/nullservices_p.h
+++ b/src/core/services/nullservices_p.h
@@ -52,8 +52,9 @@
 //
 
 #include <Qt3DCore/qt3dcore_global.h>
-#include "qopenglinformationservice_p.h"
-#include "qsysteminformationservice_p.h"
+
+#include <Qt3DCore/private/qopenglinformationservice_p.h>
+#include <Qt3DCore/private/qsysteminformationservice_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/services/qabstractframeadvanceservice_p.h b/src/core/services/qabstractframeadvanceservice_p.h
index 2dde68f06..a5f635710 100644
--- a/src/core/services/qabstractframeadvanceservice_p.h
+++ b/src/core/services/qabstractframeadvanceservice_p.h
@@ -52,8 +52,9 @@
 //
 
 #include <Qt3DCore/qt3dcore_global.h>
+#include <QtCore/QString>
+
 #include <Qt3DCore/private/qservicelocator_p.h>
-#include <QString>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/services/qabstractframeadvanceservice_p_p.h b/src/core/services/qabstractframeadvanceservice_p_p.h
index d73ca3116..c49586b8f 100644
--- a/src/core/services/qabstractframeadvanceservice_p_p.h
+++ b/src/core/services/qabstractframeadvanceservice_p_p.h
@@ -52,6 +52,7 @@
 //
 
 #include <Qt3DCore/qt3dcore_global.h>
+
 #include <Qt3DCore/private/qabstractserviceprovider_p.h>
 #include <Qt3DCore/private/qservicelocator_p.h>
 
diff --git a/src/core/services/qabstractserviceprovider_p.h b/src/core/services/qabstractserviceprovider_p.h
index 2913cee31..c0514b785 100644
--- a/src/core/services/qabstractserviceprovider_p.h
+++ b/src/core/services/qabstractserviceprovider_p.h
@@ -54,6 +54,8 @@
 #include <Qt3DCore/qt3dcore_global.h>
 #include <QtCore/qstring.h>
 
+#include <Qt3DCore/private/qservicelocator_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
diff --git a/src/core/services/qeventfilterservice.cpp b/src/core/services/qeventfilterservice.cpp
index 2907c1a2e..e8fd98121 100644
--- a/src/core/services/qeventfilterservice.cpp
+++ b/src/core/services/qeventfilterservice.cpp
@@ -38,10 +38,12 @@
 ****************************************************************************/
 
 #include "qeventfilterservice_p.h"
-#include "qabstractserviceprovider_p.h"
-#include <QMap>
-#include <QObject>
-#include <QVector>
+
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
+
+#include <Qt3DCore/private/qabstractserviceprovider_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/services/qeventfilterservice_p.h b/src/core/services/qeventfilterservice_p.h
index 4962e2af6..5f779c9cd 100644
--- a/src/core/services/qeventfilterservice_p.h
+++ b/src/core/services/qeventfilterservice_p.h
@@ -52,6 +52,7 @@
 //
 
 #include <Qt3DCore/qt3dcore_global.h>
+
 #include <Qt3DCore/private/qservicelocator_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/services/qopenglinformationservice_p.h b/src/core/services/qopenglinformationservice_p.h
index a2c37c29a..c84c5ed10 100644
--- a/src/core/services/qopenglinformationservice_p.h
+++ b/src/core/services/qopenglinformationservice_p.h
@@ -52,9 +52,10 @@
 //
 
 #include <Qt3DCore/qt3dcore_global.h>
-#include <Qt3DCore/private/qservicelocator_p.h>
-#include <QtGui/qsurfaceformat.h>
 #include <QtCore/qstring.h>
+#include <QtGui/qsurfaceformat.h>
+
+#include <Qt3DCore/private/qservicelocator_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/services/qopenglinformationservice_p_p.h b/src/core/services/qopenglinformationservice_p_p.h
index 4abef6f18..d10d81d71 100644
--- a/src/core/services/qopenglinformationservice_p_p.h
+++ b/src/core/services/qopenglinformationservice_p_p.h
@@ -52,6 +52,7 @@
 //
 
 #include <Qt3DCore/qt3dcore_global.h>
+
 #include <Qt3DCore/private/qabstractserviceprovider_p.h>
 #include <Qt3DCore/private/qservicelocator_p.h>
 
diff --git a/src/core/services/qservicelocator.cpp b/src/core/services/qservicelocator.cpp
index 3d3d56386..bc5c9f5bb 100644
--- a/src/core/services/qservicelocator.cpp
+++ b/src/core/services/qservicelocator.cpp
@@ -38,11 +38,13 @@
 ****************************************************************************/
 
 #include "qservicelocator_p.h"
-#include "qabstractserviceprovider_p.h"
-#include "nullservices_p.h"
-#include "qtickclockservice_p.h"
-#include "qeventfilterservice_p.h"
-#include <QHash>
+
+#include <QtCore/QHash>
+
+#include <Qt3DCore/private/nullservices_p.h>
+#include <Qt3DCore/private/qabstractserviceprovider_p.h>
+#include <Qt3DCore/private/qeventfilterservice_p.h>
+#include <Qt3DCore/private/qtickclockservice_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/services/qservicelocator_p.h b/src/core/services/qservicelocator_p.h
index c68b56ffd..fff5a2732 100644
--- a/src/core/services/qservicelocator_p.h
+++ b/src/core/services/qservicelocator_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <Qt3DCore/qt3dcore_global.h>
-#include <QScopedPointer>
+#include <QtCore/QScopedPointer>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/services/qsysteminformationservice_p.h b/src/core/services/qsysteminformationservice_p.h
index dc384fb93..0ab737817 100644
--- a/src/core/services/qsysteminformationservice_p.h
+++ b/src/core/services/qsysteminformationservice_p.h
@@ -52,9 +52,10 @@
 //
 
 #include <Qt3DCore/qt3dcore_global.h>
-#include <Qt3DCore/private/qservicelocator_p.h>
 #include <QtCore/qstringlist.h>
 
+#include <Qt3DCore/private/qservicelocator_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
diff --git a/src/core/services/qsysteminformationservice_p_p.h b/src/core/services/qsysteminformationservice_p_p.h
index 897caf62b..e3ce9fe49 100644
--- a/src/core/services/qsysteminformationservice_p_p.h
+++ b/src/core/services/qsysteminformationservice_p_p.h
@@ -52,6 +52,7 @@
 //
 
 #include <Qt3DCore/qt3dcore_global.h>
+
 #include <Qt3DCore/private/qabstractserviceprovider_p.h>
 #include <Qt3DCore/private/qservicelocator_p.h>
 
diff --git a/src/core/services/qtickclockservice.cpp b/src/core/services/qtickclockservice.cpp
index 3691959ed..225e70ec2 100644
--- a/src/core/services/qtickclockservice.cpp
+++ b/src/core/services/qtickclockservice.cpp
@@ -38,9 +38,10 @@
 ****************************************************************************/
 
 #include "qtickclockservice_p.h"
-#include "qtickclock_p.h"
-#include "qabstractframeadvanceservice_p.h"
-#include "qabstractframeadvanceservice_p_p.h"
+
+#include <Qt3DCore/private/qabstractframeadvanceservice_p.h>
+#include <Qt3DCore/private/qabstractframeadvanceservice_p_p.h>
+#include <Qt3DCore/private/qtickclock_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/services/qtickclockservice_p.h b/src/core/services/qtickclockservice_p.h
index b84018d0b..53f3cf310 100644
--- a/src/core/services/qtickclockservice_p.h
+++ b/src/core/services/qtickclockservice_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include "qabstractframeadvanceservice_p.h"
+#include <Qt3DCore/private/qabstractframeadvanceservice_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/transforms/qmath3d_p.h b/src/core/transforms/qmath3d_p.h
index 38ebbd99a..8c2afac31 100644
--- a/src/core/transforms/qmath3d_p.h
+++ b/src/core/transforms/qmath3d_p.h
@@ -50,7 +50,6 @@
 //
 // We mean it.
 //
-
 #include <QtGui/qmatrix4x4.h>
 #include <QtGui/qquaternion.h>
 #include <QtGui/qvector3d.h>
diff --git a/src/core/transforms/qtransform.cpp b/src/core/transforms/qtransform.cpp
index d28138cad..a551d83d8 100644
--- a/src/core/transforms/qtransform.cpp
+++ b/src/core/transforms/qtransform.cpp
@@ -39,10 +39,11 @@
 
 #include "qtransform.h"
 #include "qtransform_p.h"
-#include "qmath3d_p.h"
 
 #include <Qt3DCore/qpropertyupdatedchange.h>
 
+#include <Qt3DCore/private/qmath3d_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
diff --git a/src/core/transforms/qtransform.h b/src/core/transforms/qtransform.h
index 25b1da8cd..cb2b1bdce 100644
--- a/src/core/transforms/qtransform.h
+++ b/src/core/transforms/qtransform.h
@@ -41,7 +41,6 @@
 #define QT3DCORE_QTRANSFORM_H
 
 #include <Qt3DCore/qcomponent.h>
-
 #include <QtGui/qmatrix4x4.h>
 #include <QtGui/qquaternion.h>
 #include <QtGui/qvector3d.h>
diff --git a/src/core/transforms/qtransform_p.h b/src/core/transforms/qtransform_p.h
index 8d1a60566..89bc55491 100644
--- a/src/core/transforms/qtransform_p.h
+++ b/src/core/transforms/qtransform_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <private/qcomponent_p.h>
+#include <Qt3DCore/private/qcomponent_p.h>
 
 QT_BEGIN_NAMESPACE