diff --git a/src/Mod/Sketcher/Gui/EditDatumDialog.h b/src/Mod/Sketcher/Gui/EditDatumDialog.h
index d4ded4873a..0682e81ca9 100644
--- a/src/Mod/Sketcher/Gui/EditDatumDialog.h
+++ b/src/Mod/Sketcher/Gui/EditDatumDialog.h
@@ -23,8 +23,9 @@
 #ifndef SKETCHERGUI_EditDatumDialog_H
 #define SKETCHERGUI_EditDatumDialog_H
 
-#include <QObject>
 #include <memory>
+#include <QObject>
+
 
 namespace Sketcher {
 class Constraint;
diff --git a/src/Mod/Sketcher/Gui/EditModeCoinManager.cpp b/src/Mod/Sketcher/Gui/EditModeCoinManager.cpp
index 30b08fb7a4..6e570cede3 100644
--- a/src/Mod/Sketcher/Gui/EditModeCoinManager.cpp
+++ b/src/Mod/Sketcher/Gui/EditModeCoinManager.cpp
@@ -20,85 +20,43 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <Inventor/nodes/SoSeparator.h>
-# include <Inventor/nodes/SoGroup.h>
-# include <Inventor/nodes/SoSwitch.h>
-# include <Inventor/nodes/SoMaterial.h>
+# include <memory>
+
+# include <Inventor/SbVec3f.h>
+# include <Inventor/SoPickedPoint.h>
+# include <Inventor/details/SoDetail.h>
+# include <Inventor/details/SoLineDetail.h>
+# include <Inventor/details/SoPointDetail.h>
+# include <Inventor/nodes/SoDrawStyle.h>
 # include <Inventor/nodes/SoCoordinate3.h>
 # include <Inventor/nodes/SoLineSet.h>
 # include <Inventor/nodes/SoFont.h>
-
+# include <Inventor/nodes/SoGroup.h>
 # include <Inventor/nodes/SoMarkerSet.h>
-# include <Inventor/nodes/SoTranslation.h>
-# include <Inventor/nodes/SoText2.h>
+# include <Inventor/nodes/SoMaterial.h>
 # include <Inventor/nodes/SoPickStyle.h>
-# include <Inventor/nodes/SoDrawStyle.h>
-# include <Inventor/SoPickedPoint.h>
-# include <Inventor/details/SoPointDetail.h>
-# include <Inventor/details/SoDetail.h>
-# include <Inventor/details/SoLineDetail.h>
-
-# include <Inventor/nodes/SoAnnotation.h>
-# include <Inventor/nodes/SoImage.h>
-# include <Inventor/nodes/SoInfo.h>
-
-# include <Inventor/actions/SoRayPickAction.h>
-
-# include <Inventor/SbVec3f.h>
-# include <Inventor/SbImage.h>
-
-# include <memory>
+# include <Inventor/nodes/SoSeparator.h>
+# include <Inventor/nodes/SoText2.h>
+# include <Inventor/nodes/SoTranslation.h>
 #endif  // #ifndef _PreComp_
 
-#include <Gui/Inventor/SmSwitchboard.h>
-
-#include <Mod/Part/App/Geometry.h>
-#include <Mod/Sketcher/App/GeometryFacade.h>
-#include <Mod/Sketcher/App/SolverGeometryExtension.h>
-#include <Mod/Sketcher/App/GeoEnum.h>
+#include <Base/Exception.h>
+#include <Gui/SoFCBoundingBox.h>
+#include <Gui/Inventor/MarkerBitmaps.h>
 #include <Mod/Sketcher/App/Constraint.h>
 #include <Mod/Sketcher/App/GeoList.h>
 
-#include <Base/Exception.h>
-#include <Base/Tools2D.h>
-#include <Base/UnitsApi.h>
-#include <Gui/Tree.h>
-#include <Gui/Utilities.h>
-#include <Base/Converter.h>
-#include <Base/Tools.h>
-
-#include <Base/Vector3D.h>
-
-#include <App/ObjectIdentifier.h>
-
-#include <Gui/SoFCBoundingBox.h>
-#include <Gui/BitmapFactory.h>
-#include <Gui/Inventor/MarkerBitmaps.h>
-#include <Gui/Tools.h>
-
-#include <qpainter.h>
-
-#include "SoZoomTranslation.h"
-#include "SoDatumLabel.h"
-
-#include "EditModeInformationOverlayCoinConverter.h"
-
+#include "EditModeCoinManager.h"
+#include "EditModeConstraintCoinManager.h"
 #include "EditModeGeometryCoinConverter.h"
-
+#include "EditModeGeometryCoinManager.h"
+#include "EditModeInformationOverlayCoinConverter.h"
+#include "Utils.h"
 #include "ViewProviderSketch.h"
-
 #include "ViewProviderSketchCoinAttorney.h"
 
-#include "EditModeGeometryCoinManager.h"
-#include "EditModeConstraintCoinManager.h"
-
-#include "EditModeCoinManager.h"
-
-#include "Utils.h"
 
 using namespace SketcherGui;
 using namespace Sketcher;
diff --git a/src/Mod/Sketcher/Gui/EditModeCoinManager.h b/src/Mod/Sketcher/Gui/EditModeCoinManager.h
index 77e2a76bb4..a032847ebb 100644
--- a/src/Mod/Sketcher/Gui/EditModeCoinManager.h
+++ b/src/Mod/Sketcher/Gui/EditModeCoinManager.h
@@ -20,19 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef SKETCHERGUI_EditModeCoinManager_H
 #define SKETCHERGUI_EditModeCoinManager_H
 
-#include <vector>
 #include <functional>
+#include <vector>
 
-#include <Base/Parameter.h>
 #include <App/Application.h>
+#include <Mod/Sketcher/App/GeoList.h>
 
 #include "EditModeCoinManagerParameters.h"
 
-#include <Mod/Sketcher/App/GeoList.h>
 
 class SbVec3f;
 class SoRayPickAction;
diff --git a/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.cpp b/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.cpp
index e93fe845ee..f6cf090c9e 100644
--- a/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.cpp
+++ b/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.cpp
@@ -20,40 +20,36 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-
-#endif  // #ifndef _PreComp_
-
 #include "EditModeCoinManagerParameters.h"
 
+
 using namespace SketcherGui;
 
-SbColor DrawingParameters::InformationColor                         (0.0f,1.0f,0.0f);     // #00FF00 -> (  0,255,  0)
-SbColor DrawingParameters::CreateCurveColor                         (0.8f,0.8f,0.8f);     // #CCCCCC -> (204,204,204)
-SbColor DrawingParameters::CrossColorH                              (0.8f,0.4f,0.4f);     // #CC6666 -> (204,102,102)
-SbColor DrawingParameters::CrossColorV                              (0.47f,1.0f,0.51f);   // #83FF83 -> (120,255,131)
-SbColor DrawingParameters::InvalidSketchColor                       (1.0f,0.42f,0.0f);    // #FF6D00 -> (255,109,  0)
-SbColor DrawingParameters::FullyConstrainedColor                    (0.0f,1.0f,0.0f);     // #00FF00 -> (  0,255,  0)
-SbColor DrawingParameters::FullyConstraintInternalAlignmentColor    (0.87f,0.87f,0.78f);  // #DEDEC8 -> (222,222,200)
-SbColor DrawingParameters::InternalAlignedGeoColor                  (0.7f,0.7f,0.5f);     // #B2B27F -> (178,178,127)
-SbColor DrawingParameters::FullyConstraintConstructionPointColor    (1.0f,0.58f,0.50f);   // #FF9580 -> (255,149,128)
-SbColor DrawingParameters::VertexColor                              (1.0f,0.149f,0.0f);   // #FF2600 -> (255, 38,  0)
-SbColor DrawingParameters::FullyConstraintElementColor              (0.50f,0.81f,0.62f);  // #80D0A0 -> (128,208,160)
-SbColor DrawingParameters::CurveColor                               (1.0f,1.0f,1.0f);     // #FFFFFF -> (255,255,255)
-SbColor DrawingParameters::PreselectColor                           (0.88f,0.88f,0.0f);   // #E1E100 -> (225,225,  0)
-SbColor DrawingParameters::SelectColor                              (0.11f,0.68f,0.11f);  // #1CAD1C -> ( 28,173, 28)
-SbColor DrawingParameters::PreselectSelectedColor                   (0.36f,0.48f,0.11f);  // #5D7B1C -> ( 93,123, 28)
-SbColor DrawingParameters::CurveExternalColor                       (0.8f,0.2f,0.6f);     // #CC3399 -> (204, 51,153)
-SbColor DrawingParameters::CurveDraftColor                          (0.0f,0.0f,0.86f);    // #0000DC -> (  0,  0,220)
-SbColor DrawingParameters::FullyConstraintConstructionElementColor  (0.56f,0.66f,0.99f);  // #8FA9FD -> (143,169,253)
+SbColor DrawingParameters::InformationColor                         (0.0f,  1.0f,   0.0f);     // #00FF00 -> (  0,255,  0)
+SbColor DrawingParameters::CreateCurveColor                         (0.8f,  0.8f,   0.8f);     // #CCCCCC -> (204,204,204)
+SbColor DrawingParameters::CrossColorH                              (0.8f,  0.4f,   0.4f);     // #CC6666 -> (204,102,102)
+SbColor DrawingParameters::CrossColorV                              (0.47f, 1.0f,   0.51f);   // #83FF83 -> (120,255,131)
+SbColor DrawingParameters::InvalidSketchColor                       (1.0f,  0.42f,  0.0f);    // #FF6D00 -> (255,109,  0)
+SbColor DrawingParameters::FullyConstrainedColor                    (0.0f,  1.0f,   0.0f);     // #00FF00 -> (  0,255,  0)
+SbColor DrawingParameters::FullyConstraintInternalAlignmentColor    (0.87f, 0.87f,  0.78f);  // #DEDEC8 -> (222,222,200)
+SbColor DrawingParameters::InternalAlignedGeoColor                  (0.7f,  0.7f,   0.5f);     // #B2B27F -> (178,178,127)
+SbColor DrawingParameters::FullyConstraintConstructionPointColor    (1.0f,  0.58f,  0.50f);   // #FF9580 -> (255,149,128)
+SbColor DrawingParameters::VertexColor                              (1.0f,  0.149f, 0.0f);   // #FF2600 -> (255, 38,  0)
+SbColor DrawingParameters::FullyConstraintElementColor              (0.50f, 0.81f,  0.62f);  // #80D0A0 -> (128,208,160)
+SbColor DrawingParameters::CurveColor                               (1.0f,  1.0f,   1.0f);     // #FFFFFF -> (255,255,255)
+SbColor DrawingParameters::PreselectColor                           (0.88f, 0.88f,  0.0f);   // #E1E100 -> (225,225,  0)
+SbColor DrawingParameters::SelectColor                              (0.11f, 0.68f,  0.11f);  // #1CAD1C -> ( 28,173, 28)
+SbColor DrawingParameters::PreselectSelectedColor                   (0.36f, 0.48f,  0.11f);  // #5D7B1C -> ( 93,123, 28)
+SbColor DrawingParameters::CurveExternalColor                       (0.8f,  0.2f,   0.6f);     // #CC3399 -> (204, 51,153)
+SbColor DrawingParameters::CurveDraftColor                          (0.0f,  0.0f,   0.86f);    // #0000DC -> (  0,  0,220)
+SbColor DrawingParameters::FullyConstraintConstructionElementColor  (0.56f, 0.66f,  0.99f);  // #8FA9FD -> (143,169,253)
 
-SbColor DrawingParameters::ConstrDimColor                           (1.0f,0.149f,0.0f);   // #FF2600 -> (255, 38,  0)
-SbColor DrawingParameters::ConstrIcoColor                           (1.0f,0.149f,0.0f);   // #FF2600 -> (255, 38,  0)
-SbColor DrawingParameters::NonDrivingConstrDimColor                 (0.0f,0.149f,1.0f);   // #0026FF -> (  0, 38,255)
-SbColor DrawingParameters::ExprBasedConstrDimColor                  (1.0f,0.5f,0.149f);   // #FF7F26 -> (255, 127,38)
-SbColor DrawingParameters::DeactivatedConstrDimColor                (0.8f,0.8f,0.8f);     // #CCCCCC -> (204,204,204)
+SbColor DrawingParameters::ConstrDimColor                           (1.0f,  0.149f, 0.0f);   // #FF2600 -> (255, 38,  0)
+SbColor DrawingParameters::ConstrIcoColor                           (1.0f,  0.149f, 0.0f);   // #FF2600 -> (255, 38,  0)
+SbColor DrawingParameters::NonDrivingConstrDimColor                 (0.0f,  0.149f, 1.0f);   // #0026FF -> (  0, 38,255)
+SbColor DrawingParameters::ExprBasedConstrDimColor                  (1.0f,  0.5f,   0.149f);   // #FF7F26 -> (255, 127,38)
+SbColor DrawingParameters::DeactivatedConstrDimColor                (0.8f,  0.8f,   0.8f);     // #CCCCCC -> (204,204,204)
 
 const MultiFieldId MultiFieldId::Invalid = MultiFieldId();
diff --git a/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.h b/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.h
index 58da82eca1..5ff0a18aee 100644
--- a/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.h
+++ b/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.h
@@ -20,33 +20,28 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef SKETCHERGUI_EditModeCoinManagerParameters_H
 #define SKETCHERGUI_EditModeCoinManagerParameters_H
 
-#ifndef _PreComp_
-# include <Inventor/nodes/SoMaterial.h>
-# include <Inventor/nodes/SoCoordinate3.h>
-# include <Inventor/nodes/SoLineSet.h>
-# include <Inventor/nodes/SoGroup.h>
-# include <Inventor/nodes/SoMarkerSet.h>
-# include <Inventor/nodes/SoText2.h>
-# include <Inventor/nodes/SoPickStyle.h>
-# include <Inventor/nodes/SoTranslation.h>
-# include <Inventor/nodes/SoDrawStyle.h>
-# include <Inventor/SbColor.h>
-#endif  // #ifndef _PreComp_
+#include <map>
+#include <vector>
+
+#include <QString>
+
+#include <Inventor/SbColor.h>
+#include <Inventor/nodes/SoDrawStyle.h>
+#include <Inventor/nodes/SoCoordinate3.h>
+#include <Inventor/nodes/SoGroup.h>
+#include <Inventor/nodes/SoLineSet.h>
+#include <Inventor/nodes/SoMarkerSet.h>
+#include <Inventor/nodes/SoMaterial.h>
+#include <Inventor/nodes/SoPickStyle.h>
+#include <Inventor/nodes/SoText2.h>
+#include <Inventor/nodes/SoTranslation.h>
 
 #include <Gui/Inventor/SmSwitchboard.h>
-
-#include <qstring.h>
-#include <qcolor.h>
-
 #include <Mod/Sketcher/App/GeoList.h>
 
-#include <vector>
-#include <map>
-
 
 namespace Part {
     class Geometry;
diff --git a/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.cpp b/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.cpp
index 4ac6e54432..cc35a06ae1 100644
--- a/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.cpp
+++ b/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.cpp
@@ -20,46 +20,36 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <Inventor/nodes/SoSeparator.h>
-# include <Inventor/nodes/SoGroup.h>
-# include <Inventor/nodes/SoSwitch.h>
-# include <Inventor/nodes/SoMaterial.h>
-# include <Inventor/nodes/SoMaterialBinding.h>
-
-# include <Inventor/nodes/SoCoordinate3.h>
-# include <Inventor/nodes/SoLineSet.h>
-# include <Inventor/nodes/SoFont.h>
-
-# include <Inventor/nodes/SoMarkerSet.h>
-# include <Inventor/nodes/SoTranslation.h>
-# include <Inventor/nodes/SoText2.h>
-# include <Inventor/nodes/SoPickStyle.h>
-# include <Inventor/nodes/SoDrawStyle.h>
-# include <Inventor/SoPickedPoint.h>
-# include <Inventor/details/SoPointDetail.h>
-# include <Inventor/details/SoDetail.h>
-# include <Inventor/details/SoLineDetail.h>
-
-# include <Inventor/nodes/SoAnnotation.h>
-# include <Inventor/nodes/SoImage.h>
-# include <Inventor/nodes/SoInfo.h>
-
-# include <Inventor/actions/SoRayPickAction.h>
-
-# include <Inventor/SbVec3f.h>
-# include <Inventor/SbImage.h>
-
+# include <memory>
+# include <QPainter>
 # include <QRegularExpression>
 
-# include <memory>
+# include <Inventor/SbImage.h>
+# include <Inventor/SbVec3f.h>
+# include <Inventor/SoPickedPoint.h>
+# include <Inventor/nodes/SoAnnotation.h>
+# include <Inventor/nodes/SoDrawStyle.h>
+# include <Inventor/nodes/SoGroup.h>
+# include <Inventor/nodes/SoImage.h>
+# include <Inventor/nodes/SoInfo.h>
+# include <Inventor/nodes/SoMaterial.h>
+# include <Inventor/nodes/SoMaterialBinding.h>
+# include <Inventor/nodes/SoPickStyle.h>
+# include <Inventor/nodes/SoSeparator.h>
+# include <Inventor/nodes/SoTranslation.h>
 #endif  // #ifndef _PreComp_
 
+#include <Base/Converter.h>
+#include <Base/Exception.h>
+#include <Base/Tools.h>
+#include <Base/UnitsApi.h>
+#include <Base/Vector3D.h>
+#include <Gui/BitmapFactory.h>
+#include <Gui/Tools.h>
+#include <Gui/Utilities.h>
 #include <Gui/Inventor/SmSwitchboard.h>
-
 #include <Mod/Part/App/Geometry.h>
 #include <Mod/Sketcher/App/GeometryFacade.h>
 #include <Mod/Sketcher/App/SolverGeometryExtension.h>
@@ -67,38 +57,12 @@
 #include <Mod/Sketcher/App/Constraint.h>
 #include <Mod/Sketcher/App/GeoList.h>
 
-#include <Base/Exception.h>
-#include <Base/Tools2D.h>
-#include <Base/UnitsApi.h>
-#include <Gui/Utilities.h>
-#include <Base/Converter.h>
-#include <Base/Tools.h>
-
-#include <Base/Vector3D.h>
-
-#include <App/ObjectIdentifier.h>
-
-#include <Gui/SoFCBoundingBox.h>
-#include <Gui/BitmapFactory.h>
-#include <Gui/Inventor/MarkerBitmaps.h>
-#include <Gui/Tools.h>
-
-#include <qpainter.h>
-
-#include "SoZoomTranslation.h"
+#include "EditModeConstraintCoinManager.h"
 #include "SoDatumLabel.h"
-
-#include "EditModeInformationOverlayCoinConverter.h"
-
-#include "EditModeGeometryCoinConverter.h"
-
-#include "EditModeCoinManager.h"
-
+#include "SoZoomTranslation.h"
 #include "ViewProviderSketch.h"
-
 #include "ViewProviderSketchCoinAttorney.h"
 
-#include "EditModeConstraintCoinManager.h"
 
 using namespace SketcherGui;
 using namespace Sketcher;
diff --git a/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.h b/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.h
index e085674643..e4af4ee127 100644
--- a/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.h
+++ b/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.h
@@ -20,20 +20,24 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef SKETCHERGUI_EditModeConstraintCoinManager_H
 #define SKETCHERGUI_EditModeConstraintCoinManager_H
 
-#include <vector>
 #include <functional>
+#include <vector>
 
-#include <Base/Parameter.h>
-#include <App/Application.h>
+#include <QColor>
+#include <QImage>
+#include <QRect>
+
+# include <Inventor/nodes/SoImage.h>
+# include <Inventor/nodes/SoInfo.h>
 
 #include <Mod/Sketcher/App/GeoList.h>
 
 #include "EditModeCoinManagerParameters.h"
 
+
 class SbVec3f;
 class SoRayPickAction;
 class SoPickedPoint;
diff --git a/src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.cpp b/src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.cpp
index 63fc0a95cf..4cf4fa6efb 100644
--- a/src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.cpp
+++ b/src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.cpp
@@ -20,33 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <Inventor/nodes/SoSeparator.h>
-# include <Inventor/nodes/SoGroup.h>
-# include <Inventor/nodes/SoSwitch.h>
-# include <Inventor/nodes/SoMaterial.h>
-# include <Inventor/nodes/SoCoordinate3.h>
-# include <Inventor/nodes/SoLineSet.h>
-# include <Inventor/nodes/SoFont.h>
-
-# include <Inventor/nodes/SoTranslation.h>
-# include <Inventor/nodes/SoText2.h>
-#endif  // #ifndef _PreComp_
-
-#include <Mod/Part/App/Geometry.h>
 #include <Base/Console.h>
 #include <Base/Exception.h>
 
-#include <Base/UnitsApi.h>
-
-#include "EditModeCoinManagerParameters.h"
-
-#include "Mod/Sketcher/App/Constraint.h"
-
 #include "EditModeGeometryCoinConverter.h"
+#include "EditModeCoinManagerParameters.h"
 #include "ViewProviderSketchCoinAttorney.h"
 
 
diff --git a/src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.h b/src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.h
index 45164e74cf..0f0a7489bd 100644
--- a/src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.h
+++ b/src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef SKETCHERGUI_GeometryCoinConverter_H
 #define SKETCHERGUI_GeometryCoinConverter_H
 
@@ -28,6 +27,7 @@
 
 #include "ViewProviderSketch.h"
 
+
 namespace Base {
     template< typename T >
     class Vector3;
diff --git a/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.cpp b/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.cpp
index 64dbf72c00..78c3e54c64 100644
--- a/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.cpp
+++ b/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.cpp
@@ -20,81 +20,31 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <Inventor/nodes/SoSeparator.h>
-# include <Inventor/nodes/SoGroup.h>
-# include <Inventor/nodes/SoSwitch.h>
-# include <Inventor/nodes/SoMaterial.h>
-# include <Inventor/nodes/SoCoordinate3.h>
-# include <Inventor/nodes/SoLineSet.h>
-# include <Inventor/nodes/SoFont.h>
-
-# include <Inventor/nodes/SoMarkerSet.h>
-# include <Inventor/nodes/SoTranslation.h>
-# include <Inventor/nodes/SoText2.h>
-# include <Inventor/nodes/SoPickStyle.h>
-# include <Inventor/nodes/SoDrawStyle.h>
-# include <Inventor/SoPickedPoint.h>
-# include <Inventor/details/SoPointDetail.h>
-# include <Inventor/details/SoDetail.h>
-# include <Inventor/details/SoLineDetail.h>
-
-# include <Inventor/nodes/SoAnnotation.h>
-# include <Inventor/nodes/SoImage.h>
-# include <Inventor/nodes/SoInfo.h>
-
-# include <Inventor/actions/SoRayPickAction.h>
+# include <memory>
 
 # include <Inventor/SbVec3f.h>
-# include <Inventor/SbImage.h>
-
-# include <memory>
+# include <Inventor/nodes/SoCoordinate3.h>
+# include <Inventor/nodes/SoDrawStyle.h>
+# include <Inventor/nodes/SoLineSet.h>
+# include <Inventor/nodes/SoMarkerSet.h>
+# include <Inventor/nodes/SoMaterial.h>
+# include <Inventor/nodes/SoSeparator.h>
 #endif  // #ifndef _PreComp_
 
+#include <Gui/Inventor/MarkerBitmaps.h>
 #include <Gui/Inventor/SmSwitchboard.h>
-
-#include <Mod/Part/App/Geometry.h>
+#include <Mod/Sketcher/App/Constraint.h>
+#include <Mod/Sketcher/App/GeoEnum.h>
+#include <Mod/Sketcher/App/GeoList.h>
 #include <Mod/Sketcher/App/GeometryFacade.h>
 #include <Mod/Sketcher/App/SolverGeometryExtension.h>
-#include <Mod/Sketcher/App/GeoEnum.h>
-#include <Mod/Sketcher/App/Constraint.h>
-#include <Mod/Sketcher/App/GeoList.h>
-
-#include <Base/Exception.h>
-#include <Base/Tools2D.h>
-#include <Base/UnitsApi.h>
-#include <Gui/Utilities.h>
-#include <Base/Converter.h>
-#include <Base/Tools.h>
-
-#include <Base/Vector3D.h>
-
-#include <App/ObjectIdentifier.h>
-
-#include <Gui/SoFCBoundingBox.h>
-#include <Gui/BitmapFactory.h>
-#include <Gui/Inventor/MarkerBitmaps.h>
-#include <Gui/Tools.h>
-
-#include <qpainter.h>
-
-#include "SoZoomTranslation.h"
-#include "SoDatumLabel.h"
-
-#include "EditModeInformationOverlayCoinConverter.h"
-
-#include "EditModeGeometryCoinConverter.h"
-
-#include "ViewProviderSketch.h"
-
-#include "ViewProviderSketchCoinAttorney.h"
-
-#include "EditModeConstraintCoinManager.h"
 
 #include "EditModeGeometryCoinManager.h"
+#include "EditModeGeometryCoinConverter.h"
+#include "ViewProviderSketchCoinAttorney.h"
+
 
 using namespace SketcherGui;
 using namespace Sketcher;
diff --git a/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.h b/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.h
index 2c9d6d3578..fe62ef2b26 100644
--- a/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.h
+++ b/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.h
@@ -20,19 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef SKETCHERGUI_EditModeGeometryCoinManager_H
 #define SKETCHERGUI_EditModeGeometryCoinManager_H
 
-#include <vector>
 #include <functional>
+#include <vector>
 
-#include <Base/Parameter.h>
-#include <App/Application.h>
+#include <Mod/Sketcher/App/GeoList.h>
 
 #include "EditModeCoinManagerParameters.h"
 
-#include <Mod/Sketcher/App/GeoList.h>
 
 class SbVec3f;
 class SoRayPickAction;
diff --git a/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.cpp b/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.cpp
index b1c31942aa..52446f6cb1 100644
--- a/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.cpp
+++ b/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.cpp
@@ -20,31 +20,25 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <Inventor/nodes/SoSeparator.h>
-# include <Inventor/nodes/SoGroup.h>
-# include <Inventor/nodes/SoSwitch.h>
-# include <Inventor/nodes/SoMaterial.h>
 # include <Inventor/nodes/SoCoordinate3.h>
 # include <Inventor/nodes/SoLineSet.h>
 # include <Inventor/nodes/SoFont.h>
-
-# include <Inventor/nodes/SoTranslation.h>
+# include <Inventor/nodes/SoGroup.h>
+# include <Inventor/nodes/SoMaterial.h>
+# include <Inventor/nodes/SoSeparator.h>
+# include <Inventor/nodes/SoSwitch.h>
 # include <Inventor/nodes/SoText2.h>
+# include <Inventor/nodes/SoTranslation.h>
 #endif  // #ifndef _PreComp_
 
-#include <Mod/Part/App/Geometry.h>
 #include <Base/Console.h>
 #include <Base/Exception.h>
-
 #include <Base/UnitsApi.h>
 
-#include "EditModeCoinManagerParameters.h"
-
 #include "EditModeInformationOverlayCoinConverter.h"
+#include "EditModeCoinManagerParameters.h"
 #include "ViewProviderSketchCoinAttorney.h"
 
 
@@ -197,7 +191,7 @@ void EditModeInformationOverlayCoinConverter::calculate(const Part::Geometry * g
         std::vector<Base::Vector3d> pointatcomblist;
         pointatcomblist.reserve(ndiv);
 
-        for(int i = 0; i < ndiv; i++) {
+        for (int i = 0; i < ndiv; i++) {
             pointatcomblist.emplace_back(pointatcurvelist[i] - overlayParameters.currentBSplineCombRepresentationScale * curvaturelist[i] * normallist[i]);
         }
 
@@ -206,7 +200,7 @@ void EditModeInformationOverlayCoinConverter::calculate(const Part::Geometry * g
 
         auto zInfoH = ViewProviderSketchCoinAttorney::getViewOrientationFactor(viewProvider) * drawingParameters.zInfo;
 
-        for(int i = 0; i < ndiv; i++) {
+        for (int i = 0; i < ndiv; i++) {
             // note emplace emplaces on the position BEFORE the iterator given.
             curvatureComb.coordinates.emplace_back(pointatcurvelist[i].x, pointatcurvelist[i].y, zInfoH); // radials
             curvatureComb.coordinates.emplace_back(pointatcomblist[i].x, pointatcomblist[i].y, zInfoH); // radials
@@ -214,7 +208,7 @@ void EditModeInformationOverlayCoinConverter::calculate(const Part::Geometry * g
             curvatureComb.indices.emplace_back(2); // line
         }
 
-        for(int i = 0; i < ndiv; i++)
+        for (int i = 0; i < ndiv; i++)
             curvatureComb.coordinates.emplace_back(pointatcomblist[i].x, pointatcomblist[i].y, zInfoH); // // comb endpoint closing segment
 
         curvatureComb.indices.emplace_back(ndiv); // Comb line
@@ -225,7 +219,7 @@ void EditModeInformationOverlayCoinConverter::calculate(const Part::Geometry * g
         std::vector<double> knots = spline->getKnots();
         std::vector<int> mult = spline->getMultiplicities();
 
-        for(size_t i=0; i<knots.size(); i++) {
+        for (size_t i=0; i<knots.size(); i++) {
             knotMultiplicity.positions.emplace_back(spline->pointAtParameter(knots[i]));
 
             std::ostringstream stringStream;
@@ -240,7 +234,7 @@ void EditModeInformationOverlayCoinConverter::calculate(const Part::Geometry * g
         std::vector<Base::Vector3d> poles = spline->getPoles();
         auto weights = spline->getWeights();
 
-        for(size_t i=0; i<poles.size(); i++) {
+        for (size_t i=0; i<poles.size(); i++) {
             poleWeights.positions.emplace_back(poles[i]);
 
             QString WeightString  = QString::fromLatin1("[%1]").arg(weights[i], 0, 'f', Base::UnitsApi::getDecimals());
@@ -254,7 +248,7 @@ void EditModeInformationOverlayCoinConverter::calculate(const Part::Geometry * g
 template <typename Result>
 void EditModeInformationOverlayCoinConverter::addUpdateNode(const Result & result) {
 
-    if(overlayParameters.rebuildInformationLayer)
+    if (overlayParameters.rebuildInformationLayer)
         addNode(result);
     else
         updateNode(result);
@@ -288,11 +282,11 @@ void EditModeInformationOverlayCoinConverter::setPolygon(const Result & result,
     int32_t *index = polygonlineset->numVertices.startEditing();
     SbVec3f *vts = polygoncoords->point.startEditing();
 
-    for(size_t i = 0; i < result.coordinates.size(); i++)
+    for (size_t i = 0; i < result.coordinates.size(); i++)
         vts[i].setValue(result.coordinates[i].x, result.coordinates[i].y,
                         ViewProviderSketchCoinAttorney::getViewOrientationFactor(viewProvider) * drawingParameters.zInfo);
 
-    for(size_t i = 0; i < result.indices.size(); i++)
+    for (size_t i = 0; i < result.indices.size(); i++)
         index[i] = result.indices[i];
 
     polygoncoords->point.finishEditing();
diff --git a/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.h b/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.h
index aae6ce9b42..a2373c1596 100644
--- a/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.h
+++ b/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef SKETCHERGUI_InformationOverlayCoinConverter_H
 #define SKETCHERGUI_InformationOverlayCoinConverter_H
 
@@ -28,6 +27,7 @@
 
 #include "ViewProviderSketch.h"
 
+
 namespace Base {
     template< typename T >
     class Vector3;
diff --git a/src/Mod/Sketcher/Gui/PropertyConstraintListItem.cpp b/src/Mod/Sketcher/Gui/PropertyConstraintListItem.cpp
index c89aa89853..726d8c3fb8 100644
--- a/src/Mod/Sketcher/Gui/PropertyConstraintListItem.cpp
+++ b/src/Mod/Sketcher/Gui/PropertyConstraintListItem.cpp
@@ -21,7 +21,6 @@
 ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <memory>
 # include <QDebug>
@@ -29,9 +28,8 @@
 #endif
 
 #include <Base/Tools.h>
+#include <Mod/Sketcher/App/PropertyConstraintList.h>
 
-#include <Gui/MetaTypes.h>
-#include "../App/PropertyConstraintList.h"
 #include "PropertyConstraintListItem.h"
 
 
diff --git a/src/Mod/Sketcher/Gui/PropertyConstraintListItem.h b/src/Mod/Sketcher/Gui/PropertyConstraintListItem.h
index f14703d062..ad3f4fcb7d 100644
--- a/src/Mod/Sketcher/Gui/PropertyConstraintListItem.h
+++ b/src/Mod/Sketcher/Gui/PropertyConstraintListItem.h
@@ -22,17 +22,8 @@
 #ifndef PROPERTYCONSTRAINTLISTITEM_H
 #define PROPERTYCONSTRAINTLISTITEM_H
 
-#include <QObject>
-#include <QPointer>
-#include <QItemEditorFactory>
 #include <vector>
-#include <QList>
-
-#include <Base/Type.h>
-#include <Base/Quantity.h>
-#include <Base/UnitsApi.h>
-#include <App/PropertyStandard.h>
-#include <Gui/Widgets.h>
+#include <QObject>
 
 #include <Gui/propertyeditor/PropertyItem.h>
 
diff --git a/src/Mod/Sketcher/Gui/ShortcutListener.cpp b/src/Mod/Sketcher/Gui/ShortcutListener.cpp
index 1b795e8101..6a7b235494 100644
--- a/src/Mod/Sketcher/Gui/ShortcutListener.cpp
+++ b/src/Mod/Sketcher/Gui/ShortcutListener.cpp
@@ -20,9 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <QKeyEvent>
 #endif
@@ -30,6 +28,7 @@
 #include "ShortcutListener.h"
 #include "ViewProviderSketch.h"
 
+
 using namespace SketcherGui;
 
 // ******************** ViewProvider attorney *********************************************//
diff --git a/src/Mod/Sketcher/Gui/ShortcutListener.h b/src/Mod/Sketcher/Gui/ShortcutListener.h
index 80d0ae7f65..6bd4ab3796 100644
--- a/src/Mod/Sketcher/Gui/ShortcutListener.h
+++ b/src/Mod/Sketcher/Gui/ShortcutListener.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef SKETCHERGUI_SHORTCUTLISTENER_H
 #define SKETCHERGUI_SHORTCUTLISTENER_H
 
diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketchCoinAttorney.h b/src/Mod/Sketcher/Gui/ViewProviderSketchCoinAttorney.h
index d086b9dfe7..4818018402 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderSketchCoinAttorney.h
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketchCoinAttorney.h
@@ -20,11 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef SKETCHERGUI_ViewProviderSketchCoinAttorney_H
 #define SKETCHERGUI_ViewProviderSketchCoinAttorney_H
 
 #include <vector>
+#include <QFont>
 
 #include <Inventor/SbVec2f.h>
 #include <Inventor/SbVec3f.h>