diff --git a/src/Mod/Fem/App/FemPostFunction.cpp b/src/Mod/Fem/App/FemPostFunction.cpp
index 4386ed89b2..0cf7540cee 100644
--- a/src/Mod/Fem/App/FemPostFunction.cpp
+++ b/src/Mod/Fem/App/FemPostFunction.cpp
@@ -20,14 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "FemPostFunction.h"
-#include <Base/Console.h>
+
 
 using namespace Fem;
 using namespace App;
diff --git a/src/Mod/Fem/App/FemPostFunction.h b/src/Mod/Fem/App/FemPostFunction.h
index 294e9f3637..6c6cffc06b 100644
--- a/src/Mod/Fem/App/FemPostFunction.h
+++ b/src/Mod/Fem/App/FemPostFunction.h
@@ -26,8 +26,8 @@
 #include <vtkBoundingBox.h>
 #include <vtkImplicitFunction.h>
 #include <vtkPlane.h>
-#include <vtkSphere.h>
 #include <vtkSmartPointer.h>
+#include <vtkSphere.h>
 
 #include <App/PropertyUnits.h>
 
diff --git a/src/Mod/Fem/App/FemPostPipeline.cpp b/src/Mod/Fem/App/FemPostPipeline.cpp
index 15a9d17b39..e66134ba59 100644
--- a/src/Mod/Fem/App/FemPostPipeline.cpp
+++ b/src/Mod/Fem/App/FemPostPipeline.cpp
@@ -23,7 +23,6 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <SMESH_Mesh.hxx>
 # include <vtkAppendFilter.h>
 # include <vtkDataSetReader.h>
 # include <vtkImageData.h>
@@ -32,22 +31,20 @@
 # include <vtkUnstructuredGrid.h>
 # include <vtkXMLImageDataReader.h>
 # include <vtkXMLPolyDataReader.h>
+# include <vtkXMLPUnstructuredGridReader.h>
 # include <vtkXMLRectilinearGridReader.h>
 # include <vtkXMLStructuredGridReader.h>
-# include <vtkXMLPUnstructuredGridReader.h>
 # include <vtkXMLUnstructuredGridReader.h>
 #endif
 
+#include <Base/Console.h>
+
 #include "FemPostPipeline.h"
+#include "FemPostPipelinePy.h"
 #include "FemMesh.h"
 #include "FemMeshObject.h"
 #include "FemVTKTools.h"
 
-#include <App/DocumentObjectPy.h>
-#include <Base/Console.h>
-
-#include "FemPostPipelinePy.h"
-
 
 using namespace Fem;
 using namespace App;
diff --git a/src/Mod/Fem/App/FemPostPipelinePyImp.cpp b/src/Mod/Fem/App/FemPostPipelinePyImp.cpp
index 6ceaf8af66..e6ad531271 100644
--- a/src/Mod/Fem/App/FemPostPipelinePyImp.cpp
+++ b/src/Mod/Fem/App/FemPostPipelinePyImp.cpp
@@ -20,17 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#include <Python.h>
-#endif
 
-#include "FemPostPipeline.h"
 #include <Base/FileInfo.h>
 
-#include <Mod/Fem/App/FemPostPipelinePy.h>
-#include <Mod/Fem/App/FemPostPipelinePy.cpp>
+#include "FemPostPipeline.h"
+#include "FemPostPipelinePy.h"
+#include "FemPostPipelinePy.cpp"
+
 
 using namespace Fem;
 
diff --git a/src/Mod/Fem/App/PropertyPostDataObject.cpp b/src/Mod/Fem/App/PropertyPostDataObject.cpp
index ee7e11ecf1..8571a851bb 100644
--- a/src/Mod/Fem/App/PropertyPostDataObject.cpp
+++ b/src/Mod/Fem/App/PropertyPostDataObject.cpp
@@ -23,37 +23,33 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <Python.h>
-# include <vtkPolyData.h>
-# include <vtkStructuredGrid.h>
-# include <vtkRectilinearGrid.h>
-# include <vtkUnstructuredGrid.h>
-# include <vtkUniformGrid.h>
 # include <vtkCompositeDataSet.h>
 # include <vtkMultiBlockDataSet.h>
 # include <vtkMultiPieceDataSet.h>
+# include <vtkPolyData.h>
+# include <vtkRectilinearGrid.h>
+# include <vtkStructuredGrid.h>
+# include <vtkUnstructuredGrid.h>
+# include <vtkUniformGrid.h>
 # include <vtkXMLDataSetWriter.h>
+# include <vtkXMLImageDataReader.h>
 # include <vtkXMLPolyDataReader.h>
+# include <vtkXMLRectilinearGridReader.h>
 # include <vtkXMLStructuredGridReader.h>
 # include <vtkXMLUnstructuredGridReader.h>
-# include <vtkXMLRectilinearGridReader.h>
-# include <vtkXMLImageDataReader.h>
 #endif
 
-#include <Base/FileInfo.h>
+#include <App/Application.h>
+#include <App/DocumentObject.h>
 #include <Base/Console.h>
+#include <Base/FileInfo.h>
 #include <Base/Reader.h>
 #include <Base/Stream.h>
 #include <Base/Writer.h>
-#include <App/Application.h>
-#include <App/DocumentObject.h>
 #include <CXX/Objects.hxx>
 
 #include "PropertyPostDataObject.h"
 
-#ifndef _PreComp_
-
-#endif
 
 using namespace Fem;
 
diff --git a/src/Mod/Fem/App/PropertyPostDataObject.h b/src/Mod/Fem/App/PropertyPostDataObject.h
index 4ae6b23bd6..c950177647 100644
--- a/src/Mod/Fem/App/PropertyPostDataObject.h
+++ b/src/Mod/Fem/App/PropertyPostDataObject.h
@@ -24,7 +24,6 @@
 #define FEM_PROPERTYPOSTDATASET_H
 
 #include <vtkDataObject.h>
-#include <vtkDataSet.h>
 #include <vtkSmartPointer.h>
 
 #include <App/Property.h>