diff --git a/src/Gui/ViewProviderMaterialObject.cpp b/src/Gui/ViewProviderMaterialObject.cpp
index 9937ed1581..cc373d39ec 100644
--- a/src/Gui/ViewProviderMaterialObject.cpp
+++ b/src/Gui/ViewProviderMaterialObject.cpp
@@ -20,24 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <QApplication>
-# include <QPixmap>
 #endif
 
-#include <App/DocumentObjectGroup.h>
-#include <App/Document.h>
-
-/// Here the FreeCAD includes sorted by Base,App,Gui......
 #include "ViewProviderMaterialObject.h"
 #include "Application.h"
-#include "Command.h"
-#include "BitmapFactory.h"
 #include "Document.h"
-#include "Tree.h"
 
 
 using namespace Gui;
diff --git a/src/Gui/ViewProviderMeasureDistance.cpp b/src/Gui/ViewProviderMeasureDistance.cpp
index 10d651e102..72261340a7 100644
--- a/src/Gui/ViewProviderMeasureDistance.cpp
+++ b/src/Gui/ViewProviderMeasureDistance.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -31,29 +30,29 @@
 # include <Inventor/events/SoMouseButtonEvent.h>
 # include <Inventor/nodes/SoAnnotation.h>
 # include <Inventor/nodes/SoBaseColor.h>
+# include <Inventor/nodes/SoCoordinate3.h>
+# include <Inventor/nodes/SoDrawStyle.h>
 # include <Inventor/nodes/SoFontStyle.h>
+# include <Inventor/nodes/SoIndexedLineSet.h>
+# include <Inventor/nodes/SoMarkerSet.h>
 # include <Inventor/nodes/SoPickStyle.h>
 # include <Inventor/nodes/SoText2.h>
 # include <Inventor/nodes/SoTranslation.h>
-# include <Inventor/nodes/SoCoordinate3.h>
-# include <Inventor/nodes/SoIndexedLineSet.h>
-# include <Inventor/nodes/SoMarkerSet.h>
-# include <Inventor/nodes/SoDrawStyle.h>
 #endif
 
+#include <Inventor/MarkerBitmaps.h>
+
+#include <App/MeasureDistance.h>
+#include <Base/Console.h>
+#include <Base/Quantity.h>
+
 #include "ViewProviderMeasureDistance.h"
 #include "Application.h"
+#include <Command.h>
 #include "Document.h"
 #include "View3DInventorViewer.h"
 #include "ViewParams.h"
 
-#include <App/PropertyGeo.h>
-#include <App/PropertyStandard.h>
-#include <App/MeasureDistance.h>
-#include <Base/Console.h>
-#include <Base/Quantity.h>
-#include <Inventor/MarkerBitmaps.h>
-#include <Command.h>
 
 using namespace Gui;
 
diff --git a/src/Gui/ViewProviderOrigin.cpp b/src/Gui/ViewProviderOrigin.cpp
index 37ea28864e..3908991edb 100644
--- a/src/Gui/ViewProviderOrigin.cpp
+++ b/src/Gui/ViewProviderOrigin.cpp
@@ -21,37 +21,23 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <QApplication>
-# include <QPixmap>
-# include <Inventor/actions/SoGetBoundingBoxAction.h>
-# include <Inventor/nodes/SoSeparator.h>
+# include <Inventor/nodes/SoGroup.h>
 #endif
 
-
-#include <Base/Vector3D.h>
 #include <App/Origin.h>
-#include <App/OriginFeature.h>
-#include <App/Document.h>
+#include "Base/Console.h"
+#include <Base/Vector3D.h>
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
 #include "ViewProviderOrigin.h"
-#include "ViewProviderPlane.h"
-#include "ViewProviderLine.h"
 #include "Application.h"
 #include "Command.h"
-#include "BitmapFactory.h"
 #include "Document.h"
-#include "Tree.h"
-#include "View3DInventor.h"
-#include "View3DInventorViewer.h"
+#include "ViewProviderLine.h"
+#include "ViewProviderPlane.h"
 
-#include "Base/Console.h"
-
-#include <App/Origin.h>
 
 using namespace Gui;
 
diff --git a/src/Gui/ViewProviderOrigin.h b/src/Gui/ViewProviderOrigin.h
index e9fd870706..eedf442733 100644
--- a/src/Gui/ViewProviderOrigin.h
+++ b/src/Gui/ViewProviderOrigin.h
@@ -21,7 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_VIEWPROVIDER_ViewProviderOrigin_H
 #define GUI_VIEWPROVIDER_ViewProviderOrigin_H
 
@@ -29,6 +28,7 @@
 
 #include "ViewProviderDocumentObject.h"
 
+
 namespace Gui {
 
 class Document;
diff --git a/src/Gui/ViewProviderOriginFeature.cpp b/src/Gui/ViewProviderOriginFeature.cpp
index 3b28561e71..b2ddf3dbf1 100644
--- a/src/Gui/ViewProviderOriginFeature.cpp
+++ b/src/Gui/ViewProviderOriginFeature.cpp
@@ -24,27 +24,22 @@
 
 #ifndef _PreComp_
 # include <Inventor/nodes/SoAsciiText.h>
-# include <Inventor/nodes/SoSeparator.h>
-# include <Inventor/nodes/SoMaterial.h>
-# include <Inventor/nodes/SoMaterialBinding.h>
 # include <Inventor/nodes/SoAnnotation.h>
 # include <Inventor/nodes/SoDrawStyle.h>
-# include <Inventor/nodes/SoCoordinate3.h>
-# include <Inventor/nodes/SoIndexedLineSet.h>
-# include <Inventor/nodes/SoTranslation.h>
-# include <Inventor/nodes/SoFontStyle.h>
+# include <Inventor/nodes/SoFont.h>
+# include <Inventor/nodes/SoMaterial.h>
+# include <Inventor/nodes/SoMaterialBinding.h>
 # include <Inventor/nodes/SoScale.h>
-# include <Inventor/details/SoLineDetail.h>
+# include <Inventor/nodes/SoSeparator.h>
 #endif
 
 #include <App/Document.h>
 #include <App/OriginFeature.h>
 
+#include "ViewProviderOriginFeature.h"
 #include "SoFCSelection.h"
-#include "Window.h"
 #include "ViewProviderOrigin.h"
 
-#include "ViewProviderOriginFeature.h"
 
 using namespace Gui;
 
diff --git a/src/Gui/ViewProviderOriginGroup.cpp b/src/Gui/ViewProviderOriginGroup.cpp
index a54d768fee..6b680ae227 100644
--- a/src/Gui/ViewProviderOriginGroup.cpp
+++ b/src/Gui/ViewProviderOriginGroup.cpp
@@ -22,20 +22,6 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
-#include <Base/Console.h>
-#include <App/OriginGroupExtension.h>
-#include <App/Origin.h>
-
-#include "Application.h"
-#include "Document.h"
-#include "View3DInventor.h"
-#include "View3DInventorViewer.h"
-#include "ViewProviderOrigin.h"
-#include "ViewProviderOriginFeature.h"
-
 #include "ViewProviderOriginGroup.h"
 
 
diff --git a/src/Gui/ViewProviderOriginGroup.h b/src/Gui/ViewProviderOriginGroup.h
index e1c1c44293..d27611236f 100644
--- a/src/Gui/ViewProviderOriginGroup.h
+++ b/src/Gui/ViewProviderOriginGroup.h
@@ -20,10 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef VIEWPROVIDERORIGINGROUP_H_JIXBOPA7
-#define VIEWPROVIDERORIGINGROUP_H_JIXBOPA7
+#ifndef VIEWPROVIDERORIGINGROUP_H
+#define VIEWPROVIDERORIGINGROUP_H
 
-#include "ViewProviderGeoFeatureGroup.h"
 #include "ViewProviderOriginGroupExtension.h"
 
 namespace Gui {
@@ -40,4 +39,4 @@ public:
 } /* Gui  */
 
 
-#endif /* end of include guard: VIEWPROVIDERORIGINGROUP_H_JIXBOPA7 */
+#endif /* end of include guard: VIEWPROVIDERORIGINGROUP_H */
diff --git a/src/Gui/ViewProviderOriginGroupExtension.cpp b/src/Gui/ViewProviderOriginGroupExtension.cpp
index 6cfac12db0..3c3540b04e 100644
--- a/src/Gui/ViewProviderOriginGroupExtension.cpp
+++ b/src/Gui/ViewProviderOriginGroupExtension.cpp
@@ -21,27 +21,25 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#include <boost_bind_bind.hpp>
 #include <Inventor/actions/SoGetBoundingBoxAction.h>
 #include <Inventor/nodes/SoSeparator.h>
 #endif
 
+#include <App/Origin.h>
+#include <App/OriginGroupExtension.h>
+#include <Base/Console.h>
+
 #include "ViewProviderOriginGroupExtension.h"
 #include "Application.h"
 #include "Document.h"
-#include "ViewProviderOriginFeature.h"
-#include "ViewProviderOrigin.h"
-#include "View3DInventorViewer.h"
 #include "View3DInventor.h"
-#include "Command.h"
-#include <App/OriginGroupExtension.h>
-#include <App/Document.h>
-#include <App/Origin.h>
-#include <Base/Console.h>
+#include "View3DInventorViewer.h"
+#include "ViewProviderOrigin.h"
+#include "ViewProviderOriginFeature.h"
+
 
 using namespace Gui;
 namespace bp = boost::placeholders;
diff --git a/src/Gui/ViewProviderOriginGroupExtension.h b/src/Gui/ViewProviderOriginGroupExtension.h
index 1a28f7fe4e..23b0c181cc 100644
--- a/src/Gui/ViewProviderOriginGroupExtension.h
+++ b/src/Gui/ViewProviderOriginGroupExtension.h
@@ -21,13 +21,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_VIEWPROVIDERORIGINGROUPEXTENSION_H
 #define GUI_VIEWPROVIDERORIGINGROUPEXTENSION_H
 
-#include <App/Extension.h>
 #include "ViewProviderGeoFeatureGroup.h"
 
+
 namespace Gui
 {
 
diff --git a/src/Gui/ViewProviderPart.cpp b/src/Gui/ViewProviderPart.cpp
index 38543fc336..ba402dc3df 100644
--- a/src/Gui/ViewProviderPart.cpp
+++ b/src/Gui/ViewProviderPart.cpp
@@ -20,27 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <QApplication>
 # include <QMenu>
-# include <QPixmap>
-# include <boost_bind_bind.hpp>
 #endif
 
+#include <App/DocumentObject.h>
 #include <App/Part.h>
-#include <App/Document.h>
-
-#include "ActiveObjectList.h"
-#include "ActionFunction.h"
-#include "BitmapFactory.h"
-#include "Command.h"
 
 #include "ViewProviderPart.h"
+#include "ActionFunction.h"
 #include "Application.h"
-#include "MDIView.h"
+#include "BitmapFactory.h"
+#include "Command.h"
 
 
 using namespace Gui;
diff --git a/src/Gui/ViewProviderPart.h b/src/Gui/ViewProviderPart.h
index 526ecca4fb..55c4b5043c 100644
--- a/src/Gui/ViewProviderPart.h
+++ b/src/Gui/ViewProviderPart.h
@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_VIEWPROVIDER_ViewProviderPart_H
 #define GUI_VIEWPROVIDER_ViewProviderPart_H
 
-
-#include "ViewProviderOriginGroup.h"
 #include "ViewProviderDragger.h"
+#include "ViewProviderOriginGroup.h"
 #include "ViewProviderPythonFeature.h"