diff --git a/src/Gui/GestureNavigationStyle.cpp b/src/Gui/GestureNavigationStyle.cpp
index 3ac06ed05..5317e9445 100644
--- a/src/Gui/GestureNavigationStyle.cpp
+++ b/src/Gui/GestureNavigationStyle.cpp
@@ -50,7 +50,6 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <cfloat>
-# include "InventorAll.h"
 # include <QAction>
 # include <QActionGroup>
 # include <QApplication>
@@ -58,6 +57,7 @@
 # include <QCursor>
 # include <QList>
 # include <QMenu>
+# include <QMessageBox>
 # include <QMetaObject>
 # include <QRegExp>
 #endif
diff --git a/src/Gui/NavigationStyle.cpp b/src/Gui/NavigationStyle.cpp
index 16446ece6..fa9a6dc23 100644
--- a/src/Gui/NavigationStyle.cpp
+++ b/src/Gui/NavigationStyle.cpp
@@ -793,7 +793,10 @@ void NavigationStyle::doZoom(SoCamera* camera, SbBool forward, const SbVec2f& po
  */
 void NavigationStyle::doZoom(SoCamera* camera, float logfactor, const SbVec2f& pos)
 {
-    if (abs(logfactor)>4.0) return;//something is asking for big zoom factor. This func is made for interactive zooming, where the changes are per mouse move and thus are small.
+    // something is asking for big zoom factor. This func is made for interactive zooming,
+    // where the changes are per mouse move and thus are small.
+    if (abs(logfactor)>4.0)
+        return;
     SbBool zoomAtCur = this->zoomAtCursor;
     if (zoomAtCur) {
         const SbViewportRegion & vp = viewer->getSoRenderManager()->getViewportRegion();
diff --git a/src/Gui/SoTouchEvents.cpp b/src/Gui/SoTouchEvents.cpp
index 37a38b9c5..ec11101b4 100644
--- a/src/Gui/SoTouchEvents.cpp
+++ b/src/Gui/SoTouchEvents.cpp
@@ -26,6 +26,7 @@
 #include "SoTouchEvents.h"
 #include <QApplication>
 #include <QGestureEvent>
+#include <QWidget>
 #include <Base/Exception.h>
 
 SO_EVENT_SOURCE(SoGestureEvent);
diff --git a/src/Gui/SoTouchEvents.h b/src/Gui/SoTouchEvents.h
index 5422939d6..0046651f8 100644
--- a/src/Gui/SoTouchEvents.h
+++ b/src/Gui/SoTouchEvents.h
@@ -24,10 +24,14 @@
 #ifndef SOTOUCHEVENTS_H
 #define SOTOUCHEVENTS_H
 
-#include <qwidget.h>
-#include <qgesture.h>
-#include <InventorAll.h>
+#include <QGesture>
 #include <Quarter/devices/InputDevice.h>
+#include <Inventor/SbLinear.h>
+#include <Inventor/events/SoEvent.h>
+#include <Inventor/events/SoSubEvent.h>
+
+class QWidget;
+
 namespace Quarter = SIM::Coin3D::Quarter;
 
 class SoGestureEvent : public SoEvent {
diff --git a/src/Gui/View3DInventorViewer.cpp b/src/Gui/View3DInventorViewer.cpp
index 79db2b119..f6bd20ebf 100644
--- a/src/Gui/View3DInventorViewer.cpp
+++ b/src/Gui/View3DInventorViewer.cpp
@@ -81,7 +81,7 @@
 # include <QMessageBox>
 # include <QTimer>
 # include <QStatusBar>
-#include <QBitmap>
+# include <QBitmap>
 #endif
 
 #include <sstream>
@@ -123,10 +123,10 @@
 
 #include <Inventor/draggers/SoCenterballDragger.h>
 #include <Inventor/annex/Profiler/SoProfiler.h>
-#include <SoTouchEvents.h>
-#include <qgesture.h>
+#include <QGesture>
 
-#include <WinNativeGestureRecognizers.h>
+#include "SoTouchEvents.h"
+#include "WinNativeGestureRecognizers.h"
 
 //#define FC_LOGGING_CB
 
diff --git a/src/Gui/View3DInventorViewer.h b/src/Gui/View3DInventorViewer.h
index 32037260b..0809f6deb 100644
--- a/src/Gui/View3DInventorViewer.h
+++ b/src/Gui/View3DInventorViewer.h
@@ -357,7 +357,12 @@ protected:
     SbBool processSoEventBase(const SoEvent * const ev);
     void printDimension();
     void selectAll();
-    bool isWinGesturesTuned;//a flag. If false, gestures on windows will get tuned(or re-tuned) upon the first event that arrives to eventFilter. This is needed to tune windows gestures after Qt does it internally, since its settings are not all right for us.
+    /** A flag. If false, gestures on windows will get tuned(or re-tuned)
+     *  upon the first event that arrives to eventFilter. This is needed to
+     *  tune windows gestures after Qt does it internally, since its settings
+     *  are not all right for us.
+     */
+    bool isWinGesturesTuned;
 
 private:
     static void setViewportCB(void * userdata, SoAction * action);
diff --git a/src/Gui/WinNativeGestureRecognizers.cpp b/src/Gui/WinNativeGestureRecognizers.cpp
index c0e1c4677..b1cd3b6ed 100644
--- a/src/Gui/WinNativeGestureRecognizers.cpp
+++ b/src/Gui/WinNativeGestureRecognizers.cpp
@@ -23,11 +23,13 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-    #include <qevent.h>
-    #include <qgraphicsitem.h>
-    #include <QWidget>
-    #include <Windows.h>
-    #include <assert.h>
+# include <QEvent>
+# include <QGraphicsItem>
+# include <QWidget>
+# ifdef FC_OS_WIN32
+# include <Windows.h>
+# endif
+# include <cassert>
 #endif
 
 #include "WinNativeGestureRecognizers.h"