diff --git a/src/Base/AxisPyImp.cpp b/src/Base/AxisPyImp.cpp
index 5290c32a21..c0ed19577a 100644
--- a/src/Base/AxisPyImp.cpp
+++ b/src/Base/AxisPyImp.cpp
@@ -24,12 +24,12 @@
 
 #include "GeometryPyCXX.h"
 
-// inclusion of the generated files (generated out of AxisPy.pyi)
+// generated out of Axis.pyi
 #include "AxisPy.h"
 #include "AxisPy.cpp"
 
-#include "VectorPy.h"
 #include "PlacementPy.h"
+#include "VectorPy.h"
 
 using namespace Base;
 
diff --git a/src/Base/BaseClassPyImp.cpp b/src/Base/BaseClassPyImp.cpp
index 5b303f29c6..5a48d3df54 100644
--- a/src/Base/BaseClassPyImp.cpp
+++ b/src/Base/BaseClassPyImp.cpp
@@ -20,10 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-// inclusion of the generated files (generated out of BaseClassPy.pyi)
+#include "Type.h"
+
+// generated out of BaseClass.pyi
 #include "BaseClassPy.h"
 #include "BaseClassPy.cpp"
 
@@ -35,7 +36,6 @@ std::string BaseClassPy::representation() const
     return {"<binding object>"};
 }
 
-
 PyObject* BaseClassPy::isDerivedFrom(PyObject* args) const
 {
     char* name {};
diff --git a/src/Base/BoundBoxPyImp.cpp b/src/Base/BoundBoxPyImp.cpp
index 4828b15a6f..a58a0a0408 100644
--- a/src/Base/BoundBoxPyImp.cpp
+++ b/src/Base/BoundBoxPyImp.cpp
@@ -20,16 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-// inclusion of the generated files (generated out of BoundBoxPy.pyi)
-#include "MatrixPy.h"
-#include "VectorPy.h"
 #include "GeometryPyCXX.h"
+
+// generated out of BoundBox.pyi
 #include "BoundBoxPy.h"
 #include "BoundBoxPy.cpp"
 
+#include "MatrixPy.h"
+#include "VectorPy.h"
+
 using namespace Base;
 
 // returns a string which represent the object e.g. when printed in python
diff --git a/src/Base/CoordinateSystemPyImp.cpp b/src/Base/CoordinateSystemPyImp.cpp
index 9c7093e68a..f532c7e3f4 100644
--- a/src/Base/CoordinateSystemPyImp.cpp
+++ b/src/Base/CoordinateSystemPyImp.cpp
@@ -22,14 +22,16 @@
 
 #include "PreCompiled.h"
 
-#include "AxisPy.h"
+#include "GeometryPyCXX.h"
+
+// generated out of CoordinateSystem.pyi
 #include "CoordinateSystemPy.h"
 #include "CoordinateSystemPy.cpp"
-#include "GeometryPyCXX.h"
+
+#include "AxisPy.h"
 #include "PlacementPy.h"
 #include "VectorPy.h"
 
-
 using namespace Base;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Base/MatrixPyImp.cpp b/src/Base/MatrixPyImp.cpp
index 67a2413c4e..9096364ff6 100644
--- a/src/Base/MatrixPyImp.cpp
+++ b/src/Base/MatrixPyImp.cpp
@@ -20,21 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 #include <limits>
 #endif
 
-// inclusion of the generated files (generated out of MatrixPy.pyi)
-#include "RotationPy.h"
-#include "VectorPy.h"
 #include "GeometryPyCXX.h"
-#include "QuantityPy.h"
+
+// generated out of Matrix.pyi
 #include "MatrixPy.h"
 #include "MatrixPy.cpp"
 
+#include "RotationPy.h"
+#include "QuantityPy.h"
+#include "VectorPy.h"
 
 using namespace Base;
 
diff --git a/src/Base/PersistencePyImp.cpp b/src/Base/PersistencePyImp.cpp
index 7d950e9e68..6c5e2a4663 100644
--- a/src/Base/PersistencePyImp.cpp
+++ b/src/Base/PersistencePyImp.cpp
@@ -20,16 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #include <boost/iostreams/stream.hpp>
 
 #include "Persistence.h"
+#include "PyWrapParseTupleAndKeywords.h"
 #include "Writer.h"
-#include <Base/PyWrapParseTupleAndKeywords.h>
 
-// inclusion of the generated files (generated out of PersistencePy.pyi)
+// generated out of Persistence.pyi
 #include "PersistencePy.h"
 #include "PersistencePy.cpp"
 
diff --git a/src/Base/PlacementPyImp.cpp b/src/Base/PlacementPyImp.cpp
index 93d97682a2..ce994f700e 100644
--- a/src/Base/PlacementPyImp.cpp
+++ b/src/Base/PlacementPyImp.cpp
@@ -20,20 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #include "GeometryPyCXX.h"
-#include <Base/PyWrapParseTupleAndKeywords.h>
+#include "Matrix.h"
+#include "PyWrapParseTupleAndKeywords.h"
+#include "Tools.h"
 
-// inclusion of the generated files (generated out of PlacementPy.pyi)
+// generated out of Placement.pyi
 #include "PlacementPy.h"
 #include "PlacementPy.cpp"
-#include "Matrix.h"
+
 #include "MatrixPy.h"
 #include "RotationPy.h"
 #include "VectorPy.h"
-#include "Tools.h"
 
 using namespace Base;
 
diff --git a/src/Base/PrecisionPyImp.cpp b/src/Base/PrecisionPyImp.cpp
index f69c102775..0124d5ce70 100644
--- a/src/Base/PrecisionPyImp.cpp
+++ b/src/Base/PrecisionPyImp.cpp
@@ -22,14 +22,13 @@
 
 #include "PreCompiled.h"
 
+// generated out of Precision.pyi
 #include "PrecisionPy.h"
 #include "PrecisionPy.cpp"
 
-
 using Base::Precision;
 using Base::PrecisionPy;
 
-
 // returns a string which represents the object e.g. when printed in python
 std::string PrecisionPy::representation() const
 {
diff --git a/src/Base/QuantityPyImp.cpp b/src/Base/QuantityPyImp.cpp
index e0b9333a8a..32797d8046 100644
--- a/src/Base/QuantityPyImp.cpp
+++ b/src/Base/QuantityPyImp.cpp
@@ -21,16 +21,17 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 #include <limits>
 #endif
 
-// inclusion of the generated files (generated out of QuantityPy.pyi)
+#include "Unit.h"
+
+// generated out of Quantity.pyi
 #include "QuantityPy.h"
-#include "UnitPy.h"
 #include "QuantityPy.cpp"
 
+#include "UnitPy.h"
 
 using namespace Base;
 
diff --git a/src/Base/RotationPyImp.cpp b/src/Base/RotationPyImp.cpp
index d1f91f3f35..b1e97a0cdd 100644
--- a/src/Base/RotationPyImp.cpp
+++ b/src/Base/RotationPyImp.cpp
@@ -20,18 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#include <Base/GeometryPyCXX.h>
-#include <Base/Tools.h>
-#include <Base/PyWrapParseTupleAndKeywords.h>
+#include "GeometryPyCXX.h"
+#include "PyWrapParseTupleAndKeywords.h"
+#include "Tools.h"
 
-// inclusion of the generated files (generated out of RotationPy.pyi)
+// generated out of Rotation.pyi
 #include "RotationPy.h"
 #include "RotationPy.cpp"
-#include "VectorPy.h"
 
+#include "VectorPy.h"
 
 using namespace Base;
 
diff --git a/src/Base/TypePyImp.cpp b/src/Base/TypePyImp.cpp
index 54b72a97fb..f69b6f81cd 100644
--- a/src/Base/TypePyImp.cpp
+++ b/src/Base/TypePyImp.cpp
@@ -20,11 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #include "Type.h"
 #include "BindingManager.h"
+
+// generated out of Type.pyi
 #include "TypePy.h"
 #include "TypePy.cpp"
 
diff --git a/src/Base/UnitPyImp.cpp b/src/Base/UnitPyImp.cpp
index 29389df0f4..6c38d9d430 100644
--- a/src/Base/UnitPyImp.cpp
+++ b/src/Base/UnitPyImp.cpp
@@ -22,12 +22,13 @@
 
 #include "PreCompiled.h"
 
-#include <Base/Unit.h>
+#include "Unit.h"
 
-// inclusion of the generated files (generated out of UnitPy.pyi)
-#include <Base/UnitPy.h>
-#include <Base/QuantityPy.h>
-#include <Base/UnitPy.cpp>
+// generated out of Unit.pyi
+#include "UnitPy.h"
+#include "UnitPy.cpp"
+
+#include "QuantityPy.h"
 
 using namespace Base;
 
diff --git a/src/Base/VectorPyImp.cpp b/src/Base/VectorPyImp.cpp
index 47abc254fb..114821e526 100644
--- a/src/Base/VectorPyImp.cpp
+++ b/src/Base/VectorPyImp.cpp
@@ -20,17 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 #include <sstream>
 #endif
 
+#include "GeometryPyCXX.h"
 #include "Vector3D.h"
 
-// inclusion of the generated files (generated out of VectorPy.pyi)
-#include "GeometryPyCXX.h"
+// generated out of Vector.pyi
 #include "VectorPy.h"
 #include "VectorPy.cpp"