diff --git a/src/Mod/Fem/App/FemConstraint.cpp b/src/Mod/Fem/App/FemConstraint.cpp
index bed7d33043..7e18a37c8d 100644
--- a/src/Mod/Fem/App/FemConstraint.cpp
+++ b/src/Mod/Fem/App/FemConstraint.cpp
@@ -21,62 +21,48 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <cmath> //OvG: Required for log10
-# include <TopoDS.hxx>
-# include <BRepGProp_Face.hxx>
-# include <gp_Vec.hxx>
-# include <gp_Pnt.hxx>
-# include <gp_Pln.hxx>
-# include <gp_Cylinder.hxx>
-# include <gp_Ax3.hxx>
-# include <BRepAdaptor_Curve.hxx>
-# include <GCPnts_AbscissaPoint.hxx>
 # include <Adaptor3d_IsoCurve.hxx>
-# include <BRepAdaptor_Surface.hxx>
-# include <GProp_GProps.hxx>
-# include <BRepGProp.hxx>
-# include <TopoDS_Vertex.hxx>
-# include <BRepClass_FaceClassifier.hxx>
 # include <BRep_Tool.hxx>
+# include <BRepAdaptor_Curve.hxx>
+# include <BRepAdaptor_Surface.hxx>
+# include <BRepGProp.hxx>
 # include <BRepGProp_Face.hxx>
-# include <ShapeAnalysis.hxx>
-# include <GeomAPI_ProjectPointOnSurf.hxx>
-# include <GeomAPI_IntCS.hxx>
-# include <Geom_Plane.hxx>
+# include <BRepClass_FaceClassifier.hxx>
+# include <GCPnts_AbscissaPoint.hxx>
 # include <Geom_Line.hxx>
+# include <Geom_Plane.hxx>
+# include <GeomAPI_IntCS.hxx>
+# include <GeomAPI_ProjectPointOnSurf.hxx>
+# include <gp_Cylinder.hxx>
+# include <gp_Pln.hxx>
+# include <gp_Pnt.hxx>
+# include <gp_Vec.hxx>
+# include <GProp_GProps.hxx>
 # include <Precision.hxx>
 # include <Standard_Version.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Vertex.hxx>
 # if OCC_VERSION_HEX < 0x070600
-# include <Adaptor3d_HSurface.hxx>
-# include <BRepAdaptor_HSurface.hxx>
+#  include <Adaptor3d_HSurface.hxx>
+#  include <BRepAdaptor_HSurface.hxx>
 # endif
 #endif
 
-#include "FemConstraint.h"
-#include "FemTools.h"
-
 #include <App/DocumentObjectPy.h>
 #include <App/FeaturePythonPyImp.h>
 #include <App/OriginFeature.h>
-
 #include <Mod/Part/App/PartFeature.h>
-#include <Base/Console.h>
-#include <Base/Exception.h>
+
+#include "FemConstraint.h"
+#include "FemTools.h"
 
 
 using namespace Fem;
 
-// maybe in the c++ standard later, older compiler don't have round()
-#if _MSC_VER <= 1700
-double round(double r) {
-    return (r > 0.0) ? floor(r + 0.5) : ceil(r - 0.5);
-}
-#endif
-
 #if OCC_VERSION_HEX >= 0x070600
 using Adaptor3d_HSurface = Adaptor3d_Surface;
 using BRepAdaptor_HSurface = BRepAdaptor_Surface;
diff --git a/src/Mod/Fem/App/FemConstraint.h b/src/Mod/Fem/App/FemConstraint.h
index bcbc58444b..4d85793c04 100644
--- a/src/Mod/Fem/App/FemConstraint.h
+++ b/src/Mod/Fem/App/FemConstraint.h
@@ -21,7 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef FEM_CONSTRAINT_H
 #define FEM_CONSTRAINT_H
 
@@ -29,9 +28,9 @@
 #include <App/FeaturePython.h>
 #include <App/DocumentObject.h>
 #include <App/PropertyLinks.h>
-#include <App/PropertyGeo.h>
 #include <Mod/Fem/FemGlobal.h>
 
+
 namespace Fem {
 
 /**
diff --git a/src/Mod/Fem/App/FemConstraintBearing.cpp b/src/Mod/Fem/App/FemConstraintBearing.cpp
index 2ca239ff1b..f4e1cf9e96 100644
--- a/src/Mod/Fem/App/FemConstraintBearing.cpp
+++ b/src/Mod/Fem/App/FemConstraintBearing.cpp
@@ -21,23 +21,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#include <gp_Pnt.hxx>
-#include <gp_Pln.hxx>
-#include <gp_Lin.hxx>
-#include <TopoDS.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepAdaptor_Curve.hxx>
-#include <Precision.hxx>
+#include <BRepAdaptor_Surface.hxx>
+#include <TopoDS.hxx>
 #endif
 
+#include <Mod/Part/App/PartFeature.h>
+
 #include "FemConstraintBearing.h"
 
-#include <Mod/Part/App/PartFeature.h>
-#include <Base/Console.h>
 
 using namespace Fem;
 
@@ -64,7 +59,6 @@ App::DocumentObjectExecReturn *ConstraintBearing::execute(void)
 
 void ConstraintBearing::onChanged(const App::Property* prop)
 {
-    //Base::Console().Error("ConstraintBearing: onChanged %s\n", prop->getName());
     // Note: If we call this at the end, then the symbol is not oriented correctly initially
     // because the NormalDirection has not been calculated yet
     Constraint::onChanged(prop);
diff --git a/src/Mod/Fem/App/FemConstraintBearing.h b/src/Mod/Fem/App/FemConstraintBearing.h
index ab027b9dfa..6efa7a1b3d 100644
--- a/src/Mod/Fem/App/FemConstraintBearing.h
+++ b/src/Mod/Fem/App/FemConstraintBearing.h
@@ -21,16 +21,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef FEM_CONSTRAINTBEARING_H
 #define FEM_CONSTRAINTBEARING_H
 
 #include <App/DocumentObject.h>
 #include <App/PropertyLinks.h>
-#include <App/PropertyGeo.h>
 
 #include "FemConstraint.h"
 
+
 namespace Fem
 {
 
diff --git a/src/Mod/Fem/App/FemConstraintContact.cpp b/src/Mod/Fem/App/FemConstraintContact.cpp
index 390f09efc4..a1911542be 100644
--- a/src/Mod/Fem/App/FemConstraintContact.cpp
+++ b/src/Mod/Fem/App/FemConstraintContact.cpp
@@ -21,21 +21,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <Precision.hxx>
-#include <TopoDS.hxx>
-#include <gp_Lin.hxx>
-#include <gp_Pln.hxx>
-#include <gp_Pnt.hxx>
-#endif
-
 #include "FemConstraintContact.h"
 
+
 using namespace Fem;
 
 PROPERTY_SOURCE(Fem::ConstraintContact, Fem::Constraint)
diff --git a/src/Mod/Fem/App/FemConstraintDisplacement.cpp b/src/Mod/Fem/App/FemConstraintDisplacement.cpp
index 6a50add28c..68cab80a62 100644
--- a/src/Mod/Fem/App/FemConstraintDisplacement.cpp
+++ b/src/Mod/Fem/App/FemConstraintDisplacement.cpp
@@ -23,21 +23,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <Precision.hxx>
-#include <TopoDS.hxx>
-#include <gp_Lin.hxx>
-#include <gp_Pln.hxx>
-#include <gp_Pnt.hxx>
-#endif
-
 #include "FemConstraintDisplacement.h"
 
+
 using namespace Fem;
 
 PROPERTY_SOURCE(Fem::ConstraintDisplacement, Fem::Constraint)
diff --git a/src/Mod/Fem/App/FemConstraintGear.cpp b/src/Mod/Fem/App/FemConstraintGear.cpp
index 10c1559323..779169d4c0 100644
--- a/src/Mod/Fem/App/FemConstraintGear.cpp
+++ b/src/Mod/Fem/App/FemConstraintGear.cpp
@@ -21,23 +21,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#include <gp_Pnt.hxx>
-#include <gp_Pln.hxx>
-#include <gp_Lin.hxx>
-#include <TopoDS.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <Precision.hxx>
+# include <Precision.hxx>
 #endif
 
 #include "FemConstraintGear.h"
 
-#include <Mod/Part/App/PartFeature.h>
-#include <Base/Console.h>
 
 using namespace Fem;
 
diff --git a/src/Mod/Fem/App/FemConstraintGear.h b/src/Mod/Fem/App/FemConstraintGear.h
index 27f186bf1a..1c805cd9cc 100644
--- a/src/Mod/Fem/App/FemConstraintGear.h
+++ b/src/Mod/Fem/App/FemConstraintGear.h
@@ -21,16 +21,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef FEM_CONSTRAINTGear_H
 #define FEM_CONSTRAINTGear_H
 
-#include <App/DocumentObject.h>
-#include <App/PropertyLinks.h>
-#include <App/PropertyGeo.h>
-
 #include "FemConstraintBearing.h"
 
+
 namespace Fem
 {
 
diff --git a/src/Mod/Fem/App/FemConstraintPulley.cpp b/src/Mod/Fem/App/FemConstraintPulley.cpp
index e38fbf9703..ed767c2ddd 100644
--- a/src/Mod/Fem/App/FemConstraintPulley.cpp
+++ b/src/Mod/Fem/App/FemConstraintPulley.cpp
@@ -21,23 +21,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#include <gp_Pnt.hxx>
-#include <gp_Pln.hxx>
-#include <gp_Lin.hxx>
-#include <TopoDS.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <Precision.hxx>
+# include <Precision.hxx>
 #endif
 
 #include "FemConstraintPulley.h"
 
-#include <Mod/Part/App/PartFeature.h>
-#include <Base/Console.h>
 
 using namespace Fem;
 
diff --git a/src/Mod/Fem/App/FemConstraintPulley.h b/src/Mod/Fem/App/FemConstraintPulley.h
index 9d37df73ac..94e9afcdd4 100644
--- a/src/Mod/Fem/App/FemConstraintPulley.h
+++ b/src/Mod/Fem/App/FemConstraintPulley.h
@@ -24,9 +24,6 @@
 #ifndef FEM_CONSTRAINTPulley_H
 #define FEM_CONSTRAINTPulley_H
 
-#include <App/DocumentObject.h>
-#include <App/PropertyStandard.h>
-
 #include "FemConstraintGear.h"