diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
index cd5aed7ab7..224fa39d5c 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
@@ -25,16 +25,11 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
-# include <Poly_Polygon3D.hxx>
 
 # include <Inventor/actions/SoGetBoundingBoxAction.h>
 # include <Inventor/SbBox3f.h>
 # include <Inventor/SoPickedPoint.h>
 # include <Inventor/details/SoPointDetail.h>
-# include <Inventor/nodes/SoDrawStyle.h>
-# include <Inventor/nodes/SoLineSet.h>
-# include <Inventor/nodes/SoPointSet.h>
-# include <Inventor/nodes/SoMarkerSet.h>
 # include <Inventor/nodes/SoCamera.h>
 # include <Inventor/SbTime.h>
 
@@ -42,64 +37,51 @@
 # include <QAction>
 # include <QApplication>
 # include <QColor>
+# include <QDesktopWidget>
 # include <QDialog>
 # include <QFont>
+# include <QKeyEvent>
 # include <QMenu>
 # include <QMessageBox>
 # include <QPainter>
 # include <QTextStream>
-# include <QKeyEvent>
-# include <QDesktopWidget>
 
 # include <boost_bind_bind.hpp>
 #endif
 
 /// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <Base/Converter.h>
-#include <Base/Tools.h>
-#include <Base/Parameter.h>
 #include <Base/Console.h>
+#include <Base/Tools.h>
 #include <Base/Vector3D.h>
-#include <Base/Interpreter.h>
-#include <Base/UnitsSchema.h>
-#include <Base/UnitsApi.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
-#include <Gui/Document.h>
 #include <Gui/CommandT.h>
 #include <Gui/Control.h>
-#include <Gui/Selection.h>
-#include <Gui/Tools.h>
-#include <Gui/Utilities.h>
+#include <Gui/Document.h>
 #include <Gui/MainWindow.h>
 #include <Gui/MenuManager.h>
+#include <Gui/Selection.h>
+#include <Gui/SoFCUnifiedSelection.h>
+#include <Gui/Utilities.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
-#include <Gui/DlgEditFileIncludePropertyExternal.h>
-#include <Gui/SoFCBoundingBox.h>
-#include <Gui/SoFCUnifiedSelection.h>
-#include <Gui/Inventor/MarkerBitmaps.h>
-#include <Gui/Inventor/SmSwitchboard.h>
 
 #include <Mod/Part/App/Geometry.h>
-#include <Mod/Part/App/BodyBase.h>
-#include <Mod/Sketcher/App/SketchObject.h>
-#include <Mod/Sketcher/App/Sketch.h>
-#include <Mod/Sketcher/App/GeometryFacade.h>
 #include <Mod/Sketcher/App/GeoList.h>
+#include <Mod/Sketcher/App/GeometryFacade.h>
+#include <Mod/Sketcher/App/Sketch.h>
+#include <Mod/Sketcher/App/SketchObject.h>
 #include <Mod/Sketcher/App/SolverGeometryExtension.h>
 
-#include "SoZoomTranslation.h"
-#include "SoDatumLabel.h"
-#include "EditDatumDialog.h"
 #include "ViewProviderSketch.h"
 #include "DrawSketchHandler.h"
+#include "EditModeCoinManager.h"
+#include "EditDatumDialog.h"
 #include "TaskDlgEditSketch.h"
 #include "TaskSketcherValidation.h"
 #include "Utils.h"
 #include "ViewProviderSketchGeometryExtension.h"
 
-#include "EditModeCoinManager.h"
 
 FC_LOG_LEVEL_INIT("Sketch",true,true)