diff --git a/src/Gui/Inventor/MarkerBitmaps.cpp b/src/Gui/Inventor/MarkerBitmaps.cpp
index 90ed4a6af2..3dfd0fe4e1 100644
--- a/src/Gui/Inventor/MarkerBitmaps.cpp
+++ b/src/Gui/Inventor/MarkerBitmaps.cpp
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
 # include <Inventor/nodes/SoMarkerSet.h>
 # include <vector>
diff --git a/src/Gui/Inventor/SoAutoZoomTranslation.h b/src/Gui/Inventor/SoAutoZoomTranslation.h
index bdd33a08a5..e1854e9d3e 100644
--- a/src/Gui/Inventor/SoAutoZoomTranslation.h
+++ b/src/Gui/Inventor/SoAutoZoomTranslation.h
@@ -23,6 +23,7 @@
 #ifndef GUI_SOAUTOZOOMTRANSLATION_H
 #define GUI_SOAUTOZOOMTRANSLATION_H
 
+#include <Inventor/fields/SoSFFloat.h>
 #include <Inventor/nodes/SoTransformation.h>
 
 
diff --git a/src/Gui/InventorAll.h b/src/Gui/InventorAll.h
index 4c6143669a..bfe75449d6 100644
--- a/src/Gui/InventorAll.h
+++ b/src/Gui/InventorAll.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef __InventorAll__
 #define __InventorAll__
 
@@ -32,19 +31,22 @@
 #endif
 #include <Inventor/C/basic.h>
 #include <Inventor/SbBox.h>
+#include <Inventor/SbBox2f.h>
 #include <Inventor/SbClip.h>
 #include <Inventor/SbColor.h>
+#include <Inventor/SbLinear.h>
 #include <Inventor/SbRotation.h>
+#include <Inventor/SbTesselator.h>
+#include <Inventor/SbVec2s.h>
+#include <Inventor/SbViewportRegion.h>
 #include <Inventor/SoDB.h>
+#include <Inventor/SoEventManager.h>
 #include <Inventor/SoInput.h>
 #include <Inventor/SoInteraction.h>
-#include <Inventor/SbLinear.h>
 #include <Inventor/SoOffscreenRenderer.h>
 #include <Inventor/SoPickedPoint.h>
 #include <Inventor/SoPrimitiveVertex.h>
-#include <Inventor/SbTesselator.h>
-#include <Inventor/SbViewportRegion.h>
-#include <Inventor/SoEventManager.h>
+#include <Inventor/actions/SoAction.h>
 #include <Inventor/actions/SoBoxHighlightRenderAction.h>
 #include <Inventor/actions/SoCallbackAction.h>
 #include <Inventor/actions/SoGetBoundingBoxAction.h>
@@ -66,10 +68,10 @@
 #include <Inventor/details/SoFaceDetail.h>
 #include <Inventor/details/SoLineDetail.h>
 #include <Inventor/details/SoPointDetail.h>
-#include <Inventor/draggers/SoDragger.h>
-#include <Inventor/draggers/SoTransformerDragger.h>
-#include <Inventor/draggers/SoTrackballDragger.h>
 #include <Inventor/draggers/SoCenterballDragger.h>
+#include <Inventor/draggers/SoDragger.h>
+#include <Inventor/draggers/SoTrackballDragger.h>
+#include <Inventor/draggers/SoTransformerDragger.h>
 #include <Inventor/elements/SoCacheElement.h>
 #include <Inventor/elements/SoCoordinateElement.h>
 #include <Inventor/elements/SoCreaseAngleElement.h>
@@ -98,10 +100,19 @@
 #include <Inventor/events/SoMouseButtonEvent.h>
 #include <Inventor/events/SoSpaceballButtonEvent.h>
 #include <Inventor/fields/SoMFColor.h>
+#include <Inventor/fields/SoMFNode.h>
+#include <Inventor/fields/SoSFBool.h>
+#include <Inventor/fields/SoSFColor.h>
+#include <Inventor/fields/SoSFDouble.h>
+#include <Inventor/fields/SoSFFloat.h>
+#include <Inventor/fields/SoSFInt32.h>
+#include <Inventor/fields/SoSFNode.h>
+#include <Inventor/fields/SoSFRotation.h>
 #include <Inventor/fields/SoSFVec3f.h>
 #include <Inventor/manips/SoCenterballManip.h>
 #include <Inventor/manips/SoClipPlaneManip.h>
 #include <Inventor/manips/SoTransformerManip.h>
+#include <Inventor/misc/SoState.h>
 #include <Inventor/nodes/SoAnnotation.h>
 #include <Inventor/nodes/SoAntiSquish.h>
 #include <Inventor/nodes/SoAsciiText.h>
@@ -134,6 +145,7 @@
 #include <Inventor/nodes/SoMaterialBinding.h>
 #include <Inventor/nodes/SoMatrixTransform.h>
 #include <Inventor/nodes/SoMultipleCopy.h>
+#include <Inventor/nodes/SoNode.h>
 #include <Inventor/nodes/SoNormal.h>
 #include <Inventor/nodes/SoNurbsSurface.h>
 #include <Inventor/nodes/SoOrthographicCamera.h>
@@ -152,6 +164,7 @@
 #include <Inventor/nodes/SoShape.h>
 #include <Inventor/nodes/SoShapeHints.h>
 #include <Inventor/nodes/SoSphere.h>
+#include <Inventor/nodes/SoSubNode.h>
 #include <Inventor/nodes/SoSurroundScale.h>
 #include <Inventor/nodes/SoSwitch.h>
 #include <Inventor/nodes/SoText2.h>
@@ -159,15 +172,23 @@
 #include <Inventor/nodes/SoTexture3.h>
 #include <Inventor/nodes/SoTextureCoordinate3.h>
 #include <Inventor/nodes/SoTransform.h>
+#include <Inventor/nodes/SoTransformation.h>
 #include <Inventor/nodes/SoTranslation.h>
 #include <Inventor/nodes/SoTransparencyType.h>
 #include <Inventor/nodekits/SoShapeKit.h>
 #include <Inventor/manips/SoTransformBoxManip.h>
+#include <Inventor/projectors/SbLineProjector.h>
+#include <Inventor/projectors/SbPlaneProjector.h>
 #include <Inventor/projectors/SbSpherePlaneProjector.h>
 #include <Inventor/projectors/SbSphereSheetProjector.h>
+#include <Inventor/sensors/SoFieldSensor.h>
+#include <Inventor/sensors/SoIdleSensor.h>
 #include <Inventor/sensors/SoNodeSensor.h>
 #include <Inventor/sensors/SoTimerSensor.h>
 #include <Inventor/system/inttypes.h>
 #include <Inventor/VRMLnodes/SoVRMLGroup.h>
-
+#include <Inventor/VRMLnodes/SoVRMLIndexedFaceSet.h>
+#include <Inventor/VRMLnodes/SoVRMLNormal.h>
+#include <Inventor/VRMLnodes/SoVRMLParent.h>
+#include <Inventor/VRMLnodes/SoVRMLShape.h>
 #endif
diff --git a/src/Gui/SoFCBackgroundGradient.cpp b/src/Gui/SoFCBackgroundGradient.cpp
index 03d944a07c..025e8832cf 100644
--- a/src/Gui/SoFCBackgroundGradient.cpp
+++ b/src/Gui/SoFCBackgroundGradient.cpp
@@ -20,11 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
+#ifndef _PreComp_
+#ifdef FC_OS_MACOSX
+#include <OpenGL/gl.h>
+#else
+#include <GL/gl.h>
+#endif
+#endif
+
 #include "SoFCBackgroundGradient.h"
 
+
 using namespace Gui;
 
 SO_NODE_SOURCE(SoFCBackgroundGradient)
diff --git a/src/Gui/SoFCBackgroundGradient.h b/src/Gui/SoFCBackgroundGradient.h
index 23b2339f73..ad1a7028ed 100644
--- a/src/Gui/SoFCBackgroundGradient.h
+++ b/src/Gui/SoFCBackgroundGradient.h
@@ -20,13 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_SOFCBACKGROUNDGRADIENT_H
 #define GUI_SOFCBACKGROUNDGRADIENT_H
 
-#ifndef __InventorAll__
-# include "InventorAll.h"
-#endif
+#include <Inventor/SbColor.h>
+#include <Inventor/nodes/SoNode.h>
+#include <Inventor/nodes/SoSubNode.h>
+
 
 class SbColor;
 class SoGLRenderAction;
diff --git a/src/Gui/SoFCBoundingBox.cpp b/src/Gui/SoFCBoundingBox.cpp
index 2a5e8c5309..685958c218 100644
--- a/src/Gui/SoFCBoundingBox.cpp
+++ b/src/Gui/SoFCBoundingBox.cpp
@@ -24,23 +24,20 @@
 
 #ifndef _PreComp_
 # include <sstream>
-#endif
 
 #include <Inventor/SbBox.h>
-#include <Inventor/SoPrimitiveVertex.h>
 #include <Inventor/actions/SoGLRenderAction.h>
-#include <Inventor/bundles/SoMaterialBundle.h>
-#include <Inventor/elements/SoLightModelElement.h>
 #include <Inventor/elements/SoLazyElement.h>
-#include <Inventor/elements/SoMaterialBindingElement.h>
-#include <Inventor/elements/SoModelMatrixElement.h>
 #include <Inventor/misc/SoState.h>
-
-#include <string.h>
+#include <Inventor/nodes/SoText2.h>
+#include <Inventor/nodes/SoTransform.h>
 #include <iostream>
+#include <string>
+#endif
 
 #include "SoFCBoundingBox.h"
 
+
 using namespace Gui;
 
 SO_NODE_SOURCE(SoFCBoundingBox)
diff --git a/src/Gui/SoFCBoundingBox.h b/src/Gui/SoFCBoundingBox.h
index 3043ccf82f..9431694d45 100644
--- a/src/Gui/SoFCBoundingBox.h
+++ b/src/Gui/SoFCBoundingBox.h
@@ -20,22 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef COIN_SOFCBOUNDINGBOX_H
 #define COIN_SOFCBOUNDINGBOX_H
 
-#include <Inventor/SbLinear.h>
 #include <Inventor/actions/SoAction.h>
-#include <Inventor/fields/SoSFFloat.h>
-#include <Inventor/fields/SoSFVec4f.h>
-#include <Inventor/fields/SoSFString.h>
+#include <Inventor/fields/SoSFBool.h>
+#include <Inventor/fields/SoSFVec3f.h>
 #include <Inventor/nodes/SoCoordinate3.h>
 #include <Inventor/nodes/SoIndexedLineSet.h>
 #include <Inventor/nodes/SoSeparator.h>
-#include <Inventor/nodes/SoText2.h>
-#include <Inventor/nodes/SoTransform.h>
 #include <Inventor/nodes/SoShape.h>
-#include <Inventor/fields/SoSFBool.h>
+
 
 namespace Gui {
 
diff --git a/src/Gui/SoFCCSysDragger.cpp b/src/Gui/SoFCCSysDragger.cpp
index 72d2b053ba..1576222076 100644
--- a/src/Gui/SoFCCSysDragger.cpp
+++ b/src/Gui/SoFCCSysDragger.cpp
@@ -24,34 +24,32 @@
 #ifndef _PreComp_
 #include <assert.h>
 
-#include <Inventor/nodes/SoGroup.h>
-#include <Inventor/nodes/SoSeparator.h>
-#include <Inventor/nodes/SoSwitch.h>
-#include <Inventor/nodes/SoTranslation.h>
-#include <Inventor/nodes/SoRotation.h>
-#include <Inventor/nodes/SoCone.h>
-#include <Inventor/nodes/SoCylinder.h>
-#include <Inventor/nodes/SoPickStyle.h>
-#include <Inventor/nodes/SoBaseColor.h>
+#include <Inventor/SbRotation.h>
+#include <Inventor/actions/SoGLRenderAction.h>
+#include <Inventor/engines/SoComposeVec3f.h>
 #include <Inventor/nodes/SoAnnotation.h>
+#include <Inventor/nodes/SoBaseColor.h>
+#include <Inventor/nodes/SoCone.h>
 #include <Inventor/nodes/SoCoordinate3.h>
+#include <Inventor/nodes/SoCylinder.h>
+#include <Inventor/nodes/SoGroup.h>
 #include <Inventor/nodes/SoLineSet.h>
-#include <Inventor/nodes/SoSphere.h>
 #include <Inventor/nodes/SoOrthographicCamera.h>
 #include <Inventor/nodes/SoPerspectiveCamera.h>
-#include <Inventor/actions/SoGLRenderAction.h>
-
-#include <Inventor/SbRotation.h>
-
-#include <Inventor/engines/SoComposeVec3f.h>
+#include <Inventor/nodes/SoPickStyle.h>
+#include <Inventor/nodes/SoRotation.h>
+#include <Inventor/nodes/SoSeparator.h>
+#include <Inventor/nodes/SoSphere.h>
+#include <Inventor/nodes/SoSwitch.h>
+#include <Inventor/nodes/SoTranslation.h>
 #endif
 
-#include <math.h>
-
 #include <Base/Quantity.h>
-#include <Gui/MainWindow.h>
-#include "SoFCDB.h"
+
 #include "SoFCCSysDragger.h"
+#include "MainWindow.h"
+#include "SoFCDB.h"
+
 
 /*
    GENERAL NOTE ON COIN3D CUSTOM DRAGGERS
diff --git a/src/Gui/SoFCCSysDragger.h b/src/Gui/SoFCCSysDragger.h
index 3a37df095d..fb2ecf085d 100644
--- a/src/Gui/SoFCCSysDragger.h
+++ b/src/Gui/SoFCCSysDragger.h
@@ -34,6 +34,7 @@
 #include <Inventor/sensors/SoFieldSensor.h>
 #include <Inventor/sensors/SoIdleSensor.h>
 
+
 class SoCamera;
 
 namespace Gui
diff --git a/src/Gui/SoFCColorBar.cpp b/src/Gui/SoFCColorBar.cpp
index 4cef34447f..de17a76710 100644
--- a/src/Gui/SoFCColorBar.cpp
+++ b/src/Gui/SoFCColorBar.cpp
@@ -20,13 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
-# include <Inventor/nodes/SoEventCallback.h>
 # include <Inventor/actions/SoGLRenderAction.h>
-# include <Inventor/nodes/SoSwitch.h>
 # include <Inventor/events/SoMouseButtonEvent.h>
+# include <Inventor/nodes/SoEventCallback.h>
+# include <Inventor/nodes/SoSwitch.h>
 # include <QApplication>
 # include <QMenu>
 #endif
@@ -35,6 +35,7 @@
 #include "SoFCColorGradient.h"
 #include "SoFCColorLegend.h"
 
+
 using namespace Gui;
 
 SO_NODE_ABSTRACT_SOURCE(SoFCColorBarBase)
diff --git a/src/Gui/SoFCColorBar.h b/src/Gui/SoFCColorBar.h
index 580c4e401a..5d98259659 100644
--- a/src/Gui/SoFCColorBar.h
+++ b/src/Gui/SoFCColorBar.h
@@ -20,16 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_SOFCCOLORBAR_H
 #define GUI_SOFCCOLORBAR_H
 
+#include <QElapsedTimer>
+#include <vector>
 #include <Inventor/SbVec2s.h>
 #include <Inventor/nodes/SoSeparator.h>
-#include <QElapsedTimer>
-#include <Base/Observer.h>
+
 #include <App/ColorModel.h>
-#include <vector>
+#include <Base/Observer.h>
+
 
 class SoSwitch;
 class SoEventCallback;
diff --git a/src/Gui/SoFCColorGradient.cpp b/src/Gui/SoFCColorGradient.cpp
index a040df1bb0..d9717980f9 100644
--- a/src/Gui/SoFCColorGradient.cpp
+++ b/src/Gui/SoFCColorGradient.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -41,6 +40,7 @@
 #include "MDIView.h"
 #include "ViewProvider.h"
 
+
 using namespace Gui;
 
 SO_NODE_SOURCE(SoFCColorGradient)
diff --git a/src/Gui/SoFCColorGradient.h b/src/Gui/SoFCColorGradient.h
index aca050333a..6af3d07582 100644
--- a/src/Gui/SoFCColorGradient.h
+++ b/src/Gui/SoFCColorGradient.h
@@ -20,15 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_SOFCCOLORGRADIENT_H
 #define GUI_SOFCCOLORGRADIENT_H
 
-#include <Inventor/nodes/SoSeparator.h>
-#include <Inventor/SbBox2f.h>
-#include "SoFCColorBar.h"
-#include <App/ColorModel.h>
 #include <vector>
+#include <Inventor/SbBox2f.h>
+#include <Inventor/nodes/SoSeparator.h>
+
+#include "SoFCColorBar.h"
+
 
 class SoCoordinate3;
 class SoMFString;
diff --git a/src/Gui/SoFCColorLegend.cpp b/src/Gui/SoFCColorLegend.cpp
index 7a0181c6b2..c197570a72 100644
--- a/src/Gui/SoFCColorLegend.cpp
+++ b/src/Gui/SoFCColorLegend.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <sstream>
-# include <limits>
 # include <Inventor/fields/SoMFString.h>
 # include <Inventor/nodes/SoBaseColor.h>
 # include <Inventor/nodes/SoCoordinate3.h>
@@ -35,8 +33,8 @@
 # include <Inventor/nodes/SoTransform.h>
 #endif
 
-#include "ViewProvider.h"
 #include "SoFCColorLegend.h"
+#include "ViewProvider.h"
 
 
 using namespace Gui;
diff --git a/src/Gui/SoFCColorLegend.h b/src/Gui/SoFCColorLegend.h
index 3df03f4fc6..8c17bcba0e 100644
--- a/src/Gui/SoFCColorLegend.h
+++ b/src/Gui/SoFCColorLegend.h
@@ -20,14 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_SOFCCOLORLEGEND_H
 #define GUI_SOFCCOLORLEGEND_H
 
-#include <Inventor/nodes/SoSeparator.h>
 #include <Inventor/SbBox2f.h>
+#include <Inventor/nodes/SoSeparator.h>
+
 #include "SoFCColorBar.h"
-#include <App/ColorModel.h>
+
 
 class SoCoordinate3;
 class SoMFString;
diff --git a/src/Gui/SoFCDB.cpp b/src/Gui/SoFCDB.cpp
index 92e9045ad3..94e3a9e217 100644
--- a/src/Gui/SoFCDB.cpp
+++ b/src/Gui/SoFCDB.cpp
@@ -20,62 +20,57 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <Inventor/actions/SoToVRML2Action.h>
-# include <Inventor/VRMLnodes/SoVRMLGroup.h>
-# include <Inventor/VRMLnodes/SoVRMLParent.h>
 # include <Inventor/SbString.h>
+# include <Inventor/actions/SoToVRML2Action.h>
+# include <Inventor/fields/SoMFNode.h>
+# include <Inventor/fields/SoSFNode.h>
 # include <Inventor/nodes/SoGroup.h>
+# include <Inventor/VRMLnodes/SoVRMLGroup.h>
+# include <Inventor/VRMLnodes/SoVRMLIndexedFaceSet.h>
+# include <Inventor/VRMLnodes/SoVRMLNormal.h>
+# include <Inventor/VRMLnodes/SoVRMLParent.h>
+# include <Inventor/VRMLnodes/SoVRMLShape.h>
 # include <QDir>
 # include <QProcess>
 # include <QTemporaryFile>
 # include <sstream>
 #endif
 
-#include <Inventor/VRMLnodes/SoVRMLGeometry.h>
-#include <Inventor/VRMLnodes/SoVRMLNormal.h>
-#include <Inventor/VRMLnodes/SoVRMLIndexedFaceSet.h>
-#include <Inventor/VRMLnodes/SoVRMLShape.h>
-#include <Inventor/fields/SoSFNode.h>
-#include <Inventor/fields/SoMFNode.h>
-
 #include <Base/FileInfo.h>
 #include <Base/Stream.h>
 #include <Base/Tools.h>
 #include <zipios++/gzipoutputstream.h>
 
 #include "SoFCDB.h"
-#include "SoFCColorBar.h"
-#include "SoFCColorLegend.h"
-#include "SoFCColorGradient.h"
-#include "SoFCSelection.h"
+#include "Flag.h"
+#include "GestureNavigationStyle.h"
+#include "NavigationStyle.h"
+#include "SelectionObject.h"
+#include "SoAxisCrossKit.h"
 #include "SoFCBackgroundGradient.h"
 #include "SoFCBoundingBox.h"
-#include "SoFCSelection.h"
-#include "SoFCUnifiedSelection.h"
-#include "SoFCSelectionAction.h"
+#include "SoFCColorBar.h"
+#include "SoFCColorGradient.h"
+#include "SoFCColorLegend.h"
+#include "SoFCCSysDragger.h"
 #include "SoFCInteractiveElement.h"
+#include "SoFCSelection.h"
+#include "SoFCSelectionAction.h"
 #include "SoFCUnifiedSelection.h"
 #include "SoFCVectorizeSVGAction.h"
 #include "SoFCVectorizeU3DAction.h"
-#include "SoAxisCrossKit.h"
-#include "SoTextLabel.h"
+#include "SoMouseWheelEvent.h"
 #include "SoNavigationDragger.h"
-#include "Inventor/SoDrawingGrid.h"
-#include "Inventor/SoAutoZoomTranslation.h"
+#include "SoTextLabel.h"
+#include "View3DPy.h"
 #include "Inventor/MarkerBitmaps.h"
 #include "Inventor/SmSwitchboard.h"
-#include "SoFCCSysDragger.h"
-#include "SoMouseWheelEvent.h"
-
+#include "Inventor/SoAutoZoomTranslation.h"
+#include "Inventor/SoDrawingGrid.h"
 #include "propertyeditor/PropertyItem.h"
-#include "NavigationStyle.h"
-#include "GestureNavigationStyle.h"
-#include "Flag.h"
-#include "SelectionObject.h"
-#include "View3DPy.h"
+
 
 using namespace Gui;
 using namespace Gui::Inventor;
diff --git a/src/Gui/SoFCDB.h b/src/Gui/SoFCDB.h
index ff92642063..aca7014756 100644
--- a/src/Gui/SoFCDB.h
+++ b/src/Gui/SoFCDB.h
@@ -20,14 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_SOFCDB_H
 #define GUI_SOFCDB_H
 
+#include <iosfwd>
 #include <map>
 #include <string>
-#include <iosfwd>
-#include <Inventor/SbBasic.h>
+#include <Inventor/C/basic.h>
+
 
 class SoNode;
 class SoGroup;