7 files changed, 6 insertions, 8 deletions
diff --git a/src/input/backend/assignkeyboardfocusjob_p.h b/src/input/backend/assignkeyboardfocusjob_p.h
index 200fd72f1..0789a8dbc 100644
--- a/src/input/backend/assignkeyboardfocusjob_p.h
+++ b/src/input/backend/assignkeyboardfocusjob_p.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <Qt3DInput/qkeyboarddevice.h>
 #include <Qt3DCore/qaspectjob.h>
 #include <Qt3DCore/qnodeid.h>
 
diff --git a/src/input/frontend/qactioninput.h b/src/input/frontend/qactioninput.h
index 7bc9a768d..86dfcb282 100644
--- a/src/input/frontend/qactioninput.h
+++ b/src/input/frontend/qactioninput.h
@@ -41,6 +41,7 @@
 #define QT3DINPUT_QACTIONINPUT_H
 
 #include <Qt3DInput/qabstractactioninput.h>
+#include <Qt3DInput/qabstractphysicaldevice.h>
 #include <Qt3DInput/qt3dinput_global.h>
 #include <Qt3DCore/qnode.h>
 
@@ -48,7 +49,6 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
 
-class QAbstractPhysicalDevice;
 class QActionInputPrivate;
 
 class Q_3DINPUTSHARED_EXPORT QActionInput : public Qt3DInput::QAbstractActionInput
diff --git a/src/input/frontend/qaxisaccumulator.h b/src/input/frontend/qaxisaccumulator.h
index 4f12f2a69..e767b426f 100644
--- a/src/input/frontend/qaxisaccumulator.h
+++ b/src/input/frontend/qaxisaccumulator.h
@@ -41,13 +41,13 @@
 #define QT3DINPUT_QAXISACCUMULATOR_H
 
 #include <Qt3DInput/qt3dinput_global.h>
+#include <Qt3DInput/qaxis.h>
 #include <Qt3DCore/qcomponent.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
 
-class QAxis;
 class QAxisAccumulatorPrivate;
 
 class Q_3DINPUTSHARED_EXPORT QAxisAccumulator : public Qt3DCore::QComponent
diff --git a/src/input/frontend/qkeyboarddevice.h b/src/input/frontend/qkeyboarddevice.h
index ee4b864f7..8b309f6a7 100644
--- a/src/input/frontend/qkeyboarddevice.h
+++ b/src/input/frontend/qkeyboarddevice.h
@@ -40,7 +40,7 @@
 #ifndef QT3DINPUT_INPUT_QKEYBOARDDEVICE_H
 #define QT3DINPUT_INPUT_QKEYBOARDDEVICE_H
 
-#include <Qt3DInput/QKeyboardHandler>
+#include <Qt3DInput/qkeyboardhandler.h>
 #include <Qt3DInput/qt3dinput_global.h>
 #include <Qt3DInput/qabstractphysicaldevice.h>
 
@@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DInput {
 
 class QKeyboardDevicePrivate;
-class QKeyboardHandler;
 
 class Q_3DINPUTSHARED_EXPORT QKeyboardDevice : public Qt3DInput::QAbstractPhysicalDevice
 {
diff --git a/src/input/frontend/qkeyboardhandler.h b/src/input/frontend/qkeyboardhandler.h
index 1ee9ef1af..6dac60c37 100644
--- a/src/input/frontend/qkeyboardhandler.h
+++ b/src/input/frontend/qkeyboardhandler.h
@@ -56,6 +56,7 @@ class Q_3DINPUTSHARED_EXPORT QKeyboardHandler : public Qt3DCore::QComponent
     Q_OBJECT
     Q_PROPERTY(Qt3DInput::QKeyboardDevice *sourceDevice READ sourceDevice WRITE setSourceDevice NOTIFY sourceDeviceChanged)
     Q_PROPERTY(bool focus READ focus WRITE setFocus NOTIFY focusChanged)
+    Q_MOC_INCLUDE("Qt3DInput/qkeyboarddevice.h")
 public:
     explicit QKeyboardHandler(QNode *parent = nullptr);
     ~QKeyboardHandler();
diff --git a/src/input/frontend/qmousedevice.h b/src/input/frontend/qmousedevice.h
index 66ad39e0f..3f8850d49 100644
--- a/src/input/frontend/qmousedevice.h
+++ b/src/input/frontend/qmousedevice.h
@@ -48,11 +48,8 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DInput {
 
 class QMouseDevicePrivate;
-class QMouseHandler;
-
 class QMouseInput;
 
-
 class Q_3DINPUTSHARED_EXPORT QMouseDevice : public Qt3DInput::QAbstractPhysicalDevice
 {
     Q_OBJECT
diff --git a/src/input/frontend/qmousehandler.h b/src/input/frontend/qmousehandler.h
index 307d30e9f..e895d8dd3 100644
--- a/src/input/frontend/qmousehandler.h
+++ b/src/input/frontend/qmousehandler.h
@@ -42,13 +42,13 @@
 
 #include <Qt3DInput/qt3dinput_global.h>
 #include <Qt3DInput/qmouseevent.h>
+#include <Qt3DInput/qmousedevice.h>
 #include <Qt3DCore/qcomponent.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
 
-class QMouseDevice;
 class QMouseHandlerPrivate;
 
 class Q_3DINPUTSHARED_EXPORT QMouseHandler : public Qt3DCore::QComponent