diff --git a/src/Mod/Sketcher/App/Analyse.h b/src/Mod/Sketcher/App/Analyse.h
index 5398ce5a6d..2a4c968ccf 100644
--- a/src/Mod/Sketcher/App/Analyse.h
+++ b/src/Mod/Sketcher/App/Analyse.h
@@ -21,12 +21,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef SKETCHER_ANALYSE_H
 #define SKETCHER_ANALYSE_H
 
 #include <vector>
-#include <Mod/Sketcher/App/Constraint.h>
+
+#include "Constraint.h"
+
 
 namespace Sketcher {
 
diff --git a/src/Mod/Sketcher/App/AppSketcher.cpp b/src/Mod/Sketcher/App/AppSketcher.cpp
index 8f9ed001a7..8e45af68cd 100644
--- a/src/Mod/Sketcher/App/AppSketcher.cpp
+++ b/src/Mod/Sketcher/App/AppSketcher.cpp
@@ -25,22 +25,22 @@
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
 
-#include "SketchObjectSF.h"
-#include "SketchObject.h"
-#include "SketchGeometryExtension.h"
-#include "ExternalGeometryExtension.h"
-#include "SolverGeometryExtension.h"
-#include "GeometryFacade.h"
-#include "ExternalGeometryFacade.h"
 #include "Constraint.h"
-#include "Sketch.h"
 #include "ConstraintPy.h"
-#include "SketchPy.h"
-#include "SketchGeometryExtensionPy.h"
+#include "ExternalGeometryExtension.h"
 #include "ExternalGeometryExtensionPy.h"
-#include "GeometryFacadePy.h"
+#include "ExternalGeometryFacade.h"
 #include "ExternalGeometryFacadePy.h"
+#include "GeometryFacade.h"
+#include "GeometryFacadePy.h"
 #include "PropertyConstraintList.h"
+#include "Sketch.h"
+#include "SketchGeometryExtension.h"
+#include "SketchGeometryExtensionPy.h"
+#include "SketchObject.h"
+#include "SketchObjectSF.h"
+#include "SketchPy.h"
+#include "SolverGeometryExtension.h"
 
 
 namespace Sketcher {
diff --git a/src/Mod/Sketcher/App/AppSketcherPy.cpp b/src/Mod/Sketcher/App/AppSketcherPy.cpp
index 0333eccf77..6624c44e40 100644
--- a/src/Mod/Sketcher/App/AppSketcherPy.cpp
+++ b/src/Mod/Sketcher/App/AppSketcherPy.cpp
@@ -20,27 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <BRepPrimAPI_MakeBox.hxx>
-# include <TopoDS_Face.hxx>
-# include <Geom_Plane.hxx>
-#endif
 
-#include <Base/Console.h>
-#include <Base/PyObjectBase.h>
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
 #include <App/Application.h>
 #include <App/Document.h>
-
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
-// Things from the part module
-#include <Mod/Part/App/TopoShape.h>
-#include <Mod/Part/App/TopoShapePy.h>
+#include <Base/Console.h>
+#include <Base/Exception.h>
+#include <Base/FileInfo.h>
+#include <Base/PyObjectBase.h>
 
 #include "SketchObjectSF.h"
 
diff --git a/src/Mod/Sketcher/App/Constraint.cpp b/src/Mod/Sketcher/App/Constraint.cpp
index 6133385634..5032dd6e3f 100644
--- a/src/Mod/Sketcher/App/Constraint.cpp
+++ b/src/Mod/Sketcher/App/Constraint.cpp
@@ -20,18 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <cmath>
 # include <QDateTime>
 #endif
 
-#include <Base/Writer.h>
 #include <Base/Reader.h>
+#include <Base/Writer.h>
 #include <Base/Tools.h>
-#include <App/Property.h>
-
 
 #include "Constraint.h"
 #include "ConstraintPy.h"
diff --git a/src/Mod/Sketcher/App/Constraint.h b/src/Mod/Sketcher/App/Constraint.h
index d7b8c90c78..0b15c5c2f0 100644
--- a/src/Mod/Sketcher/App/Constraint.h
+++ b/src/Mod/Sketcher/App/Constraint.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef SKETCHER_CONSTRAINT_H
 #define SKETCHER_CONSTRAINT_H
 
@@ -33,6 +32,7 @@
 
 #include "GeoEnum.h"
 
+
 namespace Sketcher
 {
 /*!
diff --git a/src/Mod/Sketcher/App/ConstraintPyImp.cpp b/src/Mod/Sketcher/App/ConstraintPyImp.cpp
index 523058d259..457aee001e 100644
--- a/src/Mod/Sketcher/App/ConstraintPyImp.cpp
+++ b/src/Mod/Sketcher/App/ConstraintPyImp.cpp
@@ -21,15 +21,15 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <sstream>
 #endif
 
-#include "Constraint.h"
+#include <Base/QuantityPy.h>
+
 #include "ConstraintPy.h"
 #include "ConstraintPy.cpp"
-#include <Base/QuantityPy.h>
+
 
 using namespace Sketcher;
 
diff --git a/src/Mod/Sketcher/App/ExternalGeometryExtension.cpp b/src/Mod/Sketcher/App/ExternalGeometryExtension.cpp
index a0921a5473..9f1daea08c 100644
--- a/src/Mod/Sketcher/App/ExternalGeometryExtension.cpp
+++ b/src/Mod/Sketcher/App/ExternalGeometryExtension.cpp
@@ -22,12 +22,12 @@
 
 #include "PreCompiled.h"
 
-#include <Base/Writer.h>
 #include <Base/Reader.h>
-
-#include <Mod/Sketcher/App/ExternalGeometryExtensionPy.h>
+#include <Base/Writer.h>
 
 #include "ExternalGeometryExtension.h"
+#include "ExternalGeometryExtensionPy.h"
+
 
 using namespace Sketcher;
 
diff --git a/src/Mod/Sketcher/App/ExternalGeometryExtension.h b/src/Mod/Sketcher/App/ExternalGeometryExtension.h
index 6185d77ece..077c10e0cf 100644
--- a/src/Mod/Sketcher/App/ExternalGeometryExtension.h
+++ b/src/Mod/Sketcher/App/ExternalGeometryExtension.h
@@ -23,11 +23,13 @@
 #ifndef SKETCHER_EXTERNALGEOMETRYEXTENSION_H
 #define SKETCHER_EXTERNALGEOMETRYEXTENSION_H
 
-#include <Mod/Part/App/Geometry.h>
-#include <Mod/Sketcher/SketcherGlobal.h>
 #include <array>
 #include <bitset>
 
+#include <Mod/Part/App/Geometry.h>
+#include <Mod/Sketcher/SketcherGlobal.h>
+
+
 namespace Sketcher
 {
 
diff --git a/src/Mod/Sketcher/App/ExternalGeometryExtensionPyImp.cpp b/src/Mod/Sketcher/App/ExternalGeometryExtensionPyImp.cpp
index f4d9c9eedd..1d3cd764b5 100644
--- a/src/Mod/Sketcher/App/ExternalGeometryExtensionPyImp.cpp
+++ b/src/Mod/Sketcher/App/ExternalGeometryExtensionPyImp.cpp
@@ -20,18 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-//#ifndef _PreComp_
-//# include <gp.hxx>
-//#endif
-
-#include <Mod/Part/App/Geometry.h>
-#include "SketchObject.h"
 #include "ExternalGeometryExtensionPy.h"
 #include "ExternalGeometryExtensionPy.cpp"
 
+
 using namespace Sketcher;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Sketcher/App/ExternalGeometryFacade.cpp b/src/Mod/Sketcher/App/ExternalGeometryFacade.cpp
index 4f0a69aefe..e557399ff2 100644
--- a/src/Mod/Sketcher/App/ExternalGeometryFacade.cpp
+++ b/src/Mod/Sketcher/App/ExternalGeometryFacade.cpp
@@ -25,14 +25,12 @@
 # include <boost/uuid/uuid_io.hpp>
 #endif
 
+#include <Base/Console.h>
+
 #include "ExternalGeometryFacade.h"
-
-#include <Base/Console.h> // Only for Debug - To be removed
-#include <Base/Exception.h>
-
-
 #include "ExternalGeometryFacadePy.h"
 
+
 using namespace Sketcher;
 
 TYPESYSTEM_SOURCE(Sketcher::ExternalGeometryFacade,Base::BaseClass)
diff --git a/src/Mod/Sketcher/App/ExternalGeometryFacade.h b/src/Mod/Sketcher/App/ExternalGeometryFacade.h
index 2b0e218741..b53277a21f 100644
--- a/src/Mod/Sketcher/App/ExternalGeometryFacade.h
+++ b/src/Mod/Sketcher/App/ExternalGeometryFacade.h
@@ -20,18 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef SKETCHER_GEOMETRYEXTERNALFACADE_H
 #define SKETCHER_GEOMETRYEXTERNALFACADE_H
 
-#include <Base/BaseClass.h>
-
-#include <Base/Console.h> // Only for Debug - To be removed
 #include <boost/uuid/uuid_io.hpp>
 
-#include <Mod/Part/App/Geometry.h>
-#include <Mod/Sketcher/App/SketchGeometryExtension.h>
+#include <Base/BaseClass.h>
 #include <Mod/Sketcher/App/ExternalGeometryExtension.h>
+#include <Mod/Sketcher/App/SketchGeometryExtension.h>
+
 
 namespace Sketcher
 {
diff --git a/src/Mod/Sketcher/App/ExternalGeometryFacadePyImp.cpp b/src/Mod/Sketcher/App/ExternalGeometryFacadePyImp.cpp
index f757e45ef4..7e12b25732 100644
--- a/src/Mod/Sketcher/App/ExternalGeometryFacadePyImp.cpp
+++ b/src/Mod/Sketcher/App/ExternalGeometryFacadePyImp.cpp
@@ -20,32 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-//#ifndef _PreComp_
-//# include <gp.hxx>
-//#endif
-
 #include <Base/GeometryPyCXX.h>
-#include <Base/Matrix.h>
 #include <Base/MatrixPy.h>
+#include <Base/PlacementPy.h>
 #include <Base/Vector3D.h>
 #include <Base/VectorPy.h>
-#include <Base/Rotation.h>
-#include <Base/Placement.h>
-#include <Base/PlacementPy.h>
-
-#include <Mod/Part/App/OCCError.h>
-#include <Mod/Part/App/Geometry.h>
-
 #include <Mod/Part/App/GeometryPy.h>
 #include <Mod/Part/App/GeometryExtensionPy.h>
+#include <Mod/Part/App/OCCError.h>
 
-#include "SketchObject.h"
 #include "ExternalGeometryFacadePy.h"
 #include "ExternalGeometryFacadePy.cpp"
 
+
 using namespace Sketcher;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Sketcher/App/GeoList.cpp b/src/Mod/Sketcher/App/GeoList.cpp
index f3a97d18c5..ec3d37074c 100644
--- a/src/Mod/Sketcher/App/GeoList.cpp
+++ b/src/Mod/Sketcher/App/GeoList.cpp
@@ -20,23 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-
+# include <cassert>
 #endif  // #ifndef _PreComp_
 
-#include <cassert>
-
-#include <Base/Vector3D.h>
 #include <Base/Exception.h>
-
-#include <Mod/Sketcher/App/GeometryFacade.h>
-
-#include <Mod/Sketcher/App/Constraint.h>
+#include <Base/Vector3D.h>
 
 #include "GeoList.h"
+#include "GeometryFacade.h"
+
 
 using namespace Sketcher;
 
diff --git a/src/Mod/Sketcher/App/GeoList.h b/src/Mod/Sketcher/App/GeoList.h
index 9196ad7efb..3f662bd7f4 100644
--- a/src/Mod/Sketcher/App/GeoList.h
+++ b/src/Mod/Sketcher/App/GeoList.h
@@ -20,15 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef SKETCHER_GeoList_H
 #define SKETCHER_GeoList_H
 
-#include <vector>
 #include <memory>
+#include <vector>
+
+#include "GeoEnum.h"
+#include "GeometryFacade.h"
 
-#include <Mod/Sketcher/App/GeoEnum.h>
-#include <Mod/Sketcher/App/GeometryFacade.h>
 
 namespace Base {
     template< typename T >
diff --git a/src/Mod/Sketcher/App/GeometryFacade.cpp b/src/Mod/Sketcher/App/GeometryFacade.cpp
index b5dae65f32..d1f30bc9bf 100644
--- a/src/Mod/Sketcher/App/GeometryFacade.cpp
+++ b/src/Mod/Sketcher/App/GeometryFacade.cpp
@@ -26,13 +26,9 @@
 #endif
 
 #include "GeometryFacade.h"
-
-//#include <Base/Console.h> // Only for Debug, when/if necessary
-#include <Base/Exception.h>
-
-
 #include "GeometryFacadePy.h"
 
+
 using namespace Sketcher;
 
 TYPESYSTEM_SOURCE(Sketcher::GeometryFacade,Base::BaseClass)
diff --git a/src/Mod/Sketcher/App/GeometryFacade.h b/src/Mod/Sketcher/App/GeometryFacade.h
index 4fefcbae90..1058e9eaa1 100644
--- a/src/Mod/Sketcher/App/GeometryFacade.h
+++ b/src/Mod/Sketcher/App/GeometryFacade.h
@@ -20,17 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef SKETCHER_GEOMETRYFACADE_H
 #define SKETCHER_GEOMETRYFACADE_H
 
-#include <Base/BaseClass.h>
-
-#include <Base/Console.h> // Only for Debug - To be removed
 #include <boost/uuid/uuid_io.hpp>
 
-#include <Mod/Part/App/Geometry.h>
-#include <Mod/Sketcher/App/SketchGeometryExtension.h>
+#include <Base/BaseClass.h>
+
+#include "SketchGeometryExtension.h"
+
 
 namespace Sketcher
 {
diff --git a/src/Mod/Sketcher/App/GeometryFacadePyImp.cpp b/src/Mod/Sketcher/App/GeometryFacadePyImp.cpp
index 0521e9395d..1c3590d904 100644
--- a/src/Mod/Sketcher/App/GeometryFacadePyImp.cpp
+++ b/src/Mod/Sketcher/App/GeometryFacadePyImp.cpp
@@ -20,32 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-//#ifndef _PreComp_
-//# include <gp.hxx>
-//#endif
-
 #include <Base/GeometryPyCXX.h>
-#include <Base/Matrix.h>
 #include <Base/MatrixPy.h>
 #include <Base/Vector3D.h>
 #include <Base/VectorPy.h>
-#include <Base/Rotation.h>
-#include <Base/Placement.h>
 #include <Base/PlacementPy.h>
-
-#include <Mod/Part/App/OCCError.h>
-#include <Mod/Part/App/Geometry.h>
-
-#include <Mod/Part/App/GeometryPy.h>
 #include <Mod/Part/App/GeometryExtensionPy.h>
+#include <Mod/Part/App/GeometryPy.h>
+#include <Mod/Part/App/OCCError.h>
 
-#include "SketchObject.h"
 #include "GeometryFacadePy.h"
 #include "GeometryFacadePy.cpp"
 
+
 using namespace Sketcher;
 
 // returns a string which represents the object e.g. when printed in python