6 files changed, 12 insertions, 8 deletions
diff --git a/src/input/backend/inputhandler.cpp b/src/input/backend/inputhandler.cpp
index 7732ad98f..459d41fe2 100644
--- a/src/input/backend/inputhandler.cpp
+++ b/src/input/backend/inputhandler.cpp
@@ -17,11 +17,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
-
 namespace Qt3DInput {
 namespace Input {
 
+using namespace Qt3DCore;
+
 class InternalEventFilter : public QObject
 {
 public:
@@ -347,7 +347,6 @@ bool InternalEventFilter::processKeyEvent(QObject *obj, QT_PREPEND_NAMESPACE(QKe
     return false;
 }
 
-
 } // namespace Input
 } // namespace Qt3DInput
 
diff --git a/src/input/backend/keyboardhandler.cpp b/src/input/backend/keyboardhandler.cpp
index c503dded4..61d26a9fc 100644
--- a/src/input/backend/keyboardhandler.cpp
+++ b/src/input/backend/keyboardhandler.cpp
@@ -13,11 +13,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DInput {
 namespace Input {
 
+using namespace Qt3DCore;
+
 KeyboardHandler::KeyboardHandler()
     : BackendNode(QBackendNode::ReadWrite)
     , m_inputHandler(nullptr)
diff --git a/src/input/backend/mousehandler.cpp b/src/input/backend/mousehandler.cpp
index 1e19b191a..d425e712c 100644
--- a/src/input/backend/mousehandler.cpp
+++ b/src/input/backend/mousehandler.cpp
@@ -13,11 +13,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DInput {
 namespace Input {
 
+using namespace Qt3DCore;
+
 MouseHandler::MouseHandler()
     : BackendNode(ReadWrite)
     , m_inputHandler(nullptr)
diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp
index 4106b690a..4cbbe5fd2 100644
--- a/src/input/frontend/qinputaspect.cpp
+++ b/src/input/frontend/qinputaspect.cpp
@@ -63,10 +63,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DInput {
 
+using namespace Qt3DCore;
+
 QInputAspectPrivate::QInputAspectPrivate()
     : QAbstractAspectPrivate()
     , m_inputHandler(new Input::InputHandler())
diff --git a/src/input/frontend/qkeyboardhandler.cpp b/src/input/frontend/qkeyboardhandler.cpp
index 8a59e8086..ef3e58ede 100644
--- a/src/input/frontend/qkeyboardhandler.cpp
+++ b/src/input/frontend/qkeyboardhandler.cpp
@@ -8,10 +8,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DInput {
 
+using namespace Qt3DCore;
+
 namespace {
 
 
diff --git a/src/input/frontend/qmousehandler.cpp b/src/input/frontend/qmousehandler.cpp
index 31b3e609e..c2554dc4b 100644
--- a/src/input/frontend/qmousehandler.cpp
+++ b/src/input/frontend/qmousehandler.cpp
@@ -10,9 +10,10 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace Qt3DInput {
+
 using namespace Qt3DCore;
 
-namespace Qt3DInput {
 /*! \internal */
 QMouseHandlerPrivate::QMouseHandlerPrivate()
     : QComponentPrivate()