diff --git a/src/Mod/Fem/App/FemMeshObject.cpp b/src/Mod/Fem/App/FemMeshObject.cpp
index 7d53cc9ac8..ceb1d99458 100644
--- a/src/Mod/Fem/App/FemMeshObject.cpp
+++ b/src/Mod/Fem/App/FemMeshObject.cpp
@@ -20,18 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "FemMeshObject.h"
 #include "FemMesh.h"
 #include <App/DocumentObjectPy.h>
 #include <App/FeaturePythonPyImp.h>
 #include <Base/Placement.h>
 
+
 using namespace Fem;
 using namespace App;
 
@@ -57,7 +54,7 @@ PyObject *FemMeshObject::getPyObject()
 {
     if (PythonObject.is(Py::_None())){
         // ref counter is set to 1
-        PythonObject = Py::Object(new DocumentObjectPy(this),true);
+        PythonObject = Py::Object(new DocumentObjectPy(this), true);
     }
     return Py::new_reference_to(PythonObject);
 }
@@ -85,7 +82,7 @@ template<> const char* Fem::FemMeshObjectPython::getViewProviderName(void) const
 template<> PyObject* Fem::FemMeshObjectPython::getPyObject(void) {
     if (PythonObject.is(Py::_None())) {
         // ref counter is set to 1
-        PythonObject = Py::Object(new App::FeaturePythonPyT<App::DocumentObjectPy>(this),true);
+        PythonObject = Py::Object(new App::FeaturePythonPyT<App::DocumentObjectPy>(this), true);
     }
     return Py::new_reference_to(PythonObject);
 }
diff --git a/src/Mod/Fem/App/FemPostFilter.cpp b/src/Mod/Fem/App/FemPostFilter.cpp
index 5853dbf658..ba251ddeda 100644
--- a/src/Mod/Fem/App/FemPostFilter.cpp
+++ b/src/Mod/Fem/App/FemPostFilter.cpp
@@ -23,16 +23,12 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <Python.h>
-# include <vtkFieldData.h>
 # include <vtkPointData.h>
 #endif
 
 #include "FemPostFilter.h"
 #include "FemPostPipeline.h"
-#include <Base/Console.h>
 #include <App/Document.h>
-#include <App/DocumentObjectPy.h>
 
 
 using namespace Fem;
diff --git a/src/Mod/Fem/App/FemPostObject.cpp b/src/Mod/Fem/App/FemPostObject.cpp
index 03ca2692aa..24a30e5a5d 100644
--- a/src/Mod/Fem/App/FemPostObject.cpp
+++ b/src/Mod/Fem/App/FemPostObject.cpp
@@ -23,16 +23,10 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <Python.h>
-# include <vtkPointData.h>
-# include <vtkCellData.h>
+# include <vtkDataSet.h>
 #endif
 
 #include "FemPostObject.h"
-#include <Base/Console.h>
-#include <App/Application.h>
-#include <App/Document.h>
-#include <App/DocumentObjectPy.h>
 
 
 using namespace Fem;
diff --git a/src/Mod/Fem/App/FemPostPipeline.cpp b/src/Mod/Fem/App/FemPostPipeline.cpp
index 01586a34d8..c2b935e57b 100644
--- a/src/Mod/Fem/App/FemPostPipeline.cpp
+++ b/src/Mod/Fem/App/FemPostPipeline.cpp
@@ -23,21 +23,19 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <Python.h>
 # include <SMESH_Mesh.hxx>
+# include <vtkAppendFilter.h>
 # include <vtkDataSetReader.h>
-# include <vtkGeometryFilter.h>
-# include <vtkStructuredGrid.h>
-# include <vtkUnstructuredGrid.h>
 # include <vtkImageData.h>
 # include <vtkRectilinearGrid.h>
-# include <vtkAppendFilter.h>
-# include <vtkXMLUnstructuredGridReader.h>
-# include <vtkXMLPUnstructuredGridReader.h>
-# include <vtkXMLPolyDataReader.h>
-# include <vtkXMLStructuredGridReader.h>
-# include <vtkXMLRectilinearGridReader.h>
+# include <vtkStructuredGrid.h>
+# include <vtkUnstructuredGrid.h>
 # include <vtkXMLImageDataReader.h>
+# include <vtkXMLPolyDataReader.h>
+# include <vtkXMLRectilinearGridReader.h>
+# include <vtkXMLStructuredGridReader.h>
+# include <vtkXMLPUnstructuredGridReader.h>
+# include <vtkXMLUnstructuredGridReader.h>
 #endif
 
 #include "FemPostPipeline.h"
@@ -45,11 +43,10 @@
 #include "FemMeshObject.h"
 #include "FemVTKTools.h"
 
-#include <Base/Console.h>
-#include <App/Document.h>
-
 #include <App/DocumentObjectPy.h>
-#include <Mod/Fem/App/FemPostPipelinePy.h>
+#include <Base/Console.h>
+
+#include "FemPostPipelinePy.h"
 
 
 using namespace Fem;
diff --git a/src/Mod/Fem/App/FemResultObject.cpp b/src/Mod/Fem/App/FemResultObject.cpp
index 2c4af8b60c..1742c085bf 100644
--- a/src/Mod/Fem/App/FemResultObject.cpp
+++ b/src/Mod/Fem/App/FemResultObject.cpp
@@ -20,16 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
-#include "FemResultObject.h"
 #include <App/FeaturePythonPyImp.h>
 #include <App/DocumentObjectPy.h>
 
+#include "FemResultObject.h"
+
+
 using namespace Fem;
 using namespace App;
 
@@ -38,10 +36,10 @@ PROPERTY_SOURCE(Fem::FemResultObject, App::DocumentObject)
 
 FemResultObject::FemResultObject()
 {
-    ADD_PROPERTY_TYPE(Mesh,(nullptr), "General",Prop_None,"Link to the corresponding mesh");
-    ADD_PROPERTY_TYPE(NodeNumbers,(0), "NodeData",Prop_None,"Numbers of the result nodes");
-    ADD_PROPERTY_TYPE(Stats,(0), "Data",Prop_None,"Statistics of the results");
-    ADD_PROPERTY_TYPE(Time,(0), "Data",Prop_None,"Time of analysis increment");
+    ADD_PROPERTY_TYPE(Mesh, (nullptr), "General", Prop_None, "Link to the corresponding mesh");
+    ADD_PROPERTY_TYPE(NodeNumbers, (0), "NodeData", Prop_None, "Numbers of the result nodes");
+    ADD_PROPERTY_TYPE(Stats, (0), "Data", Prop_None, "Statistics of the results");
+    ADD_PROPERTY_TYPE(Time, (0), "Data", Prop_None, "Time of analysis increment");
 
     // make read-only for property editor
     NodeNumbers.setStatus(App::Property::ReadOnly, true);
diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp
index 438e1dd86f..ff096bafac 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp
@@ -46,7 +46,7 @@
 # include <SMESHDS_Mesh.hxx>
 #endif
 
-#include <App/Document.h>
+#include <App/DocumentObject.h>
 #include <Base/BoundBox.h>
 #include <Base/Console.h>
 #include <Base/TimeInfo.h>