diff --git a/src/Gui/GuiApplicationNativeEventAware.cpp b/src/Gui/GuiApplicationNativeEventAware.cpp
index 87ecee72a2..491da710eb 100644
--- a/src/Gui/GuiApplicationNativeEventAware.cpp
+++ b/src/Gui/GuiApplicationNativeEventAware.cpp
@@ -25,7 +25,26 @@
 #include <QGlobalStatic>
 #if defined(Q_OS_LINUX) && defined(SPNAV_FOUND)
   #include <QX11Info>
-  #include <xcb/xcb.h>
+  #include <spnav.h>
+
+  #if QT_VERSION >= 0x050000
+    #include <X11/Xlib.h>
+    #undef Bool
+    #undef CursorShape
+    #undef Expose
+    #undef KeyPress
+    #undef KeyRelease
+    #undef FocusIn
+    #undef FocusOut
+    #undef FontChange
+    #undef None
+    #undef Status
+    #undef Unsorted
+    #undef False
+    #undef True
+    #undef Complex
+  #endif // #if QT_VERSION >= 0x050000
+
 #endif // if defined(Q_OS_LINUX) && defined(SPNAV_FOUND)
 #include <QMainWindow>
 #include <QWidget>
@@ -35,10 +54,6 @@
 #include "SpaceballEvent.h"
 #include "Application.h"
 
-#if defined(Q_OS_LINUX) && defined(SPNAV_FOUND)
-  #include <spnav.h>
-#endif // if defined(Q_OS_LINUX) && defined(SPNAV_FOUND)
-
 #ifdef _USE_3DCONNEXION_SDK
 //windows
 #ifdef Q_OS_WIN
diff --git a/src/Gui/GuiApplicationNativeEventAware.h b/src/Gui/GuiApplicationNativeEventAware.h
index 8c7def7059..3d5f845e30 100644
--- a/src/Gui/GuiApplicationNativeEventAware.h
+++ b/src/Gui/GuiApplicationNativeEventAware.h
@@ -32,22 +32,8 @@
 
 class QMainWindow;
 
-#if defined(Q_OS_LINUX)
-  #include <X11/Xlib.h>
-  #undef Bool
-  #undef CursorShape
-  #undef Expose
-  #undef KeyPress
-  #undef KeyRelease
-  #undef FocusIn
-  #undef FocusOut
-  #undef FontChange
-  #undef None
-  #undef Status
-  #undef Unsorted
-  #undef False
-  #undef True
-  #undef Complex
+#if defined(Q_OS_LINUX) && QT_VERSION >= 0x050000
+  #include <xcb/xcb.h>
   #include <xcb/xproto.h>
 
 #elif defined(Q_OS_WIN) && defined(_USE_3DCONNEXION_SDK)