diff --git a/src/Mod/Measure/App/AppMeasure.cpp b/src/Mod/Measure/App/AppMeasure.cpp
index f903418914..8693bbfbc3 100644
--- a/src/Mod/Measure/App/AppMeasure.cpp
+++ b/src/Mod/Measure/App/AppMeasure.cpp
@@ -23,12 +23,12 @@
 #include "PreCompiled.h"
 
 #include <Base/Console.h>
-#include <Base/PyObjectBase.h>
 #include <Base/Interpreter.h>
 
 #include "Measurement.h"
 #include "MeasurementPy.h"
 
+
 namespace Measure {
 class Module : public Py::ExtensionModule<Module>
 {
diff --git a/src/Mod/Measure/App/Measurement.cpp b/src/Mod/Measure/App/Measurement.cpp
index 01221d25cc..c1d06389e2 100644
--- a/src/Mod/Measure/App/Measurement.cpp
+++ b/src/Mod/Measure/App/Measurement.cpp
@@ -22,37 +22,27 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-  #include <BRep_Builder.hxx>
-  #include <TopoDS_Compound.hxx>
-  # include <TopoDS_Shape.hxx>
-  # include <TopoDS_Face.hxx>
-  # include <TopoDS.hxx>
-  # include <TopExp_Explorer.hxx>
-  # include <gp_Pln.hxx>
-  # include <gp_Ax3.hxx>
-  # include <gp_Circ.hxx>
-  # include <gp_Elips.hxx>
-  # include <GCPnts_AbscissaPoint.hxx>
-  # include <BRepAdaptor_Surface.hxx>
-  # include <BRepAdaptor_Curve.hxx>
-  # include <BRepExtrema_DistShapeShape.hxx>
-  # include <GProp_GProps.hxx>
-  # include <GeomAPI_ExtremaCurveCurve.hxx>
-  # include <BRepGProp.hxx>
+# include <BRepAdaptor_Curve.hxx>
+# include <BRepExtrema_DistShapeShape.hxx>
+# include <BRepGProp.hxx>
+# include <GCPnts_AbscissaPoint.hxx>
+# include <gp_Circ.hxx>
+# include <gp_Lin.hxx>
+# include <GProp_GProps.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Shape.hxx>
 #endif
 
-
-#include <Base/Exception.h>
 #include <Base/Console.h>
-#include <Base/VectorPy.h>
+#include <Base/Exception.h>
 
-#include <Mod/Part/App/Geometry.h>
 #include <Mod/Part/App/PartFeature.h>
 #include <Mod/Part/App/TopoShape.h>
 
 #include "Measurement.h"
 #include "MeasurementPy.h"
 
+
 #ifndef M_PI
     #define M_PI    3.14159265358979323846 /* pi */
 #endif
diff --git a/src/Mod/Measure/App/Measurement.h b/src/Mod/Measure/App/Measurement.h
index f94610a812..e9853a6aad 100644
--- a/src/Mod/Measure/App/Measurement.h
+++ b/src/Mod/Measure/App/Measurement.h
@@ -23,13 +23,13 @@
 #ifndef MEASURE_MEASUREMENT_H
 #define MEASURE_MEASUREMENT_H
 
-#include <Base/BaseClass.h>
-#include <Base/SmartPtrPy.h>
-#include <Base/Vector3D.h>
-
 #include <App/DocumentObject.h>
 #include <App/PropertyLinks.h>
 
+#include <Base/BaseClass.h>
+#include <Base/Vector3D.h>
+
+
 class TopoDS_Shape;
 namespace Measure
 {
diff --git a/src/Mod/Measure/App/MeasurementPyImp.cpp b/src/Mod/Measure/App/MeasurementPyImp.cpp
index dfbe9d8c5f..89adadf2b7 100644
--- a/src/Mod/Measure/App/MeasurementPyImp.cpp
+++ b/src/Mod/Measure/App/MeasurementPyImp.cpp
@@ -25,13 +25,11 @@
 # include <sstream>
 #endif
 
-#include "Mod/Measure/App/Measurement.h"
-#include <Mod/Part/App/Geometry.h>
-#include <Base/GeometryPyCXX.h>
-#include <Base/VectorPy.h>
-#include <Base/AxisPy.h>
 #include <App/Application.h>
 #include <App/Document.h>
+#include <Base/GeometryPyCXX.h>
+
+#include "Measurement.h"
 
 // inclusion of the generated files (generated out of SketchObjectSFPy.xml)
 #include "MeasurementPy.h"