Coding convention fix for Src/Extras

Reordering the header includes to comply with Qt coding conventions

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

46 files changed, 115 insertions, 80 deletions

diff --git a/src/extras/defaults/qdiffusemapmaterial.cpp b/src/extras/defaults/qdiffusemapmaterial.cpp
index b3aa3bf00..a6da98a2e 100644
--- a/src/extras/defaults/qdiffusemapmaterial.cpp
+++ b/src/extras/defaults/qdiffusemapmaterial.cpp
@@ -39,6 +39,7 @@
 
 #include "qdiffusemapmaterial.h"
 #include "qdiffusemapmaterial_p.h"
+
 #include <Qt3DRender/qfilterkey.h>
 #include <Qt3DRender/qmaterial.h>
 #include <Qt3DRender/qeffect.h>
@@ -48,9 +49,9 @@
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DRender/qrenderpass.h>
 #include <Qt3DRender/qgraphicsapifilter.h>
-#include <QUrl>
-#include <QVector3D>
-#include <QVector4D>
+#include <QtCore/QUrl>
+#include <QtGui/QVector3D>
+#include <QtGui/QVector4D>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qdiffusemapmaterial.h b/src/extras/defaults/qdiffusemapmaterial.h
index b6bba9b36..e6c632ed2 100644
--- a/src/extras/defaults/qdiffusemapmaterial.h
+++ b/src/extras/defaults/qdiffusemapmaterial.h
@@ -42,7 +42,7 @@
 
 #include <Qt3DExtras/qt3dextras_global.h>
 #include <Qt3DRender/qmaterial.h>
-#include <QColor>
+#include <QtGui/QColor>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qdiffusespecularmapmaterial.cpp b/src/extras/defaults/qdiffusespecularmapmaterial.cpp
index 4b79eea2b..615ee6305 100644
--- a/src/extras/defaults/qdiffusespecularmapmaterial.cpp
+++ b/src/extras/defaults/qdiffusespecularmapmaterial.cpp
@@ -39,6 +39,7 @@
 
 #include "qdiffusespecularmapmaterial.h"
 #include "qdiffusespecularmapmaterial_p.h"
+
 #include <Qt3DRender/qfilterkey.h>
 #include <Qt3DRender/qmaterial.h>
 #include <Qt3DRender/qeffect.h>
@@ -48,9 +49,9 @@
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DRender/qrenderpass.h>
 #include <Qt3DRender/qgraphicsapifilter.h>
-#include <QUrl>
-#include <QVector3D>
-#include <QVector4D>
+#include <QtCore/QUrl>
+#include <QtGui/QVector3D>
+#include <QtGui/QVector4D>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qdiffusespecularmapmaterial.h b/src/extras/defaults/qdiffusespecularmapmaterial.h
index d5dd053bd..d86948673 100644
--- a/src/extras/defaults/qdiffusespecularmapmaterial.h
+++ b/src/extras/defaults/qdiffusespecularmapmaterial.h
@@ -42,7 +42,7 @@
 
 #include <Qt3DExtras/qt3dextras_global.h>
 #include <Qt3DRender/qmaterial.h>
-#include <QColor>
+#include <QtGui/QColor>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qfirstpersoncameracontroller.cpp b/src/extras/defaults/qfirstpersoncameracontroller.cpp
index e31448eb8..9f44c283e 100644
--- a/src/extras/defaults/qfirstpersoncameracontroller.cpp
+++ b/src/extras/defaults/qfirstpersoncameracontroller.cpp
@@ -48,19 +48,20 @@
 **
 ****************************************************************************/
 
-#include "qfirstpersoncameracontroller_p.h"
 #include "qfirstpersoncameracontroller.h"
-#include <Qt3DRender/QCamera>
-#include <Qt3DInput/QAxis>
-#include <Qt3DInput/QAnalogAxisInput>
-#include <Qt3DInput/QButtonAxisInput>
+#include "qfirstpersoncameracontroller_p.h"
+
 #include <Qt3DInput/QAction>
 #include <Qt3DInput/QActionInput>
-#include <Qt3DInput/QLogicalDevice>
+#include <Qt3DInput/QAnalogAxisInput>
+#include <Qt3DInput/QAxis>
+#include <Qt3DInput/QButtonAxisInput>
+#include <Qt3DLogic/QFrameAction>
 #include <Qt3DInput/QKeyboardDevice>
+#include <Qt3DInput/QLogicalDevice>
 #include <Qt3DInput/QMouseDevice>
 #include <Qt3DInput/QMouseEvent>
-#include <Qt3DLogic/QFrameAction>
+#include <Qt3DRender/QCamera>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qfirstpersoncameracontroller_p.h b/src/extras/defaults/qfirstpersoncameracontroller_p.h
index 9ea830f85..ed07d5e18 100644
--- a/src/extras/defaults/qfirstpersoncameracontroller_p.h
+++ b/src/extras/defaults/qfirstpersoncameracontroller_p.h
@@ -51,9 +51,11 @@
 #ifndef QT3DEXTRAS_QFIRSTPERSONCAMERACONTROLLER_P_H
 #define QT3DEXTRAS_QFIRSTPERSONCAMERACONTROLLER_P_H
 
+#include <Qt3DExtras/qfirstpersoncameracontroller.h>
+#include <QtGui/QVector3D>
+
 #include <Qt3DCore/private/qentity_p.h>
-#include <QVector3D>
-#include "qfirstpersoncameracontroller.h"
+
 
 //
 //  W A R N I N G
diff --git a/src/extras/defaults/qforwardrenderer.h b/src/extras/defaults/qforwardrenderer.h
index 01f50f452..aedb548d2 100644
--- a/src/extras/defaults/qforwardrenderer.h
+++ b/src/extras/defaults/qforwardrenderer.h
@@ -42,8 +42,9 @@
 
 #include <Qt3DExtras/qt3dextras_global.h>
 #include <Qt3DRender/qtechniquefilter.h>
-#include <QRectF>
-#include <QColor>
+#include <QtCore/QRectF>
+#include <QtGui/QColor>
+
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qgoochmaterial.cpp b/src/extras/defaults/qgoochmaterial.cpp
index f2f34fc84..ba7ef8dab 100644
--- a/src/extras/defaults/qgoochmaterial.cpp
+++ b/src/extras/defaults/qgoochmaterial.cpp
@@ -39,13 +39,13 @@
 
 #include "qgoochmaterial.h"
 #include "qgoochmaterial_p.h"
+
 #include <Qt3DRender/qfilterkey.h>
 #include <Qt3DRender/qeffect.h>
 #include <Qt3DRender/qgraphicsapifilter.h>
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DRender/qrenderpass.h>
 #include <Qt3DRender/qtechnique.h>
-
 #include <QtCore/qurl.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/extras/defaults/qgoochmaterial.h b/src/extras/defaults/qgoochmaterial.h
index 232257513..6afddfe8b 100644
--- a/src/extras/defaults/qgoochmaterial.h
+++ b/src/extras/defaults/qgoochmaterial.h
@@ -42,7 +42,7 @@
 
 #include <Qt3DExtras/qt3dextras_global.h>
 #include <Qt3DRender/qmaterial.h>
-#include <QColor>
+#include <QtGui/QColor>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qnormaldiffusemapalphamaterial.cpp b/src/extras/defaults/qnormaldiffusemapalphamaterial.cpp
index 92564ee3f..eb6398341 100644
--- a/src/extras/defaults/qnormaldiffusemapalphamaterial.cpp
+++ b/src/extras/defaults/qnormaldiffusemapalphamaterial.cpp
@@ -49,10 +49,9 @@
 #include <Qt3DRender/qgraphicsapifilter.h>
 #include <Qt3DRender/qalphacoverage.h>
 #include <Qt3DRender/qdepthtest.h>
-
-#include <QUrl>
-#include <QVector3D>
-#include <QVector4D>
+#include <QtCore/QUrl>
+#include <QtGui/QVector3D>
+#include <QtGui/QVector4D>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qnormaldiffusemapalphamaterial_p.h b/src/extras/defaults/qnormaldiffusemapalphamaterial_p.h
index 91b0961f1..5994d87eb 100644
--- a/src/extras/defaults/qnormaldiffusemapalphamaterial_p.h
+++ b/src/extras/defaults/qnormaldiffusemapalphamaterial_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <qnormaldiffusemapmaterial_p.h>
+#include <Qt3DExtras/private/qnormaldiffusemapmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qnormaldiffusemapmaterial.cpp b/src/extras/defaults/qnormaldiffusemapmaterial.cpp
index 8373c4d5d..35cea095a 100644
--- a/src/extras/defaults/qnormaldiffusemapmaterial.cpp
+++ b/src/extras/defaults/qnormaldiffusemapmaterial.cpp
@@ -39,6 +39,7 @@
 
 #include "qnormaldiffusemapmaterial.h"
 #include "qnormaldiffusemapmaterial_p.h"
+
 #include <Qt3DRender/qfilterkey.h>
 #include <Qt3DRender/qeffect.h>
 #include <Qt3DRender/qtexture.h>
@@ -47,10 +48,9 @@
 #include <Qt3DRender/qshaderprogram.h>
 #include <Qt3DRender/qrenderpass.h>
 #include <Qt3DRender/qgraphicsapifilter.h>
-
-#include <QUrl>
-#include <QVector3D>
-#include <QVector4D>
+#include <QtCore/QUrl>
+#include <QtGui/QVector3D>
+#include <QtGui/QVector4D>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qnormaldiffusemapmaterial.h b/src/extras/defaults/qnormaldiffusemapmaterial.h
index f60a27b86..c38d53352 100644
--- a/src/extras/defaults/qnormaldiffusemapmaterial.h
+++ b/src/extras/defaults/qnormaldiffusemapmaterial.h
@@ -42,7 +42,7 @@
 
 #include <Qt3DExtras/qt3dextras_global.h>
 #include <Qt3DRender/qmaterial.h>
-#include <QColor>
+#include <QtGui/QColor>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qnormaldiffusemapmaterial_p.h b/src/extras/defaults/qnormaldiffusemapmaterial_p.h
index 8dff59218..d88b01f1f 100644
--- a/src/extras/defaults/qnormaldiffusemapmaterial_p.h
+++ b/src/extras/defaults/qnormaldiffusemapmaterial_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <Qt3DRender/private/qmaterial_p.h>
+#include <private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp
index e4a83c50c..c6f8ced9c 100644
--- a/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp
+++ b/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp
@@ -39,6 +39,7 @@
 
 #include "qnormaldiffusespecularmapmaterial.h"
 #include "qnormaldiffusespecularmapmaterial_p.h"
+
 #include <Qt3DRender/qfilterkey.h>
 #include <Qt3DRender/qmaterial.h>
 #include <Qt3DRender/qeffect.h>
@@ -48,9 +49,9 @@
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DRender/qrenderpass.h>
 #include <Qt3DRender/qgraphicsapifilter.h>
-#include <QUrl>
-#include <QVector3D>
-#include <QVector4D>
+#include <QtCore/QUrl>
+#include <QtGui/QVector3D>
+#include <QtGui/QVector4D>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qnormaldiffusespecularmapmaterial.h b/src/extras/defaults/qnormaldiffusespecularmapmaterial.h
index 586715971..164b07710 100644
--- a/src/extras/defaults/qnormaldiffusespecularmapmaterial.h
+++ b/src/extras/defaults/qnormaldiffusespecularmapmaterial.h
@@ -42,7 +42,7 @@
 
 #include <Qt3DExtras/qt3dextras_global.h>
 #include <Qt3DRender/qmaterial.h>
-#include <QColor>
+#include <QtGui/QColor>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qorbitcameracontroller.cpp b/src/extras/defaults/qorbitcameracontroller.cpp
index 95b0e19dc..8763233c8 100644
--- a/src/extras/defaults/qorbitcameracontroller.cpp
+++ b/src/extras/defaults/qorbitcameracontroller.cpp
@@ -34,9 +34,9 @@
 **
 ****************************************************************************/
 
-#include "qorbitcameracontroller_p.h"
 #include "qorbitcameracontroller.h"
-#include <QtGlobal>
+#include "qorbitcameracontroller_p.h"
+
 #include <Qt3DRender/QCamera>
 #include <Qt3DInput/QAxis>
 #include <Qt3DInput/QAnalogAxisInput>
@@ -48,6 +48,7 @@
 #include <Qt3DInput/QMouseDevice>
 #include <Qt3DInput/QMouseEvent>
 #include <Qt3DLogic/QFrameAction>
+#include <QtCore/QtGlobal>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qorbitcameracontroller.h b/src/extras/defaults/qorbitcameracontroller.h
index e48e39142..7cb8b3eb7 100644
--- a/src/extras/defaults/qorbitcameracontroller.h
+++ b/src/extras/defaults/qorbitcameracontroller.h
@@ -37,8 +37,8 @@
 #ifndef QT3DEXTRAS_QORBITCAMERACONTROLLER_H
 #define QT3DEXTRAS_QORBITCAMERACONTROLLER_H
 
-#include <Qt3DExtras/qt3dextras_global.h>
 #include <Qt3DCore/QEntity>
+#include <Qt3DExtras/qt3dextras_global.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qorbitcameracontroller_p.h b/src/extras/defaults/qorbitcameracontroller_p.h
index d207df712..942594fd0 100644
--- a/src/extras/defaults/qorbitcameracontroller_p.h
+++ b/src/extras/defaults/qorbitcameracontroller_p.h
@@ -48,9 +48,10 @@
 // We mean it.
 //
 
+#include <Qt3DExtras/qorbitcameracontroller.h>
+#include <QtGui/QVector3D>
+
 #include <Qt3DCore/private/qentity_p.h>
-#include <QVector3D>
-#include "qorbitcameracontroller.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qpervertexcolormaterial.cpp b/src/extras/defaults/qpervertexcolormaterial.cpp
index 514f994c1..5619a71e7 100644
--- a/src/extras/defaults/qpervertexcolormaterial.cpp
+++ b/src/extras/defaults/qpervertexcolormaterial.cpp
@@ -39,6 +39,7 @@
 
 #include "qpervertexcolormaterial.h"
 #include "qpervertexcolormaterial_p.h"
+
 #include <Qt3DRender/qfilterkey.h>
 #include <Qt3DRender/qmaterial.h>
 #include <Qt3DRender/qeffect.h>
@@ -47,9 +48,9 @@
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DRender/qrenderpass.h>
 #include <Qt3DRender/qgraphicsapifilter.h>
-#include <QUrl>
-#include <QVector3D>
-#include <QVector4D>
+#include <QtCore/QUrl>
+#include <QtGui/QVector3D>
+#include <QtGui/QVector4D>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qpervertexcolormaterial.h b/src/extras/defaults/qpervertexcolormaterial.h
index 485e2fe0e..8b64eb2d3 100644
--- a/src/extras/defaults/qpervertexcolormaterial.h
+++ b/src/extras/defaults/qpervertexcolormaterial.h
@@ -42,7 +42,7 @@
 
 #include <Qt3DExtras/qt3dextras_global.h>
 #include <Qt3DRender/qmaterial.h>
-#include <QColor>
+#include <QtGui/QColor>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qphongalphamaterial.cpp b/src/extras/defaults/qphongalphamaterial.cpp
index 7a05610c2..d7f054d71 100644
--- a/src/extras/defaults/qphongalphamaterial.cpp
+++ b/src/extras/defaults/qphongalphamaterial.cpp
@@ -39,6 +39,7 @@
 
 #include "qphongalphamaterial.h"
 #include "qphongalphamaterial_p.h"
+
 #include <Qt3DRender/qfilterkey.h>
 #include <Qt3DRender/qmaterial.h>
 #include <Qt3DRender/qeffect.h>
@@ -50,9 +51,9 @@
 #include <Qt3DRender/qblendequation.h>
 #include <Qt3DRender/qblendequationarguments.h>
 #include <Qt3DRender/qnodepthmask.h>
-#include <QUrl>
-#include <QVector3D>
-#include <QVector4D>
+#include <QtCore/QUrl>
+#include <QtGui/QVector3D>
+#include <QtGui/QVector4D>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qphongalphamaterial.h b/src/extras/defaults/qphongalphamaterial.h
index b67524ef7..667c5b283 100644
--- a/src/extras/defaults/qphongalphamaterial.h
+++ b/src/extras/defaults/qphongalphamaterial.h
@@ -41,10 +41,10 @@
 #define QT3DEXTRAS_QPHONGALPHAMATERIAL_H
 
 #include <Qt3DExtras/qt3dextras_global.h>
-#include <Qt3DRender/qmaterial.h>
-#include <Qt3DRender/qblendequationarguments.h>
 #include <Qt3DRender/qblendequation.h>
-#include <QColor>
+#include <Qt3DRender/qblendequationarguments.h>
+#include <Qt3DRender/qmaterial.h>
+#include <QtGui/QColor>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qphongmaterial.cpp b/src/extras/defaults/qphongmaterial.cpp
index c294984b6..449eb7351 100644
--- a/src/extras/defaults/qphongmaterial.cpp
+++ b/src/extras/defaults/qphongmaterial.cpp
@@ -39,6 +39,7 @@
 
 #include "qphongmaterial.h"
 #include "qphongmaterial_p.h"
+
 #include <Qt3DRender/qfilterkey.h>
 #include <Qt3DRender/qmaterial.h>
 #include <Qt3DRender/qeffect.h>
@@ -47,9 +48,10 @@
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DRender/qrenderpass.h>
 #include <Qt3DRender/qgraphicsapifilter.h>
-#include <QUrl>
-#include <QVector3D>
-#include <QVector4D>
+#include <QtCore/QUrl>
+#include <QtGui/QVector3D>
+#include <QtGui/QVector4D>
+
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qphongmaterial.h b/src/extras/defaults/qphongmaterial.h
index d4b8a0f0e..d78c8c2ff 100644
--- a/src/extras/defaults/qphongmaterial.h
+++ b/src/extras/defaults/qphongmaterial.h
@@ -42,7 +42,7 @@
 
 #include <Qt3DExtras/qt3dextras_global.h>
 #include <Qt3DRender/qmaterial.h>
-#include <QColor>
+#include <QtGui/QColor>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qskyboxentity_p.h b/src/extras/defaults/qskyboxentity_p.h
index effe97fce..bf7024f95 100644
--- a/src/extras/defaults/qskyboxentity_p.h
+++ b/src/extras/defaults/qskyboxentity_p.h
@@ -51,8 +51,9 @@
 // We mean it.
 //
 
+#include <QtGui/QVector3D>
+
 #include <Qt3DCore/private/qentity_p.h>
-#include <QVector3D>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/defaults/qt3dwindow.cpp b/src/extras/defaults/qt3dwindow.cpp
index 06ff14212..c876c21ea 100644
--- a/src/extras/defaults/qt3dwindow.cpp
+++ b/src/extras/defaults/qt3dwindow.cpp
@@ -50,17 +50,15 @@
 
 #include "qt3dwindow.h"
 
+#include <Qt3DCore/qaspectengine.h>
+#include <Qt3DCore/qentity.h>
 #include <Qt3DExtras/qforwardrenderer.h>
 #include <Qt3DRender/qrendersettings.h>
 #include <Qt3DRender/qrenderaspect.h>
 #include <Qt3DInput/qinputaspect.h>
 #include <Qt3DInput/qinputsettings.h>
 #include <Qt3DLogic/qlogicaspect.h>
-
-#include <Qt3DCore/qaspectengine.h>
 #include <Qt3DRender/qcamera.h>
-#include <Qt3DCore/qentity.h>
-
 #include <QtGui/qopenglcontext.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/extras/defaults/qt3dwindow.h b/src/extras/defaults/qt3dwindow.h
index 109e1be75..0e28b1c82 100644
--- a/src/extras/defaults/qt3dwindow.h
+++ b/src/extras/defaults/qt3dwindow.h
@@ -51,8 +51,8 @@
 #ifndef QT3DWINDOW_H
 #define QT3DWINDOW_H
 
-#include <QWindow>
 #include <Qt3DExtras/qt3dextras_global.h>
+#include <QtGui/QWindow>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/geometries/qconegeometry.cpp b/src/extras/geometries/qconegeometry.cpp
index a86d10f6b..12bbf7ce3 100644
--- a/src/extras/geometries/qconegeometry.cpp
+++ b/src/extras/geometries/qconegeometry.cpp
@@ -57,10 +57,12 @@
 
 #include "qconegeometry.h"
 #include "qconegeometry_p.h"
+
 #include <Qt3DRender/qbuffer.h>
 #include <Qt3DRender/qbufferdatagenerator.h>
 #include <Qt3DRender/qattribute.h>
-#include <QVector3D>
+#include <QtGui/QVector3D>
+
 #include <cmath>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/extras/geometries/qconemesh.cpp b/src/extras/geometries/qconemesh.cpp
index 8baa19217..5e327df03 100644
--- a/src/extras/geometries/qconemesh.cpp
+++ b/src/extras/geometries/qconemesh.cpp
@@ -41,13 +41,15 @@
 # define _USE_MATH_DEFINES // For MSVC
 #endif
 
-#include "qconemesh.h"
 #include "qconegeometry.h"
+
+#include <Qt3DExtras/qconemesh.h>
 #include <Qt3DRender/qbuffer.h>
 #include <Qt3DRender/qbufferdatagenerator.h>
 #include <Qt3DRender/qattribute.h>
+#include <QtGui/QVector3D>
+
 #include <qmath.h>
-#include <QVector3D>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/geometries/qcuboidgeometry.cpp b/src/extras/geometries/qcuboidgeometry.cpp
index 28743858a..3bb68a500 100644
--- a/src/extras/geometries/qcuboidgeometry.cpp
+++ b/src/extras/geometries/qcuboidgeometry.cpp
@@ -39,12 +39,15 @@
 
 #include "qcuboidgeometry.h"
 #include "qcuboidgeometry_p.h"
+
 #include <Qt3DRender/qattribute.h>
 #include <Qt3DRender/qbuffer.h>
 #include <Qt3DRender/qbufferdatagenerator.h>
 #include <Qt3DRender/private/renderlogging_p.h>
+
 #include <limits>
 
+
 QT_BEGIN_NAMESPACE
 
 using namespace Qt3DRender;
diff --git a/src/extras/geometries/qcuboidgeometry.h b/src/extras/geometries/qcuboidgeometry.h
index fad5dcf9f..2c295d6c4 100644
--- a/src/extras/geometries/qcuboidgeometry.h
+++ b/src/extras/geometries/qcuboidgeometry.h
@@ -42,7 +42,7 @@
 
 #include <Qt3DExtras/qt3dextras_global.h>
 #include <Qt3DRender/qgeometry.h>
-#include <QSize>
+#include <QtCore/QSize>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/geometries/qcuboidgeometry_p.h b/src/extras/geometries/qcuboidgeometry_p.h
index 212be19b4..cfabc0388 100644
--- a/src/extras/geometries/qcuboidgeometry_p.h
+++ b/src/extras/geometries/qcuboidgeometry_p.h
@@ -51,8 +51,9 @@
 // We mean it.
 //
 
+#include <QtCore/QSize>
+
 #include <Qt3DRender/private/qgeometry_p.h>
-#include <QSize>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/geometries/qcuboidmesh.cpp b/src/extras/geometries/qcuboidmesh.cpp
index 88c735746..9e10d93a4 100644
--- a/src/extras/geometries/qcuboidmesh.cpp
+++ b/src/extras/geometries/qcuboidmesh.cpp
@@ -38,7 +38,8 @@
 ****************************************************************************/
 
 #include "qcuboidmesh.h"
-#include "qcuboidgeometry.h"
+
+#include <Qt3DExtras/qcuboidgeometry.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/geometries/qcuboidmesh.h b/src/extras/geometries/qcuboidmesh.h
index f709703c5..ca33c5f2d 100644
--- a/src/extras/geometries/qcuboidmesh.h
+++ b/src/extras/geometries/qcuboidmesh.h
@@ -42,7 +42,7 @@
 
 #include <Qt3DExtras/qt3dextras_global.h>
 #include <Qt3DRender/qgeometryrenderer.h>
-#include <QSize>
+#include <QtCore/QSize>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/geometries/qcylindergeometry.cpp b/src/extras/geometries/qcylindergeometry.cpp
index 29f7ea7e0..4051477a6 100644
--- a/src/extras/geometries/qcylindergeometry.cpp
+++ b/src/extras/geometries/qcylindergeometry.cpp
@@ -43,11 +43,14 @@
 
 #include "qcylindergeometry.h"
 #include "qcylindergeometry_p.h"
+
 #include <Qt3DRender/qbuffer.h>
 #include <Qt3DRender/qbufferdatagenerator.h>
 #include <Qt3DRender/qattribute.h>
+#include <QtGui/QVector3D>
+
 #include <qmath.h>
-#include <QVector3D>
+
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/geometries/qcylindermesh.cpp b/src/extras/geometries/qcylindermesh.cpp
index 9b0ded28b..02df6295f 100644
--- a/src/extras/geometries/qcylindermesh.cpp
+++ b/src/extras/geometries/qcylindermesh.cpp
@@ -43,12 +43,14 @@
 #endif
 
 #include "qcylindermesh.h"
-#include "qcylindergeometry.h"
+
+#include <Qt3DExtras/qcylindergeometry.h>
 #include <Qt3DRender/qbuffer.h>
 #include <Qt3DRender/qbufferdatagenerator.h>
 #include <Qt3DRender/qattribute.h>
+#include <QtGui/QVector3D>
+
 #include <qmath.h>
-#include <QVector3D>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/geometries/qplanegeometry.cpp b/src/extras/geometries/qplanegeometry.cpp
index 16b401d3d..f6eba9e61 100644
--- a/src/extras/geometries/qplanegeometry.cpp
+++ b/src/extras/geometries/qplanegeometry.cpp
@@ -39,9 +39,11 @@
 
 #include "qplanegeometry.h"
 #include "qplanegeometry_p.h"
+
 #include <Qt3DRender/qattribute.h>
 #include <Qt3DRender/qbuffer.h>
 #include <Qt3DRender/qbufferdatagenerator.h>
+
 #include <limits>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/extras/geometries/qplanegeometry.h b/src/extras/geometries/qplanegeometry.h
index 7ec5cba43..694e04e82 100644
--- a/src/extras/geometries/qplanegeometry.h
+++ b/src/extras/geometries/qplanegeometry.h
@@ -42,7 +42,7 @@
 
 #include <Qt3DExtras/qt3dextras_global.h>
 #include <Qt3DRender/qgeometry.h>
-#include <QSize>
+#include <QtCore/QSize>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/geometries/qplanegeometry_p.h b/src/extras/geometries/qplanegeometry_p.h
index d0a4e88e4..cfde6da1c 100644
--- a/src/extras/geometries/qplanegeometry_p.h
+++ b/src/extras/geometries/qplanegeometry_p.h
@@ -51,8 +51,9 @@
 // We mean it.
 //
 
+#include <QtCore/QSize>
+
 #include <Qt3DRender/private/qgeometry_p.h>
-#include <QSize>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/geometries/qplanemesh.cpp b/src/extras/geometries/qplanemesh.cpp
index 120aed6df..5991c5397 100644
--- a/src/extras/geometries/qplanemesh.cpp
+++ b/src/extras/geometries/qplanemesh.cpp
@@ -38,7 +38,8 @@
 ****************************************************************************/
 
 #include "qplanemesh.h"
-#include "qplanegeometry.h"
+
+#include <Qt3DExtras/qplanegeometry.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/geometries/qplanemesh.h b/src/extras/geometries/qplanemesh.h
index b1505db17..d68774ca0 100644
--- a/src/extras/geometries/qplanemesh.h
+++ b/src/extras/geometries/qplanemesh.h
@@ -42,7 +42,7 @@
 
 #include <Qt3DExtras/qt3dextras_global.h>
 #include <Qt3DRender/qgeometryrenderer.h>
-#include <QSize>
+#include <QtCore/QSize>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/geometries/qspheregeometry.cpp b/src/extras/geometries/qspheregeometry.cpp
index a79eb8074..eae12ef39 100644
--- a/src/extras/geometries/qspheregeometry.cpp
+++ b/src/extras/geometries/qspheregeometry.cpp
@@ -39,15 +39,17 @@
 
 #include "qspheregeometry.h"
 #include "qspheregeometry_p.h"
+
 #include <Qt3DRender/qbufferdatagenerator.h>
 #include <Qt3DRender/qbuffer.h>
 #include <Qt3DRender/qattribute.h>
 
+#include <qmath.h>
+
 #ifndef _USE_MATH_DEFINES
 # define _USE_MATH_DEFINES // For MSVC
 #endif
 
-#include <qmath.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/geometries/qspheremesh.cpp b/src/extras/geometries/qspheremesh.cpp
index 988a95990..22089d7ab 100644
--- a/src/extras/geometries/qspheremesh.cpp
+++ b/src/extras/geometries/qspheremesh.cpp
@@ -39,7 +39,8 @@
 ****************************************************************************/
 
 #include "qspheremesh.h"
-#include "qspheregeometry.h"
+
+#include <Qt3DExtras/qspheregeometry.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/geometries/qtorusgeometry.cpp b/src/extras/geometries/qtorusgeometry.cpp
index 08afce1b0..57c94ec95 100644
--- a/src/extras/geometries/qtorusgeometry.cpp
+++ b/src/extras/geometries/qtorusgeometry.cpp
@@ -39,12 +39,14 @@
 
 #include "qtorusgeometry.h"
 #include "qtorusgeometry_p.h"
+
 #include <Qt3DRender/qbuffer.h>
 #include <Qt3DRender/qbufferdatagenerator.h>
 #include <Qt3DRender/qattribute.h>
+#include <QtGui/QVector3D>
+#include <QtGui/QVector4D>
+
 #include <qmath.h>
-#include <QVector3D>
-#include <QVector4D>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/geometries/qtorusmesh.cpp b/src/extras/geometries/qtorusmesh.cpp
index 96fce9ec0..8e7c678db 100644
--- a/src/extras/geometries/qtorusmesh.cpp
+++ b/src/extras/geometries/qtorusmesh.cpp
@@ -43,7 +43,8 @@
 #endif
 
 #include "qtorusmesh.h"
-#include "qtorusgeometry.h"
+
+#include <Qt3DExtras/qtorusgeometry.h>
 
 QT_BEGIN_NAMESPACE