diff --git a/src/Mod/Part/Gui/SoBrepEdgeSet.cpp b/src/Mod/Part/Gui/SoBrepEdgeSet.cpp
index e9e65d2c7b..5733f02ec8 100644
--- a/src/Mod/Part/Gui/SoBrepEdgeSet.cpp
+++ b/src/Mod/Part/Gui/SoBrepEdgeSet.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -32,35 +31,24 @@
 # else
 #  include <GL/gl.h>
 # endif
-# include <cfloat>
 # include <algorithm>
+# include <cfloat>
 # 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/SoWriteAction.h>
 # include <Inventor/bundles/SoMaterialBundle.h>
-# include <Inventor/bundles/SoTextureCoordinateBundle.h>
-# include <Inventor/elements/SoOverrideElement.h>
+# include <Inventor/details/SoLineDetail.h>
 # include <Inventor/elements/SoCoordinateElement.h>
 # include <Inventor/elements/SoGLCoordinateElement.h>
-# include <Inventor/elements/SoGLCacheContextElement.h>
 # include <Inventor/elements/SoLineWidthElement.h>
-# include <Inventor/elements/SoPointSizeElement.h>
 # include <Inventor/errors/SoDebugError.h>
-# include <Inventor/errors/SoReadError.h>
-# include <Inventor/details/SoFaceDetail.h>
-# include <Inventor/details/SoLineDetail.h>
 # include <Inventor/misc/SoState.h>
-# include <Inventor/elements/SoCacheElement.h>
 #endif
 
-#include "SoBrepEdgeSet.h"
 #include <Gui/SoFCUnifiedSelection.h>
-#include <Gui/SoFCSelectionAction.h>
+#include "SoBrepEdgeSet.h"
+
 
 using namespace PartGui;
 
diff --git a/src/Mod/Part/Gui/SoBrepEdgeSet.h b/src/Mod/Part/Gui/SoBrepEdgeSet.h
index dc04483250..b0bdc44c0f 100644
--- a/src/Mod/Part/Gui/SoBrepEdgeSet.h
+++ b/src/Mod/Part/Gui/SoBrepEdgeSet.h
@@ -23,19 +23,13 @@
 #ifndef PARTGUI_SOBREPEDGESET_H
 #define PARTGUI_SOBREPEDGESET_H
 
-#include <Inventor/fields/SoSFInt32.h>
-#include <Inventor/fields/SoMFInt32.h>
-#include <Inventor/fields/SoSFNode.h>
-#include <Inventor/fields/SoSubField.h>
-#include <Inventor/nodes/SoSubNode.h>
 #include <Inventor/nodes/SoIndexedLineSet.h>
-#include <Inventor/elements/SoLazyElement.h>
-#include <Inventor/elements/SoReplacedElement.h>
-#include <vector>
 #include <memory>
+#include <vector>
 #include <Gui/SoFCSelectionContext.h>
 #include <Mod/Part/PartGlobal.h>
 
+
 class SoCoordinateElement;
 class SoGLCoordinateElement;
 class SoTextureCoordinateBundle;
diff --git a/src/Mod/Part/Gui/SoBrepFaceSet.cpp b/src/Mod/Part/Gui/SoBrepFaceSet.cpp
index 00c70dff8f..fb5e22d5f5 100644
--- a/src/Mod/Part/Gui/SoBrepFaceSet.cpp
+++ b/src/Mod/Part/Gui/SoBrepFaceSet.cpp
@@ -29,17 +29,13 @@
 #endif
 
 #ifndef _PreComp_
-# include <cfloat>
 # include <algorithm>
+# include <cfloat>
 # include <map>
 # 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/SoWriteAction.h>
 # include <Inventor/bundles/SoMaterialBundle.h>
 # include <Inventor/bundles/SoTextureCoordinateBundle.h>
 # include <Inventor/elements/SoLazyElement.h>
@@ -48,17 +44,13 @@
 # include <Inventor/elements/SoGLCoordinateElement.h>
 # include <Inventor/elements/SoGLCacheContextElement.h>
 # include <Inventor/elements/SoGLVBOElement.h>
-# include <Inventor/elements/SoLineWidthElement.h>
-# include <Inventor/elements/SoPointSizeElement.h>
 # include <Inventor/errors/SoDebugError.h>
-# include <Inventor/errors/SoReadError.h>
 # include <Inventor/details/SoFaceDetail.h>
-# include <Inventor/details/SoLineDetail.h>
 # include <Inventor/misc/SoState.h>
 # include <Inventor/misc/SoContextHandler.h>
-# include <Inventor/elements/SoShapeStyleElement.h>
 # include <Inventor/elements/SoCacheElement.h>
 # include <Inventor/elements/SoTextureEnabledElement.h>
+
 # ifdef FC_OS_WIN32
 #  include <windows.h>
 #  include <GL/gl.h>
@@ -76,11 +68,12 @@
 # include <Inventor/C/glue/gl.h>
 #endif
 
-#include <boost/algorithm/string/predicate.hpp>
-#include "SoBrepFaceSet.h"
-#include <Gui/SoFCUnifiedSelection.h>
-#include <Gui/SoFCSelectionAction.h>
 #include <Gui/SoFCInteractiveElement.h>
+#include <Gui/SoFCSelectionAction.h>
+#include <Gui/SoFCUnifiedSelection.h>
+
+#include "SoBrepFaceSet.h"
+
 
 using namespace PartGui;
 
diff --git a/src/Mod/Part/Gui/SoBrepFaceSet.h b/src/Mod/Part/Gui/SoBrepFaceSet.h
index 17c22575b9..32a6d9c780 100644
--- a/src/Mod/Part/Gui/SoBrepFaceSet.h
+++ b/src/Mod/Part/Gui/SoBrepFaceSet.h
@@ -23,19 +23,15 @@
 #ifndef PARTGUI_SOBREPFACESET_H
 #define PARTGUI_SOBREPFACESET_H
 
-#include <Inventor/fields/SoSFInt32.h>
 #include <Inventor/fields/SoMFInt32.h>
-#include <Inventor/fields/SoSFNode.h>
-#include <Inventor/fields/SoSubField.h>
-#include <Inventor/nodes/SoSubNode.h>
+#include <Inventor/fields/SoSFInt32.h>
 #include <Inventor/nodes/SoIndexedFaceSet.h>
-#include <Inventor/elements/SoLazyElement.h>
-#include <Inventor/elements/SoReplacedElement.h>
-#include <vector>
 #include <memory>
+#include <vector>
 #include <Gui/SoFCSelectionContext.h>
 #include <Mod/Part/PartGlobal.h>
 
+
 class SoGLCoordinateElement;
 class SoTextureCoordinateBundle;
 
diff --git a/src/Mod/Part/Gui/SoBrepPointSet.cpp b/src/Mod/Part/Gui/SoBrepPointSet.cpp
index e5bf1fb2e6..afbf447a04 100644
--- a/src/Mod/Part/Gui/SoBrepPointSet.cpp
+++ b/src/Mod/Part/Gui/SoBrepPointSet.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -32,34 +31,22 @@
 # else
 #  include <GL/gl.h>
 # endif
-# include <cfloat>
 # include <algorithm>
-# include <Inventor/SoPickedPoint.h>
-# include <Inventor/SoPrimitiveVertex.h>
-# include <Inventor/actions/SoCallbackAction.h>
+# include <cfloat>
 # include <Inventor/actions/SoGetBoundingBoxAction.h>
-# include <Inventor/actions/SoGetPrimitiveCountAction.h>
 # include <Inventor/actions/SoGLRenderAction.h>
-# include <Inventor/actions/SoPickAction.h>
-# include <Inventor/actions/SoWriteAction.h>
 # include <Inventor/bundles/SoMaterialBundle.h>
-# include <Inventor/bundles/SoTextureCoordinateBundle.h>
-# include <Inventor/elements/SoOverrideElement.h>
+# include <Inventor/details/SoPointDetail.h>
 # include <Inventor/elements/SoCoordinateElement.h>
-# include <Inventor/elements/SoGLCoordinateElement.h>
-# include <Inventor/elements/SoGLCacheContextElement.h>
-# include <Inventor/elements/SoLineWidthElement.h>
 # include <Inventor/elements/SoPointSizeElement.h>
 # include <Inventor/errors/SoDebugError.h>
-# include <Inventor/errors/SoReadError.h>
-# include <Inventor/details/SoFaceDetail.h>
-# include <Inventor/details/SoLineDetail.h>
 # include <Inventor/misc/SoState.h>
 #endif
 
-#include "SoBrepPointSet.h"
 #include <Gui/SoFCUnifiedSelection.h>
-#include <Gui/SoFCSelectionAction.h>
+
+#include "SoBrepPointSet.h"
+
 
 using namespace PartGui;
 
diff --git a/src/Mod/Part/Gui/SoBrepPointSet.h b/src/Mod/Part/Gui/SoBrepPointSet.h
index d1baf2d1ff..69f5ac605e 100644
--- a/src/Mod/Part/Gui/SoBrepPointSet.h
+++ b/src/Mod/Part/Gui/SoBrepPointSet.h
@@ -23,19 +23,13 @@
 #ifndef PARTGUI_SOBREPPOINTSET_H
 #define PARTGUI_SOBREPPOINTSET_H
 
-#include <Inventor/fields/SoSFInt32.h>
-#include <Inventor/fields/SoMFInt32.h>
-#include <Inventor/fields/SoSFNode.h>
-#include <Inventor/fields/SoSubField.h>
-#include <Inventor/nodes/SoSubNode.h>
 #include <Inventor/nodes/SoPointSet.h>
-#include <Inventor/elements/SoLazyElement.h>
-#include <Inventor/elements/SoReplacedElement.h>
-#include <vector>
 #include <memory>
+#include <vector>
 #include <Gui/SoFCSelectionContext.h>
 #include <Mod/Part/PartGlobal.h>
 
+
 class SoCoordinateElement;
 class SoGLCoordinateElement;
 class SoTextureCoordinateBundle;
diff --git a/src/Mod/Part/Gui/SoFCShapeObject.cpp b/src/Mod/Part/Gui/SoFCShapeObject.cpp
index b5a4d7fbe1..50691d970b 100644
--- a/src/Mod/Part/Gui/SoFCShapeObject.cpp
+++ b/src/Mod/Part/Gui/SoFCShapeObject.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -32,26 +31,21 @@
 # else
 #  include <GL/gl.h>
 # endif
-# include <cfloat>
 # include <algorithm>
-# include <Inventor/actions/SoCallbackAction.h>
-# include <Inventor/actions/SoGetBoundingBoxAction.h>
-# include <Inventor/actions/SoGetPrimitiveCountAction.h>
+# include <cfloat>
 # include <Inventor/actions/SoGLRenderAction.h>
-# include <Inventor/actions/SoPickAction.h>
-# include <Inventor/actions/SoWriteAction.h>
 # include <Inventor/bundles/SoMaterialBundle.h>
 # include <Inventor/bundles/SoTextureCoordinateBundle.h>
 # include <Inventor/elements/SoCoordinateElement.h>
-# include <Inventor/elements/SoGLCacheContextElement.h>
+# include <Inventor/elements/SoLazyElement.h>
 # include <Inventor/errors/SoReadError.h>
 # include <Inventor/misc/SoState.h>
 #endif
 
 #include "SoFCShapeObject.h"
 
-using namespace PartGui;
 
+using namespace PartGui;
 
 SO_NODE_SOURCE(SoFCControlPoints)
 
diff --git a/src/Mod/Part/Gui/SoFCShapeObject.h b/src/Mod/Part/Gui/SoFCShapeObject.h
index 40194d2cc8..115d1f2567 100644
--- a/src/Mod/Part/Gui/SoFCShapeObject.h
+++ b/src/Mod/Part/Gui/SoFCShapeObject.h
@@ -23,14 +23,12 @@
 #ifndef PARTGUI_SOFCSHAPEOBJECT_H
 #define PARTGUI_SOFCSHAPEOBJECT_H
 
-#include <Inventor/fields/SoSFUInt32.h>
 #include <Inventor/fields/SoSFColor.h>
-#include <Inventor/fields/SoSubField.h>
-#include <Inventor/nodes/SoSubNode.h>
+#include <Inventor/fields/SoSFUInt32.h>
 #include <Inventor/nodes/SoShape.h>
-#include <Inventor/elements/SoReplacedElement.h>
 #include <Mod/Part/PartGlobal.h>
 
+
 namespace PartGui {
 
 class PartGuiExport SoFCControlPoints : public SoShape {