diff --git a/src/Gui/SoMouseWheelEvent.h b/src/Gui/SoMouseWheelEvent.h
index a08b49a7b8..05a6ce841a 100644
--- a/src/Gui/SoMouseWheelEvent.h
+++ b/src/Gui/SoMouseWheelEvent.h
@@ -28,7 +28,7 @@
 //#endif
 
 #include <Inventor/events/SoEvent.h>
-#include <Inventor/events/SoSubEvent.h>
+
 
 /**
  * @brief The SoMouseWheelEvent class is a temporary replacement for
diff --git a/src/Gui/SoNavigationDragger.cpp b/src/Gui/SoNavigationDragger.cpp
index 3f7ee2a8cc..153267f444 100644
--- a/src/Gui/SoNavigationDragger.cpp
+++ b/src/Gui/SoNavigationDragger.cpp
@@ -26,12 +26,10 @@
 #include <Inventor/nodes/SoRotation.h>
 #include <Inventor/nodes/SoSeparator.h>
 #include <Inventor/nodes/SoSurroundScale.h>
-#include <Inventor/nodes/SoTransform.h>
 #include <Inventor/sensors/SoFieldSensor.h>
 
 // Include files for child dragger classes.
 #include <Inventor/draggers/SoRotateCylindricalDragger.h>
-//#include "TranslateRadialDragger.h"
 #include <Inventor/draggers/SoTranslate1Dragger.h>
 
 // Include file for our new class.
@@ -40,9 +38,6 @@
 // Include file the binaray of SoNavigationDraggerLayout.iv, the layout of the dragger.
 #include "SoNavigationDraggerLayout.h"
 
-// This file contains RotTransDragger::geomBuffer, which
-// describes the default geometry resources for this class.
-//#include "RotTransDraggerGeom.h"
 
 SO_KIT_SOURCE(RotTransDragger)
 
diff --git a/src/Gui/SoNavigationDragger.h b/src/Gui/SoNavigationDragger.h
index f5c8391ec7..00c1091bae 100644
--- a/src/Gui/SoNavigationDragger.h
+++ b/src/Gui/SoNavigationDragger.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef SONAVIGATIONDRAGGER_H
 #define SONAVIGATIONDRAGGER_H
 
@@ -39,10 +38,11 @@
 // rotTransRotatorFeedbackActive      XRotator.feedbackActive
 // (and similarly for parts of the YRotator and ZRotator)
 
-#include <Inventor/sensors/SoFieldSensor.h>
 #include <Inventor/draggers/SoDragger.h>
-#include <Inventor/fields/SoSFVec3f.h>
 #include <Inventor/fields/SoSFRotation.h>
+#include <Inventor/fields/SoSFVec3f.h>
+#include <Inventor/sensors/SoFieldSensor.h>
+
 
 //class TranslateRadialDragger;
 class SoRotateCylindricalDragger;
diff --git a/src/Gui/SoTextLabel.cpp b/src/Gui/SoTextLabel.cpp
index c32d7ec115..e230fb7825 100644
--- a/src/Gui/SoTextLabel.cpp
+++ b/src/Gui/SoTextLabel.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -33,28 +32,26 @@
 # include <GL/gl.h>
 # endif
 # include <cfloat>
-# include <algorithm>
 # include <QFontMetrics>
 # include <QPainter>
 # include <QPen>
 # include <Inventor/actions/SoGLRenderAction.h>
 # include <Inventor/bundles/SoMaterialBundle.h>
 # include <Inventor/elements/SoLazyElement.h>
-# include <Inventor/nodes/SoSurroundScale.h>
 # include <Inventor/misc/SoState.h>
 #endif
 
 #include <Inventor/C/basic.h>
 #include <Inventor/draggers/SoTranslate2Dragger.h>
-#include <Inventor/elements/SoFontNameElement.h>
-#include <Inventor/elements/SoFontSizeElement.h>
 #include <Inventor/elements/SoCullElement.h>
+#include <Inventor/elements/SoFontNameElement.h>
+#include <Inventor/elements/SoGLTextureEnabledElement.h>
 #include <Inventor/elements/SoModelMatrixElement.h>
 #include <Inventor/elements/SoProjectionMatrixElement.h>
 #include <Inventor/elements/SoViewingMatrixElement.h>
-#include <Inventor/elements/SoViewVolumeElement.h>
 #include <Inventor/elements/SoViewportRegionElement.h>
-#include <Inventor/elements/SoGLTextureEnabledElement.h>
+#include <Inventor/elements/SoViewVolumeElement.h>
+
 #if COIN_MAJOR_VERSION > 3
 #include <Inventor/elements/SoMultiTextureEnabledElement.h>
 #else
@@ -62,11 +59,13 @@
 #endif
 
 #include <QtOpenGL.h>
+
 #include "SoTextLabel.h"
-#include "SoFCInteractiveElement.h"
 #include "BitmapFactory.h"
+#include "SoFCInteractiveElement.h"
 #include "Tools.h"
 
+
 using namespace Gui;
 
 /*!
diff --git a/src/Gui/SoTextLabel.h b/src/Gui/SoTextLabel.h
index d63f7c1d56..ba83c5b7c3 100644
--- a/src/Gui/SoTextLabel.h
+++ b/src/Gui/SoTextLabel.h
@@ -23,18 +23,16 @@
 #ifndef GUI_SOTEXTLABEL_H
 #define GUI_SOTEXTLABEL_H
 
-#include <Inventor/fields/SoSubField.h>
-#include <Inventor/nodes/SoSubNode.h>
-#include <Inventor/nodes/SoImage.h>
-#include <Inventor/nodes/SoText2.h>
+#include <Inventor/fields/SoSFBool.h>
 #include <Inventor/fields/SoSFColor.h>
 #include <Inventor/fields/SoSFEnum.h>
 #include <Inventor/fields/SoSFFloat.h>
-#include <Inventor/fields/SoSFBool.h>
-#include <Inventor/fields/SoSFName.h>
 #include <Inventor/fields/SoSFInt32.h>
-#include <Inventor/fields/SoSFImage.h>
+#include <Inventor/fields/SoSFName.h>
 #include <Inventor/manips/SoTransformManip.h>
+#include <Inventor/nodes/SoImage.h>
+#include <Inventor/nodes/SoText2.h>
+
 
 namespace Gui {
 
diff --git a/src/Gui/SoTouchEvents.cpp b/src/Gui/SoTouchEvents.cpp
index 1cc73540f0..eb777a5a7a 100644
--- a/src/Gui/SoTouchEvents.cpp
+++ b/src/Gui/SoTouchEvents.cpp
@@ -22,12 +22,15 @@
 
 #include "PreCompiled.h"
 
-#include "SoTouchEvents.h"
 #include <QApplication>
 #include <QGestureEvent>
 #include <QWidget>
+
 #include <Base/Exception.h>
 
+#include "SoTouchEvents.h"
+
+
 SO_EVENT_SOURCE(SoGestureEvent);
 
 SbBool SoGestureEvent::isSoGestureEvent(const SoEvent *ev) const
diff --git a/src/Gui/SoTouchEvents.h b/src/Gui/SoTouchEvents.h
index ccba4add80..b0814c7577 100644
--- a/src/Gui/SoTouchEvents.h
+++ b/src/Gui/SoTouchEvents.h
@@ -27,7 +27,7 @@
 #include <Quarter/devices/InputDevice.h>
 #include <Inventor/SbLinear.h>
 #include <Inventor/events/SoEvent.h>
-#include <Inventor/events/SoSubEvent.h>
+
 
 class QWidget;