diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp
index 330b54e0c1..06e89cc346 100644
--- a/src/Gui/Application.cpp
+++ b/src/Gui/Application.cpp
@@ -20,11 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include "InventorAll.h"
+# include <boost/interprocess/sync/file_lock.hpp>
 # include <QCloseEvent>
 # include <QDir>
 # include <QFileInfo>
@@ -38,7 +37,6 @@
 # include <QWindow>
 #endif
 
-#include <boost/interprocess/sync/file_lock.hpp>
 #include <App/Document.h>
 #include <App/DocumentObjectPy.h>
 #include <Base/Console.h>
diff --git a/src/Gui/DocumentRecovery.cpp b/src/Gui/DocumentRecovery.cpp
index d670e56833..90a95ce327 100644
--- a/src/Gui/DocumentRecovery.cpp
+++ b/src/Gui/DocumentRecovery.cpp
@@ -27,6 +27,7 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <boost/interprocess/sync/file_lock.hpp>
 # include <QApplication>
 # include <QCloseEvent>
 # include <QDateTime>
@@ -46,8 +47,6 @@
 # include <sstream>
 #endif
 
-#include <boost/interprocess/sync/file_lock.hpp>
-
 #include <App/Application.h>
 #include <App/Document.h>
 #include <Base/Exception.h>
diff --git a/src/Gui/ExpressionCompleter.cpp b/src/Gui/ExpressionCompleter.cpp
index fe021896e6..c00c4b6823 100644
--- a/src/Gui/ExpressionCompleter.cpp
+++ b/src/Gui/ExpressionCompleter.cpp
@@ -23,15 +23,14 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#include <QAbstractItemView>
-#include <QContextMenuEvent>
-#include <QLineEdit>
-#include <QMenu>
-#include <QTextBlock>
+# include <boost/algorithm/string/predicate.hpp>
+# include <QAbstractItemView>
+# include <QContextMenuEvent>
+# include <QLineEdit>
+# include <QMenu>
+# include <QTextBlock>
 #endif
 
-#include <boost/algorithm/string/predicate.hpp>
-
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
diff --git a/src/Gui/InventorAll.h b/src/Gui/InventorAll.h
index bfe75449d6..7a98f2444f 100644
--- a/src/Gui/InventorAll.h
+++ b/src/Gui/InventorAll.h
@@ -29,23 +29,29 @@
 #else
 #include <GL/gl.h>
 #endif
+
 #include <Inventor/C/basic.h>
+#include <Inventor/SbBSPTree.h>
 #include <Inventor/SbBox.h>
 #include <Inventor/SbBox2f.h>
 #include <Inventor/SbClip.h>
 #include <Inventor/SbColor.h>
+#include <Inventor/SbLine.h>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SbRotation.h>
+#include <Inventor/SbSphere.h>
 #include <Inventor/SbTesselator.h>
 #include <Inventor/SbVec2s.h>
 #include <Inventor/SbViewportRegion.h>
 #include <Inventor/SoDB.h>
 #include <Inventor/SoEventManager.h>
+#include <Inventor/SoFullPath.h>
 #include <Inventor/SoInput.h>
 #include <Inventor/SoInteraction.h>
 #include <Inventor/SoOffscreenRenderer.h>
 #include <Inventor/SoPickedPoint.h>
 #include <Inventor/SoPrimitiveVertex.h>
+#include <Inventor/SoRenderManager.h>
 #include <Inventor/actions/SoAction.h>
 #include <Inventor/actions/SoBoxHighlightRenderAction.h>
 #include <Inventor/actions/SoCallbackAction.h>
@@ -60,11 +66,13 @@
 #include <Inventor/actions/SoSearchAction.h>
 #include <Inventor/actions/SoToVRML2Action.h>
 #include <Inventor/actions/SoWriteAction.h>
+#include <Inventor/annex/HardCopy/SoVectorizeAction.h>
 #include <Inventor/annex/HardCopy/SoVectorizePSAction.h>
 #include <Inventor/annex/HardCopy/SoVectorOutput.h>
 #include <Inventor/bundles/SoMaterialBundle.h>
 #include <Inventor/bundles/SoTextureCoordinateBundle.h>
 #include <Inventor/caches/SoNormalCache.h>
+#include <Inventor/details/SoDetail.h>
 #include <Inventor/details/SoFaceDetail.h>
 #include <Inventor/details/SoLineDetail.h>
 #include <Inventor/details/SoPointDetail.h>
@@ -73,21 +81,34 @@
 #include <Inventor/draggers/SoTrackballDragger.h>
 #include <Inventor/draggers/SoTransformerDragger.h>
 #include <Inventor/elements/SoCacheElement.h>
+#include <Inventor/elements/SoComplexityTypeElement.h>
 #include <Inventor/elements/SoCoordinateElement.h>
 #include <Inventor/elements/SoCreaseAngleElement.h>
+#include <Inventor/elements/SoDrawStyleElement.h>
+#include <Inventor/elements/SoFontNameElement.h>
+#include <Inventor/elements/SoFontSizeElement.h>
 #include <Inventor/elements/SoGLCacheContextElement.h>
 #include <Inventor/elements/SoGLCoordinateElement.h>
 #include <Inventor/elements/SoLazyElement.h>
+#include <Inventor/elements/SoLightModelElement.h>
+#include <Inventor/elements/SoLineWidthElement.h>
+#include <Inventor/elements/SoMaterialBindingElement.h>
 #include <Inventor/elements/SoModelMatrixElement.h>
 #include <Inventor/elements/SoNormalBindingElement.h>
 #include <Inventor/elements/SoNormalElement.h>
+#include <Inventor/elements/SoOverrideElement.h>
+#include <Inventor/elements/SoProfileCoordinateElement.h>
+#include <Inventor/elements/SoProfileElement.h>
 #include <Inventor/elements/SoProjectionMatrixElement.h>
 #include <Inventor/elements/SoReplacedElement.h>
 #include <Inventor/elements/SoShapeStyleElement.h>
+#include <Inventor/elements/SoSwitchElement.h>
 #include <Inventor/elements/SoTextureEnabledElement.h>
+#include <Inventor/elements/SoUnitsElement.h>
 #include <Inventor/elements/SoViewingMatrixElement.h>
 #include <Inventor/elements/SoViewportRegionElement.h>
 #include <Inventor/elements/SoViewVolumeElement.h>
+#include <Inventor/elements/SoWindowElement.h>
 #include <Inventor/engines/SoComposeVec3f.h>
 #include <Inventor/engines/SoComposeRotationFromTo.h>
 #include <Inventor/engines/SoComposeRotation.h>
@@ -112,12 +133,14 @@
 #include <Inventor/manips/SoCenterballManip.h>
 #include <Inventor/manips/SoClipPlaneManip.h>
 #include <Inventor/manips/SoTransformerManip.h>
+#include <Inventor/misc/SoChildList.h>
 #include <Inventor/misc/SoState.h>
 #include <Inventor/nodes/SoAnnotation.h>
 #include <Inventor/nodes/SoAntiSquish.h>
 #include <Inventor/nodes/SoAsciiText.h>
 #include <Inventor/nodes/SoBaseColor.h>
 #include <Inventor/nodes/SoCallback.h>
+#include <Inventor/nodes/SoCamera.h>
 #include <Inventor/nodes/SoComplexity.h>
 #include <Inventor/nodes/SoCone.h>
 #include <Inventor/nodes/SoCoordinate3.h>
@@ -147,6 +170,7 @@
 #include <Inventor/nodes/SoMultipleCopy.h>
 #include <Inventor/nodes/SoNode.h>
 #include <Inventor/nodes/SoNormal.h>
+#include <Inventor/nodes/SoNormalBinding.h>
 #include <Inventor/nodes/SoNurbsSurface.h>
 #include <Inventor/nodes/SoOrthographicCamera.h>
 #include <Inventor/nodes/SoPerspectiveCamera.h>
@@ -186,6 +210,7 @@
 #include <Inventor/sensors/SoNodeSensor.h>
 #include <Inventor/sensors/SoTimerSensor.h>
 #include <Inventor/system/inttypes.h>
+#include <Inventor/threads/SbStorage.h>
 #include <Inventor/VRMLnodes/SoVRMLGroup.h>
 #include <Inventor/VRMLnodes/SoVRMLIndexedFaceSet.h>
 #include <Inventor/VRMLnodes/SoVRMLNormal.h>
diff --git a/src/Gui/PreCompiled.h b/src/Gui/PreCompiled.h
index abb0a54e88..f52facf8ef 100644
--- a/src/Gui/PreCompiled.h
+++ b/src/Gui/PreCompiled.h
@@ -83,14 +83,16 @@
 #include <tuple>
 
 // Boost
-#include <boost_signals2.hpp>
-#include <boost/bind/bind.hpp>
-#include <boost/program_options.hpp>
-#include <boost/utility.hpp>
 #include <boost_graph_adjacency_list.hpp>
+#include <boost_signals2.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/bind/bind.hpp>
+#include <boost/filesystem/exception.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/exception.hpp>
+#include <boost/interprocess/sync/file_lock.hpp>
+#include <boost/program_options.hpp>
+#include <boost/utility.hpp>
 
 // Python
 #include <Python.h>
diff --git a/src/Gui/Selection.cpp b/src/Gui/Selection.cpp
index 684ec7895e..8353076e3c 100644
--- a/src/Gui/Selection.cpp
+++ b/src/Gui/Selection.cpp
@@ -24,11 +24,10 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <boost/algorithm/string/predicate.hpp>
 # include <QApplication>
 #endif
 
-#include <boost/algorithm/string/predicate.hpp>
-
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
diff --git a/src/Gui/SoFCDB.cpp b/src/Gui/SoFCDB.cpp
index 388939df32..16e7a930f6 100644
--- a/src/Gui/SoFCDB.cpp
+++ b/src/Gui/SoFCDB.cpp
@@ -22,8 +22,12 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <Inventor/SbSphere.h>
 # include <Inventor/SbString.h>
+# include <Inventor/SoInteraction.h>
+# include <Inventor/actions/SoGetBoundingBoxAction.h>
 # include <Inventor/actions/SoToVRML2Action.h>
+# include <Inventor/actions/SoWriteAction.h>
 # include <Inventor/fields/SoMFNode.h>
 # include <Inventor/fields/SoSFNode.h>
 # include <Inventor/nodes/SoGroup.h>
diff --git a/src/Gui/SoFCInteractiveElement.cpp b/src/Gui/SoFCInteractiveElement.cpp
index 8b36147e89..b65ba4800d 100644
--- a/src/Gui/SoFCInteractiveElement.cpp
+++ b/src/Gui/SoFCInteractiveElement.cpp
@@ -20,12 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#include <Inventor/elements/SoOverrideElement.h>
+#ifndef _PreComp_
+# include <Inventor/elements/SoOverrideElement.h>
+#endif
+
 #include "SoFCInteractiveElement.h"
 
+
 using namespace Gui;
 
 SO_ELEMENT_SOURCE(SoFCInteractiveElement)
diff --git a/src/Gui/SoFCInteractiveElement.h b/src/Gui/SoFCInteractiveElement.h
index 059c20b255..e849886179 100644
--- a/src/Gui/SoFCInteractiveElement.h
+++ b/src/Gui/SoFCInteractiveElement.h
@@ -20,16 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_SOFCINTERACTIVEELEMENT_H
 #define GUI_SOFCINTERACTIVEELEMENT_H
 
-#ifndef __InventorAll__
-# include "InventorAll.h"
-#endif
+#include <Inventor/actions/SoGLRenderAction.h>
+#include <Inventor/actions/SoHandleEventAction.h>
+#include <Inventor/elements/SoReplacedElement.h>
+#include <Inventor/nodes/SoNode.h>
+#include <Inventor/nodes/SoSubNode.h>
 
 #include <QtOpenGL.h>
 
+
 namespace Gui {
 /**
  * @author Werner Mayer
diff --git a/src/Gui/SoFCOffscreenRenderer.cpp b/src/Gui/SoFCOffscreenRenderer.cpp
index 34c3fecd4c..65dc378ea7 100644
--- a/src/Gui/SoFCOffscreenRenderer.cpp
+++ b/src/Gui/SoFCOffscreenRenderer.cpp
@@ -21,7 +21,11 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
+# include <iomanip>
+# include <ios>
+# include <sstream>
 # include <Inventor/actions/SoGLRenderAction.h>
 # include <Inventor/elements/SoGLCacheContextElement.h>
 # include <Inventor/fields/SoSFImage.h>
@@ -31,7 +35,6 @@
 # include <QFile>
 # include <QImage>
 # include <QImageWriter>
-# include <QPainter>
 #endif
 
 #if !defined(FC_OS_MACOSX)
@@ -40,21 +43,16 @@
 # include <GL/glext.h>
 #endif
 
-//gcc
-# include <iomanip>
-# include <ios>
-# include <sstream>
+#include <QOffscreenSurface>
 
+#include <App/Application.h>
 #include <Base/FileInfo.h>
 #include <Base/Exception.h>
 #include <Base/Console.h>
-#include <App/Application.h>
 
 #include "SoFCOffscreenRenderer.h"
 #include "BitmapFactory.h"
 
-#include <QOffscreenSurface>
-#include <QOpenGLContext>
 
 using namespace Gui;
 using namespace std;
diff --git a/src/Gui/SoFCOffscreenRenderer.h b/src/Gui/SoFCOffscreenRenderer.h
index 9606d9bbf1..b46c4610e9 100644
--- a/src/Gui/SoFCOffscreenRenderer.h
+++ b/src/Gui/SoFCOffscreenRenderer.h
@@ -20,17 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_SOFCOFFSCREENRENDERER_H
 #define GUI_SOFCOFFSCREENRENDERER_H
 
-#include <Inventor/SoOffscreenRenderer.h>
-#include <Inventor/SbMatrix.h>
 #include <Inventor/SbColor4f.h>
+#include <Inventor/SbMatrix.h>
+#include <Inventor/SoOffscreenRenderer.h>
+
 #include <QImage>
 #include <QStringList>
 #include <QtOpenGL.h>
 
+
 namespace Gui {
 
 /**
diff --git a/src/Gui/SoFCSelection.cpp b/src/Gui/SoFCSelection.cpp
index 47247c93da..11f42454e7 100644
--- a/src/Gui/SoFCSelection.cpp
+++ b/src/Gui/SoFCSelection.cpp
@@ -24,29 +24,29 @@
 
 #ifndef _PreComp_
 # include <QString>
+# include <Inventor/SoFullPath.h>
+# include <Inventor/SoPickedPoint.h>
+# include <Inventor/actions/SoGLRenderAction.h>
+# include <Inventor/actions/SoHandleEventAction.h>
 # include <Inventor/details/SoFaceDetail.h>
 # include <Inventor/details/SoLineDetail.h>
+# include <Inventor/elements/SoLazyElement.h>
+# include <Inventor/elements/SoMaterialBindingElement.h>
+# include <Inventor/elements/SoOverrideElement.h>
+# include <Inventor/elements/SoWindowElement.h>
+# include <Inventor/events/SoKeyboardEvent.h>
+# include <Inventor/events/SoLocation2Event.h>
+# include <Inventor/events/SoMouseButtonEvent.h>
+# include <Inventor/misc/SoState.h>
 #endif
 
-#include <Inventor/SoFullPath.h>
-#include <Inventor/SoPickedPoint.h>
-#include <Inventor/actions/SoGLRenderAction.h>
-#include <Inventor/actions/SoHandleEventAction.h>
-#include <Inventor/elements/SoLazyElement.h>
-#include <Inventor/elements/SoOverrideElement.h>
-#include <Inventor/elements/SoWindowElement.h>
-#include <Inventor/events/SoKeyboardEvent.h>
-#include <Inventor/events/SoLocation2Event.h>
-#include <Inventor/events/SoMouseButtonEvent.h>
-#include <Inventor/misc/SoState.h>
-
 #include "SoFCSelection.h"
 #include "MainWindow.h"
-#include "SoFCInteractiveElement.h"
 #include "SoFCSelectionAction.h"
 #include "SoFCUnifiedSelection.h"
 #include "ViewParams.h"
 
+
 // For 64-bit system the method using the front buffer doesn't work at all for lines.
 // Thus, use the method which forces a redraw every time. This is a bit slower but at
 // least it works.
diff --git a/src/Gui/SoFCSelection.h b/src/Gui/SoFCSelection.h
index c6c8224435..448d8c4285 100644
--- a/src/Gui/SoFCSelection.h
+++ b/src/Gui/SoFCSelection.h
@@ -35,15 +35,16 @@
 # include <GL/gl.h>
 # endif
 
+#include <Inventor/elements/SoLazyElement.h>
 #include <Inventor/fields/SoSFBool.h>
 #include <Inventor/fields/SoSFColor.h>
 #include <Inventor/fields/SoSFEnum.h>
 #include <Inventor/fields/SoSFString.h>
 #include <Inventor/nodes/SoGroup.h>
-#include <Inventor/nodes/SoLightModel.h>
 
 #include "SoFCSelectionContext.h"
 
+
 class SoFullPath;
 class SoPickedPoint;
 
diff --git a/src/Gui/SoFCSelectionAction.cpp b/src/Gui/SoFCSelectionAction.cpp
index aa4768d627..a80ab41f27 100644
--- a/src/Gui/SoFCSelectionAction.cpp
+++ b/src/Gui/SoFCSelectionAction.cpp
@@ -23,47 +23,45 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#  include <Inventor/actions/SoSearchAction.h>
-#  include <Inventor/actions/SoGetBoundingBoxAction.h>
-#  include <Inventor/nodes/SoCallback.h>
-#  include <Inventor/nodes/SoMatrixTransform.h>
-#  include <Inventor/nodes/SoSwitch.h>
-#  include <Inventor/nodes/SoIndexedLineSet.h>
-#  include <Inventor/nodes/SoIndexedFaceSet.h>
-#  include <Inventor/nodes/SoPointSet.h>
-#  include <Inventor/nodes/SoDrawStyle.h>
-#  include <Inventor/nodes/SoLightModel.h>
-#  include <Inventor/nodes/SoBaseColor.h>
+# include <Inventor/actions/SoSearchAction.h>
+# include <Inventor/actions/SoGetBoundingBoxAction.h>
+# include <Inventor/elements/SoComplexityElement.h>
+# include <Inventor/elements/SoComplexityTypeElement.h>
+# include <Inventor/elements/SoCoordinateElement.h>
+# include <Inventor/elements/SoFontNameElement.h>
+# include <Inventor/elements/SoFontSizeElement.h>
+# include <Inventor/elements/SoModelMatrixElement.h>
+# include <Inventor/elements/SoProfileCoordinateElement.h>
+# include <Inventor/elements/SoProfileElement.h>
+# include <Inventor/elements/SoProjectionMatrixElement.h>
+# include <Inventor/elements/SoShapeStyleElement.h>
+# include <Inventor/elements/SoSwitchElement.h>
+# include <Inventor/elements/SoUnitsElement.h>
+# include <Inventor/elements/SoViewingMatrixElement.h>
+# include <Inventor/elements/SoViewportRegionElement.h>
+# include <Inventor/elements/SoViewVolumeElement.h>
+# include <Inventor/nodes/SoBaseColor.h>
+# include <Inventor/nodes/SoCallback.h>
+# include <Inventor/nodes/SoCamera.h>
+# include <Inventor/nodes/SoComplexity.h>
+# include <Inventor/nodes/SoCoordinate3.h>
+# include <Inventor/nodes/SoCoordinate4.h>
+# include <Inventor/nodes/SoCube.h>
+# include <Inventor/nodes/SoDrawStyle.h>
+# include <Inventor/nodes/SoFont.h>
+# include <Inventor/nodes/SoIndexedLineSet.h>
+# include <Inventor/nodes/SoIndexedFaceSet.h>
+# include <Inventor/nodes/SoLightModel.h>
+# include <Inventor/nodes/SoMatrixTransform.h>
+# include <Inventor/nodes/SoPointSet.h>
+# include <Inventor/nodes/SoProfile.h>
+# include <Inventor/nodes/SoProfileCoordinate2.h>
+# include <Inventor/nodes/SoProfileCoordinate3.h>
+# include <Inventor/nodes/SoSeparator.h>
+# include <Inventor/nodes/SoSwitch.h>
+# include <Inventor/nodes/SoTransformation.h>
 #endif
 
-#include <Inventor/elements/SoComplexityElement.h>
-#include <Inventor/elements/SoComplexityTypeElement.h>
-#include <Inventor/elements/SoCoordinateElement.h>
-#include <Inventor/elements/SoElements.h>
-#include <Inventor/elements/SoFontNameElement.h>
-#include <Inventor/elements/SoFontSizeElement.h>
-#include <Inventor/elements/SoModelMatrixElement.h>
-#include <Inventor/elements/SoProfileCoordinateElement.h>
-#include <Inventor/elements/SoProfileElement.h>
-#include <Inventor/elements/SoShapeStyleElement.h>
-#include <Inventor/elements/SoSwitchElement.h>
-#include <Inventor/elements/SoUnitsElement.h>
-#include <Inventor/elements/SoViewingMatrixElement.h>
-#include <Inventor/elements/SoViewVolumeElement.h>
-#include <Inventor/elements/SoViewportRegionElement.h>
-#include <Inventor/nodes/SoCamera.h>
-#include <Inventor/nodes/SoComplexity.h>
-#include <Inventor/nodes/SoCoordinate3.h>
-#include <Inventor/nodes/SoCoordinate4.h>
-#include <Inventor/nodes/SoCube.h>
-#include <Inventor/nodes/SoGroup.h>
-#include <Inventor/nodes/SoFont.h>
-#include <Inventor/nodes/SoProfile.h>
-#include <Inventor/nodes/SoProfileCoordinate2.h>
-#include <Inventor/nodes/SoProfileCoordinate3.h>
-#include <Inventor/nodes/SoSeparator.h>
-#include <Inventor/nodes/SoTransformation.h>
-
 #include "SoFCSelectionAction.h"
 #include "SoFCSelection.h"
 
diff --git a/src/Gui/SoFCSelectionAction.h b/src/Gui/SoFCSelectionAction.h
index 3361f83ccf..545b3d4640 100644
--- a/src/Gui/SoFCSelectionAction.h
+++ b/src/Gui/SoFCSelectionAction.h
@@ -20,16 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef _SoFCSelectionAction_h
 #define _SoFCSelectionAction_h
 
+#include <Inventor/SbColor.h>
 #include <Inventor/actions/SoGLRenderAction.h>
 #include <Inventor/fields/SoSFColor.h>
 #include <Inventor/fields/SoSFString.h>
-#include <Inventor/SbColor.h>
 #include <vector>
 
+
 class SoSFString;
 class SoSFColor;
 
diff --git a/src/Gui/SoFCSelectionContext.cpp b/src/Gui/SoFCSelectionContext.cpp
index e940a22c49..84b2253872 100644
--- a/src/Gui/SoFCSelectionContext.cpp
+++ b/src/Gui/SoFCSelectionContext.cpp
@@ -19,13 +19,18 @@
  *   Suite 330, Boston, MA  02111-1307, USA                                 *
  *                                                                          *
  ****************************************************************************/
+
 #include "PreCompiled.h"
-#include <boost/algorithm/string/predicate.hpp>
-#include <Inventor/misc/SoState.h>
-#include <Inventor/elements/SoGLCacheContextElement.h>
-#include <Inventor/elements/SoCacheElement.h>
+
+#ifndef _PreComp_
+# include <boost/algorithm/string/predicate.hpp>
+# include <Inventor/elements/SoCacheElement.h>
+# include <Inventor/misc/SoState.h>
+#endif
+
+#include "SoFCSelectionContext.h"
 #include "SoFCUnifiedSelection.h"
-#include "Selection.h"
+
 
 using namespace Gui;
 
diff --git a/src/Gui/SoFCSelectionContext.h b/src/Gui/SoFCSelectionContext.h
index e4a8387a86..850d07f89e 100644
--- a/src/Gui/SoFCSelectionContext.h
+++ b/src/Gui/SoFCSelectionContext.h
@@ -24,12 +24,14 @@
 #define GUI_SOFCSELECTIONCONTEXT_H
 
 #include <map>
-#include <vector>
-#include <set>
 #include <memory>
-#include <climits>
+#include <set>
+#include <vector>
+#include <Inventor/SbColor.h>
+
 #include <App/Material.h>
 
+
 namespace Gui {
 
 class SoFCSelectionRoot;
diff --git a/src/Gui/SoFCUnifiedSelection.cpp b/src/Gui/SoFCUnifiedSelection.cpp
index 4b0477c9b6..30135e4412 100644
--- a/src/Gui/SoFCUnifiedSelection.cpp
+++ b/src/Gui/SoFCUnifiedSelection.cpp
@@ -23,8 +23,42 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <Inventor/SoFullPath.h>
+# include <Inventor/SoPickedPoint.h>
+# include <Inventor/actions/SoCallbackAction.h>
+# include <Inventor/actions/SoGetBoundingBoxAction.h>
+# include <Inventor/actions/SoGetPrimitiveCountAction.h>
+# include <Inventor/actions/SoGLRenderAction.h>
+# include <Inventor/actions/SoHandleEventAction.h>
+# include <Inventor/actions/SoWriteAction.h>
+# include <Inventor/bundles/SoMaterialBundle.h>
 # include <Inventor/details/SoFaceDetail.h>
 # include <Inventor/details/SoLineDetail.h>
+# include <Inventor/elements/SoCacheElement.h>
+# include <Inventor/elements/SoCoordinateElement.h>
+# include <Inventor/elements/SoDrawStyleElement.h>
+# include <Inventor/elements/SoGLCacheContextElement.h>
+# include <Inventor/elements/SoLazyElement.h>
+# include <Inventor/elements/SoLineWidthElement.h>
+# include <Inventor/elements/SoMaterialBindingElement.h>
+# include <Inventor/elements/SoModelMatrixElement.h>
+# include <Inventor/elements/SoOverrideElement.h>
+# include <Inventor/elements/SoShapeStyleElement.h>
+# include <Inventor/elements/SoSwitchElement.h>
+# include <Inventor/elements/SoTextureEnabledElement.h>
+# include <Inventor/events/SoLocation2Event.h>
+# include <Inventor/events/SoMouseButtonEvent.h>
+# include <Inventor/misc/SoChildList.h>
+# include <Inventor/misc/SoState.h>
+# include <Inventor/nodes/SoCoordinate3.h>
+# include <Inventor/nodes/SoCube.h>
+# include <Inventor/nodes/SoIndexedFaceSet.h>
+# include <Inventor/nodes/SoIndexedLineSet.h>
+# include <Inventor/nodes/SoMaterial.h>
+# include <Inventor/nodes/SoMaterialBinding.h>
+# include <Inventor/nodes/SoNormalBinding.h>
+# include <Inventor/nodes/SoPointSet.h>
+# include <Inventor/threads/SbStorage.h>
 #endif
 
 #ifdef FC_OS_MACOSX
@@ -36,30 +70,7 @@
 # include <GL/gl.h>
 #endif
 
-#include <Inventor/SoFullPath.h>
-#include <Inventor/SoPickedPoint.h>
-#include <Inventor/actions/SoGLRenderAction.h>
-#include <Inventor/actions/SoHandleEventAction.h>
-#include <Inventor/elements/SoCacheElement.h>
-#include <Inventor/elements/SoCoordinateElement.h>
-#include <Inventor/elements/SoGLCacheContextElement.h>
-#include <Inventor/elements/SoLazyElement.h>
-#include <Inventor/elements/SoLineWidthElement.h>
-#include <Inventor/elements/SoMaterialBindingElement.h>
-#include <Inventor/elements/SoModelMatrixElement.h>
-#include <Inventor/elements/SoOverrideElement.h>
-#include <Inventor/elements/SoShapeStyleElement.h>
-#include <Inventor/elements/SoSwitchElement.h>
-#include <Inventor/events/SoLocation2Event.h>
-#include <Inventor/events/SoMouseButtonEvent.h>
-#include <Inventor/misc/SoState.h>
-#include <Inventor/nodes/SoMaterialBinding.h>
-#include <Inventor/nodes/SoNormalBinding.h>
-#include <Inventor/threads/SbStorage.h>
-
-#include <App/Application.h>
 #include <App/Document.h>
-#include <App/DocumentObject.h>
 #include <App/ComplexGeoData.h>
 #include <Base/Tools.h>
 
@@ -67,13 +78,13 @@
 #include "Application.h"
 #include "Document.h"
 #include "MainWindow.h"
-#include "Selection.h"
 #include "SoFCInteractiveElement.h"
 #include "SoFCSelectionAction.h"
 #include "ViewParams.h"
 #include "ViewProvider.h"
 #include "ViewProviderDocumentObject.h"
 
+
 FC_LOG_LEVEL_INIT("SoFCUnifiedSelection",false,true,true)
 
 using namespace Gui;
diff --git a/src/Gui/SoFCUnifiedSelection.h b/src/Gui/SoFCUnifiedSelection.h
index 0745d01359..854044ed96 100644
--- a/src/Gui/SoFCUnifiedSelection.h
+++ b/src/Gui/SoFCUnifiedSelection.h
@@ -23,18 +23,19 @@
 #ifndef GUI_SOFCUNIFIEDSELECTION_H
 #define GUI_SOFCUNIFIEDSELECTION_H
 
-#include <Inventor/nodes/SoSubNode.h>
-#include <Inventor/nodes/SoSeparator.h>
+#include <list>
+#include <unordered_map>
+#include <unordered_set>
+
+#include <Inventor/elements/SoLazyElement.h>
 #include <Inventor/fields/SoSFBool.h>
 #include <Inventor/fields/SoSFColor.h>
 #include <Inventor/fields/SoSFEnum.h>
-#include <Inventor/fields/SoSFString.h>
-#include <Inventor/nodes/SoLightModel.h>
-#include "View3DInventorViewer.h"
+#include <Inventor/nodes/SoSeparator.h>
+
 #include "SoFCSelectionContext.h"
-#include <list>
-#include <unordered_set>
-#include <unordered_map>
+#include "View3DInventorViewer.h"
+
 
 class SoFullPath;
 class SoPickedPoint;
diff --git a/src/Gui/SoFCVectorizeSVGAction.cpp b/src/Gui/SoFCVectorizeSVGAction.cpp
index eb75c76740..7a1a5c17e4 100644
--- a/src/Gui/SoFCVectorizeSVGAction.cpp
+++ b/src/Gui/SoFCVectorizeSVGAction.cpp
@@ -20,20 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
+# include <qglobal.h>
 # include <iomanip>
 # include <ios>
+# include <Inventor/SbBSPTree.h>
 #endif
-#include <Inventor/SbBasic.h>
-#include <Inventor/SbBSPTree.h>
 
-#include <qglobal.h>
 #include <Base/FileInfo.h>
-#include <Base/Console.h>
+
 #include "SoFCVectorizeSVGAction.h"
 
+
 using namespace Gui;
 
 class SoVectorizeItem {
diff --git a/src/Gui/SoFCVectorizeSVGAction.h b/src/Gui/SoFCVectorizeSVGAction.h
index 734d2f9e8b..2924418bd2 100644
--- a/src/Gui/SoFCVectorizeSVGAction.h
+++ b/src/Gui/SoFCVectorizeSVGAction.h
@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_SOFCVECTORIZESVGACTION_H
 #define GUI_SOFCVECTORIZESVGACTION_H
 
-#ifndef __InventorAll__
-# include "InventorAll.h"
-#endif
+#include <Inventor/annex/HardCopy/SoVectorizeAction.h>
+#include <Inventor/annex/HardCopy/SoVectorOutput.h>
 
 #include <fstream>
 
diff --git a/src/Gui/SoFCVectorizeU3DAction.cpp b/src/Gui/SoFCVectorizeU3DAction.cpp
index b2c3a52efe..51ac1c4e6a 100644
--- a/src/Gui/SoFCVectorizeU3DAction.cpp
+++ b/src/Gui/SoFCVectorizeU3DAction.cpp
@@ -20,20 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
 # include <qglobal.h>
 # include <iomanip>
 # include <ios>
+# include <Inventor/SbBSPTree.h>
 #endif
-#include <Inventor/SbBasic.h>
-#include <Inventor/SbBSPTree.h>
 
 #include <Base/FileInfo.h>
 #include <Base/Tools.h>
+
 #include "SoFCVectorizeU3DAction.h"
 
+
 using namespace Gui;
 
 class SoVectorizeItem {
diff --git a/src/Gui/SoFCVectorizeU3DAction.h b/src/Gui/SoFCVectorizeU3DAction.h
index 839b3f4116..de5c01bdac 100644
--- a/src/Gui/SoFCVectorizeU3DAction.h
+++ b/src/Gui/SoFCVectorizeU3DAction.h
@@ -20,15 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_SOFCVECTORIZEU3DACTION_H
 #define GUI_SOFCVECTORIZEU3DACTION_H
 
-#ifndef __InventorAll__
-# include "InventorAll.h"
-#endif
-
 #include <fstream>
+#include <Inventor/annex/HardCopy/SoVectorizeAction.h>
+#include <Inventor/annex/HardCopy/SoVectorOutput.h>
 
 
 namespace Gui {
diff --git a/src/Gui/TaskElementColors.cpp b/src/Gui/TaskElementColors.cpp
index 9092f7af7e..6e423f5926 100644
--- a/src/Gui/TaskElementColors.cpp
+++ b/src/Gui/TaskElementColors.cpp
@@ -23,13 +23,11 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <boost/algorithm/string/predicate.hpp>
+# include <QColorDialog>
 # include <sstream>
 #endif
 
-#include <QColorDialog>
-
-#include <boost/algorithm/string/predicate.hpp>
-
 #include <App/ComplexGeoData.h>
 #include <App/Document.h>
 
diff --git a/src/Gui/View3DInventor.cpp b/src/Gui/View3DInventor.cpp
index 9753be881c..2d7ff36912 100644
--- a/src/Gui/View3DInventor.cpp
+++ b/src/Gui/View3DInventor.cpp
@@ -45,15 +45,15 @@
 # include <Inventor/actions/SoGetPrimitiveCountAction.h>
 # include <Inventor/fields/SoSFColor.h>
 # include <Inventor/fields/SoSFString.h>
+# include <Inventor/nodes/SoDirectionalLight.h>
+# include <Inventor/nodes/SoOrthographicCamera.h>
+# include <Inventor/nodes/SoPerspectiveCamera.h>
 # include <Inventor/nodes/SoSeparator.h>
 #endif
 
-#include <Inventor/nodes/SoOrthographicCamera.h>
-#include <Inventor/nodes/SoPerspectiveCamera.h>
-
+#include <App/Document.h>
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
-#include <App/Document.h>
 
 #include "View3DInventor.h"
 #include "Application.h"
diff --git a/src/Gui/View3DInventorViewer.cpp b/src/Gui/View3DInventorViewer.cpp
index e468843f54..e817b7c84c 100644
--- a/src/Gui/View3DInventorViewer.cpp
+++ b/src/Gui/View3DInventorViewer.cpp
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
 # include <float.h>
 # ifdef FC_OS_WIN32
@@ -43,6 +43,9 @@
 # include <Inventor/actions/SoHandleEventAction.h>
 # include <Inventor/actions/SoRayPickAction.h>
 # include <Inventor/annex/HardCopy/SoVectorizePSAction.h>
+# include <Inventor/details/SoDetail.h>
+# include <Inventor/elements/SoLightModelElement.h>
+# include <Inventor/elements/SoOverrideElement.h>
 # include <Inventor/elements/SoViewportRegionElement.h>
 # include <Inventor/events/SoEvent.h>
 # include <Inventor/events/SoKeyboardEvent.h>
@@ -73,9 +76,6 @@
 # include <QWheelEvent>
 #endif
 
-# include <Inventor/elements/SoLightModelElement.h>
-# include <Inventor/elements/SoOverrideElement.h>
-
 #include <App/Document.h>
 #include <App/GeoFeatureGroupExtension.h>
 #include <Base/Console.h>
diff --git a/src/Gui/ViewProviderLink.cpp b/src/Gui/ViewProviderLink.cpp
index 6d206a46f6..2f39d945ed 100644
--- a/src/Gui/ViewProviderLink.cpp
+++ b/src/Gui/ViewProviderLink.cpp
@@ -25,6 +25,7 @@
 #ifndef _PreComp_
 # include <atomic>
 # include <cctype>
+# include <boost/algorithm/string/predicate.hpp>
 # include <Inventor/SoPickedPoint.h>
 # include <Inventor/actions/SoGetBoundingBoxAction.h>
 # include <Inventor/details/SoDetail.h>
@@ -44,8 +45,6 @@
 #include <QMenu>
 #endif
 
-#include <boost/algorithm/string/predicate.hpp>
-
 #include <App/ComplexGeoData.h>
 #include <App/Document.h>
 #include <Base/BoundBoxPy.h>
diff --git a/src/Gui/propertyeditor/PropertyEditor.cpp b/src/Gui/propertyeditor/PropertyEditor.cpp
index 25bfb5b98d..9d3d026ab8 100644
--- a/src/Gui/propertyeditor/PropertyEditor.cpp
+++ b/src/Gui/propertyeditor/PropertyEditor.cpp
@@ -24,14 +24,13 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <boost/algorithm/string/predicate.hpp>
 # include <QApplication>
 # include <QInputDialog>
 # include <QMenu>
 # include <QPainter>
 #endif
 
-#include <boost/algorithm/string/predicate.hpp>
-
 #include <App/Application.h>
 #include <App/AutoTransaction.h>
 #include <App/Document.h>
diff --git a/src/Gui/propertyeditor/PropertyModel.cpp b/src/Gui/propertyeditor/PropertyModel.cpp
index 49f84e928f..6ddc74e487 100644
--- a/src/Gui/propertyeditor/PropertyModel.cpp
+++ b/src/Gui/propertyeditor/PropertyModel.cpp
@@ -20,10 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#include <boost/algorithm/string/predicate.hpp>
+#ifndef _PreComp_
+# include <boost/algorithm/string/predicate.hpp>
+#endif
 
 #include "PropertyItem.h"
 #include "PropertyModel.h"
diff --git a/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.cpp b/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.cpp
index 308a3fb257..2ac9a6c008 100644
--- a/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.cpp
+++ b/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.cpp
@@ -42,8 +42,11 @@
 # include <GL/glext.h>
 # endif
 # include <Inventor/actions/SoGLRenderAction.h>
+# include <Inventor/actions/SoSearchAction.h>
 # include <Inventor/bundles/SoMaterialBundle.h>
+# include <Inventor/bundles/SoTextureCoordinateBundle.h>
 # include <Inventor/elements/SoCoordinateElement.h>
+# include <Inventor/elements/SoGLCacheContextElement.h>
 # include <Inventor/elements/SoGLCoordinateElement.h>
 # include <Inventor/elements/SoGLLazyElement.h>
 # include <Inventor/elements/SoMaterialBindingElement.h>
@@ -51,6 +54,7 @@
 # include <Inventor/elements/SoProjectionMatrixElement.h>
 # include <Inventor/elements/SoViewingMatrixElement.h>
 # include <Inventor/errors/SoDebugError.h>
+# include <Inventor/nodes/SoCoordinate3.h>
 #endif
 
 #include <Inventor/C/glue/gl.h>
diff --git a/src/Mod/Mesh/Gui/SoFCMeshObject.cpp b/src/Mod/Mesh/Gui/SoFCMeshObject.cpp
index 385bce7882..d4206eda16 100644
--- a/src/Mod/Mesh/Gui/SoFCMeshObject.cpp
+++ b/src/Mod/Mesh/Gui/SoFCMeshObject.cpp
@@ -36,13 +36,20 @@
 # include <GL/gl.h>
 # include <GL/glu.h>
 # endif
+# include <Inventor/SbLine.h>
+# include <Inventor/SoPickedPoint.h>
+# include <Inventor/SoPrimitiveVertex.h>
 # include <Inventor/actions/SoCallbackAction.h>
 # include <Inventor/actions/SoGetBoundingBoxAction.h>
 # include <Inventor/actions/SoGetPrimitiveCountAction.h>
 # include <Inventor/actions/SoGLRenderAction.h>
 # include <Inventor/actions/SoPickAction.h>
+# include <Inventor/actions/SoSearchAction.h>
 # include <Inventor/actions/SoWriteAction.h>
+# include <Inventor/bundles/SoMaterialBundle.h>
+# include <Inventor/bundles/SoTextureCoordinateBundle.h>
 # include <Inventor/details/SoFaceDetail.h>
+# include <Inventor/details/SoLineDetail.h>
 # include <Inventor/errors/SoReadError.h>
 # include <Inventor/misc/SoState.h>
 #endif
diff --git a/src/Mod/TechDraw/Gui/Grabber3d.cpp b/src/Mod/TechDraw/Gui/Grabber3d.cpp
index 6a8ac03495..c0b43078bc 100644
--- a/src/Mod/TechDraw/Gui/Grabber3d.cpp
+++ b/src/Mod/TechDraw/Gui/Grabber3d.cpp
@@ -23,69 +23,35 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-
+#include <QScreen>
+#include <Inventor/SbColor.h>
+#include <Inventor/SbVec2s.h>
+#include <Inventor/SbViewportRegion.h>
+#include <Inventor/SoRenderManager.h>
+#include <Inventor/actions/SoWriteAction.h>
+#include <Inventor/annex/HardCopy/SoVectorizeAction.h>
+#include <Inventor/misc/SoChildList.h>
+#include <Inventor/nodes/SoCamera.h>
+#include <Inventor/nodes/SoDirectionalLight.h>
+#include <Inventor/nodes/SoNode.h>
+#include <Inventor/nodes/SoOrthographicCamera.h>
+#include <Inventor/nodes/SoPerspectiveCamera.h>
+#include <Inventor/nodes/SoSeparator.h>
 #endif
 
-//#include <QGuiApplication>
-
-#include <QImage>
-#include <QPixmap>
-#include <QBitmap>
-#include <QGraphicsView>
-#include <QGroupBox>
-#include <QLabel>
-#include <QLineEdit>
-#include <QFormLayout>
-#include <QGraphicsProxyWidget>
-#include <QScreen>
-
-#include <App/Application.h>
-#include <App/Document.h>
-#include <App/DocumentObject.h>
 #include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Parameter.h>
 #include <Gui/Application.h>
-#include <Gui/Command.h>
-#include <Gui/Control.h>
 #include <Gui/Document.h>
-#include <Gui/Selection.h>
 #include <Gui/MainWindow.h>
 #include <Gui/MDIView.h>
-#include <Gui/NavigationStyle.h>
-#include <Gui/ViewProvider.h>
+#include <Gui/Selection.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
 #include <Gui/SoFCVectorizeSVGAction.h>
 
-#include <Inventor/SbBasic.h>
-#include <Inventor/SbBox3f.h>
-#include <Inventor/SbColor.h>
-#include <Inventor/SbVec3f.h>
-#include <Inventor/SbVec2s.h>
-#include <Inventor/SbVec2f.h>
-#include <Inventor/SbVec2d.h>
-#include <Inventor/SbViewportRegion.h>
-#include <Inventor/SoRenderManager.h>
-#include <Inventor/actions/SoWriteAction.h>
-#include <Inventor/fields/SoSFVec3f.h>
-#include <Inventor/nodes/SoCamera.h>
-#include <Inventor/nodes/SoOrthographicCamera.h>
-#include <Inventor/nodes/SoPerspectiveCamera.h>
-#include <Inventor/nodes/SoMaterial.h>
-#include <Inventor/nodes/SoNode.h>
-#include <Inventor/nodes/SoSeparator.h>
-#include <Inventor/nodes/SoDirectionalLight.h>
-#include <Inventor/nodes/SoDrawStyle.h>
-#include <Inventor/annex/HardCopy/SoVectorizeAction.h>
-
-#include "Rez.h"
-#include "QGVPage.h"
-#include "MDIViewPage.h"
-#include "DrawGuiUtil.h"
-
 #include "Grabber3d.h"
 
+
 using namespace TechDrawGui;
 using namespace TechDraw;
 using namespace Gui;