diff --git a/src/Gui/3Dconnexion/GuiNativeEventWin32.cpp b/src/Gui/3Dconnexion/GuiNativeEventWin32.cpp
index aaf44c337f..7046b79b0f 100644
--- a/src/Gui/3Dconnexion/GuiNativeEventWin32.cpp
+++ b/src/Gui/3Dconnexion/GuiNativeEventWin32.cpp
@@ -37,7 +37,7 @@ http://www.3dconnexion.com/forum/viewtopic.php?f=19&t=4968&sid=72c018bdcf0e6edc9
 
 #include "PreCompiled.h"
 
-#include "GuiNativeEventLinux.h"
+#include "GuiNativeEventWin32.h"
 
 #include <QGlobalStatic>
 #include <QMainWindow>
@@ -192,7 +192,7 @@ Gui::GuiNativeEvent::~GuiNativeEvent()
     }
 }
 
-void Gui::GuiNativeEvent::initSpaceball(QMainWindow *window)
+void Gui::GuiNativeEvent::initSpaceball(QMainWindow *mainWindow)
 {
     mainApp->setSpaceballPresent(Is3dmouseAttached());
 
@@ -299,7 +299,7 @@ void Gui::GuiNativeEvent::Move3d(HANDLE device, std::vector<float>& motionData)
     motionDataArray[4] = ceil(motionData[4]);
     motionDataArray[5] = ceil(motionData[5]);
 
-    mainApp->postMotionEvent(&motionDataArray[0]);
+    mainApp->postMotionEvent(motionDataArray);
 }
 
 /*!
diff --git a/src/Gui/3Dconnexion/GuiNativeEventWin32.h b/src/Gui/3Dconnexion/GuiNativeEventWin32.h
index 4eba6b8ed8..77bfb1b48a 100644
--- a/src/Gui/3Dconnexion/GuiNativeEventWin32.h
+++ b/src/Gui/3Dconnexion/GuiNativeEventWin32.h
@@ -32,32 +32,15 @@
 
 //#define _WIN32_WINNT 0x0501  //target at least windows XP
 #include <Windows.h>
-#include <QAbstractNativeEventFilter>
-
+#if QT_VERSION >= 0x050000
+#include "GuiRawInputEventFilter.h"
+#endif
 
 class QMainWindow;
 class GUIApplicationNativeEventAware;
 
 namespace Gui
 {
-#if QT_VERSION >= 0x050000
-    class RawInputEventFilter : public QAbstractNativeEventFilter
-    {
-    public:
-        typedef bool (*EventFilter)(void *message, long *result);
-        RawInputEventFilter(EventFilter filter) : eventFilter(filter) {
-        }
-        virtual ~RawInputEventFilter() {
-        }
-
-        virtual bool nativeEventFilter(const QByteArray & /*eventType*/, void *message, long *result) {
-            return eventFilter(message, result);
-        }
-
-    private:
-        EventFilter eventFilter;
-    };
-#endif // if QT_VERSION >= 0x050000
 	class GUIApplicationNativeEventAware;
 
 	class GuiNativeEvent : public QObject
diff --git a/src/Gui/3Dconnexion/GuiRawInputEventFilter.h b/src/Gui/3Dconnexion/GuiRawInputEventFilter.h
index cfc5a94a1e..3c218f6db2 100644
--- a/src/Gui/3Dconnexion/GuiRawInputEventFilter.h
+++ b/src/Gui/3Dconnexion/GuiRawInputEventFilter.h
@@ -23,6 +23,8 @@
 #ifndef GUIRAWNATIVEINPUTEVENTFILTER_H
 #define GUIRAWNATIVEINPUTEVENTFILTER_H
 
+#include <QAbstractNativeEventFilter>
+
 namespace Gui
 {
     class RawInputEventFilter : public QAbstractNativeEventFilter