Coding convention fix for Src/input

Reordering the header includes to comply with Qt coding conventions

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

51 files changed, 170 insertions, 114 deletions

diff --git a/src/input/backend/abstractaxisinput.cpp b/src/input/backend/abstractaxisinput.cpp
index 5cb209f25..aae165a7e 100644
--- a/src/input/backend/abstractaxisinput.cpp
+++ b/src/input/backend/abstractaxisinput.cpp
@@ -37,13 +37,15 @@
 **
 ****************************************************************************/
 
-#include "abstractaxisinput_p.h"
-#include <Qt3DInput/qabstractaxisinput.h>
+#include "qabstractaxisinput.h"
+#include "qabstractaxisinput_p.h"
+
 #include <Qt3DInput/qabstractphysicaldevice.h>
+#include <Qt3DCore/qpropertyupdatedchange.h>
+
+#include <Qt3DInput/private/abstractaxisinput_p.h>
 #include <Qt3DInput/private/inputhandler_p.h>
-#include <Qt3DInput/private/qabstractaxisinput_p.h>
 #include <Qt3DInput/private/qinputdeviceintegration_p.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/action.cpp b/src/input/backend/action.cpp
index b7fa8740e..601961dd9 100644
--- a/src/input/backend/action.cpp
+++ b/src/input/backend/action.cpp
@@ -38,13 +38,15 @@
 ****************************************************************************/
 
 #include "action_p.h"
+
 #include <Qt3DInput/qaction.h>
 #include <Qt3DInput/qabstractactioninput.h>
-#include <Qt3DInput/private/qaction_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qpropertynoderemovedchange.h>
 
+#include <Qt3DInput/private/qaction_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
diff --git a/src/input/backend/actioninput.cpp b/src/input/backend/actioninput.cpp
index b120c789e..46dc7f584 100644
--- a/src/input/backend/actioninput.cpp
+++ b/src/input/backend/actioninput.cpp
@@ -38,10 +38,12 @@
 ****************************************************************************/
 
 #include "actioninput_p.h"
+
 #include <Qt3DInput/qactioninput.h>
+#include <Qt3DCore/qpropertyupdatedchange.h>
+
 #include <Qt3DInput/private/qactioninput_p.h>
 #include <Qt3DInput/private/inputhandler_p.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DInput/private/utils_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/input/backend/actioninput_p.h b/src/input/backend/actioninput_p.h
index da99c985e..3059f66cf 100644
--- a/src/input/backend/actioninput_p.h
+++ b/src/input/backend/actioninput_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
-#include <Qt3DInput/private/abstractactioninput_p.h>
 #include <Qt3DCore/qnodeid.h>
 
+#include <Qt3DInput/private/abstractactioninput_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
diff --git a/src/input/backend/analogaxisinput.cpp b/src/input/backend/analogaxisinput.cpp
index 914604e33..4a801baec 100644
--- a/src/input/backend/analogaxisinput.cpp
+++ b/src/input/backend/analogaxisinput.cpp
@@ -38,11 +38,13 @@
 ****************************************************************************/
 
 #include "analogaxisinput_p.h"
+
 #include <Qt3DInput/qanalogaxisinput.h>
 #include <Qt3DInput/qabstractphysicaldevice.h>
+#include <Qt3DCore/qpropertyupdatedchange.h>
+
 #include <Qt3DInput/private/qabstractphysicaldevicebackendnode_p.h>
 #include <Qt3DInput/private/qanalogaxisinput_p.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DInput/private/utils_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/input/backend/assignkeyboardfocusjob.cpp b/src/input/backend/assignkeyboardfocusjob.cpp
index ae845beaf..216c914d4 100644
--- a/src/input/backend/assignkeyboardfocusjob.cpp
+++ b/src/input/backend/assignkeyboardfocusjob.cpp
@@ -38,11 +38,12 @@
 ****************************************************************************/
 
 #include "assignkeyboardfocusjob_p.h"
-#include "keyboarddevice_p.h"
-#include "keyboardhandler_p.h"
-#include "inputhandler_p.h"
-#include "inputmanagers_p.h"
-#include "job_common_p.h"
+
+#include <Qt3DInput/private/inputhandler_p.h>
+#include <Qt3DInput/private/inputmanagers_p.h>
+#include <Qt3DInput/private/job_common_p.h>
+#include <Qt3DInput/private/keyboarddevice_p.h>
+#include <Qt3DInput/private/keyboardhandler_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/axis.cpp b/src/input/backend/axis.cpp
index 4239749c1..6ba4e2b34 100644
--- a/src/input/backend/axis.cpp
+++ b/src/input/backend/axis.cpp
@@ -38,13 +38,15 @@
 ****************************************************************************/
 
 #include "axis_p.h"
+
 #include <Qt3DInput/qaxis.h>
 #include <Qt3DInput/qabstractaxisinput.h>
-#include <Qt3DInput/private/qaxis_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qpropertynoderemovedchange.h>
 
+#include <Qt3DInput/private/qaxis_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
diff --git a/src/input/backend/axisaccumulator.cpp b/src/input/backend/axisaccumulator.cpp
index 3b0423f47..edc282bec 100644
--- a/src/input/backend/axisaccumulator.cpp
+++ b/src/input/backend/axisaccumulator.cpp
@@ -38,10 +38,12 @@
 ****************************************************************************/
 
 #include "axisaccumulator_p.h"
-#include <Qt3DInput/private/qaxisaccumulator_p.h>
-#include <Qt3DInput/private/inputmanagers_p.h>
+
 #include <Qt3DCore/qpropertyupdatedchange.h>
 
+#include <Qt3DInput/private/inputmanagers_p.h>
+#include <Qt3DInput/private/qaxisaccumulator_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
diff --git a/src/input/backend/axisaccumulator_p.h b/src/input/backend/axisaccumulator_p.h
index 67eb3906a..7d6799eb0 100644
--- a/src/input/backend/axisaccumulator_p.h
+++ b/src/input/backend/axisaccumulator_p.h
@@ -51,11 +51,10 @@
 // We mean it.
 //
 
+#include <Qt3DInput/qaxisaccumulator.h>
 #include <Qt3DCore/qbackendnode.h>
 #include <Qt3DCore/qnodeid.h>
 
-#include <Qt3DInput/qaxisaccumulator.h>
-
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
diff --git a/src/input/backend/axisaccumulatorjob.cpp b/src/input/backend/axisaccumulatorjob.cpp
index 133f9713a..7ea2d063d 100644
--- a/src/input/backend/axisaccumulatorjob.cpp
+++ b/src/input/backend/axisaccumulatorjob.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "axisaccumulatorjob_p.h"
+
 #include <Qt3DInput/private/axisaccumulator_p.h>
 #include <Qt3DInput/private/job_common_p.h>
 #include <Qt3DInput/private/inputmanagers_p.h>
diff --git a/src/input/backend/axisaccumulatorjob_p.h b/src/input/backend/axisaccumulatorjob_p.h
index d8ced8a3a..4d38fd70f 100644
--- a/src/input/backend/axisaccumulatorjob_p.h
+++ b/src/input/backend/axisaccumulatorjob_p.h
@@ -51,9 +51,9 @@
 // We mean it.
 //
 
+#include <Qt3DInput/private/handle_types_p.h>
 #include <Qt3DCore/qaspectjob.h>
 #include <Qt3DCore/qnodeid.h>
-#include <Qt3DInput/private/handle_types_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/axissetting.cpp b/src/input/backend/axissetting.cpp
index 10892f861..b3c81f84d 100644
--- a/src/input/backend/axissetting.cpp
+++ b/src/input/backend/axissetting.cpp
@@ -38,10 +38,12 @@
 ****************************************************************************/
 
 #include "axissetting_p.h"
+
 #include <Qt3DInput/qaxissetting.h>
-#include <Qt3DInput/private/qaxissetting_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 
+#include <Qt3DInput/private/qaxissetting_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
diff --git a/src/input/backend/buttonaxisinput.cpp b/src/input/backend/buttonaxisinput.cpp
index 99fa99852..fef8f6d41 100644
--- a/src/input/backend/buttonaxisinput.cpp
+++ b/src/input/backend/buttonaxisinput.cpp
@@ -38,11 +38,13 @@
 ****************************************************************************/
 
 #include "buttonaxisinput_p.h"
+
 #include <Qt3DInput/qbuttonaxisinput.h>
 #include <Qt3DInput/qabstractphysicaldevice.h>
+#include <Qt3DCore/qpropertyupdatedchange.h>
+
 #include <Qt3DInput/private/qabstractphysicaldevicebackendnode_p.h>
 #include <Qt3DInput/private/qbuttonaxisinput_p.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DInput/private/utils_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/input/backend/eventsourcesetterhelper.cpp b/src/input/backend/eventsourcesetterhelper.cpp
index 4ae6cebae..5c11ada38 100644
--- a/src/input/backend/eventsourcesetterhelper.cpp
+++ b/src/input/backend/eventsourcesetterhelper.cpp
@@ -38,7 +38,8 @@
 ****************************************************************************/
 
 #include "eventsourcesetterhelper_p.h"
-#include "inputhandler_p.h"
+
+#include <Qt3DInput/private/inputhandler_p.h>
 #include <Qt3DCore/private/qeventfilterservice_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/input/backend/eventsourcesetterhelper_p.h b/src/input/backend/eventsourcesetterhelper_p.h
index 97776dc9b..48418f1b9 100644
--- a/src/input/backend/eventsourcesetterhelper_p.h
+++ b/src/input/backend/eventsourcesetterhelper_p.h
@@ -51,8 +51,8 @@
 // We mean it.
 //
 
-#include <QObject>
-#include <QMutex>
+#include <QtCore/QMutex>
+#include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/genericdevicebackendnode.cpp b/src/input/backend/genericdevicebackendnode.cpp
index 093acd966..40202b4a5 100644
--- a/src/input/backend/genericdevicebackendnode.cpp
+++ b/src/input/backend/genericdevicebackendnode.cpp
@@ -38,11 +38,12 @@
 ****************************************************************************/
 
 #include "genericdevicebackendnode_p.h"
-#include "inputhandler_p.h"
-#include "inputmanagers_p.h"
 
-#include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DInput/qabstractphysicaldevice.h>
+#include <Qt3DCore/qpropertyupdatedchange.h>
+
+#include <Qt3DInput/private/inputhandler_p.h>
+#include <Qt3DInput/private/inputmanagers_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/genericdevicebackendnode_p.h b/src/input/backend/genericdevicebackendnode_p.h
index 8c0ffcfde..16aaf3e5b 100644
--- a/src/input/backend/genericdevicebackendnode_p.h
+++ b/src/input/backend/genericdevicebackendnode_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
+#include <QtCore/QHash>
+#include <QtCore/QMutex>
+
 #include <Qt3DInput/private/qabstractphysicaldevicebackendnode_p.h>
-#include <QHash>
-#include <QMutex>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/inputchord.cpp b/src/input/backend/inputchord.cpp
index ebcf79737..731fd91e3 100644
--- a/src/input/backend/inputchord.cpp
+++ b/src/input/backend/inputchord.cpp
@@ -38,13 +38,15 @@
 ****************************************************************************/
 
 #include "inputchord_p.h"
+
 #include <Qt3DInput/qinputchord.h>
-#include <Qt3DInput/private/qinputchord_p.h>
-#include <Qt3DInput/private/inputhandler_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qpropertynoderemovedchange.h>
 
+#include <Qt3DInput/private/qinputchord_p.h>
+#include <Qt3DInput/private/inputhandler_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
diff --git a/src/input/backend/inputchord_p.h b/src/input/backend/inputchord_p.h
index 7f51f5d96..95557a00d 100644
--- a/src/input/backend/inputchord_p.h
+++ b/src/input/backend/inputchord_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
-#include <Qt3DInput/private/abstractactioninput_p.h>
 #include <Qt3DCore/qnodeid.h>
 
+#include <Qt3DInput/private/abstractactioninput_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
diff --git a/src/input/backend/inputhandler.cpp b/src/input/backend/inputhandler.cpp
index aebf2c8f1..985d67470 100644
--- a/src/input/backend/inputhandler.cpp
+++ b/src/input/backend/inputhandler.cpp
@@ -38,16 +38,17 @@
 ****************************************************************************/
 
 #include "inputhandler_p.h"
-#include "inputmanagers_p.h"
-#include "keyboardeventfilter_p.h"
-#include "mouseeventfilter_p.h"
-#include "assignkeyboardfocusjob_p.h"
-#include "keyeventdispatcherjob_p.h"
-#include "mouseeventdispatcherjob_p.h"
-#include <Qt3DCore/private/qeventfilterservice_p.h>
-#include "inputsettings_p.h"
-#include "eventsourcesetterhelper_p.h"
+
+#include <Qt3DInput/private/assignkeyboardfocusjob_p.h>
+#include <Qt3DInput/private/eventsourcesetterhelper_p.h>
+#include <Qt3DInput/private/inputmanagers_p.h>
+#include <Qt3DInput/private/inputsettings_p.h>
+#include <Qt3DInput/private/keyboardeventfilter_p.h>
+#include <Qt3DInput/private/keyeventdispatcherjob_p.h>
+#include <Qt3DInput/private/mouseeventdispatcherjob_p.h>
+#include <Qt3DInput/private/mouseeventfilter_p.h>
 #include <Qt3DInput/private/qinputdeviceintegration_p.h>
+#include <Qt3DCore/private/qeventfilterservice_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/inputhandler_p.h b/src/input/backend/inputhandler_p.h
index eff0c0c24..e80441f1a 100644
--- a/src/input/backend/inputhandler_p.h
+++ b/src/input/backend/inputhandler_p.h
@@ -51,11 +51,12 @@
 // We mean it.
 //
 
+#include <Qt3DInput/QKeyEvent>
 #include <Qt3DInput/qt3dinput_global.h>
-#include <Qt3DInput/private/handle_types_p.h>
 #include <Qt3DCore/qaspectjob.h>
-#include <QKeyEvent>
-#include <QMutex>
+#include <QtCore/QMutex>
+
+#include <Qt3DInput/private/handle_types_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/inputmanagers_p.h b/src/input/backend/inputmanagers_p.h
index 473042867..a0cb127b1 100644
--- a/src/input/backend/inputmanagers_p.h
+++ b/src/input/backend/inputmanagers_p.h
@@ -51,13 +51,13 @@
 // We mean it.
 //
 
-#include <QtGlobal>
+#include <QtCore/QtGlobal>
+
 #include <Qt3DInput/private/handle_types_p.h>
 #include <Qt3DInput/private/keyboarddevice_p.h>
 #include <Qt3DInput/private/keyboardhandler_p.h>
 #include <Qt3DInput/private/mousehandler_p.h>
 #include <Qt3DInput/private/mousedevice_p.h>
-#include <Qt3DCore/private/qresourcemanager_p.h>
 #include <Qt3DInput/private/actioninput_p.h>
 #include <Qt3DInput/private/inputsequence_p.h>
 #include <Qt3DInput/private/inputchord_p.h>
@@ -70,6 +70,7 @@
 #include <Qt3DInput/private/logicaldevice_p.h>
 #include <Qt3DInput/private/genericdevicebackendnode_p.h>
 #include <Qt3DInput/private/physicaldeviceproxy_p.h>
+#include <Qt3DCore/private/qresourcemanager_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/inputsequence.cpp b/src/input/backend/inputsequence.cpp
index ee31cb1de..e45fae364 100644
--- a/src/input/backend/inputsequence.cpp
+++ b/src/input/backend/inputsequence.cpp
@@ -38,14 +38,16 @@
 ****************************************************************************/
 
 #include "inputsequence_p.h"
-#include <Qt3DInput/qinputsequence.h>
+
 #include <Qt3DInput/qabstractphysicaldevice.h>
-#include <Qt3DInput/private/qinputsequence_p.h>
-#include <Qt3DInput/private/inputhandler_p.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
+#include <Qt3DInput/qinputsequence.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qpropertynoderemovedchange.h>
-#include <QDateTime>
+#include <Qt3DCore/qpropertyupdatedchange.h>
+#include <QtCore/QDateTime>
+
+#include <Qt3DInput/private/inputhandler_p.h>
+#include <Qt3DInput/private/qinputsequence_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/inputsequence_p.h b/src/input/backend/inputsequence_p.h
index 28cb1c0e1..a9fa2dd2f 100644
--- a/src/input/backend/inputsequence_p.h
+++ b/src/input/backend/inputsequence_p.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
-#include <Qt3DInput/private/abstractactioninput_p.h>
 #include <Qt3DCore/qnodeid.h>
 
+#include <Qt3DInput/private/abstractactioninput_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
diff --git a/src/input/backend/inputsettings.cpp b/src/input/backend/inputsettings.cpp
index 587e4ce1a..b695ed600 100644
--- a/src/input/backend/inputsettings.cpp
+++ b/src/input/backend/inputsettings.cpp
@@ -38,10 +38,12 @@
 ****************************************************************************/
 
 #include "inputsettings_p.h"
+
 #include <Qt3DInput/qinputsettings.h>
+#include <Qt3DCore/qpropertyupdatedchange.h>
+
 #include <Qt3DInput/private/inputhandler_p.h>
 #include <Qt3DInput/private/qinputsettings_p.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/inputsettings_p.h b/src/input/backend/inputsettings_p.h
index 386716bc5..2fee6c946 100644
--- a/src/input/backend/inputsettings_p.h
+++ b/src/input/backend/inputsettings_p.h
@@ -51,8 +51,8 @@
 // We mean it.
 //
 
-#include <QPointer>
 #include <Qt3DCore/qbackendnode.h>
+#include <QtCore/QPointer>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/keyboarddevice.cpp b/src/input/backend/keyboarddevice.cpp
index 2566dacd2..33578bdad 100644
--- a/src/input/backend/keyboarddevice.cpp
+++ b/src/input/backend/keyboarddevice.cpp
@@ -38,11 +38,13 @@
 ****************************************************************************/
 
 #include "keyboarddevice_p.h"
-#include "inputhandler_p.h"
-#include "inputmanagers_p.h"
+
+#include <Qt3DInput/QKeyEvent>
 #include <Qt3DCore/qnode.h>
 
-#include <QKeyEvent>
+#include <Qt3DInput/private/inputhandler_p.h>
+#include <Qt3DInput/private/inputmanagers_p.h>
+
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/keyboarddevice_p.h b/src/input/backend/keyboarddevice_p.h
index 0ab7d22e8..611a06233 100644
--- a/src/input/backend/keyboarddevice_p.h
+++ b/src/input/backend/keyboarddevice_p.h
@@ -51,10 +51,11 @@
 // We mean it.
 //
 
-#include <Qt3DInput/private/qabstractphysicaldevicebackendnode_p.h>
+#include <Qt3DInput/QKeyEvent>
 #include <Qt3DCore/qnodeid.h>
+
 #include <Qt3DInput/private/handle_types_p.h>
-#include <QKeyEvent>
+#include <Qt3DInput/private/qabstractphysicaldevicebackendnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/keyboardeventfilter.cpp b/src/input/backend/keyboardeventfilter.cpp
index e94af9ade..bd3bac5a7 100644
--- a/src/input/backend/keyboardeventfilter.cpp
+++ b/src/input/backend/keyboardeventfilter.cpp
@@ -38,9 +38,11 @@
 ****************************************************************************/
 
 #include "keyboardeventfilter_p.h"
-#include "inputhandler_p.h"
-#include <QEvent>
-#include <QKeyEvent>
+
+#include <Qt3DInput/QKeyEvent>
+#include <QtCore/QEvent>
+
+#include <Qt3DInput/private/inputhandler_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/keyboardeventfilter_p.h b/src/input/backend/keyboardeventfilter_p.h
index a06b4cdd5..46b8071cd 100644
--- a/src/input/backend/keyboardeventfilter_p.h
+++ b/src/input/backend/keyboardeventfilter_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QObject>
+#include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/keyboardhandler.cpp b/src/input/backend/keyboardhandler.cpp
index b96334e50..ae1e6d03c 100644
--- a/src/input/backend/keyboardhandler.cpp
+++ b/src/input/backend/keyboardhandler.cpp
@@ -38,13 +38,15 @@
 ****************************************************************************/
 
 #include "keyboardhandler_p.h"
+
+#include <Qt3DInput/qkeyboarddevice.h>
 #include <Qt3DInput/qkeyboardhandler.h>
-#include <Qt3DInput/private/qkeyboardhandler_p.h>
-#include "qkeyboarddevice.h"
-#include "inputhandler_p.h"
-#include "inputmanagers_p.h"
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <QVariant>
+#include <QtCore/QVariant>
+
+#include <Qt3DInput/private/inputhandler_p.h>
+#include <Qt3DInput/private/inputmanagers_p.h>
+#include <Qt3DInput/private/qkeyboardhandler_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/keyboardhandler_p.h b/src/input/backend/keyboardhandler_p.h
index 6dd3a2c5e..e2aeab4f3 100644
--- a/src/input/backend/keyboardhandler_p.h
+++ b/src/input/backend/keyboardhandler_p.h
@@ -51,9 +51,9 @@
 // We mean it.
 //
 
+#include <Qt3DInput/qkeyevent.h>
 #include <Qt3DCore/qbackendnode.h>
 #include <Qt3DCore/qnodeid.h>
-#include <Qt3DInput/qkeyevent.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/keyboardmousegenericdeviceintegration.cpp b/src/input/backend/keyboardmousegenericdeviceintegration.cpp
index 31d0ea981..05430b0e8 100644
--- a/src/input/backend/keyboardmousegenericdeviceintegration.cpp
+++ b/src/input/backend/keyboardmousegenericdeviceintegration.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "keyboardmousegenericdeviceintegration_p.h"
+
 #include <Qt3DInput/private/inputhandler_p.h>
 #include <Qt3DInput/private/inputmanagers_p.h>
 
diff --git a/src/input/backend/keyeventdispatcherjob.cpp b/src/input/backend/keyeventdispatcherjob.cpp
index bbf703a56..ac90e9e37 100644
--- a/src/input/backend/keyeventdispatcherjob.cpp
+++ b/src/input/backend/keyeventdispatcherjob.cpp
@@ -38,10 +38,11 @@
 ****************************************************************************/
 
 #include "keyeventdispatcherjob_p.h"
-#include "inputhandler_p.h"
-#include "keyboardhandler_p.h"
-#include "inputmanagers_p.h"
-#include "job_common_p.h"
+
+#include <Qt3DInput/private/inputhandler_p.h>
+#include <Qt3DInput/private/inputmanagers_p.h>
+#include <Qt3DInput/private/job_common_p.h>
+#include <Qt3DInput/private/keyboardhandler_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/keyeventdispatcherjob_p.h b/src/input/backend/keyeventdispatcherjob_p.h
index b89d8ced2..1456f0878 100644
--- a/src/input/backend/keyeventdispatcherjob_p.h
+++ b/src/input/backend/keyeventdispatcherjob_p.h
@@ -51,9 +51,9 @@
 // We mean it.
 //
 
+#include <Qt3DInput/QKeyEvent>
 #include <Qt3DCore/qaspectjob.h>
 #include <Qt3DCore/qnodeid.h>
-#include <QKeyEvent>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/loadproxydevicejob.cpp b/src/input/backend/loadproxydevicejob.cpp
index 622d7ab83..2ea29b4a9 100644
--- a/src/input/backend/loadproxydevicejob.cpp
+++ b/src/input/backend/loadproxydevicejob.cpp
@@ -38,9 +38,10 @@
 ****************************************************************************/
 
 #include "loadproxydevicejob_p.h"
+
 #include <Qt3DInput/private/inputhandler_p.h>
 #include <Qt3DInput/private/inputmanagers_p.h>
-#include "job_common_p.h"
+#include <Qt3DInput/private/job_common_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/logicaldevice.cpp b/src/input/backend/logicaldevice.cpp
index fd4a637f2..5fcfb07bb 100644
--- a/src/input/backend/logicaldevice.cpp
+++ b/src/input/backend/logicaldevice.cpp
@@ -38,14 +38,16 @@
 ****************************************************************************/
 
 #include "logicaldevice_p.h"
-#include <Qt3DInput/qlogicaldevice.h>
-#include <Qt3DInput/qaxis.h>
+
 #include <Qt3DInput/qaction.h>
-#include <Qt3DInput/private/inputmanagers_p.h>
-#include <Qt3DInput/private/qlogicaldevice_p.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
+#include <Qt3DInput/qaxis.h>
+#include <Qt3DInput/qlogicaldevice.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qpropertynoderemovedchange.h>
+#include <Qt3DCore/qpropertyupdatedchange.h>
+
+#include <Qt3DInput/private/inputmanagers_p.h>
+#include <Qt3DInput/private/qlogicaldevice_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/mousedevice.cpp b/src/input/backend/mousedevice.cpp
index 918fdecb0..1d329252d 100644
--- a/src/input/backend/mousedevice.cpp
+++ b/src/input/backend/mousedevice.cpp
@@ -38,15 +38,16 @@
 ****************************************************************************/
 
 #include "mousedevice_p.h"
-#include "inputmanagers_p.h"
-#include "inputhandler_p.h"
-#include "qmousedevice.h"
-#include <Qt3DInput/private/qmousedevice_p.h>
 
-#include <Qt3DCore/qnode.h>
+#include <Qt3DInput/qmousedevice.h>
 #include <Qt3DCore/qentity.h>
+#include <Qt3DCore/qnode.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 
+#include <Qt3DInput/private/inputmanagers_p.h>
+#include <Qt3DInput/private/inputhandler_p.h>
+#include <Qt3DInput/private/qmousedevice_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
diff --git a/src/input/backend/mousedevice_p.h b/src/input/backend/mousedevice_p.h
index 8b85ee34a..0b95c6183 100644
--- a/src/input/backend/mousedevice_p.h
+++ b/src/input/backend/mousedevice_p.h
@@ -51,8 +51,9 @@
 // We mean it.
 //
 
+#include <Qt3DInput/QMouseEvent>
+
 #include <Qt3DInput/private/qabstractphysicaldevicebackendnode_p.h>
-#include <QMouseEvent>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/mouseeventdispatcherjob.cpp b/src/input/backend/mouseeventdispatcherjob.cpp
index 167560e39..77eb69712 100644
--- a/src/input/backend/mouseeventdispatcherjob.cpp
+++ b/src/input/backend/mouseeventdispatcherjob.cpp
@@ -38,10 +38,11 @@
 ****************************************************************************/
 
 #include "mouseeventdispatcherjob_p.h"
-#include "inputhandler_p.h"
-#include "mousehandler_p.h"
-#include "inputmanagers_p.h"
-#include "job_common_p.h"
+
+#include <Qt3DInput/private/inputhandler_p.h>
+#include <Qt3DInput/private/inputmanagers_p.h>
+#include <Qt3DInput/private/job_common_p.h>
+#include <Qt3DInput/private/mousehandler_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/mouseeventdispatcherjob_p.h b/src/input/backend/mouseeventdispatcherjob_p.h
index defe3c3a3..ebf1538e4 100644
--- a/src/input/backend/mouseeventdispatcherjob_p.h
+++ b/src/input/backend/mouseeventdispatcherjob_p.h
@@ -51,9 +51,9 @@
 // We mean it.
 //
 
+#include <Qt3DInput/QMouseEvent>
 #include <Qt3DCore/qaspectjob.h>
 #include <Qt3DCore/qnodeid.h>
-#include <QMouseEvent>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/mouseeventfilter.cpp b/src/input/backend/mouseeventfilter.cpp
index f12127c3b..bc2473a33 100644
--- a/src/input/backend/mouseeventfilter.cpp
+++ b/src/input/backend/mouseeventfilter.cpp
@@ -38,9 +38,11 @@
 ****************************************************************************/
 
 #include "mouseeventfilter_p.h"
-#include "inputhandler_p.h"
-#include <QEvent>
-#include <QKeyEvent>
+
+#include <Qt3DInput/QKeyEvent>
+#include <QtCore/QEvent>
+
+#include <Qt3DInput/private/inputhandler_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/mouseeventfilter_p.h b/src/input/backend/mouseeventfilter_p.h
index a733b3ad1..340524a61 100644
--- a/src/input/backend/mouseeventfilter_p.h
+++ b/src/input/backend/mouseeventfilter_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QObject>
+#include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/mousehandler.cpp b/src/input/backend/mousehandler.cpp
index b7b748843..a0619aaf2 100644
--- a/src/input/backend/mousehandler.cpp
+++ b/src/input/backend/mousehandler.cpp
@@ -38,15 +38,16 @@
 ****************************************************************************/
 
 #include "mousehandler_p.h"
-#include "inputmanagers_p.h"
-#include "inputhandler_p.h"
-#include "mousedevice_p.h"
 
 #include <Qt3DInput/qmousehandler.h>
-#include <Qt3DInput/private/qmousehandler_p.h>
 #include <Qt3DInput/qmousedevice.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 
+#include <Qt3DInput/private/inputmanagers_p.h>
+#include <Qt3DInput/private/inputhandler_p.h>
+#include <Qt3DInput/private/mousedevice_p.h>
+#include <Qt3DInput/private/qmousehandler_p.h>
+
 QT_BEGIN_NAMESPACE
 
 using namespace Qt3DCore;
diff --git a/src/input/backend/mousehandler_p.h b/src/input/backend/mousehandler_p.h
index b2ae4f9ed..867764017 100644
--- a/src/input/backend/mousehandler_p.h
+++ b/src/input/backend/mousehandler_p.h
@@ -51,8 +51,8 @@
 // We mean it.
 //
 
-#include <Qt3DCore/qbackendnode.h>
 #include <Qt3DInput/qmouseevent.h>
+#include <Qt3DCore/qbackendnode.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/physicaldeviceproxy.cpp b/src/input/backend/physicaldeviceproxy.cpp
index 2e46309fd..9512296b8 100644
--- a/src/input/backend/physicaldeviceproxy.cpp
+++ b/src/input/backend/physicaldeviceproxy.cpp
@@ -38,11 +38,13 @@
 ****************************************************************************/
 
 #include "physicaldeviceproxy_p.h"
-#include <Qt3DCore/qpropertyupdatedchange.h>
+
 #include <Qt3DInput/qabstractphysicaldevice.h>
-#include <Qt3DInput/private/qabstractphysicaldeviceproxy_p_p.h>
+#include <Qt3DCore/qpropertyupdatedchange.h>
+#include <QtCore/QCoreApplication>
+
 #include <Qt3DInput/private/inputmanagers_p.h>
-#include <QCoreApplication>
+#include <Qt3DInput/private/qabstractphysicaldeviceproxy_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/qabstractphysicaldevicebackendnode.cpp b/src/input/backend/qabstractphysicaldevicebackendnode.cpp
index 45f228e1a..5006d702a 100644
--- a/src/input/backend/qabstractphysicaldevicebackendnode.cpp
+++ b/src/input/backend/qabstractphysicaldevicebackendnode.cpp
@@ -39,22 +39,22 @@
 
 #include "qabstractphysicaldevicebackendnode_p.h"
 #include "qabstractphysicaldevicebackendnode_p_p.h"
-#include "qabstractphysicaldevice.h"
-#include "qaxissetting.h"
-#include "inputhandler_p.h"
-#include "inputmanagers_p.h"
 
+#include <Qt3DInput/qabstractphysicaldevice.h>
+#include <Qt3DInput/qaxissetting.h>
 #include <Qt3DInput/qinputaspect.h>
 #include <Qt3DInput/qphysicaldevicecreatedchange.h>
-#include <Qt3DInput/private/qinputaspect_p.h>
-
-#include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qpropertynoderemovedchange.h>
-#include <Qt3DCore/private/qabstractaspect_p.h>
+#include <Qt3DCore/qpropertyupdatedchange.h>
 
 #include <cmath>
 
+#include <Qt3DInput/private/inputhandler_p.h>
+#include <Qt3DInput/private/inputmanagers_p.h>
+#include <Qt3DInput/private/qinputaspect_p.h>
+#include <Qt3DCore/private/qabstractaspect_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace {
diff --git a/src/input/backend/qabstractphysicaldevicebackendnode_p.h b/src/input/backend/qabstractphysicaldevicebackendnode_p.h
index aa789fe27..272143c45 100644
--- a/src/input/backend/qabstractphysicaldevicebackendnode_p.h
+++ b/src/input/backend/qabstractphysicaldevicebackendnode_p.h
@@ -52,6 +52,7 @@
 //
 
 #include <Qt3DCore/qbackendnode.h>
+
 #include <Qt3DInput/private/qt3dinput_global_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/input/backend/qabstractphysicaldevicebackendnode_p_p.h b/src/input/backend/qabstractphysicaldevicebackendnode_p_p.h
index 8d9ee0617..d6928aced 100644
--- a/src/input/backend/qabstractphysicaldevicebackendnode_p_p.h
+++ b/src/input/backend/qabstractphysicaldevicebackendnode_p_p.h
@@ -51,11 +51,12 @@
 // We mean it.
 //
 
-#include <Qt3DCore/private/qbackendnode_p.h>
-#include <Qt3DCore/qnodeid.h>
 #include <QtCore/qvector.h>
-#include <Qt3DInput/private/qt3dinput_global_p.h>
+#include <Qt3DCore/qnodeid.h>
+
 #include <Qt3DInput/private/movingaverage_p.h>
+#include <Qt3DInput/private/qt3dinput_global_p.h>
+#include <Qt3DCore/private/qbackendnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/updateaxisactionjob.cpp b/src/input/backend/updateaxisactionjob.cpp
index 4e990ff0e..03690479a 100644
--- a/src/input/backend/updateaxisactionjob.cpp
+++ b/src/input/backend/updateaxisactionjob.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "updateaxisactionjob_p.h"
+
 #include <Qt3DInput/private/inputhandler_p.h>
 #include <Qt3DInput/private/inputmanagers_p.h>
 #include <Qt3DInput/private/job_common_p.h>
diff --git a/src/input/backend/updateaxisactionjob_p.h b/src/input/backend/updateaxisactionjob_p.h
index ea590a1b2..b65cbec87 100644
--- a/src/input/backend/updateaxisactionjob_p.h
+++ b/src/input/backend/updateaxisactionjob_p.h
@@ -53,6 +53,7 @@
 
 #include <Qt3DCore/qaspectjob.h>
 #include <Qt3DCore/qnodeid.h>
+
 #include <Qt3DInput/private/handle_types_p.h>
 
 QT_BEGIN_NAMESPACE